vxe-table 4.23.4 → 4.23.5
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/dist/all.esm.js +64 -31
- package/dist/style.css +1 -1
- package/es/style.css +1 -1
- package/es/table/module/edit/hook.js +2 -2
- package/es/table/src/table.js +60 -27
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +22 -18
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/hook.js +2 -2
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/src/table.js +18 -14
- 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/module/edit/hook.ts +2 -2
- package/packages/table/src/table.ts +64 -28
- /package/es/{iconfont.1792740941484.ttf → iconfont.1792838769925.ttf} +0 -0
- /package/es/{iconfont.1792740941484.woff → iconfont.1792838769925.woff} +0 -0
- /package/es/{iconfont.1792740941484.woff2 → iconfont.1792838769925.woff2} +0 -0
- /package/lib/{iconfont.1792740941484.ttf → iconfont.1792838769925.ttf} +0 -0
- /package/lib/{iconfont.1792740941484.woff → iconfont.1792838769925.woff} +0 -0
- /package/lib/{iconfont.1792740941484.woff2 → iconfont.1792838769925.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.23.
|
|
16
|
+
const version = exports.version = "4.23.5";
|
|
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.23.
|
|
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.23.5",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},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:{mode:"tooltip",enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{mode:"tooltip",enterable:!0},footerTooltipConfig:{mode:"tooltip",enterable:!0},validConfig:{showErrorMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,allowAlign:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0,align:!0,headerAlign:!0,footerAlign:!0,aggFunc:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0,maxHeight:320},floatingFilterConfig:{},aggregateConfig:{padding:!0,placement:"left",rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0,isReuseKeep:!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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{},undoRedoHistoryConfig:{stackSize:50}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_CUSTOM_FIXED_LEFT:iconPrefix+"fixed-left",TABLE_CUSTOM_FIXED_RIGHT:iconPrefix+"fixed-right",TABLE_CUSTOM_ALIGN_LEFT:iconPrefix+"align-left",TABLE_CUSTOM_ALIGN_CENTER:iconPrefix+"align-center",TABLE_CUSTOM_ALIGN_RIGHT:iconPrefix+"align-right",TABLE_CUSTOM_MOVE_UP:iconPrefix+"arrows-up",TABLE_CUSTOM_MOVE_DN:iconPrefix+"arrows-down",TABLE_CUSTOM_PUT_TOP:iconPrefix+"top",TABLE_CUSTOM_PUT_BOTTOM:iconPrefix+"bottom",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",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",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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+"setting",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -9,7 +9,7 @@ var _core = require("@vxe-ui/core");
|
|
|
9
9
|
const {
|
|
10
10
|
log
|
|
11
11
|
} = _core.VxeUI;
|
|
12
|
-
const tableVersion = `table v${"4.23.
|
|
12
|
+
const tableVersion = `table v${"4.23.5"}`;
|
|
13
13
|
function createComponentLog(name) {
|
|
14
14
|
const uiVersion = _core.VxeUI.uiVersion ? `ui v${_core.VxeUI.uiVersion}` : '';
|
|
15
15
|
const ganttVersion = _core.VxeUI.ganttVersion ? `gantt v${_core.VxeUI.ganttVersion}` : '';
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.23.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.23.5";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",t=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"",r=[r,tableVersion,o,t].filter(e=>e).join(" ");return{warnLog:log.create("warn",r+"] ["+e),errLog:log.create("error",r+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.23.
|
|
3
|
+
"version": "4.23.5",
|
|
4
4
|
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"typescript": "~5.9.3",
|
|
67
67
|
"vue": "3.4.27",
|
|
68
68
|
"vue-router": "~4.5.1",
|
|
69
|
-
"vxe-pc-ui": "4.20.
|
|
69
|
+
"vxe-pc-ui": "4.20.19"
|
|
70
70
|
},
|
|
71
71
|
"vetur": {
|
|
72
72
|
"tags": "helper/vetur/tags.json",
|
|
@@ -307,7 +307,7 @@ hooks.add('tableEditModule', {
|
|
|
307
307
|
|
|
308
308
|
reactData.removeRowFlag++
|
|
309
309
|
reactData.insertRowFlag++
|
|
310
|
-
$xeTable.cacheRowMap(false)
|
|
310
|
+
$xeTable.cacheRowMap(false, false)
|
|
311
311
|
$xeTable.updateScrollYStatus()
|
|
312
312
|
$xeTable.handleTableData(treeConfig && transform)
|
|
313
313
|
if (!(treeConfig && transform)) {
|
|
@@ -692,7 +692,7 @@ hooks.add('tableEditModule', {
|
|
|
692
692
|
reactData.removeRowFlag++
|
|
693
693
|
reactData.insertRowFlag++
|
|
694
694
|
reactData.pendingRowFlag++
|
|
695
|
-
$xeTable.cacheRowMap(false)
|
|
695
|
+
$xeTable.cacheRowMap(false, false)
|
|
696
696
|
$xeTable.handleTableData(treeConfig && transform)
|
|
697
697
|
$xeTable.updateFooter()
|
|
698
698
|
$xeTable.handleUpdateBodyMerge()
|
|
@@ -1780,7 +1780,7 @@ export default defineVxeComponent({
|
|
|
1780
1780
|
internalData.tableFullGroupData = groupRest.treeData
|
|
1781
1781
|
reactData.isRowGroupStatus = true
|
|
1782
1782
|
reactData.rowGroupList = aggGroupConfs
|
|
1783
|
-
$xeTable.cacheRowMap(false)
|
|
1783
|
+
$xeTable.cacheRowMap(false, false)
|
|
1784
1784
|
}
|
|
1785
1785
|
// 如果自定义了顺序
|
|
1786
1786
|
if (isCustomSort && sortData) {
|
|
@@ -3341,7 +3341,7 @@ export default defineVxeComponent({
|
|
|
3341
3341
|
}
|
|
3342
3342
|
}
|
|
3343
3343
|
|
|
3344
|
-
const handleAsyncTreeExpandChilds = (row: any): Promise<void> => {
|
|
3344
|
+
const handleAsyncTreeExpandChilds = (row: any, autoExpand: boolean): Promise<void> => {
|
|
3345
3345
|
const treeOpts = computeTreeOpts.value
|
|
3346
3346
|
const checkboxOpts = computeCheckboxOpts.value
|
|
3347
3347
|
const { transform, loadMethod } = treeOpts
|
|
@@ -3367,7 +3367,7 @@ export default defineVxeComponent({
|
|
|
3367
3367
|
if (childRecords) {
|
|
3368
3368
|
return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
|
|
3369
3369
|
const { treeExpandedMaps } = internalData
|
|
3370
|
-
if (childRows.length && !treeExpandedMaps[rowid]) {
|
|
3370
|
+
if (autoExpand && childRows.length && !treeExpandedMaps[rowid]) {
|
|
3371
3371
|
treeExpandedMaps[rowid] = row
|
|
3372
3372
|
}
|
|
3373
3373
|
reactData.treeExpandedFlag++
|
|
@@ -4094,7 +4094,7 @@ export default defineVxeComponent({
|
|
|
4094
4094
|
internalData.tableFullTreeData = isRGroup ? [] : treeData
|
|
4095
4095
|
internalData.tableFullGroupData = isRGroup ? treeData : []
|
|
4096
4096
|
// 缓存数据
|
|
4097
|
-
$xeTable.cacheRowMap(isReset)
|
|
4097
|
+
$xeTable.cacheRowMap(isReset, true)
|
|
4098
4098
|
// 原始数据
|
|
4099
4099
|
internalData.tableSynchData = datas
|
|
4100
4100
|
if (isReset) {
|
|
@@ -4576,7 +4576,7 @@ export default defineVxeComponent({
|
|
|
4576
4576
|
const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
|
|
4577
4577
|
// 是否使用懒加载
|
|
4578
4578
|
if (isLoad) {
|
|
4579
|
-
result.push(handleAsyncTreeExpandChilds(row))
|
|
4579
|
+
result.push(handleAsyncTreeExpandChilds(row, true))
|
|
4580
4580
|
} else {
|
|
4581
4581
|
if (row[childrenField] && row[childrenField].length) {
|
|
4582
4582
|
treeExpandedMaps[rowid] = row
|
|
@@ -5583,7 +5583,7 @@ export default defineVxeComponent({
|
|
|
5583
5583
|
if (reDelFlag) {
|
|
5584
5584
|
reactData.removeRowFlag++
|
|
5585
5585
|
$xeTable.updateFooter()
|
|
5586
|
-
$xeTable.cacheRowMap(false)
|
|
5586
|
+
$xeTable.cacheRowMap(false, true)
|
|
5587
5587
|
$xeTable.handleTableData(treeConfig && transform)
|
|
5588
5588
|
if (!(treeConfig && transform)) {
|
|
5589
5589
|
$xeTable.updateAfterDataIndex()
|
|
@@ -7801,7 +7801,7 @@ export default defineVxeComponent({
|
|
|
7801
7801
|
* 重新懒加载树节点,并展开该节点
|
|
7802
7802
|
* @param {Row} row 行对象
|
|
7803
7803
|
*/
|
|
7804
|
-
reloadTreeExpand (row) {
|
|
7804
|
+
reloadTreeExpand (row, autoExpand = true) {
|
|
7805
7805
|
const { treeExpandLazyLoadedMaps } = internalData
|
|
7806
7806
|
const treeOpts = computeTreeOpts.value
|
|
7807
7807
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
|
|
@@ -7809,7 +7809,7 @@ export default defineVxeComponent({
|
|
|
7809
7809
|
const rowid = getRowid($xeTable, row)
|
|
7810
7810
|
if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
|
|
7811
7811
|
return $xeTable.clearTreeExpandLoaded(row).then(() => {
|
|
7812
|
-
return handleAsyncTreeExpandChilds(row)
|
|
7812
|
+
return handleAsyncTreeExpandChilds(row, autoExpand)
|
|
7813
7813
|
}).then(() => {
|
|
7814
7814
|
if (transform) {
|
|
7815
7815
|
handleVirtualTreeToList()
|
|
@@ -9703,7 +9703,7 @@ export default defineVxeComponent({
|
|
|
9703
9703
|
internalData.removeRowMaps = rRowMaps
|
|
9704
9704
|
internalData.afterFullData = afterFullList
|
|
9705
9705
|
|
|
9706
|
-
$xeTable.cacheRowMap(false)
|
|
9706
|
+
$xeTable.cacheRowMap(false, false)
|
|
9707
9707
|
$xeTable.handleTableData(treeConfig && transform)
|
|
9708
9708
|
$xeTable.updateFooter()
|
|
9709
9709
|
$xeTable.handleUpdateBodyMerge()
|
|
@@ -9928,7 +9928,7 @@ export default defineVxeComponent({
|
|
|
9928
9928
|
/**
|
|
9929
9929
|
* 更新数据行的 Map
|
|
9930
9930
|
*/
|
|
9931
|
-
cacheRowMap (isReset) {
|
|
9931
|
+
cacheRowMap (isReset, isReLoaded) {
|
|
9932
9932
|
const { treeConfig } = props
|
|
9933
9933
|
const { isRowGroupStatus } = reactData
|
|
9934
9934
|
const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps, rowExpandedMaps, selectCheckboxMaps } = internalData
|
|
@@ -9948,8 +9948,10 @@ export default defineVxeComponent({
|
|
|
9948
9948
|
fullDataRowIdMaps[rowid] = rowRest
|
|
9949
9949
|
fullAllDataRowIdMaps[rowid] = rowRest
|
|
9950
9950
|
}
|
|
9951
|
-
|
|
9952
|
-
|
|
9951
|
+
if (isReset || isReLoaded) {
|
|
9952
|
+
rowRest.treeLoaded = false
|
|
9953
|
+
rowRest.expandLoaded = false
|
|
9954
|
+
}
|
|
9953
9955
|
|
|
9954
9956
|
rowRest._seq = rowNum++
|
|
9955
9957
|
rowRest.row = row
|
|
@@ -11783,7 +11785,9 @@ export default defineVxeComponent({
|
|
|
11783
11785
|
}
|
|
11784
11786
|
$xeTable.closeTooltip()
|
|
11785
11787
|
},
|
|
11786
|
-
handleRowDragSwapEvent (evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
|
|
11788
|
+
handleRowDragSwapEvent (evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild): Promise<{
|
|
11789
|
+
status: boolean
|
|
11790
|
+
}> {
|
|
11787
11791
|
const { treeConfig, dragConfig } = props
|
|
11788
11792
|
const rowDragOpts = computeRowDragOpts.value
|
|
11789
11793
|
const { afterFullData, tableFullData, fullAllDataRowIdData } = internalData
|
|
@@ -11918,7 +11922,6 @@ export default defineVxeComponent({
|
|
|
11918
11922
|
if (!status) {
|
|
11919
11923
|
return errRest
|
|
11920
11924
|
}
|
|
11921
|
-
|
|
11922
11925
|
// 如果为树结构
|
|
11923
11926
|
if (treeConfig) {
|
|
11924
11927
|
if (transform) {
|
|
@@ -11973,7 +11976,7 @@ export default defineVxeComponent({
|
|
|
11973
11976
|
|
|
11974
11977
|
$xeTable.handleClearStack()
|
|
11975
11978
|
$xeTable.handleTableData(treeConfig && transform)
|
|
11976
|
-
$xeTable.cacheRowMap(false)
|
|
11979
|
+
$xeTable.cacheRowMap(false, false)
|
|
11977
11980
|
updateScrollYStatus()
|
|
11978
11981
|
if (!(treeConfig && transform)) {
|
|
11979
11982
|
$xeTable.updateAfterDataIndex()
|
|
@@ -12331,29 +12334,62 @@ export default defineVxeComponent({
|
|
|
12331
12334
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
|
|
12332
12335
|
const { prevDragRow, prevDragPos } = internalData
|
|
12333
12336
|
const rowDragOpts = computeRowDragOpts.value
|
|
12334
|
-
const { isCrossTableDrag } = rowDragOpts
|
|
12337
|
+
const { isCrossDrag, isCrossTableDrag, isAutoExpandToChild, isAutoLazyLoadToChild } = rowDragOpts
|
|
12338
|
+
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
12335
12339
|
// 跨表拖拽
|
|
12336
|
-
if (isCrossTableDrag && crossTableDragRowObj) {
|
|
12340
|
+
if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
|
|
12337
12341
|
const { $newTable } = crossTableDragRowObj
|
|
12338
12342
|
if ($newTable && $newTable.xID !== $xeTable.xID) {
|
|
12339
12343
|
$newTable.handleCrossTableRowDragInsertEvent(evnt)
|
|
12340
12344
|
return
|
|
12341
12345
|
}
|
|
12342
12346
|
}
|
|
12343
|
-
if (treeConfig &&
|
|
12347
|
+
if (treeConfig && prevDragToChild) {
|
|
12344
12348
|
// 懒加载
|
|
12345
|
-
const
|
|
12346
|
-
const rowRest = fullAllDataRowIdData[
|
|
12347
|
-
if (
|
|
12348
|
-
|
|
12349
|
+
const prevRowid = getRowid($xeTable, prevDragRow)
|
|
12350
|
+
const rowRest = fullAllDataRowIdData[prevRowid]
|
|
12351
|
+
if (!rowRest) {
|
|
12352
|
+
handleRowDragEndClearStatus()
|
|
12353
|
+
return
|
|
12354
|
+
}
|
|
12355
|
+
const hasLazyChilds = prevDragRow[hasChildField]
|
|
12356
|
+
const rowChilds = prevDragRow[childrenField]
|
|
12357
|
+
// 如果懒加载节点未被加载
|
|
12358
|
+
if (isAutoExpandToChild) {
|
|
12359
|
+
// 判断目标节点是否有树子级
|
|
12360
|
+
if ((lazy && hasLazyChilds) || (rowChilds && rowChilds.length)) {
|
|
12361
|
+
hideDropTip()
|
|
12362
|
+
$xeTable.setTreeExpand(prevDragRow, true).then(() => {
|
|
12363
|
+
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
12364
|
+
})
|
|
12365
|
+
return
|
|
12366
|
+
}
|
|
12367
|
+
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild).then(() => {
|
|
12368
|
+
if (!$xeTable.isTreeExpandByRow(prevDragRow)) {
|
|
12369
|
+
$xeTable.setTreeExpand(prevDragRow, true)
|
|
12370
|
+
}
|
|
12371
|
+
})
|
|
12372
|
+
return
|
|
12373
|
+
}
|
|
12374
|
+
// 如果是懒加载节点。只加载不自动展开
|
|
12375
|
+
if ((lazy && hasLazyChilds) && isAutoLazyLoadToChild) {
|
|
12376
|
+
if (rowChilds && rowChilds.length) {
|
|
12349
12377
|
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
12378
|
+
return
|
|
12350
12379
|
}
|
|
12351
|
-
|
|
12352
|
-
$xeTable.
|
|
12380
|
+
hideDropTip()
|
|
12381
|
+
$xeTable.reloadTreeExpand(prevDragRow, false).then(() => {
|
|
12382
|
+
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
12383
|
+
})
|
|
12384
|
+
return
|
|
12385
|
+
}
|
|
12386
|
+
// 懒加载的行默认需要先展开过后才允许拖拽,除非启用 isAutoExpandToChild | isAutoLazyLoadToChild
|
|
12387
|
+
if (lazy && hasLazyChilds && !rowRest.treeLoaded) {
|
|
12388
|
+
handleRowDragEndClearStatus()
|
|
12389
|
+
return
|
|
12353
12390
|
}
|
|
12354
|
-
} else {
|
|
12355
|
-
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
12356
12391
|
}
|
|
12392
|
+
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
12357
12393
|
},
|
|
12358
12394
|
handleRowDragDragoverEvent (evnt) {
|
|
12359
12395
|
const { treeConfig } = props
|
|
@@ -12363,7 +12399,7 @@ export default defineVxeComponent({
|
|
|
12363
12399
|
const { lazy, transform, parentField } = treeOpts
|
|
12364
12400
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
|
|
12365
12401
|
const rowDragOpts = computeRowDragOpts.value
|
|
12366
|
-
const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag } = rowDragOpts
|
|
12402
|
+
const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag, isAutoLazyLoadToChild, isAutoExpandToChild } = rowDragOpts
|
|
12367
12403
|
if (!dragRow && !(isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj)) {
|
|
12368
12404
|
evnt.preventDefault()
|
|
12369
12405
|
return
|
|
@@ -12406,7 +12442,7 @@ export default defineVxeComponent({
|
|
|
12406
12442
|
}
|
|
12407
12443
|
}
|
|
12408
12444
|
if ($xeTable.eqRow(dragRow, row) ||
|
|
12409
|
-
(isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
|
|
12445
|
+
(isControlKey && treeConfig && lazy && row[hasChildField] && (rowRest && !rowRest.treeLoaded) && !isAutoLazyLoadToChild && !isAutoExpandToChild) ||
|
|
12410
12446
|
(!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))
|
|
12411
12447
|
) {
|
|
12412
12448
|
showDropTip(evnt, trEl, null, false, dragPos)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|