vxe-table 3.21.10 → 3.21.12

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.10";
+const version = "3.21.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3837,240 +3837,6 @@ var es_iterator_map = __webpack_require__(1701);
 var es_iterator_reduce = __webpack_require__(8237);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
 var es_iterator_some = __webpack_require__(3579);
-;// ./packages/ui/src/log.ts
-
-const {
-  log: log_log
-} = core_.VxeUI;
-const log_version = `table v${"3.21.10"}`;
-const warnLog = log_log.create('warn', log_version);
-const errLog = log_log.create('error', log_version);
-;// ./packages/table/src/columnInfo.ts
-
-
-
-
-
-const {
-  getI18n: columnInfo_getI18n,
-  formats: columnInfo_formats,
-  renderer: columnInfo_renderer
-} = core_.VxeUI;
-class ColumnInfo {
-  /* eslint-disable @typescript-eslint/no-use-before-define */
-  constructor($xeTable, _vm, {
-    renderHeader,
-    renderCell,
-    renderFooter,
-    renderData
-  } = {}) {
-    const tableProps = $xeTable;
-    const $xeGrid = $xeTable.$xeGrid;
-    const $xeGantt = $xeTable.$xeGantt;
-    const $xeGGWrapper = $xeGrid || $xeGantt;
-    const {
-      field,
-      editRender,
-      filterRender
-    } = _vm;
-    const colId = _vm.colId || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('col_');
-    const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
-    const formatter = _vm.formatter;
-    const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
-    const flCompConf = isEnableConf(filterRender) ? columnInfo_renderer.get(filterRender.name) : null;
-    const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
-    const filters = toFilters(_vm.filters, colId);
-    const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-    if (_vm.type && types.indexOf(_vm.type) === -1) {
-      warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-    }
-    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
-      warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-    }
-    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
-      warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
-    }
-    if (_vm.type === 'expand') {
-      const {
-        treeConfig
-      } = tableProps;
-      if (treeConfig && ($xeTable.treeOpts.showLine || $xeTable.treeOpts.line)) {
-        errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
-      }
-    }
-    if (_vm.remoteSort) {
-      warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
-    }
-    if (_vm.sortMethod) {
-      warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
-    }
-    if (formatter) {
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-        const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
-        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-          errLog('vxe.error.notFormats', [formatter]);
-        }
-      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-        const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
-        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-          errLog('vxe.error.notFormats', [formatter[0]]);
-        }
-      }
-    }
-    if (_vm.aggFunc) {
-      if (!$xeTable.handlePivotTableAggData && _vm.aggFunc !== true) {
-        errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
-      }
-    }
-    if (field && editRender) {
-      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
-        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
-      }
-      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
-        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
-      }
-    }
-    Object.assign(this, {
-      // 基本属性
-      type: _vm.type,
-      property: _vm.field,
-      field: field,
-      title: _vm.title,
-      width: _vm.width,
-      minWidth: _vm.minWidth,
-      maxWidth: _vm.maxWidth,
-      resizable: _vm.resizable,
-      fixed: _vm.fixed,
-      align: _vm.align,
-      headerAlign: _vm.headerAlign,
-      footerAlign: _vm.footerAlign,
-      showOverflow: _vm.showOverflow,
-      showHeaderOverflow: _vm.showHeaderOverflow,
-      showFooterOverflow: _vm.showFooterOverflow,
-      className: _vm.className,
-      headerClassName: _vm.headerClassName,
-      footerClassName: _vm.footerClassName,
-      formatter,
-      headerFormatter: _vm.headerFormatter,
-      footerFormatter: _vm.footerFormatter,
-      padding: _vm.padding,
-      verticalAlign: _vm.verticalAlign,
-      sortable: _vm.sortable,
-      sortBy: _vm.sortBy,
-      sortType: _vm.sortType,
-      sortMethod: _vm.sortMethod,
-      remoteSort: _vm.remoteSort,
-      filters: filters,
-      filterMultiple: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
-      filterMethod: _vm.filterMethod,
-      filterResetMethod: _vm.filterResetMethod,
-      filterRecoverMethod: _vm.filterRecoverMethod,
-      filterRender: filterRender,
-      floatingFilters: _vm.floatingFilters,
-      rules: _vm.rules,
-      rowGroupNode: _vm.rowGroupNode,
-      treeNode: _vm.treeNode,
-      dragSort: _vm.dragSort,
-      rowResize: _vm.rowResize,
-      cellType: _vm.cellType,
-      cellRender: _vm.cellRender,
-      editRender: editRender,
-      contentRender: _vm.contentRender,
-      headerExportMethod: _vm.headerExportMethod,
-      exportMethod: _vm.exportMethod,
-      footerExportMethod: _vm.footerExportMethod,
-      titleHelp: _vm.titleHelp,
-      titlePrefix: _vm.titlePrefix,
-      titleSuffix: _vm.titleSuffix,
-      aggFunc: _vm.aggFunc,
-      copyMethod: _vm.copyMethod,
-      cutMethod: _vm.cutMethod,
-      pasteMethod: _vm.pasteMethod,
-      // 自定义参数
-      params: _vm.params,
-      // 渲染属性
-      id: colId,
-      parentId: null,
-      visible,
-      // 内部属性（一旦被使用，将导致不可升级版本）
-      defaultParentId: null,
-      halfVisible: false,
-      defaultVisible: visible,
-      defaultFixed: _vm.fixed,
-      defaultAggGroup: _vm.aggGroup,
-      defaultAggFunc: _vm.aggFunc,
-      checked: false,
-      halfChecked: false,
-      disabled: false,
-      // 分组层级
-      level: 1,
-      // 跨行
-      rowSpan: 1,
-      // 跨列
-      colSpan: 1,
-      // 数据排序
-      order: null,
-      sortTime: 0,
-      // 列排序
-      sortNumber: 0,
-      renderSortNumber: 0,
-      renderAggFn: '',
-      renderAggDigits: null,
-      renderAggFormat: null,
-      renderFixed: '',
-      renderVisible: false,
-      renderWidth: 0,
-      renderHeight: 0,
-      renderResizeWidth: 0,
-      renderAutoWidth: 0,
-      resizeWidth: 0,
-      renderLeft: 0,
-      renderArgs: [],
-      model: {},
-      renderHeader: renderHeader || _vm.renderHeader,
-      renderCell: renderCell || _vm.renderCell,
-      renderFooter: renderFooter || _vm.renderFooter,
-      renderData,
-      // 单元格插槽，只对 grid 有效
-      slots: _vm.slots
-    });
-    if (ctFilterOptions && (!filters || !filters.length)) {
-      this.filters = toFilters(ctFilterOptions({
-        $table: $xeTable,
-        column: this
-      }), colId);
-    }
-    if ($xeGGWrapper) {
-      if (proxyOpts && proxyOpts.beforeColumn) {
-        proxyOpts.beforeColumn({
-          $table: $xeTable,
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          column: this
-        });
-      }
-    }
-  }
-  getTitle() {
-    return getFuncText(this.title || (this.type === 'seq' ? columnInfo_getI18n('vxe.table.seqTitle') : ''));
-  }
-  getKey() {
-    const {
-      type
-    } = this;
-    return this.field || (type ? `type=${type}` : null);
-  }
-  update(name, value) {
-    // 不支持直接修改的属性
-    if (name !== 'filters') {
-      if (name === 'field') {
-        // 兼容旧属性
-        this.property = value;
-      }
-      this[name] = value;
-    }
-  }
-}
 ;// ./packages/ui/src/dom.ts
 
 
