vxe-table 4.5.5 → 4.5.6

package/lib/validator/src/hook.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_log=require("../../tools/log"),_util=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),tableValidatorMethodKeys=["fullValidate","validate","clearValidate"],validatorHook={setupTable:function(v){function r(e,a,o){var t,r,u={},n=h.editRules,s=h.treeConfig,c=p.afterFullData,l=w.value,d=x.value,i=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?a=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||(v.getInsertRecords?v.getInsertRecords().concat(v.getUpdateRecords()):[]),[]),f=(p._lastCallTime=Date.now(),m=!1,b.clearValidate(),{});return n?(r=v.getColumns(),e=function(l){var e;!o&&m||(e=[],r.forEach(function(r){!o&&m||!_xeUtils.default.has(n,r.property)||e.push(R.validCellRules("all",l,r).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,rowIndex:v.getRowIndex(l),row:l,columnIndex:v.getColumnIndex(r),column:r,field:r.property,$table:v};if(u[r.property]||(u[r.property]=[]),f["".concat((0,_util.getRowid)(v,l),":").concat(r.id)]={column:r,row:l,rule:t,content:t.content},u[r.property].push(e),!o)return m=!0,Promise.reject(e)}))}),i.push(Promise.all(e)))},s?_xeUtils.default.eachTree(t,e,l):t.forEach(e),Promise.all(i).then(function(){var e,t,r,l=Object.keys(u);return g.validErrorMaps=(e=f,"single"===x.value.msgMode?(t=e,(r=Object.keys(e)).length&&(t[r=r[0]]=e[r]),t):e),(0,_vue.nextTick)().then(function(){if(l.length)return Promise.reject(u[l[0]][0]);a&&a()})}).catch(function(i){return new Promise(function(e,t){function r(){var t;i.cell=v.getCell(i.row,i.column),(0,_dom.scrollToView)(i.cell),t=i,new Promise(function(e){!1===x.value.autoPos?(v.dispatchEvent("valid-error",t,null),e()):v.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){e(R.showValidTooltip(t))})}).then(l)}var l=function(){(0,_vue.nextTick)(function(){a?(a(u),e()):("obsolete"===_conf.default.validToReject?t:e)(u)})},o=i.row,n=c.indexOf(o),n=0<n?c[n-1]:o;!1===d.autoPos?l():(s?v.scrollToTreeRow(n):v.scrollToRow(n)).then(r)})})):(g.validErrorMaps={},(0,_vue.nextTick)().then(function(){a&&a()}))}function _(e,t){var r=e.type,l=e.min,o=e.max,e=e.pattern,n=(r="number"===r)?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(l)&&n<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(o)&&n>_xeUtils.default.toNumber(o)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}var m,h=v.props,g=v.reactData,p=v.internalData,s=v.getRefMaps().refValidTooltip,e=v.getComputeMaps(),x=e.computeValidOpts,w=e.computeTreeOpts,c=e.computeEditOpts,b={},R={},R={validCellRules:function(u,s,c,e){var d,f,t=h.editRules,r=c.field,g=[],p=[];return r&&t&&(d=_xeUtils.default.get(t,r))&&(f=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,r):e,d.forEach(function(t){var e,r,l,o=t.type,n=t.trigger,i=t.required,a=t.validator;"all"!==u&&n&&u!==n||(a?(l={cellValue:f,rule:t,rules:d,row:s,rowIndex:v.getRowIndex(s),column:c,columnIndex:v.getColumnIndex(c),field:c.field,$table:v,$grid:v.xegrid},e=void 0,_xeUtils.default.isString(a)?(r=_vXETable.VXETable.validators.get(a))?r.cellValidatorMethod?e=r.cellValidatorMethod(l):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[a]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[a]):e=a(l),e&&(_xeUtils.default.isError(e)?(m=!0,g.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&p.push(e.catch(function(e){m=!0,g.push(new Rule({type:"custom",trigger:n,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))):(r="array"===o,a=_xeUtils.default.isArray(f),l=!0,l=r||a?!a||!f.length:_xeUtils.default.isString(f)?(0,_utils.eqEmptyValue)(f.trim()):(0,_utils.eqEmptyValue)(f),(i?l||_(t,f):!l&&_(t,f))&&(m=!0,g.push(new Rule(t)))))})),Promise.all(p).then(function(){if(g.length)return Promise.reject({rules:g,rule:g[0]})})},hasCellRules:function(t,e,r){var l=h.editRules,r=r.field;return!(!r||!l)&&(l=_xeUtils.default.get(l,r))&&!!_xeUtils.default.find(l,function(e){return"all"===t||!e.trigger||t===e.trigger})},triggerValidate:function(t){var e=h.editConfig,r=h.editRules,l=g.editStore.actived,o=c.value,n=x.value;if(r&&"single"===n.msgMode&&(g.validErrorMaps={}),e&&r&&l.row){var n=l.args,i=n.row,a=n.column,u=n.cell;if(R.hasCellRules(t,i,a))return R.validCellRules(t,i,a).then(function(){"row"===o.mode&&b.clearValidate(i,a)}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(R.showValidTooltip(e={rule:e,row:i,column:a,cell:u}),Promise.reject(e))})}return Promise.resolve()},showValidTooltip:function(e){var t=h.height,r=g.tableData,l=g.validStore,o=g.validErrorMaps,n=x.value,i=s.value;if(l.visible=!0,"single"===n.msgMode?g.validErrorMaps=((l={})["".concat((0,_util.getRowid)(v,e.row),":").concat(e.column.id)]={column:e.column,row:e.row,rule:e.rule,content:e.rule.content},l):g.validErrorMaps=Object.assign({},o,((l={})["".concat((0,_util.getRowid)(v,e.row),":").concat(e.column.id)]={column:e.column,row:e.row,rule:e.rule,content:e.rule.content},l)),v.dispatchEvent("valid-error",e,null),i){o=e.cell;if(i&&("tooltip"===n.message||"default"===n.message&&!t&&r.length<2))return i.open(o,e.rule.content)}return(0,_vue.nextTick)()}};return __assign(__assign({},b={fullValidate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),r(e,t,!0)},validate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),r(e,t)},clearValidate:function(e,t){var r,l,o=g.validErrorMaps,n=s.value,i=x.value,e=_xeUtils.default.isArray(e)?e:e?[e]:[],a=_xeUtils.default.isArray(t)?t:(t?[t]:[]).map(function(e){return(0,_util.handleFieldOrColumn)(v,e)}),u={};return n&&n.reactData.visible&&n.close(),"single"===i.msgMode?g.validErrorMaps={}:(e.length&&a.length?(u=Object.assign({},o),e.forEach(function(t){a.forEach(function(e){e="".concat((0,_util.getRowid)(v,t),":").concat(e.id);u[e]&&delete u[e]})})):e.length?(r=e.map(function(e){return"".concat((0,_util.getRowid)(v,e))}),_xeUtils.default.each(o,function(e,t){-1<r.indexOf(t.split(":")[0])&&(u[t]=e)})):a.length&&(l=a.map(function(e){return"".concat(e.id)}),_xeUtils.default.each(o,function(e,t){-1<l.indexOf(t.split(":")[1])&&(u[t]=e)})),g.validErrorMaps=u),(0,_vue.nextTick)()}}),R)},setupGrid:function(e){return e.extendTableMethods(tableValidatorMethodKeys)}},_default=validatorHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_log=require("../../tools/log"),_util=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),tableValidatorMethodKeys=["fullValidate","validate","clearValidate"],validatorHook={setupTable:function(v){function r(e,a,o){var t,r,u={},n=h.editRules,s=h.treeConfig,c=p.afterFullData,l=(l=w.value).children||l.childrenField,d=x.value,i=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?a=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||(v.getInsertRecords?v.getInsertRecords().concat(v.getUpdateRecords()):[]),[]),f=(p._lastCallTime=Date.now(),m=!1,b.clearValidate(),{});return n?(r=v.getColumns(),e=function(l){var e;!o&&m||(e=[],r.forEach(function(r){!o&&m||!_xeUtils.default.has(n,r.property)||e.push(R.validCellRules("all",l,r).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,rowIndex:v.getRowIndex(l),row:l,columnIndex:v.getColumnIndex(r),column:r,field:r.property,$table:v};if(u[r.property]||(u[r.property]=[]),f["".concat((0,_util.getRowid)(v,l),":").concat(r.id)]={column:r,row:l,rule:t,content:t.content},u[r.property].push(e),!o)return m=!0,Promise.reject(e)}))}),i.push(Promise.all(e)))},s?_xeUtils.default.eachTree(t,e,{children:l}):t.forEach(e),Promise.all(i).then(function(){var e,t,r,l=Object.keys(u);return g.validErrorMaps=(e=f,"single"===x.value.msgMode?(t=e,(r=Object.keys(e)).length&&(t[r=r[0]]=e[r]),t):e),(0,_vue.nextTick)().then(function(){if(l.length)return Promise.reject(u[l[0]][0]);a&&a()})}).catch(function(i){return new Promise(function(e,t){function r(){var t;i.cell=v.getCell(i.row,i.column),(0,_dom.scrollToView)(i.cell),t=i,new Promise(function(e){!1===x.value.autoPos?(v.dispatchEvent("valid-error",t,null),e()):v.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){e(R.showValidTooltip(t))})}).then(l)}var l=function(){(0,_vue.nextTick)(function(){a?(a(u),e()):("obsolete"===_conf.default.validToReject?t:e)(u)})},o=i.row,n=c.indexOf(o),n=0<n?c[n-1]:o;!1===d.autoPos?l():(s?v.scrollToTreeRow(n):v.scrollToRow(n)).then(r)})})):(g.validErrorMaps={},(0,_vue.nextTick)().then(function(){a&&a()}))}function _(e,t){var r=e.type,l=e.min,o=e.max,e=e.pattern,n=(r="number"===r)?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(l)&&n<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(o)&&n>_xeUtils.default.toNumber(o)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}var m,h=v.props,g=v.reactData,p=v.internalData,s=v.getRefMaps().refValidTooltip,e=v.getComputeMaps(),x=e.computeValidOpts,w=e.computeTreeOpts,c=e.computeEditOpts,b={},R={},R={validCellRules:function(u,s,c,e){var d,f,t=h.editRules,r=c.field,g=[],p=[];return r&&t&&(d=_xeUtils.default.get(t,r))&&(f=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,r):e,d.forEach(function(t){var e,r,l,o=t.type,n=t.trigger,i=t.required,a=t.validator;"all"!==u&&n&&u!==n||(a?(l={cellValue:f,rule:t,rules:d,row:s,rowIndex:v.getRowIndex(s),column:c,columnIndex:v.getColumnIndex(c),field:c.field,$table:v,$grid:v.xegrid},e=void 0,_xeUtils.default.isString(a)?(r=_vXETable.VXETable.validators.get(a))?r.cellValidatorMethod?e=r.cellValidatorMethod(l):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[a]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[a]):e=a(l),e&&(_xeUtils.default.isError(e)?(m=!0,g.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&p.push(e.catch(function(e){m=!0,g.push(new Rule({type:"custom",trigger:n,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))):(r="array"===o,a=_xeUtils.default.isArray(f),l=!0,l=r||a?!a||!f.length:_xeUtils.default.isString(f)?(0,_utils.eqEmptyValue)(f.trim()):(0,_utils.eqEmptyValue)(f),(i?l||_(t,f):!l&&_(t,f))&&(m=!0,g.push(new Rule(t)))))})),Promise.all(p).then(function(){if(g.length)return Promise.reject({rules:g,rule:g[0]})})},hasCellRules:function(t,e,r){var l=h.editRules,r=r.field;return!(!r||!l)&&(l=_xeUtils.default.get(l,r))&&!!_xeUtils.default.find(l,function(e){return"all"===t||!e.trigger||t===e.trigger})},triggerValidate:function(t){var e=h.editConfig,r=h.editRules,l=g.editStore.actived,o=c.value,n=x.value;if(r&&"single"===n.msgMode&&(g.validErrorMaps={}),e&&r&&l.row){var n=l.args,i=n.row,a=n.column,u=n.cell;if(R.hasCellRules(t,i,a))return R.validCellRules(t,i,a).then(function(){"row"===o.mode&&b.clearValidate(i,a)}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(R.showValidTooltip(e={rule:e,row:i,column:a,cell:u}),Promise.reject(e))})}return Promise.resolve()},showValidTooltip:function(e){var t=h.height,r=g.tableData,l=g.validStore,o=g.validErrorMaps,n=x.value,i=s.value;if(l.visible=!0,"single"===n.msgMode?g.validErrorMaps=((l={})["".concat((0,_util.getRowid)(v,e.row),":").concat(e.column.id)]={column:e.column,row:e.row,rule:e.rule,content:e.rule.content},l):g.validErrorMaps=Object.assign({},o,((l={})["".concat((0,_util.getRowid)(v,e.row),":").concat(e.column.id)]={column:e.column,row:e.row,rule:e.rule,content:e.rule.content},l)),v.dispatchEvent("valid-error",e,null),i){o=e.cell;if(i&&("tooltip"===n.message||"default"===n.message&&!t&&r.length<2))return i.open(o,e.rule.content)}return(0,_vue.nextTick)()}};return __assign(__assign({},b={fullValidate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),r(e,t,!0)},validate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),r(e,t)},clearValidate:function(e,t){var r,l,o=g.validErrorMaps,n=s.value,i=x.value,e=_xeUtils.default.isArray(e)?e:e?[e]:[],a=_xeUtils.default.isArray(t)?t:(t?[t]:[]).map(function(e){return(0,_util.handleFieldOrColumn)(v,e)}),u={};return n&&n.reactData.visible&&n.close(),"single"===i.msgMode?g.validErrorMaps={}:(e.length&&a.length?(u=Object.assign({},o),e.forEach(function(t){a.forEach(function(e){e="".concat((0,_util.getRowid)(v,t),":").concat(e.id);u[e]&&delete u[e]})})):e.length?(r=e.map(function(e){return"".concat((0,_util.getRowid)(v,e))}),_xeUtils.default.each(o,function(e,t){-1<r.indexOf(t.split(":")[0])&&(u[t]=e)})):a.length&&(l=a.map(function(e){return"".concat(e.id)}),_xeUtils.default.each(o,function(e,t){-1<l.indexOf(t.split(":")[1])&&(u[t]=e)})),g.validErrorMaps=u),(0,_vue.nextTick)()}}),R)},setupGrid:function(e){return e.extendTableMethods(tableValidatorMethodKeys)}},_default=validatorHook;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.5.5",
+  "version": "4.5.6",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为低/零代码而设计...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "dom-zindex": "^0.4.0"
+    "dom-zindex": "^0.5.0"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.7",

