vxe-table 4.7.65 → 4.7.66

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.65";
+const version = "4.7.66";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.65";
+core_.VxeUI.tableVersion = "4.7.66";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2334,7 +2334,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.65"}`;
+const log_version = `table v${"4.7.66"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6603,7 +6603,9 @@ const {
         }
       }, 300);
     };
-    const confirmCustomEvent = evnt => {
+    const confirmCustomEvent = ({
+      $event
+    }) => {
       const {
         customColumnList
       } = reactData;
@@ -6637,10 +6639,12 @@ const {
         }
       });
       $xeTable.closeCustom();
-      $xeTable.emitCustomEvent('confirm', evnt);
+      $xeTable.emitCustomEvent('confirm', $event);
       $xeTable.saveCustomStore('confirm');
     };
-    const cancelCustomEvent = evnt => {
+    const cancelCustomEvent = ({
+      $event
+    }) => {
       const {
         customStore
       } = props;
@@ -6681,14 +6685,16 @@ const {
         children: 'children'
       });
       $xeTable.closeCustom();
-      $xeTable.emitCustomEvent('cancel', evnt);
+      $xeTable.emitCustomEvent('cancel', $event);
     };
     const handleResetCustomEvent = evnt => {
       $xeTable.resetColumn(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
     };
-    const resetCustomEvent = evnt => {
+    const resetCustomEvent = ({
+      $event
+    }) => {
       if (core_.VxeUI.modal) {
         core_.VxeUI.modal.confirm({
           content: panel_getI18n('vxe.custom.cstmConfirmRestore'),
@@ -6696,11 +6702,11 @@ const {
           escClosable: true
         }).then(type => {
           if (type === 'confirm') {
-            handleResetCustomEvent(evnt);
+            handleResetCustomEvent($event);
           }
         });
       } else {
-        handleResetCustomEvent(evnt);
+        handleResetCustomEvent($event);
       }
     };
     const handleOptionCheck = column => {
@@ -6751,7 +6757,7 @@ const {
     //     // $xeTable.setColumnFixed(column, column.fixed)
     //   }
     // }
-    const allCustomEvent = () => {
+    const allOptionEvent = () => {
       const {
         customStore
       } = props;
@@ -6993,7 +6999,7 @@ const {
           'is--indeterminate': isAllIndeterminate
         }],
         title: panel_getI18n('vxe.table.allTitle'),
-        onClick: allCustomEvent
+        onClick: allOptionEvent
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -7176,7 +7182,7 @@ const {
               'is--indeterminate': isAllIndeterminate
             }],
             title: panel_getI18n('vxe.table.allTitle'),
-            onClick: allCustomEvent
+            onClick: allOptionEvent
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
           }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -7185,7 +7191,8 @@ const {
             class: 'vxe-table-custom-popup--table-sort-help-title'
           }, panel_getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent, {
             enterable: true,
-            content: panel_getI18n('vxe.custom.setting.sortHelpTip')
+            content: panel_getI18n('vxe.custom.setting.sortHelpTip'),
+            popupClassName: 'vxe-table--ignore-clear'
           }, {
             default: () => {
               return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
@@ -8232,6 +8239,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     // 使用已安装的组件，如果未安装则不渲染
     const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
+    const $xeTabs = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTabs', null);
     const {
       computeSize
     } = useFns.useSize(props);
@@ -11938,6 +11946,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const fullColumnFieldData = internalData.fullColumnFieldData;
         return field && fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
       },
+      getParentColumn(fieldOrColumn) {
+        const fullColumnIdData = internalData.fullColumnIdData;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
+      },
       /**
        * 获取当前表格的列
        * 收集到的全量列、全量表头列、处理条件之后的全量表头列、当前渲染中的表头列
@@ -12256,10 +12269,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 计算单元格列宽，动态分配可用剩余空间
        * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
        */
-      recalculate(refull) {
+      recalculate(reFull) {
+        const el = refElem.value;
+        if (!el || !el.clientWidth) {
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
         calcCellWidth();
         autoCellWidth();
-        if (refull === true) {
+        if (reFull === true) {
           // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
           return computeScrollLoad().then(() => {
             autoCellWidth();
@@ -14231,6 +14248,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
       }
+      const el = refElem.value;
+      if (!el || !el.clientWidth) {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      }
       tableMethods.updateCellAreas();
       tableMethods.recalculate(true);
     };
@@ -15943,6 +15964,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       });
     });
+    if ($xeTabs) {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
+        handleGlobalResizeEvent();
+      });
+    }
     table_hooks.forEach(options => {
       const {
         setupTable
@@ -16274,6 +16300,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           'is--virtual-x': scrollXLoad,
           'is--virtual-y': scrollYLoad
         }],
+        spellcheck: false,
         onKeydown: keydownEvent
       }, [
       /**
@@ -18223,28 +18250,26 @@ edit_hook_hooks.add('tableEditModule', {
         } = column;
         if (isEnableConf(editRender)) {
           const compRender = edit_hook_renderer.get(editRender.name);
-          let {
-            autofocus,
-            autoselect
-          } = editRender;
+          let autoFocus = editRender.autofocus || editRender.autoFocus;
+          let autoSelect = editRender.autoSelect || editRender.autoselect;
           let inputElem;
-          if (!autofocus && compRender) {
-            autofocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
+          if (!autoFocus && compRender) {
+            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
           }
-          if (!autoselect && compRender) {
-            autoselect = compRender.tableAutoSelect || compRender.autoselect;
+          if (!autoSelect && compRender) {
+            autoSelect = compRender.tableAutoSelect || compRender.autoselect;
           }
           // 如果指定了聚焦 class
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
-            inputElem = autofocus(params);
-          } else if (autofocus) {
-            inputElem = cell.querySelector(autofocus);
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
+            inputElem = autoFocus(params);
+          } else if (autoFocus) {
+            inputElem = cell.querySelector(autoFocus);
             if (inputElem) {
               inputElem.focus();
             }
           }
           if (inputElem) {
-            if (autoselect) {
+            if (autoSelect) {
               inputElem.select();
             } else {
               // 保持一致行为，光标移到末端
@@ -18647,7 +18672,7 @@ export_hook_hooks.add('tableExportModule', {
       const childrenField = treeOpts.children || treeOpts.childrenField;
       return row[childrenField] && row[childrenField].length;
     };
-    const getSeq = (row, $rowIndex, column, $columnIndex) => {
+    const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
       const seqOpts = computeSeqOpts.value;
       const seqMethod = seqOpts.seqMethod || column.seqMethod;
       if (seqMethod) {
@@ -18660,7 +18685,7 @@ export_hook_hooks.add('tableExportModule', {
           $columnIndex
         });
       }
-      return $xeTable.getRowSeq(row);
+      return cellValue;
     };
     function getHeaderTitle(opts, column) {
       const columnOpts = computeColumnOpts.value;
@@ -18728,8 +18753,11 @@ export_hook_hooks.add('tableExportModule', {
               } else {
                 switch (column.type) {
                   case 'seq':
-                    cellValue = mode === 'all' ? path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('') : getSeq(row, $rowIndex, column, $columnIndex);
-                    break;
+                    {
+                      const seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
+                      cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                      break;
+                    }
                   case 'checkbox':
                     cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                     item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -18795,8 +18823,11 @@ export_hook_hooks.add('tableExportModule', {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = mode === 'all' ? $rowIndex + 1 : getSeq(row, $rowIndex, column, $columnIndex);
-                break;
+                {
+                  const seqValue = $rowIndex + 1;
+                  cellValue = mode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex);
+                  break;
+                }
               case 'checkbox':
                 cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                 item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -21654,7 +21685,7 @@ function handleFilterMethod({
   const {
     data
   } = option;
-  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   /* eslint-disable eqeqeq */
   return cellValue == data;
 }
@@ -21666,7 +21697,7 @@ function handleInputFilterMethod({
   const {
     data
   } = option;
-  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   /* eslint-disable eqeqeq */
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue).indexOf(data) > -1;
 }
@@ -21753,7 +21784,7 @@ function getSelectCellValue(renderOpts, {
     optionProps = {},
     optionGroupProps = {}
   } = renderOpts;
-  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   let selectItem;
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
@@ -21792,7 +21823,7 @@ function getTreeSelectCellValue(renderOpts, {
     options,
     optionProps = {}
   } = renderOpts;
-  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
   const childrenProp = optionProps.children || 'children';
@@ -21823,23 +21854,23 @@ function handleExportTreeSelectMethod(params) {
  */
 render_renderer.mixin({
   input: {
-    autofocus: 'input',
-    renderEdit: nativeEditRender,
-    renderDefault: nativeEditRender,
-    renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    tableAutoFocus: 'input',
+    renderTableEdit: nativeEditRender,
+    renderTableDefault: nativeEditRender,
+    renderTableFilter: nativeFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    autofocus: 'textarea',
-    renderEdit: nativeEditRender
+    tableAutoFocus: 'textarea',
+    renderTableEdit: nativeEditRender
   },
   select: {
-    renderEdit: nativeSelectEditRender,
-    renderDefault: nativeSelectEditRender,
-    renderCell(renderOpts, params) {
+    renderTableEdit: nativeSelectEditRender,
+    renderTableDefault: nativeSelectEditRender,
+    renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter(renderOpts, params) {
+    renderTableFilter(renderOpts, params) {
       const {
         column
       } = params;
@@ -21852,13 +21883,13 @@ render_renderer.mixin({
         }, renderOpts.optionGroups ? renderNativeOptgroups(renderOpts, params, renderNativeOptions) : renderNativeOptions(renderOpts.options, renderOpts, params));
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell(renderOpts, params) {
       const {
         props = {}
       } = renderOpts;
@@ -21867,7 +21898,7 @@ render_renderer.mixin({
         column
       } = params;
       const digits = props.digits || render_getConfig().input?.digits || 2;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -21884,14 +21915,14 @@ render_renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell(renderOpts, params) {
       const {
         props = {}
       } = renderOpts;
@@ -21900,7 +21931,7 @@ render_renderer.mixin({
         column
       } = params;
       const digits = props.digits || render_getConfig().numberInput?.digits || 2;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case 'float':
@@ -21910,14 +21941,14 @@ render_renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell(renderOpts, params) {
       const {
         props = {}
       } = renderOpts;
@@ -21925,7 +21956,7 @@ render_renderer.mixin({
         row,
         column
       } = params;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -21939,18 +21970,18 @@ render_renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleFilterMethod
   },
   VxeTextarea: {
-    autofocus: 'VxeTextarea'
+    tableAutoFocus: 'VxeTextarea'
   },
   VxeButton: {
-    renderDefault: buttonCellRender
+    renderTableDefault: buttonCellRender
   },
   VxeButtonGroup: {
-    renderDefault(renderOpts, params) {
+    renderTableDefault(renderOpts, params) {
       const {
         options
       } = renderOpts;
@@ -21962,13 +21993,13 @@ render_renderer.mixin({
     }
   },
   VxeSelect: {
-    autofocus: 'input',
-    renderEdit: defaultSelectEditRender,
-    renderDefault: defaultSelectEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultSelectEditRender,
+    renderTableDefault: defaultSelectEditRender,
+    renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter(renderOpts, params) {
+    renderTableFilter(renderOpts, params) {
       const {
         column
       } = params;
@@ -21992,35 +22023,49 @@ render_renderer.mixin({
         });
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    autofocus: 'input',
-    renderEdit: defaultTreeSelectEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultTreeSelectEditRender,
+    renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
-    exportMethod: handleExportTreeSelectMethod
+    tableExportMethod: handleExportTreeSelectMethod
+  },
+  VxeIconPicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell(renderOpts, params) {
+      const {
+        row,
+        column
+      } = params;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+        class: cellValue
+      });
+    }
   },
   VxeRadioGroup: {
-    renderDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxEditRender
   },
   VxeCheckboxGroup: {
-    renderDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxEditRender
   },
   VxeSwitch: {
-    autofocus: 'button',
-    renderEdit: defaultEditRender,
-    renderDefault: defaultEditRender
+    tableAutoFocus: 'button',
+    renderTableEdit: defaultEditRender,
+    renderTableDefault: defaultEditRender
   },
   VxeUpload: {
-    renderEdit: defaultEditRender,
-    renderCell: defaultEditRender,
-    renderDefault: defaultEditRender
+    renderTableEdit: defaultEditRender,
+    renderTableCell: defaultEditRender,
+    renderTableDefault: defaultEditRender
   },
   VxeImage: {
-    renderDefault(renderOpts, params) {
+    renderTableDefault(renderOpts, params) {
       const {
         row,
         column
@@ -22037,7 +22082,7 @@ render_renderer.mixin({
     }
   },
   VxeImageGroup: {
-    renderDefault(renderOpts, params) {
+    renderTableDefault(renderOpts, params) {
       const {
         row,
         column
@@ -22055,9 +22100,9 @@ render_renderer.mixin({
   },
   // 以下已废弃
   $input: {
-    autofocus: '.vxe-input--inner',
-    renderEdit: oldEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: '.vxe-input--inner',
+    renderTableEdit: oldEditRender,
+    renderTableCell(renderOpts, params) {
       const {
         props = {}
       } = renderOpts;
@@ -22066,7 +22111,7 @@ render_renderer.mixin({
         column
       } = params;
       const digits = props.digits || render_getConfig().input?.digits || 2;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -22082,27 +22127,27 @@ render_renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
     },
-    renderDefault: oldEditRender,
-    renderFilter: oldFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: oldEditRender,
+    renderTableFilter: oldFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    autofocus: '.vxe-textarea--inner'
+    tableAutoFocus: '.vxe-textarea--inner'
   },
   $button: {
-    renderDefault: oldButtonEditRender
+    renderTableDefault: oldButtonEditRender
   },
   $buttons: {
-    renderDefault: oldButtonsEditRender
+    renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    autofocus: '.vxe-input--inner',
-    renderEdit: oldSelectEditRender,
-    renderDefault: oldSelectEditRender,
-    renderCell(renderOpts, params) {
+    tableAutoFocus: '.vxe-input--inner',
+    renderTableEdit: oldSelectEditRender,
+    renderTableDefault: oldSelectEditRender,
+    renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter(renderOpts, params) {
+    renderTableFilter(renderOpts, params) {
       const {
         column
       } = params;
@@ -22126,19 +22171,19 @@ render_renderer.mixin({
         });
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    autofocus: '.vxe-radio--input'
+    tableAutoFocus: '.vxe-radio--input'
   },
   $checkbox: {
-    autofocus: '.vxe-checkbox--input'
+    tableAutoFocus: '.vxe-checkbox--input'
   },
   $switch: {
-    autofocus: '.vxe-switch--button',
-    renderEdit: oldEditRender,
-    renderDefault: oldEditRender
+    tableAutoFocus: '.vxe-switch--button',
+    renderTableEdit: oldEditRender,
+    renderTableDefault: oldEditRender
   }
   // 以上已废弃
 });
@@ -22320,7 +22365,9 @@ const {
         }, 350);
       }
     };
-    const refreshEvent = evnt => {
+    const refreshEvent = ({
+      $event
+    }) => {
       const {
         isRefresh
       } = reactData;
@@ -22340,15 +22387,17 @@ const {
           reactData.isRefresh = true;
           $xeGrid.triggerToolbarCommitEvent({
             code: refreshOpts.code || 'reload'
-          }, evnt).catch(e => e).then(() => {
+          }, $event).catch(e => e).then(() => {
             reactData.isRefresh = false;
           });
         }
       }
     };
-    const zoomEvent = evnt => {
+    const zoomEvent = ({
+      $event
+    }) => {
       if ($xeGrid) {
-        $xeGrid.triggerZoomEvent(evnt);
+        $xeGrid.triggerZoomEvent($event);
       }
     };
     const btnEvent = (evnt, item) => {
@@ -22458,7 +22507,9 @@ const {
             round: child.round,
             status: child.status,
             content: child.name,
-            onClick: evnt => isBtn ? btnEvent(evnt, child) : tolEvent(evnt, child)
+            onClick: ({
+              $event
+            }) => isBtn ? btnEvent($event, child) : tolEvent($event, child)
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
         });
       }
@@ -22514,7 +22565,9 @@ const {
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
-                  onClick: evnt => btnEvent(evnt, item)
+                  onClick: ({
+                    $event
+                  }) => btnEvent($event, item)
                 }, dropdowns && dropdowns.length ? {
                   dropdowns: () => renderDropdowns(item, true)
                 } : {}));
@@ -22577,7 +22630,9 @@ const {
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
-                  onClick: evnt => tolEvent(evnt, item)
+                  onClick: ({
+                    $event
+                  }) => tolEvent($event, item)
                 }, dropdowns && dropdowns.length ? {
                   dropdowns: () => renderDropdowns(item, false)
                 } : {}));
@@ -22969,6 +23024,17 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         });
       }
     };
+    const getFormData = () => {
+      const {
+        proxyConfig
+      } = props;
+      const {
+        formData
+      } = reactData;
+      const proxyOpts = computeProxyOpts.value;
+      const formOpts = computeFormOpts.value;
+      return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
+    };
     const initPages = () => {
       const {
         tablePage
@@ -23496,7 +23562,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const formOpts = computeFormOpts.value;
       if (proxyConfig && isEnableConf(proxyOpts)) {
         if (formConfig && isEnableConf(formOpts) && proxyOpts.form && formOpts.items) {
-          const formData = {};
+          const fData = {};
           formOpts.items.forEach(item => {
             const {
               field,
@@ -23516,10 +23582,10 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   itemValue = defaultValue;
                 }
               }
-              formData[field] = itemValue;
+              fData[field] = itemValue;
             }
           });
-          reactData.formData = formData;
+          reactData.formData = fData;
         }
         if (!proxyInited) {
           reactData.proxyInited = true;
@@ -23552,8 +23618,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           validConfig
         } = props;
         const {
-          tablePage,
-          formData
+          tablePage
         } = reactData;
         const isActiveMsg = computeIsActiveMsg.value;
         const isRespMsg = computeIsRespMsg.value;
@@ -23571,6 +23636,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         } = proxyOpts;
         const resConfigs = proxyOpts.response || proxyOpts.props || {};
         const $xeTable = refTable.value;
+        const formData = getFormData();
         let button = null;
         let code = null;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(proxyTarget)) {
@@ -23980,6 +24046,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       revert() {
         return handleZoom();
       },
+      getFormData,
       getFormItems(itemIndex) {
         const formOpts = computeFormOpts.value;
         const {
@@ -24005,7 +24072,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           return {
             data: reactData.tableData,
             filter: reactData.filterData,
-            form: reactData.formData,
+            form: getFormData(),
             sort: sortData.length ? sortData[0] : {},
             sorts: sortData,
             pager: reactData.tablePage,
@@ -24173,15 +24240,14 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         const {
-          data,
-          columns,
-          proxyConfig
+          columns
         } = props;
-        const proxyOpts = computeProxyOpts.value;
-        const formOpts = computeFormOpts.value;
-        if (isEnableConf(proxyConfig) && (data || proxyOpts.form && formOpts.data)) {
-          errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
-        }
+        // const { data, columns, proxyConfig } = props
+        // const proxyOpts = computeProxyOpts.value
+        // const formOpts = computeFormOpts.value
+        // if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
+        //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+        // }
         // if (process.env.VUE_APP_VXE_ENV === 'development') {
         //   if (proxyOpts.props) {
         //     warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
@@ -24558,7 +24624,9 @@ const Grid = VxeGrid;
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '点击查看'
     },
     formDesign: {
       formName: '表单名称',
@@ -24589,6 +24657,7 @@ const Grid = VxeGrid;
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系统控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',