n20-common-lib 2.22.6 → 2.22.7
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/package.json +1 -1
- package/src/components/TablePro/index.vue +6 -1
- package/theme/blue.css +2 -2
- package/theme/cctcRed.css +2 -2
- package/theme/green.css +2 -2
- package/theme/lightBlue.css +2 -2
- package/theme/orange.css +2 -2
- package/theme/purple.css +2 -2
- package/theme/red.css +2 -2
- package/theme/yellow.css +2 -2
package/package.json
CHANGED
|
@@ -274,8 +274,13 @@ export default {
|
|
|
274
274
|
},
|
|
275
275
|
activated() {
|
|
276
276
|
this.$refs.vxeTable.loadData(this.data)
|
|
277
|
+
// 数据更新后重新设置合并单元格
|
|
278
|
+
this.$nextTick(() => {
|
|
279
|
+
if (this.mergeCells && this.mergeCells.length > 0 && this.$refs.vxeTable) {
|
|
280
|
+
this.$refs.vxeTable.setMergeCells(this.mergeCells)
|
|
281
|
+
}
|
|
282
|
+
})
|
|
277
283
|
},
|
|
278
|
-
mounted() {},
|
|
279
284
|
methods: {
|
|
280
285
|
// 全选/反选
|
|
281
286
|
toggleAllSelection() {
|