zouzhibin/zb-table
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table

Browse Source 
 Conflicts:
	.idea/workspace.xml
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
This commit is contained in:
zouzhibing
2022-04-11 18:36:24 +08:00
parent 7f84264507 89b49fb86b
commit b60c074441
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/table/index.vue
View File

@@ -22,12 +22,6 @@
@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>

2
uni_modules/zb-table/components/zb-table/zb-table.vue
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]

2
unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.js vendored
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];

2
unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js vendored
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];