vxe-table 4.1.2 → 4.1.3

package/es/table/src/cell.js

@@ -309,17 +309,18 @@ export var Cell = {
         var selectRow = reactData.selectRow;
         var radioOpts = computeRadioOpts.value;
         var slots = column.slots;
-        var labelField = radioOpts.labelField, checkMethod = radioOpts.checkMethod;
+        var labelField = radioOpts.labelField, checkMethod = radioOpts.checkMethod, visibleMethod = radioOpts.visibleMethod;
         var row = params.row;
         var defaultSlot = slots ? slots.default : null;
         var radioSlot = slots ? slots.radio : null;
         var isChecked = row === selectRow;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerRadioRowEvent(evnt, params);
                     }
                 }
@@ -328,23 +329,28 @@ export var Cell = {
                 isDisabled = !checkMethod({ row: row });
             }
         }
-        var radioParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled });
-        return radioSlot ? $table.callSlot(radioSlot, radioParams) : [
+        var radioParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible });
+        if (radioSlot) {
+            return $table.callSlot(radioSlot, radioParams);
+        }
+        var radioVNs = [];
+        if (isVisible) {
+            radioVNs.push(h('span', {
+                class: 'vxe-radio--icon vxe-radio--checked-icon'
+            }), h('span', {
+                class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+            }));
+        }
+        if (defaultSlot || labelField) {
+            radioVNs.push(h('span', {
+                class: 'vxe-radio--label'
+            }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : XEUtils.get(row, labelField)));
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--radio', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-radio--icon vxe-radio--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-radio--icon vxe-radio--unchecked-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-radio--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), radioVNs)
         ];
     },
     renderTreeRadioCell: function (params) {
@@ -416,19 +422,20 @@ export var Cell = {
         var selection = reactData.selection, treeIndeterminates = reactData.treeIndeterminates;
         var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
         var checkboxOpts = computeCheckboxOpts.value;
-        var labelField = checkboxOpts.labelField, checkMethod = checkboxOpts.checkMethod;
+        var labelField = checkboxOpts.labelField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
         var slots = column.slots;
         var defaultSlot = slots ? slots.default : null;
         var checkboxSlot = slots ? slots.checkbox : null;
         var indeterminate = false;
         var isChecked = false;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             isChecked = $table.findRowIndexOf(selection, row) > -1;
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerCheckRowEvent(evnt, params, !isChecked);
                     }
                 }
@@ -440,27 +447,31 @@ export var Cell = {
                 indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
             }
         }
-        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, indeterminate: indeterminate });
-        return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [
+        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: indeterminate });
+        if (checkboxSlot) {
+            return $table.callSlot(checkboxSlot, checkboxParams);
+        }
+        var checkVNs = [];
+        if (isVisible) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            }));
+        }
+        if (defaultSlot || labelField) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--label'
+            }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField)));
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--checkbox', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled,
                         'is--indeterminate': indeterminate
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-checkbox--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), checkVNs)
         ];
     },
     renderTreeSelectionCell: function (params) {
@@ -473,19 +484,20 @@ export var Cell = {
         var treeIndeterminates = reactData.treeIndeterminates;
         var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
         var checkboxOpts = computeCheckboxOpts.value;
-        var labelField = checkboxOpts.labelField, property = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod;
+        var labelField = checkboxOpts.labelField, property = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
         var slots = column.slots;
         var defaultSlot = slots ? slots.default : null;
         var checkboxSlot = slots ? slots.checkbox : null;
         var indeterminate = false;
         var isChecked = false;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             isChecked = XEUtils.get(row, property);
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerCheckRowEvent(evnt, params, !isChecked);
                     }
                 }
@@ -497,27 +509,31 @@ export var Cell = {
                 indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
             }
         }
