vxe-table 3.19.33 → 3.19.35
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/custom/panel.js +11 -11
- package/es/table/module/edit/mixin.js +29 -15
- package/es/table/src/methods.js +0 -13
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +45 -29
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +11 -11
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/mixin.js +31 -15
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/src/methods.js +0 -18
- package/lib/table/src/methods.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 +1 -1
- package/packages/table/module/custom/panel.ts +11 -11
- package/packages/table/module/edit/mixin.ts +29 -15
- package/packages/table/src/methods.ts +0 -16
- /package/es/{iconfont.1766363414901.ttf → iconfont.1766728191601.ttf} +0 -0
- /package/es/{iconfont.1766363414901.woff → iconfont.1766728191601.woff} +0 -0
- /package/es/{iconfont.1766363414901.woff2 → iconfont.1766728191601.woff2} +0 -0
- /package/lib/{iconfont.1766363414901.ttf → iconfont.1766728191601.ttf} +0 -0
- /package/lib/{iconfont.1766363414901.woff → iconfont.1766728191601.woff} +0 -0
- /package/lib/{iconfont.1766363414901.woff2 → iconfont.1766728191601.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.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 = "3.19.
|
|
16
|
+
const version = exports.version = "3.19.35";
|
|
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.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="3.19.
|
|
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.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="3.19.35",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!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,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!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},floatingFilterConfig:{},aggregateConfig:{padding:!0,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},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:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},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_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+"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,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
|
@@ -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${"3.19.
|
|
11
|
+
const version = `table v${"3.19.35"}`;
|
|
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 v3.19.
|
|
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 v3.19.35",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": "3.19.
|
|
3
|
+
"version": "3.19.35",
|
|
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",
|
|
@@ -214,12 +214,12 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
|
|
|
214
214
|
}, [
|
|
215
215
|
h('span', {
|
|
216
216
|
class: ['vxe-table-custom--sort-btn', {
|
|
217
|
-
'is--disabled':
|
|
217
|
+
'is--disabled': isHidden
|
|
218
218
|
}],
|
|
219
219
|
attrs: {
|
|
220
220
|
title: getI18n('vxe.custom.setting.sortHelpTip')
|
|
221
221
|
},
|
|
222
|
-
on:
|
|
222
|
+
on: isHidden
|
|
223
223
|
? {}
|
|
224
224
|
: {
|
|
225
225
|
mousedown: _vm.sortMousedownEvent,
|
|
@@ -257,7 +257,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
|
|
|
257
257
|
mode: 'text',
|
|
258
258
|
icon: column.renderFixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
|
|
259
259
|
status: column.renderFixed === 'left' ? 'primary' : '',
|
|
260
|
-
disabled:
|
|
260
|
+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
|
|
261
261
|
title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
|
|
262
262
|
},
|
|
263
263
|
on: {
|
|
@@ -271,7 +271,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
|
|
|
271
271
|
mode: 'text',
|
|
272
272
|
icon: column.renderFixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
|
|
273
273
|
status: column.renderFixed === 'right' ? 'primary' : '',
|
|
274
|
-
disabled:
|
|
274
|
+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
|
|
275
275
|
title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
|
|
276
276
|
},
|
|
277
277
|
on: {
|
|
@@ -565,12 +565,12 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
|
|
|
565
565
|
? ((isCrossDrag ? immediate : false) || column.level === 1
|
|
566
566
|
? h('div', {
|
|
567
567
|
class: ['vxe-table-custom-popup--column-sort-btn', {
|
|
568
|
-
'is--disabled':
|
|
568
|
+
'is--disabled': isHidden
|
|
569
569
|
}],
|
|
570
570
|
attrs: {
|
|
571
571
|
title: getI18n('vxe.custom.setting.sortHelpTip')
|
|
572
572
|
},
|
|
573
|
-
on: (
|
|
573
|
+
on: (isHidden
|
|
574
574
|
? {}
|
|
575
575
|
: {
|
|
576
576
|
mousedown: _vm.sortMousedownEvent,
|
|
@@ -616,7 +616,7 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
|
|
|
616
616
|
props: {
|
|
617
617
|
type: 'integer',
|
|
618
618
|
immediate: false,
|
|
619
|
-
disabled:
|
|
619
|
+
disabled: isHidden,
|
|
620
620
|
value: column.renderResizeWidth,
|
|
621
621
|
min: customMinWidth || undefined,
|
|
622
622
|
max: customMaxWidth || undefined
|
|
@@ -645,11 +645,11 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
|
|
|
645
645
|
value: column.renderFixed || '',
|
|
646
646
|
type: 'button',
|
|
647
647
|
size: 'mini',
|
|
648
|
-
disabled:
|
|
648
|
+
disabled: isHidden,
|
|
649
649
|
options: [
|
|
650
|
-
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled:
|
|
651
|
-
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled:
|
|
652
|
-
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled:
|
|
650
|
+
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isHidden || isMaxFixedColumn },
|
|
651
|
+
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isHidden },
|
|
652
|
+
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isHidden || isMaxFixedColumn }
|
|
653
653
|
]
|
|
654
654
|
},
|
|
655
655
|
on: {
|
|
@@ -100,7 +100,7 @@ function insertTreeRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
|
|
|
100
100
|
|
|
101
101
|
// }
|
|
102
102
|
|
|
103
|
-
function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, records: any[],
|
|
103
|
+
function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, records: any[], targetRowOrRowid: any, isInsertNextRow?: any) {
|
|
104
104
|
const props = $xeTable
|
|
105
105
|
const reactData = $xeTable as unknown as TableReactData
|
|
106
106
|
const internalData = $xeTable as unknown as TableInternalData
|
|
@@ -114,6 +114,13 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
|
|
|
114
114
|
if (!XEUtils.isArray(records)) {
|
|
115
115
|
records = [records]
|
|
116
116
|
}
|
|
117
|
+
let targetRow = targetRowOrRowid
|
|
118
|
+
if (XEUtils.isString(targetRowOrRowid) || XEUtils.isNumber(targetRowOrRowid)) {
|
|
119
|
+
const rowRest = fullAllDataRowIdData[targetRowOrRowid]
|
|
120
|
+
if (rowRest) {
|
|
121
|
+
targetRow = rowRest.row
|
|
122
|
+
}
|
|
123
|
+
}
|
|
117
124
|
const newRecords: any[] = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
|
|
118
125
|
let treeRecords: any[] = []
|
|
119
126
|
if (treeConfig && transform) {
|
|
@@ -313,17 +320,26 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
|
|
|
313
320
|
})
|
|
314
321
|
}
|
|
315
322
|
|
|
316
|
-
function handleInsertChildRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, records: any,
|
|
323
|
+
function handleInsertChildRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, records: any, parentRowOrParentId: any, targetRowOrRowid: any, isInsertNextRow?: boolean) {
|
|
317
324
|
const props = $xeTable
|
|
325
|
+
const internalData = $xeTable as unknown as TableInternalData
|
|
318
326
|
|
|
319
327
|
const { treeConfig } = props
|
|
328
|
+
const { fullAllDataRowIdData } = internalData
|
|
320
329
|
const treeOpts = $xeTable.computeTreeOpts
|
|
321
330
|
const { transform, rowField, parentField } = treeOpts
|
|
322
331
|
if (treeConfig && transform) {
|
|
323
332
|
if (!XEUtils.isArray(records)) {
|
|
324
333
|
records = [records]
|
|
325
334
|
}
|
|
326
|
-
|
|
335
|
+
let parentRow = parentRowOrParentId
|
|
336
|
+
if (XEUtils.isString(parentRowOrParentId) || XEUtils.isNumber(parentRowOrParentId)) {
|
|
337
|
+
const rowRest = fullAllDataRowIdData[parentRowOrParentId]
|
|
338
|
+
if (rowRest) {
|
|
339
|
+
parentRow = rowRest.row
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
return handleInsertRowAt($xeTable, records.map((item: any) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRowOrRowid, isInsertNextRow)
|
|
327
343
|
} else {
|
|
328
344
|
errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true'])
|
|
329
345
|
}
|
|
@@ -516,24 +532,22 @@ export default {
|
|
|
516
532
|
* 如果 row 为空则从插入到顶部
|
|
517
533
|
* 如果 row 为 -1 则从插入到底部
|
|
518
534
|
* 如果 row 为有效行则插入到该行的位置
|
|
519
|
-
* @param {Object/Array} records 新的数据
|
|
520
|
-
* @param {Row} targetRow 指定行
|
|
521
535
|
* @returns
|
|
522
536
|
*/
|
|
523
|
-
_insertAt (records: any,
|
|
524
|
-
return handleInsertRowAt(this, records,
|
|
537
|
+
_insertAt (records: any, targetRowOrRowid: any) {
|
|
538
|
+
return handleInsertRowAt(this, records, targetRowOrRowid)
|
|
525
539
|
},
|
|
526
|
-
_insertNextAt (records: any,
|
|
527
|
-
return handleInsertRowAt(this, records,
|
|
540
|
+
_insertNextAt (records: any, targetRowOrRowid: any) {
|
|
541
|
+
return handleInsertRowAt(this, records, targetRowOrRowid, true)
|
|
528
542
|
},
|
|
529
|
-
_insertChild (records: any,
|
|
530
|
-
return handleInsertChildRowAt(this, records,
|
|
543
|
+
_insertChild (records: any, parentRowOrParentId: any) {
|
|
544
|
+
return handleInsertChildRowAt(this, records, parentRowOrParentId, null)
|
|
531
545
|
},
|
|
532
|
-
_insertChildAt (records: any,
|
|
533
|
-
return handleInsertChildRowAt(this, records,
|
|
546
|
+
_insertChildAt (records: any, parentRowOrParentId: any, targetRowOrRowid: any) {
|
|
547
|
+
return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid)
|
|
534
548
|
},
|
|
535
|
-
_insertChildNextAt (records: any,
|
|
536
|
-
return handleInsertChildRowAt(this, records,
|
|
549
|
+
_insertChildNextAt (records: any, parentRowOrParentId: any, targetRowOrRowid: any) {
|
|
550
|
+
return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid, true)
|
|
537
551
|
},
|
|
538
552
|
/**
|
|
539
553
|
* 删除指定行数据
|
|
@@ -5819,22 +5819,6 @@ const tableMethods: any = {
|
|
|
5819
5819
|
const { treeConfig } = props
|
|
5820
5820
|
const { tableFullData, tableFullTreeData } = internalData
|
|
5821
5821
|
if (treeConfig) {
|
|
5822
|
-
const treeOpts = $xeTable.computeTreeOpts
|
|
5823
|
-
const { transform, mapChildrenField, rowField, parentField } = treeOpts
|
|
5824
|
-
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
5825
|
-
if (transform) {
|
|
5826
|
-
return XEUtils.toArrayTree(
|
|
5827
|
-
XEUtils.toTreeArray(tableFullTreeData, {
|
|
5828
|
-
children: mapChildrenField
|
|
5829
|
-
}),
|
|
5830
|
-
{
|
|
5831
|
-
key: rowField,
|
|
5832
|
-
parentKey: parentField,
|
|
5833
|
-
children: childrenField,
|
|
5834
|
-
mapChildren: mapChildrenField
|
|
5835
|
-
}
|
|
5836
|
-
)
|
|
5837
|
-
}
|
|
5838
5822
|
return tableFullTreeData.slice(0)
|
|
5839
5823
|
}
|
|
5840
5824
|
return tableFullData.slice(0)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|