|
@@ -55,6 +55,13 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ getColumns() {
|
|
|
|
|
+ if (typeof this.columns == 'function') {
|
|
|
|
|
+ return this.columns();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return this.columns;
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
//服务器和本地配置columns对比
|
|
//服务器和本地配置columns对比
|
|
|
columnsContrast(list) {
|
|
columnsContrast(list) {
|
|
|
const key = 'label';
|
|
const key = 'label';
|
|
@@ -62,8 +69,9 @@ export default {
|
|
|
let sList = list.filter((d, i, r) => {
|
|
let sList = list.filter((d, i, r) => {
|
|
|
return d[key];
|
|
return d[key];
|
|
|
});
|
|
});
|
|
|
- let devColumns =
|
|
|
|
|
- this.newColumns?.length > 0 ? this.newColumns : this.columns;
|
|
|
|
|
|
|
+ let devColumns = this.newColumns?.length
|
|
|
|
|
+ ? this.newColumns
|
|
|
|
|
+ : this.getColumns();
|
|
|
let dList = devColumns.filter((d, i, r) => {
|
|
let dList = devColumns.filter((d, i, r) => {
|
|
|
return d[key] && d[key] !== '序号';
|
|
return d[key] && d[key] !== '序号';
|
|
|
});
|
|
});
|