@@ -4303,6 +4069,252 @@ function wheelScrollTopTo(diffNum, cb) {
     wtaFrame = null;
   });
 }
+;// ./packages/ui/src/log.ts
+
+const {
+  log: log_log
+} = core_.VxeUI;
+const log_version = `table v${"3.21.12"}`;
+const warnLog = log_log.create('warn', log_version);
+const errLog = log_log.create('error', log_version);
+;// ./packages/table/src/columnInfo.ts
+
+
+
+
+
+
+const {
+  getI18n: columnInfo_getI18n,
+  formats: columnInfo_formats,
+  renderer: columnInfo_renderer
+} = core_.VxeUI;
+class ColumnInfo {
+  /* eslint-disable @typescript-eslint/no-use-before-define */
+  constructor($xeTable, colConfs, {
+    renderHeader,
+    renderCell,
+    renderFooter,
+    renderData
+  } = {}) {
+    const tableProps = $xeTable;
+    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
+    const {
+      type,
+      field,
+      width,
+      visible,
+      aggFunc,
+      formatter,
+      filterMultiple,
+      cellRender,
+      editRender,
+      filterRender
+    } = colConfs;
+    const colId = colConfs.colId || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('col_');
+    const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
+    const defaultVisible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visible) ? visible : true;
+    const defaultRenderWidth = width && isPx(width) && width !== 'auto' ? Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width)) : 0;
+    const flCompConf = filterRender && isEnableConf(filterRender) ? columnInfo_renderer.get(filterRender.name) : null;
+    const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
+    const filters = toFilters(colConfs.filters, colId);
+    const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+    if (type && types.indexOf(type) === -1) {
+      warnLog('vxe.error.errProp', [`type=${type}`, types.join(', ')]);
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(cellRender) || cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(cellRender)) {
+      warnLog('vxe.error.errProp', [`column.cell-render=${cellRender}`, 'column.cell-render={}']);
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(editRender) || editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(editRender)) {
+      warnLog('vxe.error.errProp', [`column.edit-render=${editRender}`, 'column.edit-render={}']);
+    }
+    if (type === 'expand') {
+      const {
+        treeConfig
+      } = tableProps;
+      if (treeConfig && ($xeTable.treeOpts.showLine || $xeTable.treeOpts.line)) {
+        errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
+      }
+    }
+    // 参数已废弃
+    if (colConfs.remoteSort) {
+      warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
+    }
+    // 参数已废弃
+    if (colConfs.sortMethod) {
+      warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
+    }
+    if (formatter) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter]);
+        }
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter[0]]);
+        }
+      }
+    }
+    if (aggFunc) {
+      if (!$xeTable.handlePivotTableAggData && aggFunc !== true) {
+        errLog('vxe.error.errProp', [`column.agg-func=${aggFunc}`, 'column.agg-func=true']);
+      }
+    }
+    if (field && editRender) {
+      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+      }
+      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+      }
+    }
+    Object.assign(this, {
+      // 基本属性
+      type: colConfs.type,
+      property: colConfs.field,
+      field: field,
+      title: colConfs.title,
+      width: colConfs.width,
+      minWidth: colConfs.minWidth,
+      maxWidth: colConfs.maxWidth,
+      resizable: colConfs.resizable,
+      fixed: colConfs.fixed,
+      align: colConfs.align,
+      headerAlign: colConfs.headerAlign,
+      footerAlign: colConfs.footerAlign,
+      showOverflow: colConfs.showOverflow,
+      showHeaderOverflow: colConfs.showHeaderOverflow,
+      showFooterOverflow: colConfs.showFooterOverflow,
+      className: colConfs.className,
+      headerClassName: colConfs.headerClassName,
+      footerClassName: colConfs.footerClassName,
+      formatter,
+      headerFormatter: colConfs.headerFormatter,
+      footerFormatter: colConfs.footerFormatter,
+      padding: colConfs.padding,
+      verticalAlign: colConfs.verticalAlign,
+      sortable: colConfs.sortable,
+      sortBy: colConfs.sortBy,
+      sortType: colConfs.sortType,
+      // 参数已废弃
+      sortMethod: colConfs.sortMethod,
+      // 参数已废弃
+      remoteSort: colConfs.remoteSort,
+      filters: filters,
+      filterMultiple: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(filterMultiple) ? filterMultiple : true,
+      filterMethod: colConfs.filterMethod,
+      filterResetMethod: colConfs.filterResetMethod,
+      filterRecoverMethod: colConfs.filterRecoverMethod,
+      filterRender: filterRender,
+      floatingFilters: colConfs.floatingFilters,
+      rules: colConfs.rules,
+      rowGroupNode: colConfs.rowGroupNode,
+      treeNode: colConfs.treeNode,
+      dragSort: colConfs.dragSort,
+      rowResize: colConfs.rowResize,
+      cellType: colConfs.cellType,
+      cellRender: colConfs.cellRender,
+      editRender: editRender,
+      contentRender: colConfs.contentRender,
+      headerExportMethod: colConfs.headerExportMethod,
+      exportMethod: colConfs.exportMethod,
+      footerExportMethod: colConfs.footerExportMethod,
+      titleHelp: colConfs.titleHelp,
+      titlePrefix: colConfs.titlePrefix,
+      titleSuffix: colConfs.titleSuffix,
+      aggFunc: colConfs.aggFunc,
+      copyMethod: colConfs.copyMethod,
+      cutMethod: colConfs.cutMethod,
+      pasteMethod: colConfs.pasteMethod,
+      // 自定义参数
+      params: colConfs.params,
+      // 渲染属性
+      id: colId,
+      parentId: null,
+      visible: defaultVisible,
+      // 内部属性（一旦被使用，将导致不可升级版本）
+      defaultParentId: null,
+      halfVisible: false,
+      defaultVisible: defaultVisible,
+      defaultFixed: colConfs.fixed,
+      defaultAggFunc: colConfs.aggFunc,
+      checked: false,
+      halfChecked: false,
+      disabled: false,
+      // 分组层级
+      level: 1,
+      // 跨行
+      rowSpan: 1,
+      // 跨列
+      colSpan: 1,
+      // 数据排序
+      order: null,
+      sortTime: 0,
+      // 列排序
+      sortNumber: 0,
+      renderSortNumber: 0,
+      renderAggFn: '',
+      renderAggDigits: null,
+      renderAggFormat: null,
+      renderFixed: '',
+      renderVisible: false,
+      renderWidth: defaultRenderWidth,
+      renderHeight: 0,
+      renderResizeWidth: 0,
+      renderAutoWidth: 0,
+      resizeWidth: 0,
+      renderLeft: 0,
+      renderArgs: [],
+      model: {},
+      renderHeader: renderHeader || colConfs.renderHeader,
+      renderCell: renderCell || colConfs.renderCell,
+      renderFooter: renderFooter || colConfs.renderFooter,
+      renderData,
+      // 单元格插槽，只对 grid 有效
+      slots: colConfs.slots
+    });
+    if (ctFilterOptions && (!filters || !filters.length)) {
+      this.filters = toFilters(ctFilterOptions({
+        $table: $xeTable,
+        column: this
+      }), colId);
+    }
+    if ($xeGGWrapper) {
+      if (proxyOpts && proxyOpts.beforeColumn) {
+        proxyOpts.beforeColumn({
+          $table: $xeTable,
+          $grid: $xeGrid,
+          $gantt: $xeGantt,
+          column: this
+        });
+      }
+    }
+  }
+  getTitle() {
+    return getFuncText(this.title || (this.type === 'seq' ? columnInfo_getI18n('vxe.table.seqTitle') : ''));
+  }
+  getKey() {
+    const {
+      type,
+      field
+    } = this;
+    return field || (type ? `type=${type}` : null);
+  }
+  update(name, value) {
+    // 不支持直接修改的属性
+    if (name !== 'filters') {
+      if (name === 'field') {
+        // 兼容旧属性
+        this.property = value;
+      }
+      this[name] = value;
+    }
+  }
+}
 ;// ./packages/table/src/util.ts
 
 
