n20-common-lib 2.22.5 → 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 +12 -1
- package/theme/blue.css +3 -0
- package/theme/cctcRed.css +3 -0
- package/theme/fonts/SIMSUN.5e0c362c.ttf +0 -0
- package/theme/fonts/element-icons.535877f5.woff +0 -0
- package/theme/fonts/element-icons.732389de.ttf +0 -0
- package/theme/fonts/iconfont.09d221ee.woff +0 -0
- package/theme/fonts/iconfont.1c4bfacc.ttf +0 -0
- package/theme/fonts/iconfont.38d4b428.woff +0 -0
- package/theme/fonts/iconfont.a6f34dc7.woff2 +0 -0
- package/theme/fonts/iconfont.b56977e8.woff2 +0 -0
- package/theme/fonts/iconfont.f0839d3b.ttf +0 -0
- package/theme/fonts/iconfont.f4c32765.ttf +0 -0
- package/theme/green.css +3 -0
- package/theme/lightBlue.css +3 -0
- package/theme/orange.css +3 -0
- package/theme/purple.css +3 -0
- package/theme/red.css +3 -0
- package/theme/yellow.css +3 -0
package/package.json
CHANGED
|
@@ -264,12 +264,23 @@ export default {
|
|
|
264
264
|
this.$refs.vxeTable.clearCheckboxRow()
|
|
265
265
|
this.$emit('selection-change-method', [])
|
|
266
266
|
}
|
|
267
|
+
// 数据更新后重新设置合并单元格
|
|
268
|
+
this.$nextTick(() => {
|
|
269
|
+
if (this.mergeCells && this.mergeCells.length > 0 && this.$refs.vxeTable) {
|
|
270
|
+
this.$refs.vxeTable.setMergeCells(this.mergeCells)
|
|
271
|
+
}
|
|
272
|
+
})
|
|
267
273
|
}
|
|
268
274
|
},
|
|
269
275
|
activated() {
|
|
270
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
|
+
})
|
|
271
283
|
},
|
|
272
|
-
mounted() {},
|
|
273
284
|
methods: {
|
|
274
285
|
// 全选/反选
|
|
275
286
|
toggleAllSelection() {
|