优化bug

This commit is contained in:
zouzhibing
2022-04-11 18:33:30 +08:00
parent dc972be52b
commit 89b49fb86b
7 changed files with 138 additions and 180 deletions

38
.idea/workspace.xml generated
View File

@@ -4,54 +4,18 @@
<list default="true" id="be7958c3-0d1c-4f74-a433-b590462e7034" name="Default Changelist" comment="修改 回显问题">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uni_modules/zb-table/components/zb-table/components/table-header-item.vue" beforeDir="false" afterPath="$PROJECT_DIR$/uni_modules/zb-table/components/zb-table/components/table-header-item.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uni_modules/zb-table/components/zb-table/zb-table.vue" beforeDir="false" afterPath="$PROJECT_DIR$/uni_modules/zb-table/components/zb-table/zb-table.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uni_modules/zb-table/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/uni_modules/zb-table/readme.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/.mini-ide/project-ide.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/.mini-ide/project-ide.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/common/runtime.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/common/runtime.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/common/vendor.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/common/vendor.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.acss" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.acss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.axml" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.axml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/pages/index/index.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/uni-card/components/uni-card/uni-card.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/uni-card/components/uni-card/uni-card.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-checkbox.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-checkbox.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-h5-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-h5-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-side-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-side-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/table-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/zb-load-more.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/zb-load-more.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.acss" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.acss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.axml" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.axml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/main.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/runtime.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/runtime.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/vendor.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/common/vendor.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/pages/index/index.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/project.config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxss" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -141,7 +105,7 @@
<breakpoints>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/pages/index/index.vue</url>
<line>358</line>
<line>352</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>

View File