-        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, indeterminate: indeterminate });
-        return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [
+        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: indeterminate });
+        if (checkboxSlot) {
+            return $table.callSlot(checkboxSlot, checkboxParams);
+        }
+        var checkVNs = [];
+        if (isVisible) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            }));
+            if (defaultSlot || labelField) {
+                checkVNs.push(h('span', {
+                    class: 'vxe-checkbox--label'
+                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField)));
+            }
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--checkbox', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled,
                         'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-checkbox--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), checkVNs)
         ];
     },
     renderTreeSelectionCellByProp: function (params) {

package/es/table/src/table.js

@@ -1762,11 +1762,11 @@ export default defineComponent({
                 if (transform) {
                     // 树结构自动转换
                     if (process.env.NODE_ENV === 'development') {
-                        if (!treeOpts.rowtKey) {
-                            errLog('vxe.error.reqProp', ['tree-config.rowtKey']);
+                        if (!treeOpts.rowField) {
+                            errLog('vxe.error.reqProp', ['tree-config.rowField']);
                         }
-                        if (!treeOpts.parentKey) {
-                            errLog('vxe.error.reqProp', ['tree-config.parentKey']);
+                        if (!treeOpts.parentField) {
+                            errLog('vxe.error.reqProp', ['tree-config.parentField']);
                         }
                         if (!treeOpts.children) {
                             errLog('vxe.error.reqProp', ['tree-config.children']);
@@ -1777,7 +1777,7 @@ export default defineComponent({
                             }
                         });
                     }
-                    treeData = XEUtils.toArrayTree(fullData, { key: treeOpts.rowtKey, parentKey: treeOpts.parentKey, children: treeOpts.children });
+                    treeData = XEUtils.toArrayTree(fullData, { key: treeOpts.rowField, parentKey: treeOpts.parentField, children: treeOpts.children });
                     fullData = treeData.slice(0);
                 }
                 else {

package/es/v-x-e-table/src/conf.js

@@ -62,8 +62,8 @@ var GlobalConfig = {
             showIcon: true
         },
         treeConfig: {
-            rowtKey: 'id',
-            parentKey: 'parentId',
+            rowField: 'id',
+            parentField: 'parentId',
             children: 'children',
             hasChild: 'hasChild',
             indent: 20,

package/lib/index.umd.js

@@ -8021,8 +8021,8 @@ var GlobalConfig = {
       showIcon: true
     },
     treeConfig: {
-      rowtKey: 'id',
-      parentKey: 'parentId',
+      rowField: 'id',
+      parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
       indent: 20,
@@ -18398,6 +18398,9 @@ var web_url_search_params = __webpack_require__("9861");
 
 
 
+
+
+
  // 导入
 
 var fileForm;
@@ -18623,6 +18626,8 @@ var util_saveLocalFile = function saveLocalFile(options) {
 
 
 
+
+
 
 
 
@@ -20887,6 +20892,9 @@ var Keyboard = {
 
 
 
+
+
+
 /**
  * 校验规则
  */
@@ -21820,6 +21828,7 @@ var Header = Object.assign(header, {
 
 
 
+
 var footer_renderType = 'footer';
 
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -22577,18 +22586,22 @@ var Cell = {
     var radioOpts = computeRadioOpts.value;
     var slots = column.slots;
     var labelField = radioOpts.labelField,
-        checkMethod = radioOpts.checkMethod;
+        checkMethod = radioOpts.checkMethod,
+        visibleMethod = radioOpts.visibleMethod;
     var row = params.row;
     var defaultSlot = slots ? slots.default : null;
     var radioSlot = slots ? slots.radio : null;
     var isChecked = row === selectRow;
+    var isVisible = !visibleMethod || visibleMethod({
+      row: row
+    });
     var isDisabled = !!checkMethod;
     var ons;
 
     if (!isHidden) {
       ons = {
         onClick: function onClick(evnt) {
-          if (!isDisabled) {
+          if (!isDisabled && isVisible) {
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -22603,21 +22616,36 @@ var Cell = {
 
     var radioParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
-      disabled: isDisabled
+      disabled: isDisabled,
+      visible: isVisible
     });
 
-    return radioSlot ? $table.callSlot(radioSlot, radioParams) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
+    if (radioSlot) {
+      return $table.callSlot(radioSlot, radioParams);
+    }
+
+    var radioVNs = [];
+
+    if (isVisible) {
+      radioVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-radio--icon vxe-radio--checked-icon'
+      }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+      }));
+    }
+
+    if (defaultSlot || labelField) {
+      radioVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-radio--label'
+      }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField)));
+    }
+
+    return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
       class: ['vxe-cell--radio', {
         'is--checked': isChecked,
         'is--disabled': isDisabled
       }]
-    }, ons), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-radio--icon vxe-radio--checked-icon'
-    }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-radio--icon vxe-radio--unchecked-icon'
-    })].concat(defaultSlot || labelField ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-radio--label'
-    }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField))] : []))];
+    }, ons), radioVNs)];
   },
   renderTreeRadioCell: function renderTreeRadioCell(params) {
     return Cell.renderTreeIcon(params, Cell.renderRadioCell(params));
@@ -22707,12 +22735,16 @@ var Cell = {
 
     var checkboxOpts = computeCheckboxOpts.value;
     var labelField = checkboxOpts.labelField,
-        checkMethod = checkboxOpts.checkMethod;
+        checkMethod = checkboxOpts.checkMethod,
+        visibleMethod = checkboxOpts.visibleMethod;
     var slots = column.slots;
     var defaultSlot = slots ? slots.default : null;
     var checkboxSlot = slots ? slots.checkbox : null;
     var indeterminate = false;
     var isChecked = false;
+    var isVisible = !visibleMethod || visibleMethod({
+      row: row
+    });
     var isDisabled = !!checkMethod;
     var ons;
 
@@ -22720,7 +22752,7 @@ var Cell = {
       isChecked = $table.findRowIndexOf(selection, row) > -1;
       ons = {
         onClick: function onClick(evnt) {
-          if (!isDisabled) {
+          if (!isDisabled && isVisible) {
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -22740,24 +22772,39 @@ var Cell = {
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
       disabled: isDisabled,
+      visible: isVisible,
       indeterminate: indeterminate
     });
 
-    return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
+    if (checkboxSlot) {
+      return $table.callSlot(checkboxSlot, checkboxParams);
+    }
+
+    var checkVNs = [];
+
+    if (isVisible) {
+      checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+      }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+      }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+      }));
+    }
+
+    if (defaultSlot || labelField) {
+      checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--label'
+      }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField)));
+    }
+
+    return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
       class: ['vxe-cell--checkbox', {
         'is--checked': isChecked,
         'is--disabled': isDisabled,
         'is--indeterminate': indeterminate
       }]
