vxe-table 4.12.0 → 4.12.1
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/module/edit/hook.js +19 -22
- package/es/table/module/validator/hook.js +2 -4
- package/es/table/src/body.js +7 -8
- package/es/table/src/table.js +66 -92
- package/es/ui/index.js +3 -3
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +12257 -1056
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/hook.js +24 -33
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/module/validator/hook.js +3 -8
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/src/body.js +7 -8
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/table.js +71 -108
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +3 -3
- 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/module/edit/hook.ts +19 -22
- package/packages/table/module/validator/hook.ts +2 -4
- package/packages/table/src/body.ts +7 -8
- package/packages/table/src/table.ts +72 -100
- package/packages/ui/index.ts +2 -2
- /package/es/{iconfont.1742955995631.ttf → iconfont.1743045589885.ttf} +0 -0
- /package/es/{iconfont.1742955995631.woff → iconfont.1743045589885.woff} +0 -0
- /package/es/{iconfont.1742955995631.woff2 → iconfont.1743045589885.woff2} +0 -0
- /package/lib/{iconfont.1742955995631.ttf → iconfont.1743045589885.ttf} +0 -0
- /package/lib/{iconfont.1742955995631.woff → iconfont.1743045589885.woff} +0 -0
- /package/lib/{iconfont.1742955995631.woff2 → iconfont.1743045589885.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.12.
|
|
16
|
+
const version = exports.version = "4.12.1";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -206,13 +206,13 @@ _core.VxeUI.setConfig({
|
|
|
206
206
|
enabled: true,
|
|
207
207
|
gt: 60,
|
|
208
208
|
preSize: 1,
|
|
209
|
-
oSize:
|
|
209
|
+
oSize: 0
|
|
210
210
|
},
|
|
211
211
|
virtualYConfig: {
|
|
212
212
|
enabled: true,
|
|
213
213
|
gt: 100,
|
|
214
214
|
preSize: 1,
|
|
215
|
-
oSize:
|
|
215
|
+
oSize: 0
|
|
216
216
|
},
|
|
217
217
|
scrollbarConfig: {
|
|
218
218
|
// width: 0,
|
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.12.
|
|
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.12.1",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},treeConfig:{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:!0,gt:60,preSize:1,oSize:0},virtualYConfig:{enabled:!0,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",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.12.
|
|
11
|
+
const version = `table v${"4.12.1"}`;
|
|
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.12.
|
|
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.12.1",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.12.
|
|
3
|
+
"version": "4.12.1",
|
|
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.5.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -106,8 +106,8 @@ hooks.add('tableEditModule', {
|
|
|
106
106
|
|
|
107
107
|
const handleInsertRowAt = (records: any, targetRow: any, isInsertNextRow?: boolean) => {
|
|
108
108
|
const { treeConfig } = props
|
|
109
|
-
const { mergeList
|
|
110
|
-
const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
|
|
109
|
+
const { mergeList } = reactData
|
|
110
|
+
const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData
|
|
111
111
|
const treeOpts = computeTreeOpts.value
|
|
112
112
|
const { transform, rowField, mapChildrenField } = treeOpts
|
|
113
113
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
@@ -246,11 +246,11 @@ hooks.add('tableEditModule', {
|
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
|
-
const { insertMaps } = editStore
|
|
250
249
|
newRecords.forEach(newRow => {
|
|
251
250
|
const rowid = getRowid($xeTable, newRow)
|
|
252
|
-
|
|
251
|
+
insertRowMaps[rowid] = newRow
|
|
253
252
|
})
|
|
253
|
+
reactData.insertRowFlag++
|
|
254
254
|
$xeTable.cacheRowMap(false)
|
|
255
255
|
$xeTable.updateScrollYStatus()
|
|
256
256
|
$xeTable.handleTableData(treeConfig && transform)
|
|
@@ -493,13 +493,12 @@ hooks.add('tableEditModule', {
|
|
|
493
493
|
remove (rows: any) {
|
|
494
494
|
const { treeConfig } = props
|
|
495
495
|
const { mergeList, editStore } = reactData
|
|
496
|
-
const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps } = internalData
|
|
496
|
+
const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData
|
|
497
497
|
const checkboxOpts = computeCheckboxOpts.value
|
|
498
498
|
const treeOpts = computeTreeOpts.value
|
|
499
499
|
const { transform, mapChildrenField } = treeOpts
|
|
500
500
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
501
|
-
const { actived
|
|
502
|
-
const insertDataRowMaps = Object.assign({}, editStore.insertMaps)
|
|
501
|
+
const { actived } = editStore
|
|
503
502
|
const { checkField } = checkboxOpts
|
|
504
503
|
let delList: any[] = []
|
|
505
504
|
if (!rows) {
|
|
@@ -511,7 +510,7 @@ hooks.add('tableEditModule', {
|
|
|
511
510
|
rows.forEach((row: any) => {
|
|
512
511
|
if (!$xeTable.isInsertByRow(row)) {
|
|
513
512
|
const rowid = getRowid($xeTable, row)
|
|
514
|
-
|
|
513
|
+
removeRowMaps[rowid] = row
|
|
515
514
|
}
|
|
516
515
|
})
|
|
517
516
|
// 如果绑定了多选属性,则更新状态
|
|
@@ -579,14 +578,15 @@ hooks.add('tableEditModule', {
|
|
|
579
578
|
// 从新增中移除已删除的数据
|
|
580
579
|
rows.forEach((row: any) => {
|
|
581
580
|
const rowid = getRowid($xeTable, row)
|
|
582
|
-
if (
|
|
583
|
-
delete
|
|
581
|
+
if (insertRowMaps[rowid]) {
|
|
582
|
+
delete insertRowMaps[rowid]
|
|
584
583
|
}
|
|
585
584
|
if (pendingRowMaps[rowid]) {
|
|
586
585
|
delete pendingRowMaps[rowid]
|
|
587
586
|
}
|
|
588
587
|
})
|
|
589
|
-
|
|
588
|
+
reactData.removeRowFlag++
|
|
589
|
+
reactData.insertRowFlag++
|
|
590
590
|
reactData.pendingRowFlag++
|
|
591
591
|
$xeTable.updateFooter()
|
|
592
592
|
$xeTable.cacheRowMap(false)
|
|
@@ -656,11 +656,9 @@ hooks.add('tableEditModule', {
|
|
|
656
656
|
* 获取新增的临时数据
|
|
657
657
|
*/
|
|
658
658
|
getInsertRecords () {
|
|
659
|
-
const {
|
|
660
|
-
const { fullAllDataRowIdData } = internalData
|
|
661
|
-
const { insertMaps } = editStore
|
|
659
|
+
const { fullAllDataRowIdData, insertRowMaps } = internalData
|
|
662
660
|
const insertRecords: any[] = []
|
|
663
|
-
XEUtils.each(
|
|
661
|
+
XEUtils.each(insertRowMaps, (row, rowid) => {
|
|
664
662
|
if (fullAllDataRowIdData[rowid]) {
|
|
665
663
|
insertRecords.push(row)
|
|
666
664
|
}
|
|
@@ -671,10 +669,9 @@ hooks.add('tableEditModule', {
|
|
|
671
669
|
* 获取已删除的数据
|
|
672
670
|
*/
|
|
673
671
|
getRemoveRecords () {
|
|
674
|
-
const {
|
|
675
|
-
const { removeMaps } = editStore
|
|
672
|
+
const { removeRowMaps } = internalData
|
|
676
673
|
const removeRecords: any[] = []
|
|
677
|
-
XEUtils.each(
|
|
674
|
+
XEUtils.each(removeRowMaps, (row) => {
|
|
678
675
|
removeRecords.push(row)
|
|
679
676
|
})
|
|
680
677
|
return removeRecords
|
|
@@ -701,7 +698,7 @@ hooks.add('tableEditModule', {
|
|
|
701
698
|
if (process.env.VUE_APP_VXE_ENV === 'development') {
|
|
702
699
|
warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
|
|
703
700
|
}
|
|
704
|
-
return
|
|
701
|
+
return $xeTable.getEditRecord()
|
|
705
702
|
},
|
|
706
703
|
getEditRecord () {
|
|
707
704
|
const { editStore } = reactData
|
|
@@ -729,7 +726,7 @@ hooks.add('tableEditModule', {
|
|
|
729
726
|
if (process.env.VUE_APP_VXE_ENV === 'development') {
|
|
730
727
|
warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
|
|
731
728
|
}
|
|
732
|
-
return
|
|
729
|
+
return $xeTable.clearEdit(row)
|
|
733
730
|
},
|
|
734
731
|
/**
|
|
735
732
|
* 清除激活的编辑
|
|
@@ -753,7 +750,7 @@ hooks.add('tableEditModule', {
|
|
|
753
750
|
warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
|
|
754
751
|
}
|
|
755
752
|
// 即将废弃
|
|
756
|
-
return
|
|
753
|
+
return $xeTable.isEditByRow(row)
|
|
757
754
|
},
|
|
758
755
|
/**
|
|
759
756
|
* 判断行是否为激活编辑状态
|
|
@@ -914,7 +911,7 @@ hooks.add('tableEditModule', {
|
|
|
914
911
|
if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
|
|
915
912
|
if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
|
|
916
913
|
handleClearEdit(evnt)
|
|
917
|
-
|
|
914
|
+
$xeTable.clearSelected()
|
|
918
915
|
if ($xeTable.clearCellAreas) {
|
|
919
916
|
$xeTable.clearCellAreas()
|
|
920
917
|
$xeTable.clearCopyCellArea()
|
|
@@ -109,9 +109,7 @@ hooks.add('tableValidatorModule', {
|
|
|
109
109
|
const beginValidate = (rows: any, cols: VxeTableDefines.ColumnInfo[] | null, cb: any, isFull?: boolean): Promise<any> => {
|
|
110
110
|
const validRest: any = {}
|
|
111
111
|
const { editRules, treeConfig } = props
|
|
112
|
-
const {
|
|
113
|
-
const { afterFullData, pendingRowMaps } = internalData
|
|
114
|
-
const { removeMaps } = editStore
|
|
112
|
+
const { afterFullData, pendingRowMaps, removeRowMaps } = internalData
|
|
115
113
|
const treeOpts = computeTreeOpts.value
|
|
116
114
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
117
115
|
const validOpts = computeValidOpts.value
|
|
@@ -147,7 +145,7 @@ hooks.add('tableValidatorModule', {
|
|
|
147
145
|
const handleVaild = (row: any) => {
|
|
148
146
|
const rowid = getRowid($xeTable, row)
|
|
149
147
|
// 是否删除
|
|
150
|
-
if (
|
|
148
|
+
if (removeRowMaps[rowid]) {
|
|
151
149
|
return
|
|
152
150
|
}
|
|
153
151
|
// 是否标记删除
|
|
@@ -465,10 +465,13 @@ export default defineComponent({
|
|
|
465
465
|
const rows: any[] = []
|
|
466
466
|
const { handleGetRowId } = createHandleGetRowId($xeTable)
|
|
467
467
|
tableData.forEach((row, $rowIndex) => {
|
|
468
|
-
const
|
|
468
|
+
const rowid = handleGetRowId(row)
|
|
469
|
+
const rowRest = fullAllDataRowIdData[rowid] || {}
|
|
469
470
|
let rowIndex = $rowIndex
|
|
470
|
-
|
|
471
|
-
|
|
471
|
+
let rowLevel = 0
|
|
472
|
+
let seq: string | number = -1
|
|
473
|
+
let _rowIndex = -1
|
|
474
|
+
const trOn: Record<string, any> = {}
|
|
472
475
|
// 当前行事件
|
|
473
476
|
if (rowOpts.isHover || highlightHoverRow) {
|
|
474
477
|
trOn.onMouseenter = (evnt: MouseEvent) => {
|
|
@@ -484,11 +487,6 @@ export default defineComponent({
|
|
|
484
487
|
$xeTable.clearHoverRow()
|
|
485
488
|
}
|
|
486
489
|
}
|
|
487
|
-
const rowid = handleGetRowId(row)
|
|
488
|
-
const rowRest = fullAllDataRowIdData[rowid] || {}
|
|
489
|
-
let rowLevel = 0
|
|
490
|
-
let seq: string | number = -1
|
|
491
|
-
let _rowIndex = 0
|
|
492
490
|
if (rowRest) {
|
|
493
491
|
rowLevel = rowRest.level
|
|
494
492
|
if (treeConfig && transform && seqMode === 'increasing') {
|
|
@@ -496,6 +494,7 @@ export default defineComponent({
|
|
|
496
494
|
} else {
|
|
497
495
|
seq = rowRest.seq
|
|
498
496
|
}
|
|
497
|
+
rowIndex = rowRest.index
|
|
499
498
|
_rowIndex = rowRest._index
|
|
500
499
|
}
|
|
501
500
|
const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex }
|