vxe-table 4.13.19 → 4.13.21
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/es/style.css +1 -1
- package/es/table/src/table.js +97 -19
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +7 -11
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/table.js +5 -9
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/table/src/table.ts +94 -19
- /package/es/{iconfont.1746694097015.ttf → iconfont.1746783164369.ttf} +0 -0
- /package/es/{iconfont.1746694097015.woff → iconfont.1746783164369.woff} +0 -0
- /package/es/{iconfont.1746694097015.woff2 → iconfont.1746783164369.woff2} +0 -0
- /package/lib/{iconfont.1746694097015.ttf → iconfont.1746783164369.ttf} +0 -0
- /package/lib/{iconfont.1746694097015.woff → iconfont.1746783164369.woff} +0 -0
- /package/lib/{iconfont.1746694097015.woff2 → iconfont.1746783164369.woff2} +0 -0
package/lib/ui/index.js
CHANGED
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
|
|
|
13
13
|
exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
|
|
14
14
|
var _core = require("@vxe-ui/core");
|
|
15
15
|
var _utils = require("./src/utils");
|
|
16
|
-
const version = exports.version = "4.13.
|
|
16
|
+
const version = exports.version = "4.13.21";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
package/lib/ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.13.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.13.21",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},rowGroupConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!1,gt:24,preSize:1,oSize:0},virtualYConfig:{enabled:!1,gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
|
|
|
8
8
|
const {
|
|
9
9
|
log
|
|
10
10
|
} = _core.VxeUI;
|
|
11
|
-
const version = `table v${"4.13.
|
|
11
|
+
const version = `table v${"4.13.21"}`;
|
|
12
12
|
const warnLog = exports.warnLog = log.create('warn', version);
|
|
13
13
|
const errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.13.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.13.21",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.13.
|
|
3
|
+
"version": "4.13.21",
|
|
4
4
|
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"style": "lib/style.css",
|
|
29
29
|
"typings": "types/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"vxe-pc-ui": "^4.
|
|
31
|
+
"vxe-pc-ui": "^4.6.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -1252,7 +1252,7 @@ export default defineComponent({
|
|
|
1252
1252
|
|
|
1253
1253
|
const handleFooterMerge = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
|
|
1254
1254
|
const { footerTableData } = reactData
|
|
1255
|
-
const { mergeFooterList, mergeFooterMaps } = internalData
|
|
1255
|
+
const { mergeFooterList, mergeFooterMaps, fullColumnIdData } = internalData
|
|
1256
1256
|
if (merges) {
|
|
1257
1257
|
const { visibleColumn } = internalData
|
|
1258
1258
|
if (!XEUtils.isArray(merges)) {
|
|
@@ -1264,6 +1264,12 @@ export default defineComponent({
|
|
|
1264
1264
|
let mergeColumnIndex = -1
|
|
1265
1265
|
if (XEUtils.isNumber(margeCol)) {
|
|
1266
1266
|
mergeColumnIndex = margeCol
|
|
1267
|
+
} else {
|
|
1268
|
+
const colid = margeCol ? margeCol.id : null
|
|
1269
|
+
const colRest = colid ? fullColumnIdData[colid] : null
|
|
1270
|
+
if (colRest) {
|
|
1271
|
+
mergeColumnIndex = colRest._index
|
|
1272
|
+
}
|
|
1267
1273
|
}
|
|
1268
1274
|
if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
|
|
1269
1275
|
rowspan = XEUtils.toNumber(rowspan) || 1
|
|
@@ -1297,29 +1303,82 @@ export default defineComponent({
|
|
|
1297
1303
|
}
|
|
1298
1304
|
}
|
|
1299
1305
|
|
|
1300
|
-
const
|
|
1306
|
+
const removeBodyMerges = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
|
|
1307
|
+
const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData, mergeBodyMaps } = internalData
|
|
1301
1308
|
const rest: VxeTableDefines.MergeItem[] = []
|
|
1302
1309
|
if (merges) {
|
|
1303
|
-
|
|
1304
|
-
const { visibleColumn } = internalData
|
|
1310
|
+
const { handleGetRowId } = createHandleGetRowId($xeTable)
|
|
1305
1311
|
if (!XEUtils.isArray(merges)) {
|
|
1306
1312
|
merges = [merges]
|
|
1307
1313
|
}
|
|
1308
|
-
// if (treeConfig && merges.length) {
|
|
1309
|
-
// errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
|
|
1310
|
-
// }
|
|
1311
1314
|
merges.forEach((item) => {
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
+
const { row: margeRow, col: margeCol } = item
|
|
1316
|
+
let mergeRowIndex = -1
|
|
1317
|
+
let mergeColumnIndex = -1
|
|
1318
|
+
if (XEUtils.isNumber(margeRow)) {
|
|
1319
|
+
mergeRowIndex = margeRow
|
|
1320
|
+
} else {
|
|
1321
|
+
const rowid = margeRow ? handleGetRowId(margeRow) : null
|
|
1322
|
+
const rowRest = rowid ? fullAllDataRowIdData[rowid] : null
|
|
1323
|
+
if (rowRest) {
|
|
1324
|
+
mergeRowIndex = rowRest._index
|
|
1325
|
+
}
|
|
1315
1326
|
}
|
|
1316
|
-
if (XEUtils.isNumber(
|
|
1317
|
-
|
|
1327
|
+
if (XEUtils.isNumber(margeCol)) {
|
|
1328
|
+
mergeColumnIndex = margeCol
|
|
1329
|
+
} else {
|
|
1330
|
+
const colid = margeCol ? margeCol.id : null
|
|
1331
|
+
const colRest = colid ? fullColumnIdData[colid] : null
|
|
1332
|
+
if (colRest) {
|
|
1333
|
+
mergeColumnIndex = colRest._index
|
|
1334
|
+
}
|
|
1335
|
+
}
|
|
1336
|
+
const mcIndex = XEUtils.findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex)
|
|
1337
|
+
if (mcIndex > -1) {
|
|
1338
|
+
const rItems = mergeBodyList.splice(mcIndex, 1)
|
|
1339
|
+
const item = rItems[0]
|
|
1340
|
+
if (item) {
|
|
1341
|
+
rest.push(rItems[0])
|
|
1342
|
+
if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
|
|
1343
|
+
delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]
|
|
1344
|
+
}
|
|
1345
|
+
}
|
|
1346
|
+
}
|
|
1347
|
+
})
|
|
1348
|
+
}
|
|
1349
|
+
return rest
|
|
1350
|
+
}
|
|
1351
|
+
|
|
1352
|
+
const removeFooterMerges = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
|
|
1353
|
+
const { mergeFooterList, fullColumnIdData, mergeFooterMaps } = internalData
|
|
1354
|
+
const rest: VxeTableDefines.MergeItem[] = []
|
|
1355
|
+
if (merges) {
|
|
1356
|
+
if (!XEUtils.isArray(merges)) {
|
|
1357
|
+
merges = [merges]
|
|
1358
|
+
}
|
|
1359
|
+
merges.forEach((item) => {
|
|
1360
|
+
const { row: margeRow, col: margeCol } = item
|
|
1361
|
+
const mergeRowIndex = XEUtils.isNumber(margeRow) ? margeRow : -1
|
|
1362
|
+
let mergeColumnIndex = -1
|
|
1363
|
+
if (XEUtils.isNumber(margeCol)) {
|
|
1364
|
+
mergeColumnIndex = margeCol
|
|
1365
|
+
} else {
|
|
1366
|
+
const colid = margeCol ? margeCol.id : null
|
|
1367
|
+
const colRest = colid ? fullColumnIdData[colid] : null
|
|
1368
|
+
if (colRest) {
|
|
1369
|
+
mergeColumnIndex = colRest._index
|
|
1370
|
+
}
|
|
1318
1371
|
}
|
|
1319
|
-
const mcIndex = XEUtils.findIndexOf(
|
|
1372
|
+
const mcIndex = XEUtils.findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex)
|
|
1320
1373
|
if (mcIndex > -1) {
|
|
1321
|
-
const rItems =
|
|
1322
|
-
|
|
1374
|
+
const rItems = mergeFooterList.splice(mcIndex, 1)
|
|
1375
|
+
const item = rItems[0]
|
|
1376
|
+
if (item) {
|
|
1377
|
+
rest.push(item)
|
|
1378
|
+
if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
|
|
1379
|
+
delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]
|
|
1380
|
+
}
|
|
1381
|
+
}
|
|
1323
1382
|
}
|
|
1324
1383
|
})
|
|
1325
1384
|
}
|
|
@@ -1793,7 +1852,7 @@ export default defineComponent({
|
|
|
1793
1852
|
*/
|
|
1794
1853
|
const updateAfterDataIndex = () => {
|
|
1795
1854
|
const { treeConfig } = props
|
|
1796
|
-
const { fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData
|
|
1855
|
+
const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData
|
|
1797
1856
|
const treeOpts = computeTreeOpts.value
|
|
1798
1857
|
const { transform } = treeOpts
|
|
1799
1858
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
@@ -1814,8 +1873,20 @@ export default defineComponent({
|
|
|
1814
1873
|
}
|
|
1815
1874
|
fullMaps[rowid] = row
|
|
1816
1875
|
}, { children: transform ? treeOpts.mapChildrenField : childrenField })
|
|
1876
|
+
if (transform) {
|
|
1877
|
+
afterFullData.forEach((row, index) => {
|
|
1878
|
+
const rowid = handleGetRowId(row)
|
|
1879
|
+
const rowRest = fullAllDataRowIdData[rowid]
|
|
1880
|
+
const seq = index + 1
|
|
1881
|
+
if (rowRest) {
|
|
1882
|
+
if (!treeConfig) {
|
|
1883
|
+
rowRest.seq = seq
|
|
1884
|
+
}
|
|
1885
|
+
rowRest._index = index
|
|
1886
|
+
}
|
|
1887
|
+
})
|
|
1888
|
+
}
|
|
1817
1889
|
internalData.afterFullRowMaps = fullMaps
|
|
1818
|
-
updateAfterListIndex()
|
|
1819
1890
|
} else {
|
|
1820
1891
|
updateAfterListIndex()
|
|
1821
1892
|
}
|
|
@@ -6377,7 +6448,8 @@ export default defineComponent({
|
|
|
6377
6448
|
if (props.spanMethod) {
|
|
6378
6449
|
errLog('vxe.error.errConflicts', ['merge-cells', 'span-method'])
|
|
6379
6450
|
}
|
|
6380
|
-
const rest =
|
|
6451
|
+
const rest = removeBodyMerges(merges)
|
|
6452
|
+
$xeTable.handleUpdateBodyMerge()
|
|
6381
6453
|
return nextTick().then(() => {
|
|
6382
6454
|
$xeTable.updateCellAreas()
|
|
6383
6455
|
updateStyle()
|
|
@@ -6397,6 +6469,7 @@ export default defineComponent({
|
|
|
6397
6469
|
internalData.mergeBodyList = []
|
|
6398
6470
|
internalData.mergeBodyMaps = {}
|
|
6399
6471
|
internalData.mergeBodyCellMaps = {}
|
|
6472
|
+
reactData.mergeBodyFlag++
|
|
6400
6473
|
return nextTick().then(() => {
|
|
6401
6474
|
return updateStyle()
|
|
6402
6475
|
})
|
|
@@ -6416,7 +6489,8 @@ export default defineComponent({
|
|
|
6416
6489
|
if (props.footerSpanMethod) {
|
|
6417
6490
|
errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method'])
|
|
6418
6491
|
}
|
|
6419
|
-
const rest =
|
|
6492
|
+
const rest = removeFooterMerges(merges)
|
|
6493
|
+
$xeTable.handleUpdateFooterMerge()
|
|
6420
6494
|
return nextTick().then(() => {
|
|
6421
6495
|
tableMethods.updateCellAreas()
|
|
6422
6496
|
updateStyle()
|
|
@@ -6436,6 +6510,7 @@ export default defineComponent({
|
|
|
6436
6510
|
internalData.mergeFooterList = []
|
|
6437
6511
|
internalData.mergeFooterMaps = {}
|
|
6438
6512
|
internalData.mergeFooterCellMaps = {}
|
|
6513
|
+
reactData.mergeFootFlag++
|
|
6439
6514
|
return nextTick().then(() => {
|
|
6440
6515
|
return updateStyle()
|
|
6441
6516
|
})
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|