meixioacomponent 2.0.46 → 2.0.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 +50 -39
- package/lib/meixioacomponent.umd.js +52 -41
- package/lib/meixioacomponent.umd.min.js +2 -2
- package/package.json +1 -1
- package/packages/components/proPageTable/oa_pro_colum_config.vue +1 -1
- package/packages/components/proPageTable/oa_pro_table.vue +26 -14
package/package.json
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
button-text="表格设置"
|
|
6
6
|
buttonIcon="setting-1"
|
|
7
7
|
style="margin: 0 var(--margin-4)"
|
|
8
|
-
@popoverShow="setDragConfigList"
|
|
9
8
|
>
|
|
10
9
|
<div slot="popoverContent" class="config-wrap">
|
|
11
10
|
<span class="tips-text">显示列表项</span>
|
|
@@ -94,6 +93,7 @@ export default {
|
|
|
94
93
|
},
|
|
95
94
|
},
|
|
96
95
|
]
|
|
96
|
+
this.setDragConfigList();
|
|
97
97
|
},
|
|
98
98
|
mounted() {
|
|
99
99
|
// this.$dragging.$on('dragged', ({value}) => {
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
v-show="!isCheckTableRow || !isHasHandlePlugin"
|
|
31
31
|
ref="oaProTableSearch"
|
|
32
32
|
v-model="module"
|
|
33
|
+
:size="`small`"
|
|
33
34
|
:placeholder="placeholder"
|
|
34
35
|
:pro-screen-model="proScreenModel"
|
|
35
36
|
:proScreenConfig="privateProScreenConfig"
|
|
@@ -570,20 +571,32 @@ export default {
|
|
|
570
571
|
},
|
|
571
572
|
},
|
|
572
573
|
|
|
573
|
-
showTableHeader
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
574
|
+
showTableHeader: {
|
|
575
|
+
set(val) {
|
|
576
|
+
console.log(val)
|
|
577
|
+
},
|
|
578
|
+
get() {
|
|
579
|
+
return this.tableConfigColumnList.filter((item) => {
|
|
580
|
+
if (item.hasOwnProperty('disabledSortable')) {
|
|
581
|
+
if (!item.disabledSortable) {
|
|
582
|
+
item['sorter'] = false;
|
|
583
|
+
}
|
|
584
|
+
} else {
|
|
585
|
+
item['sorter'] = true;
|
|
578
586
|
}
|
|
579
|
-
} else {
|
|
580
|
-
item['sorter'] = true;
|
|
581
|
-
}
|
|
582
587
|
|
|
583
|
-
|
|
584
|
-
|
|
588
|
+
return item.show;
|
|
589
|
+
});
|
|
590
|
+
}
|
|
585
591
|
|
|
586
592
|
},
|
|
593
|
+
columnControllerConfig() {
|
|
594
|
+
return {
|
|
595
|
+
fields:this.tableConfigColumnList.map(item=>{
|
|
596
|
+
return item.key
|
|
597
|
+
})
|
|
598
|
+
}
|
|
599
|
+
},
|
|
587
600
|
|
|
588
601
|
isCheckTableRow() {
|
|
589
602
|
const {tableCheckboxConfig} = this.$props;
|
|
@@ -661,7 +674,6 @@ export default {
|
|
|
661
674
|
item.width = 80;
|
|
662
675
|
}
|
|
663
676
|
});
|
|
664
|
-
|
|
665
677
|
this.refreshData();
|
|
666
678
|
},
|
|
667
679
|
|
|
@@ -1009,7 +1021,7 @@ export default {
|
|
|
1009
1021
|
|
|
1010
1022
|
this.$nextTick(() => {
|
|
1011
1023
|
// if (refreshLayout) {
|
|
1012
|
-
|
|
1024
|
+
this.daLayoutTable();
|
|
1013
1025
|
// }
|
|
1014
1026
|
});
|
|
1015
1027
|
}
|
|
@@ -1041,8 +1053,8 @@ export default {
|
|
|
1041
1053
|
},
|
|
1042
1054
|
// element表格的重新渲染方法
|
|
1043
1055
|
daLayoutTable() {
|
|
1044
|
-
this.$nextTick(()=>{
|
|
1045
|
-
|
|
1056
|
+
this.$nextTick(() => {
|
|
1057
|
+
console.log(this.$refs.enhancedTableRef);
|
|
1046
1058
|
})
|
|
1047
1059
|
},
|
|
1048
1060
|
// 清空高级筛选的条件
|