package/packages/export/src/hook.ts

@@ -330,6 +330,7 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
         htmlCellElem = document.createElement('div')
       }
       if (treeConfig) {
+        const childrenField = treeOpts.children || treeOpts.childrenField
         // 如果是树表格只允许导出数据源
         const rest: any[] = []
         const expandMaps: Map<any, number> = new Map()
@@ -396,7 +397,7 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
             expandMaps.set(row, 1)
             rest.push(Object.assign(item, row))
           }
-        }, treeOpts)
+        }, { children: childrenField })
         return rest
       }
       return datas.map((row, $rowIndex) => {

package/packages/keyboard/src/hook.ts

@@ -295,11 +295,12 @@ const tableKeyboardHook: VxeGlobalHooksHandles.HookOptions = {
         const { currentRow } = reactData
         const { afterFullData } = internalData
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         let targetRow
         evnt.preventDefault()
         if (currentRow) {
           if (treeConfig) {
-            const { index, items } = XEUtils.findTree(afterFullData, item => item === currentRow, treeOpts)
+            const { index, items } = XEUtils.findTree(afterFullData, item => item === currentRow, { children: childrenField })
             if (isUpArrow && index > 0) {
               targetRow = items[index - 1]
             } else if (isDwArrow && index < items.length - 1) {

package/packages/table/src/body.ts

@@ -725,8 +725,10 @@ export default defineComponent({
     onBeforeUnmount(() => {
       const el = refElem.value
       clearTimeout(wheelTime)
-      el._onscroll = null
-      el.onscroll = null
+      if (el) {
+        el._onscroll = null
+        el.onscroll = null
+      }
     })
 
     onUnmounted(() => {

package/packages/table/src/table.ts

@@ -1281,7 +1281,7 @@ export default defineComponent({
             fullDataRowIdData[rowid] = rest
           }
           fullMaps[rowid] = row
-        }, { children: treeOpts.transform ? treeOpts.mapChildrenField : (childrenField) })
+        }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField })
       } else {
         afterFullData.forEach((row, index) => {
           const rowid = getRowid($xetable, row)
@@ -1854,6 +1854,7 @@ export default defineComponent({
       const { selectCheckboxMaps } = reactData
       const { afterFullData, afterFullRowMaps, checkboxReserveRowMap } = internalData
       const treeOpts = computeTreeOpts.value
+      const childrenField = treeOpts.children || treeOpts.childrenField
       const checkboxOpts = computeCheckboxOpts.value
       const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
@@ -1891,7 +1892,7 @@ export default defineComponent({
           // 如果存在选中方法
           // 如果方法成立，则更新值，否则忽略该数据
           if (treeConfig) {
-            XEUtils.eachTree(afterFullData, checkValFn, treeOpts)
+            XEUtils.eachTree(afterFullData, checkValFn, { children: childrenField })
           } else {
             afterFullData.forEach(checkValFn)
           }
@@ -1910,7 +1911,7 @@ export default defineComponent({
                 if (isForce || (!checkMethod || checkMethod({ row }))) {
                   selectRowMaps[getRowid($xetable, row)] = row
                 }
-              }, treeOpts)
+              }, { children: childrenField })
             } else {
               /**
                * 如果是树取消
@@ -1922,7 +1923,7 @@ export default defineComponent({
                   if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                     selectRowMaps[rowid] = row
                   }
-                }, treeOpts)
+                }, { children: childrenField })
               }
             }
           } else {
@@ -2029,13 +2030,14 @@ export default defineComponent({
         const { tableFullData } = internalData
         const treeOpts = computeTreeOpts.value
         const { expandAll, expandRowKeys } = treeOpts
+        const childrenField = treeOpts.children || treeOpts.childrenField
         if (expandAll) {
           tableMethods.setAllTreeExpand(true)
         } else if (expandRowKeys) {
           const defExpandeds: any[] = []
           const rowkey = getRowkey($xetable)
           expandRowKeys.forEach((rowid: any) => {
-            const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), treeOpts)
+            const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField })
             if (matchObj) {
               defExpandeds.push(matchObj.item)
             }
@@ -2557,7 +2559,7 @@ export default defineComponent({
       if (accordion) {
         validRows = validRows.length ? [validRows[validRows.length - 1]] : []
         // 同一级只能展开一个
-        const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], treeOpts)
+        const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField })
         if (matchObj) {
           matchObj.items.forEach(item => {
             const rowid = getRowid($xetable, item)
@@ -2803,7 +2805,7 @@ export default defineComponent({
         return tableMethods.createData(childRecords).then((rows) => {
           if (keepSource) {
             const rowid = getRowid($xetable, row)
-            const matchObj = XEUtils.findTree(tableSourceData, (item) => rowid === getRowid($xetable, item), treeOpts)
+            const matchObj = XEUtils.findTree(tableSourceData, (item) => rowid === getRowid($xetable, item), { children: childrenField })
             if (matchObj) {
               matchObj.item[childrenField] = XEUtils.clone(rows, true)
             }
@@ -2813,7 +2815,7 @@ export default defineComponent({
             const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
             fullDataRowIdData[rowid] = rest
             fullAllDataRowIdData[rowid] = rest
-          }, treeOpts)
+          }, { children: childrenField })
           row[childrenField] = rows
           if (transform) {
             row[mapChildrenField] = rows
@@ -3462,6 +3464,7 @@ export default defineComponent({
         const { fullDataRowIdData, radioReserveRow, afterFullData } = internalData
         const radioOpts = computeRadioOpts.value
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         if (radioOpts.reserve && radioReserveRow) {
           const rowid = getRowid($xetable, radioReserveRow)
           if (isFull) {
@@ -3471,7 +3474,7 @@ export default defineComponent({
           } else {
             const rowkey = getRowkey($xetable)
             if (treeConfig) {
-              const matchObj = XEUtils.findTree(afterFullData, row => rowid === XEUtils.get(row, rowkey), treeOpts)
+              const matchObj = XEUtils.findTree(afterFullData, row => rowid === XEUtils.get(row, rowkey), { children: childrenField })
               if (matchObj) {
                 return radioReserveRow
               }
@@ -3496,13 +3499,14 @@ export default defineComponent({
         const { afterFullData, fullDataRowIdData, checkboxReserveRowMap } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         const reserveSelection: any[] = []
         if (checkboxOpts.reserve) {
           const afterFullIdMaps: { [key: string]: number } = {}
           if (treeConfig) {
             XEUtils.eachTree(afterFullData, row => {
               afterFullIdMaps[getRowid($xetable, row)] = 1
-            }, treeOpts)
+            }, { children: childrenField })
           } else {
             afterFullData.forEach(row => {
               afterFullIdMaps[getRowid($xetable, row)] = 1
@@ -3543,6 +3547,7 @@ export default defineComponent({
         const { treeConfig } = props
         const { tableFullData } = internalData
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, reserve } = checkboxOpts
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
@@ -3554,7 +3559,7 @@ export default defineComponent({
             XEUtils.set(item, checkField, false)
           }
           if (treeConfig) {
-            XEUtils.eachTree(tableFullData, handleClearChecked, treeOpts)
+            XEUtils.eachTree(tableFullData, handleClearChecked, { children: childrenField })
           } else {
             tableFullData.forEach(handleClearChecked)
           }
@@ -3840,11 +3845,12 @@ export default defineComponent({
       setAllRowExpand (expanded) {
         const treeOpts = computeTreeOpts.value
         const { tableFullData, tableFullTreeData } = internalData
+        const childrenField = treeOpts.children || treeOpts.childrenField
         let expandedRows: any[] = []
         if (props.treeConfig) {
           XEUtils.eachTree(tableFullTreeData, (row) => {
             expandedRows.push(row)
-          }, treeOpts)
+          }, { children: childrenField })
         } else {
           expandedRows = tableFullData
         }
@@ -4032,7 +4038,7 @@ export default defineComponent({
           if (lazy || (rowChildren && rowChildren.length)) {
             expandeds.push(row)
           }
-        }, treeOpts)
+        }, { children: childrenField })
         return tableMethods.setTreeExpand(expandeds, expanded).then(() => {
           if (transform) {
             handleVirtualTreeToList()
@@ -4079,11 +4085,12 @@ export default defineComponent({
       clearTreeExpand () {
         const { tableFullTreeData } = internalData
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         const { transform, reserve } = treeOpts
         const expList = tableMethods.getTreeExpandRecords()
         reactData.treeExpandedMaps = {}
         if (reserve) {
-          XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), treeOpts)
+          XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), { children: childrenField })
         }
         return tablePrivateMethods.handleTableData().then(() => {
           if (transform) {
@@ -4697,7 +4704,7 @@ export default defineComponent({
                 }
               } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果树形表格回退键关闭当前行返回父节点
-                const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, treeOpts)
+                const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, { children: childrenField })
                 if (parentRow) {
                   evnt.preventDefault()
                   params = {
@@ -5001,7 +5008,7 @@ export default defineComponent({
         }
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {}
         if (treeConfig) {
-          XEUtils.eachTree(tableFullTreeData, handleRow, treeOpts)
+          XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
         } else {
           tableFullData.forEach(handleRow)
         }
@@ -5022,8 +5029,9 @@ export default defineComponent({
           sourceDataRowIdData[rowid] = row
         }
         // 源数据缓存
-        if (treeConfig && !treeOpts.transform) {
-          XEUtils.eachTree(sourceData, handleSourceRow, treeOpts)
+        if (treeConfig) {
+          const childrenField = treeOpts.children || treeOpts.childrenField
+          XEUtils.eachTree(sourceData, handleSourceRow, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField })
         } else {
           sourceData.forEach(handleSourceRow)
         }
@@ -5260,6 +5268,7 @@ export default defineComponent({
         const selectRowMaps = { ...selectCheckboxMaps }
         const { afterFullData } = internalData
         const treeOpts = computeTreeOpts.value
+        const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkStrictly, checkMethod } = checkboxOpts
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
@@ -5285,10 +5294,10 @@ export default defineComponent({
                   delete treeIndeterminateMaps[getRowid($xetable, item)]
                   handleCheckboxReserveRow(row, value)
                 }
-              }, treeOpts)
+              }, { children: childrenField })
             }
             // 如果存在父节点，更新父节点状态
-            const matchObj = XEUtils.findTree(afterFullData, item => $xetable.eqRow(item, row), treeOpts)
+            const matchObj = XEUtils.findTree(afterFullData, item => $xetable.eqRow(item, row), { children: childrenField })
             if (matchObj && matchObj.parent) {
               let parentStatus
               const vItems: any[] = []
@@ -5359,10 +5368,10 @@ export default defineComponent({
                   delete treeIndeterminateMaps[getRowid($xetable, item)]
                   handleCheckboxReserveRow(row, value)
                 }
-              }, treeOpts)
+              }, { children: childrenField })
             }
             // 如果存在父节点，更新父节点状态
-            const matchObj = XEUtils.findTree(afterFullData, item => $xetable.eqRow(item, row), treeOpts)
+            const matchObj = XEUtils.findTree(afterFullData, item => $xetable.eqRow(item, row), { children: childrenField })
             if (matchObj && matchObj.parent) {
               let parentStatus
               const vItems: any[] = []
@@ -5819,7 +5828,8 @@ export default defineComponent({
         const rests: Promise<any>[] = []
         if (treeConfig) {
           const treeOpts = computeTreeOpts.value
-          const matchObj = XEUtils.findTree(tableFullData, item => $xetable.eqRow(item, row), treeOpts)
+          const childrenField = treeOpts.children || treeOpts.childrenField
+          const matchObj = XEUtils.findTree(tableFullData, item => $xetable.eqRow(item, row), { children: childrenField })
           if (matchObj) {
             const nodes = matchObj.nodes
             nodes.forEach((row, index) => {

package/packages/validator/src/hook.ts

@@ -110,6 +110,7 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
       const { editRules, treeConfig } = props
       const { afterFullData } = internalData
       const treeOpts = computeTreeOpts.value
+      const childrenField = treeOpts.children || treeOpts.childrenField
       const validOpts = computeValidOpts.value
       let vaildDatas
       if (rows === true) {
@@ -180,7 +181,7 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           }
         }
         if (treeConfig) {
-          XEUtils.eachTree(vaildDatas, handleVaild, treeOpts)
+          XEUtils.eachTree(vaildDatas, handleVaild, { children: childrenField })
         } else {
           vaildDatas.forEach(handleVaild)
         }

package/types/v-x-e-table/index.d.ts

@@ -137,7 +137,7 @@ export interface VXETableCore {
 }
 
 /**
- * 一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为低/零代码而设计...
+ * 一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...
  */
 export const VXETable: VXETableCore