meixioacomponent 1.1.46 → 1.1.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/meixioacomponent.common.js +40 -37
- package/lib/meixioacomponent.umd.js +40 -37
- package/lib/meixioacomponent.umd.min.js +2 -2
- package/package.json +1 -1
- package/packages/components/proPageTable/oaProTableSearch/oa_pro-table-search.vue +0 -3
- package/packages/components/proPageTable/oa_pro_table.vue +20 -9
package/package.json
CHANGED
|
@@ -277,9 +277,6 @@ export default {
|
|
|
277
277
|
tableConfig.push(item);
|
|
278
278
|
});
|
|
279
279
|
}
|
|
280
|
-
// if (canPush) {
|
|
281
|
-
// this.tableConfigPushEmpty();
|
|
282
|
-
// }
|
|
283
280
|
if (this.$props.useLocalTableConfig) {
|
|
284
281
|
proTableLocalConfigManage.setProTableLocalConfigByTableKey(this.$props.useLocalTableConfig, tableConfig);
|
|
285
282
|
}
|
|
@@ -260,7 +260,6 @@ import {tableSectionMixins} from "../mixins/tableSectionMixins";
|
|
|
260
260
|
import TableCheckControl from "./TableCheckControl";
|
|
261
261
|
import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
|
|
262
262
|
|
|
263
|
-
let canPush = true;
|
|
264
263
|
export default {
|
|
265
264
|
name: "baseProTable",
|
|
266
265
|
data() {
|
|
@@ -643,7 +642,6 @@ export default {
|
|
|
643
642
|
if (rowKey) {
|
|
644
643
|
this.initTableControl();
|
|
645
644
|
}
|
|
646
|
-
// canPush = !this.isAverageWidth;
|
|
647
645
|
this.initProScreenConfig();
|
|
648
646
|
this.initFooterHandleConfig();
|
|
649
647
|
this.tableConfigColumnList.forEach((item, index) => {
|
|
@@ -657,10 +655,6 @@ export default {
|
|
|
657
655
|
}
|
|
658
656
|
});
|
|
659
657
|
|
|
660
|
-
// if (canPush) {
|
|
661
|
-
// this.tableConfigPushEmpty();
|
|
662
|
-
// }
|
|
663
|
-
|
|
664
658
|
this.refreshData();
|
|
665
659
|
},
|
|
666
660
|
|
|
@@ -679,19 +673,36 @@ export default {
|
|
|
679
673
|
proTableLocalConfigManage.hasConfigByTableKey(useLocalTableConfig).forEach(item => {
|
|
680
674
|
this.tableConfigColumnList.push(item);
|
|
681
675
|
})
|
|
676
|
+
|
|
677
|
+
this.copyColumnFun()
|
|
682
678
|
return;
|
|
683
679
|
}
|
|
684
680
|
|
|
685
681
|
}
|
|
686
682
|
|
|
687
|
-
|
|
688
683
|
this.tableConfigColumnList = JSON.parse(JSON.stringify(this.$props.tableConfig));
|
|
689
|
-
|
|
690
|
-
console.log(this.tableConfigColumnList);
|
|
684
|
+
this.copyColumnFun();
|
|
691
685
|
}
|
|
692
686
|
},
|
|
693
687
|
|
|
694
688
|
|
|
689
|
+
copyColumnFun() {
|
|
690
|
+
this.$props.tableConfig.forEach(item => {
|
|
691
|
+
if (item.fun && typeof item.fun === 'function') {
|
|
692
|
+
|
|
693
|
+
const index = this.tableConfigColumnList.findIndex(cItem => {
|
|
694
|
+
return cItem.key === item.key;
|
|
695
|
+
})
|
|
696
|
+
if (index > -1) {
|
|
697
|
+
this.tableConfigColumnList[index].fun = item.fun;
|
|
698
|
+
}
|
|
699
|
+
|
|
700
|
+
}
|
|
701
|
+
})
|
|
702
|
+
|
|
703
|
+
},
|
|
704
|
+
|
|
705
|
+
|
|
695
706
|
tableConfigPushEmpty() {
|
|
696
707
|
//
|
|
697
708
|
// this.tableConfigColumnList.push({
|