@@ -22,152 +22,146 @@
@edit="buttonEdit"
@dele="dele"
:data="data">
<template v-slot:age>
<view >
<!-- <div style="color: red">{{scope.label}}</div>-->
<div style="color: red">1</div>
</view>
</template>
</zb-table>
</view>
</uni-card>
<!-- <uni-card title="普通表格" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :columns="column1"-->
<!-- :stripe="true"-->
<!-- @rowClick="rowClick"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<!-- <uni-card title="多级表头" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :border="true"-->
<!-- :columns="column5"-->
<!-- :stripe="true"-->
<!-- @rowClick="rowClick"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<!-- <uni-card title="带边框表格" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :columns="column1"-->
<!-- :stripe="true"-->
<!-- @rowClick="rowClick"-->
<!-- :border="true"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<!-- <uni-card title="多选,多行数据时使用 Checkbox" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :columns="column2"-->
<!-- :stripe="true"-->
<!-- @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection"-->
<!-- @toggleAllSelection="toggleAllSelection"-->
<!-- :border="true"-->
<!-- @edit="buttonEdit"-->
<!-- @dele="dele"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<!-- <uni-card title="固定多列和表头" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :columns="column3"-->
<!-- :stripe="true"-->
<!-- @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection"-->
<!-- @toggleAllSelection="toggleAllSelection"-->
<!-- :border="true"-->
<!-- @edit="buttonEdit"-->
<!-- @dele="dele"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<!-- <uni-card title="年纪、日期排序" >-->
<!-- <view style="height: 200px">-->
<!-- <zb-table-->
<!-- :show-header="true"-->
<!-- :columns="column4"-->
<!-- :stripe="true"-->
<!-- :fit="false"-->
<!-- @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection"-->
<!-- @toggleAllSelection="toggleAllSelection"-->
<!-- :border="true"-->
<!-- @edit="buttonEdit"-->
<!-- @dele="dele"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<uni-card title="普通表格" >
<view style="height: 200px">
<zb-table
:columns="column1"
:stripe="true"
@rowClick="rowClick"
:data="data"></zb-table>
</view>
</uni-card>
<uni-card title="多级表头" >
<view style="height: 200px">
<zb-table
:border="true"
:columns="column5"
:stripe="true"
@rowClick="rowClick"
:data="data"></zb-table>
</view>
</uni-card>
<uni-card title="带边框表格" >
<view style="height: 200px">
<zb-table
:columns="column1"
:stripe="true"
@rowClick="rowClick"
:border="true"
:data="data"></zb-table>
</view>
</uni-card>
<uni-card title="多选,多行数据时使用 Checkbox" >
<view style="height: 200px">
<zb-table
:columns="column2"
:stripe="true"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
@edit="buttonEdit"
@dele="dele"
:data="data"></zb-table>
</view>
</uni-card>
<uni-card title="固定多列和表头" >
<view style="height: 200px">
<zb-table
:columns="column3"
:stripe="true"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
@edit="buttonEdit"
@dele="dele"
:data="data"></zb-table>
</view>
</uni-card>
<uni-card title="年纪、日期排序" >
<view style="height: 200px">
<zb-table
:show-header="true"
:columns="column4"
:stripe="true"
:fit="false"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
@edit="buttonEdit"
@dele="dele"
:data="data"></zb-table>
</view>
</uni-card>
<!-- <uni-card title="表尾合计" >-->
<!-- <view style="height: 300px">-->
<!-- <zb-table-->
<!-- :show-header="true"-->
<!-- :columns="column"-->
<!-- :fit="false"-->
<!-- :show-summary="true"-->
<!-- :summary-method="getSummaries"-->
<!-- @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection"-->
<!-- @toggleAllSelection="toggleAllSelection"-->
<!-- :border="true"-->
<!-- @edit="buttonEdit"-->
<!-- @dele="dele"-->
<!-- :data="data1"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<uni-card title="表尾合计" >
<view style="height: 300px">
<zb-table
:show-header="true"
:columns="column"
:fit="false"
:show-summary="true"
:summary-method="getSummaries"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
@edit="buttonEdit"
@dele="dele"
:data="data1"></zb-table>
</view>
</uni-card>
<!-- <uni-card title="上拉加载" >-->
<!-- <view style="height: 300px">-->
<!-- <zb-table-->
<!-- :show-header="true"-->
<!-- :columns="column"-->
<!-- :isShowLoadMore="true"-->
<!-- ref="zbTable"-->
<!-- @pullUpLoading="pullUpLoadingAction"-->
<!-- :summary-method="getSummaries"-->
<!-- @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection"-->
<!-- @toggleAllSelection="toggleAllSelection"-->
<!-- :border="true"-->
<!-- @edit="buttonEdit"-->
<!-- @dele="dele"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<uni-card title="上拉加载" >
<view style="height: 300px">
<zb-table
:show-header="true"
:columns="column"
:isShowLoadMore="true"
ref="zbTable"
@pullUpLoading="pullUpLoadingAction"
:summary-method="getSummaries"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
@edit="buttonEdit"
@dele="dele"
:data="data"></zb-table>
</view>
</uni-card>
<!-- <uni-card title="选择单行数据时使用色块表示" >-->
<!-- <view style="height: 300px">-->
<!-- <zb-table-->
<!-- :show-header="true"-->
<!-- :columns="column1"-->
<!-- @currentChange="currentChange"-->
<!-- :highlight="true"-->
<!-- :border="true"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<uni-card title="选择单行数据时使用色块表示" >
<view style="height: 300px">
<zb-table
:show-header="true"
:columns="column1"
@currentChange="currentChange"
:highlight="true"
:border="true"
:data="data"></zb-table>
</view>
</uni-card>
<!-- <uni-card title="支持设置单元格样式" >-->
<!-- <view style="height: 300px">-->
<!-- <zb-table-->
<!-- :cell-header-style="cellHeaderStyle"-->
<!-- :cell-style="cellStyle"-->
<!-- :show-header="true"-->
<!-- :columns="column1"-->
<!-- @currentChange="currentChange"-->
<!-- :highlight="true"-->
<!-- :border="true"-->
<!-- :data="data"></zb-table>-->
<!-- </view>-->
<!-- </uni-card>-->
<uni-card title="支持设置单元格样式" >
<view style="height: 300px">
<zb-table
:cell-header-style="cellHeaderStyle"
:cell-style="cellStyle"
:show-header="true"
:columns="column1"
@currentChange="currentChange"
:highlight="true"
:border="true"
:data="data"></zb-table>
</view>
</uni-card>
</view>
</template>

View File

@@ -675,7 +675,7 @@ export default {
},
methods: {
formatterAction(row,column,rowIndex,columnIndex){
if(column.formatter){
if(column.formatter&&typeof this.formatter==='function'){
return this.formatter(row,column,rowIndex,columnIndex)
}
return (row[column.name]==null||row[column.name]==='')?column.emptyString:row[column.name]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -886,7 +886,7 @@ var _util = __webpack_require__(/*! ./js/util */ 42);function _interopRequireDef
},
methods: {
formatterAction: function formatterAction(row, column, rowIndex, columnIndex) {
if (column.formatter) {
if (column.formatter && typeof this.formatter === 'function') {
return this.formatter(row, column, rowIndex, columnIndex);
}
return row[column.name] == null || row[column.name] === '' ? column.emptyString : row[column.name];

View File

@@ -886,7 +886,7 @@ var _util = __webpack_require__(/*! ./js/util */ 42);function _interopRequireDef
},
methods: {
formatterAction: function formatterAction(row, column, rowIndex, columnIndex) {
if (column.formatter) {
if (column.formatter && typeof this.formatter === 'function') {
return this.formatter(row, column, rowIndex, columnIndex);
}
return row[column.name] == null || row[column.name] === '' ? column.emptyString : row[column.name];