-    }, ons), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-    }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-    }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-    })].concat(defaultSlot || labelField ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--label'
-    }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField))] : []))];
+    }, ons), checkVNs)];
   },
   renderTreeSelectionCell: function renderTreeSelectionCell(params) {
     return Cell.renderTreeIcon(params, Cell.renderSelectionCell(params));
@@ -22779,12 +22826,16 @@ var Cell = {
     var labelField = checkboxOpts.labelField,
         property = checkboxOpts.checkField,
         halfField = checkboxOpts.halfField,
-        checkMethod = checkboxOpts.checkMethod;
+        checkMethod = checkboxOpts.checkMethod,
+        visibleMethod = checkboxOpts.visibleMethod;
     var slots = column.slots;
     var defaultSlot = slots ? slots.default : null;
     var checkboxSlot = slots ? slots.checkbox : null;
     var indeterminate = false;
     var isChecked = false;
+    var isVisible = !visibleMethod || visibleMethod({
+      row: row
+    });
     var isDisabled = !!checkMethod;
     var ons;
 
@@ -22792,7 +22843,7 @@ var Cell = {
       isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
       ons = {
         onClick: function onClick(evnt) {
-          if (!isDisabled) {
+          if (!isDisabled && isVisible) {
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -22812,24 +22863,39 @@ var Cell = {
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
       disabled: isDisabled,
+      visible: isVisible,
       indeterminate: indeterminate
     });
 
-    return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
+    if (checkboxSlot) {
+      return $table.callSlot(checkboxSlot, checkboxParams);
+    }
+
+    var checkVNs = [];
+
+    if (isVisible) {
+      checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+      }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+      }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+      }));
+
+      if (defaultSlot || labelField) {
+        checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+          class: 'vxe-checkbox--label'
+        }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField)));
+      }
+    }
+
+    return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', _objectSpread2({
       class: ['vxe-cell--checkbox', {
         'is--checked': isChecked,
         'is--disabled': isDisabled,
         'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
       }]
-    }, ons), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-    }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-    }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-    })].concat(defaultSlot || labelField ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
-      class: 'vxe-checkbox--label'
-    }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField))] : []))];
+    }, ons), checkVNs)];
   },
   renderTreeSelectionCellByProp: function renderTreeSelectionCellByProp(params) {
     return Cell.renderTreeIcon(params, Cell.renderSelectionCellByProp(params));
@@ -27649,6 +27715,9 @@ function renderTitle($xeform, item) {
 
 
 
+
+
+
 
 
 
@@ -33173,12 +33242,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         if (transform) {
           // 树结构自动转换
           if (true) {
-            if (!treeOpts.rowtKey) {
-              errLog('vxe.error.reqProp', ['tree-config.rowtKey']);
+            if (!treeOpts.rowField) {
+              errLog('vxe.error.reqProp', ['tree-config.rowField']);
             }
 
-            if (!treeOpts.parentKey) {
-              errLog('vxe.error.reqProp', ['tree-config.parentKey']);
+            if (!treeOpts.parentField) {
+              errLog('vxe.error.reqProp', ['tree-config.parentField']);
             }
 
             if (!treeOpts.children) {
@@ -33193,8 +33262,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           }
 
           treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toArrayTree(fullData, {
-            key: treeOpts.rowtKey,
-            parentKey: treeOpts.parentKey,
+            key: treeOpts.rowField,
+            parentKey: treeOpts.parentField,
             children: treeOpts.children
           });
           fullData = treeData.slice(0);