@@ -6655,10 +6667,12 @@ const Cell = {
         isLazyLoading = !!rowExpandLazyLoadedMaps[rowid];
       }
     }
-    return renderCellBaseVNs(h, params, [showIcon && (!visibleMethod || visibleMethod(params)) ? h('span', {
+    return renderCellBaseVNs(h, params, [showIcon && (!visibleMethod || visibleMethod(params)) ? h('div', {
       class: ['vxe-table--expanded', {
         'is--active': isActive
-      }],
+      }]
+    }, [h('span', {
+      class: 'vxe-table--expand-btn',
       on: {
         mousedown(evnt) {
           evnt.stopPropagation();
@@ -6668,8 +6682,8 @@ const Cell = {
         }
       }
     }, [h('i', {
-      class: ['vxe-table--expand-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
-    })]) : renderEmptyElement($table), defaultSlot || labelField ? h('span', {
+      class: isLazyLoading ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE
+    })])]) : renderEmptyElement($table), defaultSlot || labelField ? h('span', {
       class: 'vxe-table--expand-label'
     }, defaultSlot ? $table.callSlot(defaultSlot, params, h) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, labelField)) : renderEmptyElement($table)]);
   },
@@ -7697,7 +7711,10 @@ if(isCustomSort&&sortData){allCols.forEach(column=>{const colKey=column.getKey()
  */function restoreCustomStorage($xeTable){const props=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{storage,restoreStore,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}:storage||{},storeOptions);const isCustomResizable=hangleStorageDefaultValue(storageOpts.resizable,isAllCustom);const isCustomVisible=hangleStorageDefaultValue(storageOpts.visible,isAllCustom);const isCustomFixed=hangleStorageDefaultValue(storageOpts.fixed,isAllCustom);const isCustomSort=hangleStorageDefaultValue(storageOpts.sort,isAllCustom);const isCustomAggFunc=hangleStorageDefaultValue(storageOpts.aggFunc,isAllCustom);if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggFunc)){if(!tableId){errLog('vxe.error.reqProp',['id']);return;}const storeData=getCustomStorageMap(tableId);if(restoreStore){return Promise.resolve(restoreStore({$table:$xeTable,id:tableId,type:'restore',storeData})).then(storeData=>{if(!storeData){return;}return handleCustomRestore($xeTable,storeData);}).catch(e=>e);}else{return handleCustomRestore($xeTable,storeData);}}}/**
  * 更新数据列的 Map
  * 牺牲数据组装的耗时，用来换取使用过程中的流畅
- */function cacheColumnMap($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig,showOverflow}=props;const{tableFullColumn,collectColumn}=internalData;const fullColIdData=internalData.fullColumnIdData={};const fullColFieldData=internalData.fullColumnFieldData={};const mouseOpts=$xeTable.computeMouseOpts;const expandOpts=$xeTable.computeExpandOpts;const columnOpts=$xeTable.computeColumnOpts;const columnDragOpts=$xeTable.computeColumnDragOpts;const virtualYOpts=$xeTable.computeVirtualYOpts;const{isCrossDrag,isSelfToChildDrag}=columnDragOpts;const customOpts=$xeTable.computeCustomOpts;const treeOpts=$xeTable.computeTreeOpts;const{storage}=customOpts;const rowOpts=$xeTable.computeRowOpts;const isGroup=collectColumn.some(hasChildrenList);let isAllOverflow=!!showOverflow;let rowGroupColumn;let expandColumn;let treeNodeColumn;let checkboxColumn;let radioColumn;let htmlColumn;let hasFixed;const handleFunc=(column,index,items,path,parentColumn)=>{const{id:colid,field,fixed,type,treeNode,rowGroupNode}=column;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};if(field){if(fullColFieldData[field]){errLog('vxe.error.colRepet',['field',field]);}fullColFieldData[field]=rest;}else{if(storage&&!type){errLog('vxe.error.reqSupportProp',['storage',`[${type?`type=${type}`:`title=${column.getTitle()}`}]field=?`]);}if(columnOpts.drag&&(isCrossDrag||isSelfToChildDrag)){errLog('vxe.error.reqSupportProp',['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag',`${column.getTitle()||type||''} -> field=?`]);}}if(!hasFixed&&fixed){hasFixed=fixed;}if(!htmlColumn&&type==='html'){htmlColumn=column;}if(treeNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['tree-node',treeNode]);}if(!treeNodeColumn){treeNodeColumn=column;}}if(rowGroupNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['row-group-node',rowGroupNode]);}if(!rowGroupColumn){rowGroupColumn=column;}}if(type==='expand'){if(expandColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!expandColumn){expandColumn=column;}}if(type==='checkbox'){if(checkboxColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!checkboxColumn){checkboxColumn=column;}}else if(type==='radio'){if(radioColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!radioColumn){radioColumn=column;}}if(isAllOverflow&&column.showOverflow===false){isAllOverflow=false;}if(fullColIdData[colid]){errLog('vxe.error.colRepet',['colId',colid]);}fullColIdData[colid]=rest;};if(isGroup){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn,nodes)=>{column.level=nodes.length;handleFunc(column,index,items,path,parentColumn);});}else{tableFullColumn.forEach(handleFunc);}if(expandColumn){if(expandOpts.mode!=='fixed'&&virtualYOpts.enabled){warnLog('vxe.error.notConflictProp',['column.type="expand','virtual-y-config.enabled=false']);}if(expandOpts.mode!=='fixed'&&mouseOpts.area){errLog('vxe.error.errConflicts',['mouse-config.area','column.type=expand']);}if(expandOpts.mode!=='inside'&&treeConfig&&!treeOpts.transform){errLog('vxe.error.notConflictProp',['tree-config.transform=false','expand-config.mode=inside']);}if(props.spanMethod){warnLog('vxe.error.notSupportProp',['column.type=expand','span-method','span-method=null']);}}if(htmlColumn){if(!columnOpts.useKey){errLog('vxe.error.notSupportProp',['column.type=html','column-config.useKey=false','column-config.useKey=true']);}if(!rowOpts.useKey){errLog('vxe.error.notSupportProp',['column.type=html','row-config.useKey=false','row-config.useKey=true']);}}reactData.isGroup=isGroup;reactData.rowGroupColumn=rowGroupColumn;reactData.treeNodeColumn=treeNodeColumn;reactData.expandColumn=expandColumn;reactData.checkboxColumn=checkboxColumn;reactData.radioColumn=radioColumn;reactData.isAllOverflow=isAllOverflow;}function updateScrollXStatus($xeTable,fullColumn){const reactData=$xeTable;const internalData=$xeTable;const virtualXOpts=$xeTable.computeVirtualXOpts;const allCols=fullColumn||internalData.tableFullColumn;// 如果gt为0，则总是启用
+ */function cacheColumnMap($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig,showOverflow}=props;const{tableFullColumn,collectColumn}=internalData;const fullColIdData=internalData.fullColumnIdData={};const fullColFieldData=internalData.fullColumnFieldData={};const mouseOpts=$xeTable.computeMouseOpts;const expandOpts=$xeTable.computeExpandOpts;const columnOpts=$xeTable.computeColumnOpts;const columnDragOpts=$xeTable.computeColumnDragOpts;const virtualYOpts=$xeTable.computeVirtualYOpts;const{isCrossDrag,isSelfToChildDrag}=columnDragOpts;const customOpts=$xeTable.computeCustomOpts;const treeOpts=$xeTable.computeTreeOpts;const{storage}=customOpts;const rowOpts=$xeTable.computeRowOpts;const isGroup=collectColumn.some(hasChildrenList);let isAllOverflow=!!showOverflow;let rowGroupColumn;let expandColumn;let treeNodeColumn;let checkboxColumn;let radioColumn;let htmlColumn;let hasFixed;const handleFunc=(column,index,items,path,parentColumn)=>{const{id:colid,field,fixed,type,treeNode,rowGroupNode}=column;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};if(field){if(fullColFieldData[field]){errLog('vxe.error.colRepet',['field',field]);}fullColFieldData[field]=rest;}else{if(storage&&!type){errLog('vxe.error.reqSupportProp',['storage',`[${type?`type=${type}`:`title=${column.getTitle()}`}]field=?`]);}if(columnOpts.drag&&(isCrossDrag||isSelfToChildDrag)){errLog('vxe.error.reqSupportProp',['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag',`${column.getTitle()||type||''} -> field=?`]);}}if(!hasFixed&&fixed){hasFixed=fixed;}if(!htmlColumn&&type==='html'){htmlColumn=column;}if(treeNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['tree-node',treeNode]);}if(!treeNodeColumn){treeNodeColumn=column;}}if(rowGroupNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['row-group-node',rowGroupNode]);}if(!rowGroupColumn){rowGroupColumn=column;}}if(type==='expand'){if(expandColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!expandColumn){expandColumn=column;}}if(type==='checkbox'){if(checkboxColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!checkboxColumn){checkboxColumn=column;}}else if(type==='radio'){if(radioColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!radioColumn){radioColumn=column;}}if(isAllOverflow&&column.showOverflow===false){isAllOverflow=false;}if(fullColIdData[colid]){errLog('vxe.error.colRepet',['colId',colid]);}fullColIdData[colid]=rest;};if(isGroup){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn,nodes)=>{column.level=nodes.length;handleFunc(column,index,items,path,parentColumn);});}else{tableFullColumn.forEach(handleFunc);}if(expandColumn){if(expandOpts.mode!=='fixed'&&virtualYOpts.enabled){warnLog('vxe.error.notConflictProp',['column.type="expand','virtual-y-config.enabled=false']);}if(expandOpts.mode!=='fixed'&&mouseOpts.area){errLog('vxe.error.errConflicts',['mouse-config.area','column.type=expand']);}if(expandOpts.mode!=='inside'&&treeConfig&&!treeOpts.transform){errLog('vxe.error.notConflictProp',['tree-config.transform=false','expand-config.mode=inside']);}// if (props.spanMethod) {
+//   warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null'])
+// }
+}if(htmlColumn){if(!columnOpts.useKey){errLog('vxe.error.notSupportProp',['column.type=html','column-config.useKey=false','column-config.useKey=true']);}if(!rowOpts.useKey){errLog('vxe.error.notSupportProp',['column.type=html','row-config.useKey=false','row-config.useKey=true']);}}reactData.isGroup=isGroup;reactData.rowGroupColumn=rowGroupColumn;reactData.treeNodeColumn=treeNodeColumn;reactData.expandColumn=expandColumn;reactData.checkboxColumn=checkboxColumn;reactData.radioColumn=radioColumn;reactData.isAllOverflow=isAllOverflow;}function updateScrollXStatus($xeTable,fullColumn){const reactData=$xeTable;const internalData=$xeTable;const virtualXOpts=$xeTable.computeVirtualXOpts;const allCols=fullColumn||internalData.tableFullColumn;// 如果gt为0，则总是启用
 const scrollXLoad=!!virtualXOpts.enabled&&virtualXOpts.gt>-1&&(virtualXOpts.gt===0||virtualXOpts.gt<allCols.length);reactData.scrollXLoad=scrollXLoad;return scrollXLoad;}function syncGanttScrollYStatus($xeTable){const reactData=$xeTable;const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;if($xeGanttView&&$xeGanttView.handleUpdateSYStatus){$xeGanttView.handleUpdateSYStatus(reactData.scrollYLoad);}}function updateScrollYStatus($xeTable,fullData){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const virtualYOpts=$xeTable.computeVirtualYOpts;const treeOpts=$xeTable.computeTreeOpts;const{transform}=treeOpts;const allList=fullData||internalData.tableFullData;// 如果gt为0，则总是启用
 const scrollYLoad=(transform||!treeConfig)&&!!virtualYOpts.enabled&&virtualYOpts.gt>-1&&(virtualYOpts.gt===0||virtualYOpts.gt<allList.length);reactData.scrollYLoad=scrollYLoad;syncGanttScrollYStatus($xeTable);return scrollYLoad;}/**
  * 展开与收起树节点
@@ -13522,12 +13539,12 @@ const {
       } = tableReactData;
       const menuOpts = $xeTable.computeMenuOpts;
       const {
-        destroyOnClose
+        destroyOnClose,
+        className
       } = menuOpts;
       const {
         visible,
-        list,
-        className
+        list
       } = ctxMenuStore;
       return h('div', {
         ref: 'refElem',
@@ -24889,6 +24906,7 @@ function grid_createInternalData() {
         return;
       }
       if (proxyConfig && isEnableConf(proxyOpts)) {
+        $xeGrid.dispatchEvent('form-submit', params, params.$event);
         internalData.uFoot = true;
         $xeGrid.commitProxy('reload').then(rest => {
           $xeGrid.dispatchEvent('proxy-query', {
@@ -24898,8 +24916,9 @@ function grid_createInternalData() {
         });
         internalData.uFoot = false;
         $xeGrid.updateQueryFooter();
+      } else {
+        $xeGrid.dispatchEvent('form-submit', params, params.$event);
       }
-      $xeGrid.dispatchEvent('form-submit', params, params.$event);
     },
     resetFormEvent(params) {
       const $xeGrid = this;
@@ -24914,7 +24933,10 @@ function grid_createInternalData() {
       } = params;
       const proxyOpts = $xeGrid.computeProxyOpts;
       if (proxyConfig && isEnableConf(proxyOpts)) {
-        $xeTable.clearScroll();
+        $xeGrid.dispatchEvent('form-reset', params, $event);
+        if ($xeTable) {
+          $xeTable.clearScroll();
+        }
         internalData.uFoot = true;
         $xeGrid.commitProxy('reload').then(rest => {
           $xeGrid.dispatchEvent('proxy-query', {
@@ -24924,8 +24946,9 @@ function grid_createInternalData() {
         });
         internalData.uFoot = false;
         $xeGrid.updateQueryFooter();
+      } else {
+        $xeGrid.dispatchEvent('form-reset', params, $event);
       }
-      $xeGrid.dispatchEvent('form-reset', params, $event);
     },
     submitInvalidEvent(params) {
       const $xeGrid = this;