@fecp/designer 5.4.106 → 5.4.108

package/lib/node_modules/vxe-table/es/grid/src/grid.js

@@ -17,26 +17,7 @@ const toolbar = require("../../toolbar/src/toolbar.js");
 const index_esm = require("../../../../@vxe-ui/core/es/index.esm.js");
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = index_esm.VxeUI;
 const tableComponentPropKeys = Object.keys(props$1.tableProps);
-const tableComponentMethodKeys = ["clearAll", "syncData", "updateData", "loadData", "reloadData", "reloadRow", "loadColumn", "reloadColumn", "getRowNode", "getColumnNode", "getRowIndex", "getVTRowIndex", "getVMRowIndex", "getColumnIndex", "getVTColumnIndex", "getVMColumnIndex", "setRow", "createData", "createRow", "revertData", "clearData", "isRemoveByRow", "isInsertByRow", "isUpdateByRow", "getColumns", "getColumnById", "getColumnByField", "getTableColumn", "getFullColumns", "getData", "getCheckboxRecords", "getParentRow", "getTreeRowChildren", "getTreeRowLevel", "getTreeParentRow", "getRowSeq", "getRowById", "getRowid", "getTableData", "getFullData", "setColumnFixed", "clearColumnFixed", "setColumnWidth", "getColumnWidth", "recalcRowHeight", "setRowHeightConf", "getRowHeightConf", "setRowHeight", "getRowHeight", "hideColumn", "showColumn", "resetColumn", "refreshColumn", "refreshScroll", "recalculate", "closeTooltip", "isAllCheckboxChecked", "isAllCheckboxIndeterminate", "getCheckboxIndeterminateRecords", "setCheckboxRow", "setCheckboxRowKey", "isCheckedByCheckboxRow", "isCheckedByCheckboxRowKey", "isIndeterminateByCheckboxRow", "isIndeterminateByCheckboxRowKey", "toggleCheckboxRow", "setAllCheckboxRow", "getRadioReserveRecord", "clearRadioReserve", "getCheckboxReserveRecords", "clearCheckboxReserve", "toggleAllCheckboxRow", "clearCheckboxRow", "setCurrentRow", "isCheckedByRadioRow", "isCheckedByRadioRowKey", "setRadioRow", "setRadioRowKey", "clearCurrentRow", "clearRadioRow", "getCurrentRecord", "getRadioRecord", "getCurrentColumn", "setCurrentColumn", "clearCurrentColumn", "setPendingRow", "togglePendingRow", "hasPendingByRow", "isPendingByRow", "getPendingRecords", "clearPendingRow", "setFilterByEvent", "sort", "setSort", "setSortByEvent", "clearSort", "clearSortByEvent", "isSort", "getSortColumns", "closeFilter", "isFilter", "clearFilterByEvent", "isActiveFilterByColumn", "isRowExpandLoaded", "clearRowExpandLoaded", "reloadRowExpand", "reloadRowExpand", "toggleRowExpand", "setAllRowExpand", "setRowExpand", "isExpandByRow", "isRowExpandByRow", "clearRowExpand", "clearRowExpandReserve", "getRowExpandRecords", "getTreeExpandRecords", "isTreeExpandLoaded", "clearTreeExpandLoaded", "reloadTreeExpand", "reloadTreeChilds", "toggleTreeExpand", "setAllTreeExpand", "setTreeExpand", "isTreeExpandByRow", "clearTreeExpand", "clearTreeExpandReserve", "getScroll", "getScrollData", "scrollTo", "scrollToStartRow", "scrollToEndRow", "scrollToRow", "scrollToStartColumn", "scrollToEndColumn", "scrollToColumn", "clearScroll", "updateFooter", "updateStatus", "setMergeCells", "removeInsertRow", "removeMergeCells", "getMergeCells", "setMergeHeaderCells", "removeMergeHeaderCells", "getMergeHeaderCells", "clearMergeHeaderCells", "clearMergeCells", "setMergeFooterItems", "removeMergeFooterItems", "getMergeFooterItems", "clearMergeFooterItems", "getCustomStoreData", "setRowGroupExpand", "setRowGroupExpandByField", "setAllRowGroupExpand", "clearRowGroupExpand", "isRowGroupExpandByRow", "isRowGroupRecord", "isAggregateRecord", "isAggregateExpandByRow", "getAggregateContentByRow", "getAggregateRowChildren", "setRowGroups", "clearRowGroups", "openTooltip", "moveColumnTo", "moveRowTo", "getCellLabel", "updateCellLabel", "clearFormatterCache", "getFooterCellLabel", "updateFooterCellLabel", "clearFooterFormatterCache", "getCellElement", "focus", "blur", "connect", "connectToolbar"];
-function createReactData() {
-  var _a;
-  return {
-    tableLoading: false,
-    proxyInited: false,
-    isZMax: false,
-    tableData: [],
-    filterData: [],
-    formData: {},
-    sortData: [],
-    footerData: [],
-    tZindex: 0,
-    tablePage: {
-      total: 0,
-      pageSize: ((_a = getConfig().pager) === null || _a === void 0 ? void 0 : _a.pageSize) || 10,
-      currentPage: 1
-    }
-  };
-}
+const tableComponentMethodKeys = ["clearAll", "syncData", "updateData", "loadData", "reloadData", "reloadRow", "loadColumn", "reloadColumn", "getRowNode", "getColumnNode", "getRowIndex", "getVTRowIndex", "getVMRowIndex", "getColumnIndex", "getVTColumnIndex", "getVMColumnIndex", "setRow", "createData", "createRow", "revertData", "clearData", "isRemoveByRow", "isInsertByRow", "isUpdateByRow", "getColumns", "getColumnById", "getColumnByField", "getTableColumn", "getFullColumns", "getData", "getCheckboxRecords", "getParentRow", "getTreeRowChildren", "getTreeRowLevel", "getTreeParentRow", "getRowSeq", "getRowById", "getRowid", "getTableData", "getFullData", "setColumnFixed", "clearColumnFixed", "setColumnWidth", "getColumnWidth", "recalcRowHeight", "setRowHeightConf", "getRowHeightConf", "setRowHeight", "getRowHeight", "hideColumn", "showColumn", "resetColumn", "refreshColumn", "refreshScroll", "recalculate", "closeTooltip", "isAllCheckboxChecked", "isAllCheckboxIndeterminate", "getCheckboxIndeterminateRecords", "setCheckboxRow", "setCheckboxRowKey", "isCheckedByCheckboxRow", "isCheckedByCheckboxRowKey", "isIndeterminateByCheckboxRow", "isIndeterminateByCheckboxRowKey", "toggleCheckboxRow", "setAllCheckboxRow", "getRadioReserveRecord", "clearRadioReserve", "getCheckboxReserveRecords", "clearCheckboxReserve", "toggleAllCheckboxRow", "clearCheckboxRow", "setCurrentRow", "isCheckedByRadioRow", "isCheckedByRadioRowKey", "setRadioRow", "setRadioRowKey", "clearCurrentRow", "clearRadioRow", "getCurrentRecord", "getRadioRecord", "getCurrentColumn", "setCurrentColumn", "clearCurrentColumn", "setPendingRow", "togglePendingRow", "hasPendingByRow", "isPendingByRow", "getPendingRecords", "clearPendingRow", "setFilterByEvent", "sort", "setSort", "setSortByEvent", "clearSort", "clearSortByEvent", "isSort", "getSortColumns", "closeFilter", "isFilter", "clearFilterByEvent", "isActiveFilterByColumn", "isRowExpandLoaded", "clearRowExpandLoaded", "reloadRowExpand", "reloadRowExpand", "toggleRowExpand", "setAllRowExpand", "setRowExpand", "isExpandByRow", "isRowExpandByRow", "clearRowExpand", "clearRowExpandReserve", "getRowExpandRecords", "getTreeExpandRecords", "isTreeExpandLoaded", "clearTreeExpandLoaded", "reloadTreeExpand", "reloadTreeChilds", "toggleTreeExpand", "setAllTreeExpand", "setTreeExpand", "isTreeExpandByRow", "clearTreeExpand", "clearTreeExpandReserve", "getScroll", "getScrollData", "scrollTo", "scrollToStartRow", "scrollToEndRow", "scrollToRow", "scrollToStartColumn", "scrollToEndColumn", "scrollToColumn", "clearScroll", "updateFooter", "updateStatus", "setMergeCells", "removeInsertRow", "removeMergeCells", "getMergeCells", "setMergeHeaderCells", "removeMergeHeaderCells", "getMergeHeaderCells", "clearMergeHeaderCells", "clearMergeCells", "setMergeFooterItems", "removeMergeFooterItems", "getMergeFooterItems", "clearMergeFooterItems", "getCustomStoreData", "setRowGroupExpand", "setRowGroupExpandByField", "setAllRowGroupExpand", "clearRowGroupExpand", "isRowGroupExpandByRow", "isRowGroupRecord", "isAggregateRecord", "isAggregateExpandByRow", "getAggregateContentByRow", "getAggregateRowChildren", "setRowGroups", "clearRowGroups", "openTooltip", "moveColumnTo", "moveRowTo", "getCellLabel", "getCellElement", "focus", "blur", "connect", "connectToolbar"];
 function createInternalData() {
   return {
     uFoot: false
@@ -47,13 +28,29 @@ const VxeGridComponent = comp.defineVxeComponent({
   props: props.gridProps,
   emits: emits.gridEmits,
   setup(props2, context) {
+    var _a;
     const { slots, emit } = context;
     const xID = index.default.uniqueId();
     const VxeUIFormComponent = index_esm.VxeUI.getComponent("VxeForm");
     const VxeUIPagerComponent = index_esm.VxeUI.getComponent("VxePager");
     const defaultLayouts = [["Form"], ["Toolbar", "Top", "Table", "Bottom", "Pager"]];
     const { computeSize } = useFns.useSize(props2);
-    const reactData = vue.reactive(createReactData());
+    const reactData = vue.reactive({
+      tableLoading: false,
+      proxyInited: false,
+      isZMax: false,
+      tableData: [],
+      filterData: [],
+      formData: {},
+      sortData: [],
+      footerData: [],
+      tZindex: 0,
+      tablePage: {
+        total: 0,
+        pageSize: ((_a = getConfig().pager) === null || _a === void 0 ? void 0 : _a.pageSize) || 10,
+        currentPage: 1
+      }
+    });
     const internalData = createInternalData();
     const refElem = vue.ref();
     const refTable = vue.ref();
@@ -1566,9 +1563,8 @@ const VxeGridComponent = comp.defineVxeComponent({
       });
       globalEvents.on($xeGrid, "keydown", handleGlobalKeydownEvent);
     });
-    vue.onBeforeUnmount(() => {
+    vue.onUnmounted(() => {
       globalEvents.off($xeGrid, "keydown");
-      index.default.assign(reactData, createReactData());
       index.default.assign(internalData, createInternalData());
     });
     $xeGrid.renderVN = renderVN;

package/lib/node_modules/vxe-table/es/locale/lang/zh-CN.js

@@ -374,8 +374,6 @@ const zhCN = {
       uploadErr: "上传失败",
       uploadSuccess: "上传成功",
       moreBtnText: "更多（{0}）",
-      moreImgBtnText: "图片（{0}）",
-      moreFileBtnText: "文件（{0}）",
       viewItemTitle: "点击查看",
       morePopup: {
         readTitle: "查看列表",
@@ -595,8 +593,6 @@ const zhCN = {
         },
         fnr: {
           title: "查找和替换",
-          titleFd: "查找",
-          titleRe: "替换",
           findLabel: "查找",
           replaceLabel: "替换",
           findTitle: "查找内容：",
@@ -746,8 +742,6 @@ const zhCN = {
       },
       fnr: {
         title: "查找和替换",
-        titleFd: "查找",
-        titleRe: "替换",
         findLabel: "查找",
         replaceLabel: "替换",
         findTitle: "查找内容：",

package/lib/node_modules/vxe-table/es/table/module/custom/hook.js

@@ -8,21 +8,13 @@ const tableCustomMethodKeys = ["openCustom", "closeCustom", "getCustomVisible",
 index_esm.VxeUI.hooks.add("tableCustomModule", {
   setupTable($xeTable) {
     const { reactData, internalData } = $xeTable;
-    const { computeCustomOpts, computeRowGroupFields, computeCustomSimpleMode } = $xeTable.getComputeMaps();
+    const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps();
     const { refElem } = $xeTable.getRefMaps();
-    const $xeGrid = $xeTable.xeGrid;
     const $xeGantt = $xeTable.xeGantt;
-    const $xeGGWrapper = $xeGrid || $xeGantt;
-    const updatePopupStyle = () => {
+    const calcMaxHeight = () => {
       const { customStore } = reactData;
-      const customOpts = computeCustomOpts.value;
-      const customSimpleMode = computeCustomSimpleMode.value;
-      const showCustomSimpleOutside = customSimpleMode === "outside";
-      const { popupOptions } = customOpts;
-      const { maxHeight } = popupOptions || {};
       let wrapperEl = refElem.value;
-      let popupTop = 0;
-      let popupMaxHeight = 0;
+      let tableHeight = 0;
       if ($xeGantt) {
         const { refGanttContainerElem } = $xeGantt.getRefMaps();
         const ganttContainerElem = refGanttContainerElem.value;
@@ -30,19 +22,10 @@ index_esm.VxeUI.hooks.add("tableCustomModule", {
           wrapperEl = ganttContainerElem;
         }
       }
-      if (showCustomSimpleOutside) {
-        if ($xeGGWrapper && wrapperEl) {
-          popupTop = wrapperEl.offsetTop;
-        }
-        popupMaxHeight = index.default.eqNull(maxHeight) ? 360 : maxHeight;
-      } else {
-        if (wrapperEl) {
-          popupMaxHeight = wrapperEl.clientHeight - 22;
-        }
-        popupMaxHeight = Math.max(88, popupMaxHeight);
+      if (wrapperEl) {
+        tableHeight = wrapperEl.clientHeight - 28;
       }
-      customStore.popupTop = popupTop;
-      customStore.maxHeight = index.default.eqNull(maxHeight) ? popupMaxHeight : maxHeight;
+      customStore.maxHeight = Math.max(88, tableHeight);
     };
     const openCustom = () => {
       const { initStore, customStore } = reactData;
@@ -50,8 +33,8 @@ index_esm.VxeUI.hooks.add("tableCustomModule", {
       initStore.custom = true;
       handleUpdateCustomColumn();
       checkCustomStatus();
-      updatePopupStyle();
-      return vue.nextTick().then(() => updatePopupStyle());
+      calcMaxHeight();
+      return vue.nextTick().then(() => calcMaxHeight());
     };
     const handleUpdateCustomColumn = () => {
       const { customStore } = reactData;

package/lib/node_modules/vxe-table/es/table/module/custom/panel.js

@@ -545,7 +545,7 @@ const TableCustomPanelComponent = comp.defineVxeComponent({
       const customOpts = computeCustomOpts.value;
       const { immediate } = customOpts;
       const columnDragOpts = computeColumnDragOpts.value;
-      const { maxHeight, popupTop } = customStore;
+      const { maxHeight } = customStore;
       const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
       const { isCrossDrag } = columnDragOpts;
@@ -662,20 +662,15 @@ const TableCustomPanelComponent = comp.defineVxeComponent({
           ]));
         }
       });
-      const popupStys = {};
-      if (maxHeight && !["left", "right"].includes(placement || "")) {
-        if (popupTop) {
-          popupStys.top = dom.toCssUnit(popupTop);
-        }
-        popupStys.maxHeight = dom.toCssUnit(maxHeight);
-      }
       return vue.h("div", {
         ref: refElem,
         key: "simple",
         class: ["vxe-table-custom-wrapper", `placement--${placement}`, {
           "is--active": customStore.visible
         }],
-        style: popupStys
+        style: maxHeight && !["left", "right"].includes(placement || "") ? {
+          maxHeight: `${maxHeight}px`
+        } : {}
       }, customStore.visible ? [
         vue.h("div", {
           ref: refBodyWrapperElem,
@@ -934,9 +929,6 @@ const TableCustomPanelComponent = comp.defineVxeComponent({
             ref: refBodyWrapperElem,
             class: "vxe-table-custom-popup--body-wrapper"
           }, defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [
-            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? vue.h($xeTable.getPivotTableAggregatePopupPanel(), {
-              customStore
-            }) : renderEmptyElement($xeTable),
             vue.h("div", {
               ref: refCustomBodyElem,
               class: "vxe-table-custom-popup--handle-wrapper"
@@ -999,7 +991,10 @@ const TableCustomPanelComponent = comp.defineVxeComponent({
                 class: "vxe-table-custom-popup--table-bottom"
               }, $xeTable.callSlot(bottomSlot, params)) : renderEmptyElement($xeTable),
               renderDragTip()
-            ])
+            ]),
+            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? vue.h($xeTable.getPivotTableAggregatePopupPanel(), {
+              customStore
+            }) : renderEmptyElement($xeTable)
           ]);
         },
         footer: () => {

package/lib/node_modules/vxe-table/es/table/module/export/export-panel.js

@@ -11,14 +11,8 @@ const { getI18n, getIcon, renderEmptyElement } = index_esm.VxeUI;
 const TableExportPanelComponent = comp.defineVxeComponent({
   name: "VxeTableExportPanel",
   props: {
-    defaultOptions: {
-      type: Object,
-      default: () => ({})
-    },
-    storeData: {
-      type: Object,
-      default: () => ({})
-    }
+    defaultOptions: Object,
+    storeData: Object
   },
   setup(props) {
     const VxeUIModalComponent = index_esm.VxeUI.getComponent("VxeModal");
@@ -150,7 +144,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
       const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData;
       const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData;
       const { isHeader } = defaultOptions;
-      const colVNs = [];
+      const cols = [];
       const checkedAll = computeCheckedAll.value;
       const showSheet = computeShowSheet.value;
       const supportMerge = computeSupportMerge.value;
@@ -167,7 +161,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
         const isChecked = column.checked;
         const indeterminate = column.halfChecked;
         const isHtml = column.type === "html";
-        colVNs.push(vue.h("li", {
+        cols.push(vue.h("li", {
           key: column.id,
           class: ["vxe-table-export--panel-column-option", `level--${column.level}`, {
             "is--group": isColGroup,
@@ -329,7 +323,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
                           ]),
                           vue.h("ul", {
                             class: "vxe-table-export--panel-column-body"
-                          }, colVNs)
+                          }, cols)
                         ])
                       ])
                     ]),

package/lib/node_modules/vxe-table/es/table/module/export/import-panel.js

@@ -11,14 +11,8 @@ const { getI18n, getIcon, renderEmptyElement } = index_esm.VxeUI;
 const TableImportPanelComponent = comp.defineVxeComponent({
   name: "VxeTableImportPanel",
   props: {
-    defaultOptions: {
-      type: Object,
-      default: () => ({})
-    },
-    storeData: {
-      type: Object,
-      default: () => ({})
-    }
+    defaultOptions: Object,
+    storeData: Object
   },
   setup(props) {
     const VxeUIModalComponent = index_esm.VxeUI.getComponent("VxeModal");
@@ -43,7 +37,7 @@ const TableImportPanelComponent = comp.defineVxeComponent({
       const { type, typeList } = storeData;
       if (type) {
         const selectItem = index.default.find(typeList, (item) => type === item.value);
-        return `${selectItem ? selectItem.label : "*.*"}`;
+        return selectItem ? selectItem.label : "*.*";
       }
       return `*.${typeList.map((item) => item.value).join(", *.")}`;
     });
@@ -60,8 +54,7 @@ const TableImportPanelComponent = comp.defineVxeComponent({
       $xeTable.readFile(defaultOptions).then((params) => {
         const { file } = params;
         Object.assign(storeData, utils.parseFile(file), { file });
-      }).catch(() => {
-      });
+      }).catch((e) => e);
     };
     const showEvent = () => {
       vue.nextTick(() => {

package/lib/node_modules/vxe-table/es/table/module/filter/hook.js

@@ -8,7 +8,6 @@ const utils = require("../../../ui/src/utils.js");
 const index_esm = require("../../../../../@vxe-ui/core/es/index.esm.js");
 const { renderer, hooks } = index_esm.VxeUI;
 const tableFilterMethodKeys = ["openFilter", "setFilter", "clearFilter", "saveFilter", "saveFilterByEvent", "saveFilterPanel", "saveFilterPanelByEvent", "resetFilter", "resetFilterByEvent", "resetFilterPanel", "resetFilterPanelByEvent", "getCheckedFilters", "updateFilterOptionStatus"];
-const sourceType = "table";
 hooks.add("tableFilterModule", {
   setupTable($xeTable) {
     const $xeGrid = $xeTable.xeGrid;
@@ -27,7 +26,16 @@ hooks.add("tableFilterModule", {
           filterStore.isIndeterminate = !filterStore.isAllSelected && filterOptions.some((item) => item._checked);
         }
       },
-      handleOpenFilterColumn(evnt, btnEl, colEl, column, params) {
+      /**
+       * 点击筛选事件
+       * 当筛选图标被点击时触发
+       * 更新选项是否全部状态
+       * 打开筛选面板
+       * @param {Event} evnt 事件
+       * @param {ColumnInfo} column 列配置
+       * @param {Object} params 参数
+       */
+      triggerFilterEvent(evnt, column, params) {
         const { initStore, filterStore } = reactData;
         const { elemStore } = internalData;
         if (filterStore.column === column && filterStore.visible) {
@@ -36,9 +44,9 @@ hooks.add("tableFilterModule", {
           const tableEl = refElem.value;
           const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = dom.getDomNode();
           const filterOpts = computeFilterOpts.value;
-          const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
-          const currEl = btnEl || colEl;
+          const { transfer } = filterOpts;
           const tableRect = tableEl.getBoundingClientRect();
+          const btnElem = evnt.currentTarget;
           const filterRender = column ? column.filterRender : null;
           const compConf = filterRender && utils.isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
           $xeTable.handleFilterOptions(column);
@@ -56,17 +64,17 @@ hooks.add("tableFilterModule", {
             if (!filterWrapperElem) {
               return;
             }
-            const btnRect = currEl.getBoundingClientRect();
+            const btnRect = btnElem.getBoundingClientRect();
             const filterHeadElem = filterWrapperElem.querySelector(".vxe-table--filter-header");
             const filterFootElem = filterWrapperElem.querySelector(".vxe-table--filter-footer");
             const filterWidth = filterWrapperElem.offsetWidth;
-            const centerWidth = btnEl ? filterWidth / 2 : (filterWidth - column.renderWidth) / 2;
+            const centerWidth = filterWidth / 2;
             let left = 0;
             let top = 0;
             let maxHeight = 0;
             if (transfer) {
               left = btnRect.left - centerWidth + scrollLeft;
-              top = btnRect.top + currEl.clientHeight + scrollTop;
+              top = btnRect.top + btnElem.clientHeight + scrollTop;
               maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
               if (left < 16) {
                 left = 16;
@@ -75,7 +83,7 @@ hooks.add("tableFilterModule", {
               }
             } else {
               left = btnRect.left - tableRect.left - centerWidth;
-              top = btnRect.top - tableRect.top + currEl.clientHeight;
+              top = btnRect.top - tableRect.top + btnElem.clientHeight;
               maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
               if (left < 1) {
                 left = 1;
@@ -90,43 +98,18 @@ hooks.add("tableFilterModule", {
                 }
               }
             }
-            const fStys = {
+            filterStore.style = {
               top: dom.toCssUnit(top),
               left: dom.toCssUnit(left)
             };
-            if (zIndex) {
-              fStys.zIndex = zIndex;
-            }
-            filterStore.style = fStys;
             if (compConf ? !compConf.tableFilterAutoHeight : false) {
               maxHeight = 0;
-            } else {
-              if (customMaxHeight) {
-                maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
-              }
             }
             filterStore.maxHeight = maxHeight;
           });
         }
         $xeTable.dispatchEvent("filter-visible", { column, field: column.field, property: column.field, filterList: $xeTable.getCheckedFilters(), visible: filterStore.visible }, evnt);
       },
-      /**
-       * 点击筛选事件
-       * 当筛选图标被点击时触发
-       * 更新选项是否全部状态
-       * 打开筛选面板
-       * @param {Event} evnt 事件
-       * @param {ColumnInfo} column 列配置
-       * @param {Object} params 参数
-       */
-      triggerFilterEvent(evnt, column, params) {
-        const { elemStore } = internalData;
-        const { fixed } = column;
-        const headerWrapperElem = util.getRefElem(elemStore[`${fixed || "main"}-header-wrapper`] || elemStore["main-header-wrapper"]);
-        const btnElem = evnt.currentTarget;
-        const colEl = headerWrapperElem ? headerWrapperElem.querySelector(`.vxe-header--column.${column.id}`) : null;
-        $xeTable.handleOpenFilterColumn(evnt, btnElem, colEl || btnElem, column, params);
-      },
       handleClearFilter(column) {
         if (column) {
           const { filters, filterRender } = column;
@@ -273,39 +256,12 @@ hooks.add("tableFilterModule", {
         const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column && column.filters) {
           const { elemStore } = internalData;
-          const { fixed, filters } = column;
+          const { fixed } = column;
           return $xeTable.scrollToColumn(column).then(() => {
             const headerWrapperElem = util.getRefElem(elemStore[`${fixed || "main"}-header-wrapper`] || elemStore["main-header-wrapper"]);
             if (headerWrapperElem) {
               const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-cell--filter`);
-              if (filterBtnElem) {
-                dom.triggerEvent(filterBtnElem, "click");
-              } else {
-                const colEl = headerWrapperElem.querySelector(`.vxe-header--column.${column.id}`);
-                if (colEl) {
-                  let firstFilterOption = null;
-                  if (filters) {
-                    firstFilterOption = filters[0];
-                  }
-                  const params = {
-                    $table: $xeTable,
-                    $grid: $xeGrid,
-                    $gantt: $xeGantt,
-                    $rowIndex: -1,
-                    column,
-                    columnIndex: $xeTable.getColumnIndex(column),
-                    $columnIndex: $xeTable.getVMColumnIndex(column),
-                    _columnIndex: $xeTable.getVTColumnIndex(column),
-                    firstFilterOption,
-                    fixed,
-                    source: sourceType,
-                    type: "header"
-                    // isHidden
-                    // hasFilter
-                  };
-                  $xeTable.handleOpenFilterColumn(new Event("click"), null, colEl, column, params);
-                }
-              }
+              dom.triggerEvent(filterBtnElem, "click");
             }
           });
         }

package/lib/node_modules/vxe-table/es/table/module/keyboard/hook.js

@@ -8,7 +8,7 @@ const { hooks } = index_esm.VxeUI;
 hooks.add("tableKeyboardModule", {
   setupTable($xeTable) {
     const { props, reactData, internalData } = $xeTable;
-    const { refElem, refTableBody } = $xeTable.getRefMaps();
+    const { refElem } = $xeTable.getRefMaps();
     const { computeEditOpts, computeCheckboxOpts, computeMouseOpts, computeTreeOpts, computeRowOpts, computeColumnOpts, computeCellOpts, computeDefaultRowHeight, computeCurrentRowOpts, computeCurrentColumnOpts } = $xeTable.getComputeMaps();
     function getCheckboxRangeRows(evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
       const { showOverflow } = props;
@@ -230,8 +230,8 @@ hooks.add("tableKeyboardModule", {
       const checkboxOpts = computeCheckboxOpts.value;
       const mouseOpts = computeMouseOpts.value;
       const editOpts = computeEditOpts.value;
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaModnEvent) {
-        return $xeTable.triggerClAreaModnEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
+        return $xeTable.triggerCellAreaModnEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           handleCheckboxRangeEvent(evnt, params);
@@ -246,18 +246,9 @@ hooks.add("tableKeyboardModule", {
     const handleMoveSelected = (evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow) => {
       const { afterFullData, visibleColumn } = internalData;
       const params = Object.assign({}, args);
-      const { row, column } = params;
-      const _rowIndex = $xeTable.getVTRowIndex(row);
-      const _columnIndex = $xeTable.getVTColumnIndex(column);
-      const tableBody = refTableBody.value;
-      const tableBodyElem = tableBody ? tableBody.$el : null;
-      const tableWidth = tableBodyElem ? tableBodyElem.clientWidth : 0;
-      let colAlign = isLeftArrow || isRightArrow || column.renderWidth < tableWidth;
-      if (isLeftArrow && _columnIndex >= 0 || isRightArrow && _columnIndex <= visibleColumn.length - 1) {
-        colAlign = false;
-      } else {
-        evnt.preventDefault();
-      }
+      const _rowIndex = $xeTable.getVTRowIndex(params.row);
+      const _columnIndex = $xeTable.getVTColumnIndex(params.column);
+      evnt.preventDefault();
       if (isUpArrow && _rowIndex > 0) {
         params.rowIndex = _rowIndex - 1;
         params.row = afterFullData[params.rowIndex];
@@ -271,9 +262,7 @@ hooks.add("tableKeyboardModule", {
         params.columnIndex = _columnIndex + 1;
         params.column = visibleColumn[params.columnIndex];
       }
-      $xeTable.scrollToRow(params.row, params.column, {
-        colAlign
-      }).then(() => {
+      $xeTable.scrollToRow(params.row, params.column).then(() => {
         params.cell = $xeTable.getCellElement(params.row, params.column);
         $xeTable.handleSelected(params, evnt);
       });

package/lib/node_modules/vxe-table/es/table/module/menu/hook.js

@@ -22,7 +22,7 @@ hooks.add("tableMenuModule", {
       const isContentMenu = computeIsContentMenu.value;
       const menuOpts = computeMenuOpts.value;
       const config = menuOpts[type];
-      const { zIndex, transfer, visibleMethod } = menuOpts;
+      const { transfer, visibleMethod } = menuOpts;
       if (config) {
         const { options, disabled } = config;
         if (disabled) {
@@ -54,7 +54,7 @@ hooks.add("tableMenuModule", {
                   selectChild: null,
                   showChild: false,
                   style: {
-                    zIndex: zIndex || internalData.tZindex,
+                    zIndex: internalData.tZindex,
                     top: `${top}px`,
                     left: `${left}px`
                   }

package/lib/node_modules/vxe-table/es/table/module/validator/hook.js

@@ -106,20 +106,19 @@ function validRuleValue(rule, val, required) {
   }
   return true;
 }
-function checkRuleStatus(rule, row, val) {
-  const { required, field } = rule;
-  const currVal = field ? index.default.get(row, field) : val;
-  const isEmptyVal = index.default.isArray(currVal) ? !currVal.length : utils.eqEmptyValue(currVal);
+function checkRuleStatus(rule, val) {
+  const { required } = rule;
+  const isEmptyVal = index.default.isArray(val) ? !val.length : utils.eqEmptyValue(val);
   if (required) {
     if (isEmptyVal) {
       return false;
     }
-    if (!validRuleValue(rule, currVal, required)) {
+    if (!validRuleValue(rule, val, required)) {
       return false;
     }
   } else {
     if (!isEmptyVal) {
-      if (!validRuleValue(rule, currVal, required)) {
+      if (!validRuleValue(rule, val, required)) {
         return false;
       }
     }
@@ -134,6 +133,7 @@ hooks.add("tableValidatorModule", {
     const { computeValidOpts, computeTreeOpts, computeEditOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
     let validatorMethods = {};
     let validatorPrivateMethods = {};
+    let validRuleErr;
     const handleValidError = (params) => {
       return new Promise((resolve) => {
         const validOpts = computeValidOpts.value;
@@ -142,7 +142,7 @@ hooks.add("tableValidatorModule", {
           resolve();
         } else {
           $xeTable.handleEdit(params, { type: "valid-error", trigger: "call" }).then(() => {
-            resolve($xeTable.showValidTooltip(params));
+            resolve(validatorPrivateMethods.showValidTooltip(params));
           });
         }
       });
@@ -187,8 +187,8 @@ hooks.add("tableValidatorModule", {
       }
       const rowValidErrs = [];
       internalData._lastCallTime = Date.now();
-      internalData.validRuleErr = false;
-      $xeTable.clearValidate();
+      validRuleErr = false;
+      validatorMethods.clearValidate();
       const validErrMaps = {};
       if (editRules) {
         const columns = cols && cols.length ? cols : $xeTable.getColumns();
@@ -203,11 +203,11 @@ hooks.add("tableValidatorModule", {
           if ($xeTable.isAggregateRecord(row)) {
             return;
           }
-          if (isFull || !internalData.validRuleErr) {
+          if (isFull || !validRuleErr) {
             const colVailds = [];
             columns.forEach((column) => {
               const field = index.default.isString(column) ? column : column.field;
-              if ((isFull || !internalData.validRuleErr) && index.default.has(editRules, field)) {
+              if ((isFull || !validRuleErr) && index.default.has(editRules, field)) {
                 colVailds.push(validatorPrivateMethods.validCellRules("all", row, column).catch(({ rule, rules }) => {
                   const rest = {
                     rule,
@@ -230,7 +230,7 @@ hooks.add("tableValidatorModule", {
                   };
                   validRest[field].push(rest);
                   if (!isFull) {
-                    internalData.validRuleErr = true;
+                    validRuleErr = true;
                     return Promise.reject(rest);
                   }
                 }));
@@ -437,18 +437,18 @@ hooks.add("tableValidatorModule", {
                   }
                   if (customValid) {
                     if (index.default.isError(customValid)) {
-                      internalData.validRuleErr = true;
+                      validRuleErr = true;
                       errorRules.push(new Rule({ type: "custom", trigger, content: customValid.message, rule: new Rule(rule) }));
                     } else if (customValid.catch) {
                       syncValidList.push(customValid.catch((e) => {
-                        internalData.validRuleErr = true;
+                        validRuleErr = true;
                         errorRules.push(new Rule({ type: "custom", trigger, content: e && e.message ? e.message : rule.content || rule.message, rule: new Rule(rule) }));
                       }));
                     }
                   }
                 } else {
-                  if (!checkRuleStatus(rule, row, cellValue)) {
-                    internalData.validRuleErr = true;
+                  if (!checkRuleStatus(rule, cellValue)) {
+                    validRuleErr = true;
                     errorRules.push(new Rule(rule));
                   }
                 }
@@ -486,15 +486,15 @@ hooks.add("tableValidatorModule", {
         }
         if (editConfig && editRules && actived.row) {
           const { row, column, cell } = actived.args;
-          if ($xeTable.hasCellRules(type, row, column)) {
-            return $xeTable.validCellRules(type, row, column).then(() => {
+          if (validatorPrivateMethods.hasCellRules(type, row, column)) {
+            return validatorPrivateMethods.validCellRules(type, row, column).then(() => {
               if (editOpts.mode === "row") {
                 validatorMethods.clearValidate(row, column);
               }
             }).catch(({ rule }) => {
               if (!rule.trigger || type === rule.trigger) {
                 const rest = { rule, row, column, cell };
-                $xeTable.showValidTooltip(rest);
+                validatorPrivateMethods.showValidTooltip(rest);
                 return Promise.reject(rest);
               }
               return Promise.resolve();