@juzhenfe/page-model 3.15.1 → 3.16.1

package/dist/index.es.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { reactive, defineComponent, openBlock, createElementBlock, computed, ref, resolveComponent, normalizeClass, unref, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, createElementVNode, toDisplayString, nextTick, watch, markRaw, getCurrentInstance, resolveDynamicComponent, renderSlot, h, inject, createTextVNode, withModifiers, toRefs, onUnmounted, useSlots, toHandlers, createSlots, onMounted, createCommentVNode, render, Teleport, normalizeStyle, pushScopeId, popScopeId, resolveDirective, withDirectives, vShow, onActivated, watchEffect, normalizeProps, guardReactiveProps, provide, Transition } from "vue";
+import { reactive, defineComponent, openBlock, createElementBlock, computed, ref, resolveComponent, normalizeClass, unref, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, createElementVNode, toDisplayString, nextTick, watch, markRaw, getCurrentInstance, resolveDynamicComponent, renderSlot, h, inject, createTextVNode, withModifiers, toRefs, onUnmounted, useSlots, toHandlers, createSlots, onMounted, createCommentVNode, render, Teleport, normalizeStyle, withDirectives, vShow, pushScopeId, popScopeId, resolveDirective, onActivated, watchEffect, normalizeProps, guardReactiveProps, provide, Transition } from "vue";
 import { ElMessage, ElLoading, useZIndex, ElMessageBox } from "element-plus";
 function defineConfig(config) {
   return reactive(config);
@@ -4728,10 +4728,16 @@ class TableManager extends IManager {
   updateLoading(loading2) {
     this.loadingData = loading2;
   }
+  get pageIndexKey() {
+    return this.table.pageIndexKey || "pageIndex";
+  }
+  get pageSizeKey() {
+    return this.table.pageSizeKey || "pageSize";
+  }
   getReqParams() {
     return {
-      pageIndex: this.currentPage,
-      pageSize: this.pageSizeUserSet || this.pageSize,
+      [this.pageIndexKey]: this.currentPage,
+      [this.pageSizeKey]: this.pageSizeUserSet || this.pageSize,
       ...this.sortParams,
       ...this.getColumnParams(),
       ...this.getColumnSortParams()
@@ -4950,7 +4956,9 @@ class TableManager extends IManager {
     this.tableEvents["rowContextmenu"] = function(row, column, event) {
       _rowContextmenu == null ? void 0 : _rowContextmenu.call(this, row, column, event);
       event.preventDefault();
-      const rowIndex = this.tableData.findIndex((a) => a[this.rowKey] === row[this.rowKey]);
+      const rowIndex = this.tableData.findIndex(
+        (a) => a[this.rowKey] === row[this.rowKey]
+      );
       this.exposeActions.showContextMenu(row, rowIndex, event);
       try {
         this.tableRef.setCurrentRow(row);
@@ -5264,25 +5272,8 @@ class TableManager extends IManager {
       return (_a = rowData[el.prop]) != null ? _a : "";
     }
   }
-  async exportDataToExcel(opts) {
-    var _a, _b, _c;
-    const depLoadResult = await this.loadExcelDependence();
-    if (!depLoadResult) {
-      return false;
-    }
-    const childrenKey = ((_b = (_a = this.table.props) == null ? void 0 : _a.treeProps) == null ? void 0 : _b.children) || "children";
-    function patchChildrenData(data) {
-      return data.reduce((memo, item) => {
-        memo.push(item);
-        if (item[childrenKey] && Array.isArray(item[childrenKey])) {
-          memo = memo.concat(patchChildrenData(item[childrenKey]));
-        }
-        return memo;
-      }, []);
-    }
-    const exportData = patchChildrenData(opts.data);
-    this.manager.context.$emit("_exported", exportData);
-    const exportEls = opts.columns.filter((a) => !a.children);
+  getExcelDataHeader(columns) {
+    const exportEls = columns.filter((a) => !a.children);
     const excelData = [[]];
     const cols = [];
     exportEls.forEach((el) => {
@@ -5291,16 +5282,55 @@ class TableManager extends IManager {
         wpx: el.width || el.minWidth || 120
       });
     });
-    for (let i = 0, len = exportData.length; i < len; i++) {
+    return {
+      exportEls,
+      excelData,
+      cols
+    };
+  }
+  insertExcelData(excelData, exportEls, insertData) {
+    for (let i = 0, len = insertData.length; i < len; i++) {
       const rowData = [];
       for (let j = 0; j < exportEls.length; j++) {
-        const item = exportData[i];
+        const item = insertData[i];
         const el = exportEls[j];
         let val = this.getTableCellText(el, item);
         rowData.push(val);
       }
       excelData.push(rowData);
     }
+  }
+  patchChildrenData(data, childrenKey) {
+    return data.reduce((memo, item) => {
+      memo.push(item);
+      if (item[childrenKey] && Array.isArray(item[childrenKey])) {
+        memo = memo.concat(this.patchChildrenData(item[childrenKey], childrenKey));
+      }
+      return memo;
+    }, []);
+  }
+  async exportDataToExcel(opts) {
+    var _a, _b;
+    const depLoadResult = await this.loadExcelDependence();
+    if (!depLoadResult) {
+      return false;
+    }
+    const childrenKey = ((_b = (_a = this.table.props) == null ? void 0 : _a.treeProps) == null ? void 0 : _b.children) || "children";
+    const exportData = this.patchChildrenData(opts.data, childrenKey);
+    this.manager.context.$emit("_exported", exportData);
+    const {
+      exportEls,
+      excelData,
+      cols
+    } = this.getExcelDataHeader(opts.columns);
+    this.insertExcelData(excelData, exportEls, exportData);
+    this.exportDataToExcelByExcelData(opts.filename, excelData, cols, {
+      exportData,
+      exportEls
+    });
+  }
+  exportDataToExcelByExcelData(filename, excelData, cols, mergeOpt) {
+    var _a;
     try {
       let s2ab = function(s) {
         var buf = new ArrayBuffer(s.length);
@@ -5310,11 +5340,11 @@ class TableManager extends IManager {
         return buf;
       };
       var sheet = window.oXlsx.utils.aoa_to_sheet(excelData);
-      if (typeof ((_c = this.table.xlsx) == null ? void 0 : _c.mergeFn) === "function") {
+      if (typeof ((_a = this.table.xlsx) == null ? void 0 : _a.mergeFn) === "function") {
         sheet["!merges"] = this.table.xlsx.mergeFn.call(
           this,
-          exportData,
-          exportEls
+          mergeOpt.exportData || [],
+          mergeOpt.exportEls || []
         );
       }
       Object.keys(sheet).forEach((colKey) => {
@@ -5369,7 +5399,7 @@ class TableManager extends IManager {
       const url = URL.createObjectURL(blob);
       const aLink = document.createElement("a");
       aLink.href = url;
-      aLink.download = opts.filename;
+      aLink.download = filename;
       aLink.click();
       return true;
     } catch (e) {
@@ -5656,9 +5686,15 @@ var FilterMatchModeEnum$1 = /* @__PURE__ */ ((FilterMatchModeEnum2) => {
   FilterMatchModeEnum2["\u5C0F\u4E8E"] = "lt";
   FilterMatchModeEnum2["\u5927\u4E8E\u7B49\u4E8E"] = "ge";
   FilterMatchModeEnum2["\u5C0F\u4E8E\u7B49\u4E8E"] = "le";
+  FilterMatchModeEnum2["\u662Fnull\u503C"] = "isNull";
+  FilterMatchModeEnum2["\u4E0D\u662Fnull\u503C"] = "isNotNull";
+  FilterMatchModeEnum2["\u662F\u7A7A\u5B57\u7B26\u4E32"] = "isEmptyString";
+  FilterMatchModeEnum2["\u4E0D\u662F\u7A7A\u5B57\u7B26\u4E32"] = "isNotEmptyString";
+  FilterMatchModeEnum2["\u662F\u7A7A\u503C"] = "isEmpty";
+  FilterMatchModeEnum2["\u4E0D\u662F\u7A7A\u503C"] = "isNotEmpty";
   return FilterMatchModeEnum2;
 })(FilterMatchModeEnum$1 || {});
-const compareOptions$1 = {
+let compareOptions$1 = {
   ["string"]: [
     {
       label: "\u5305\u542B",
@@ -5683,6 +5719,30 @@ const compareOptions$1 = {
     {
       label: "\u4E0D\u7B49\u4E8E",
       value: "neq"
+    },
+    {
+      label: "\u662Fnull\u503C",
+      value: "isNull"
+    },
+    {
+      label: "\u4E0D\u662Fnull\u503C",
+      value: "isNotNull"
+    },
+    {
+      label: "\u662F\u7A7A\u5B57\u7B26\u4E32",
+      value: "isEmptyString"
+    },
+    {
+      label: "\u4E0D\u662F\u7A7A\u5B57\u7B26\u4E32",
+      value: "isNotEmptyString"
+    },
+    {
+      label: "\u662F\u7A7A\u503C",
+      value: "isEmpty"
+    },
+    {
+      label: "\u4E0D\u662F\u7A7A\u503C",
+      value: "isNotEmpty"
     }
   ],
   ["number"]: [
@@ -5709,6 +5769,14 @@ const compareOptions$1 = {
     {
       label: "\u5C0F\u4E8E\u7B49\u4E8E",
       value: "le"
+    },
+    {
+      label: "\u662Fnull\u503C",
+      value: "isNull"
+    },
+    {
+      label: "\u4E0D\u662Fnull\u503C",
+      value: "isNotNull"
     }
   ],
   ["date"]: [
@@ -5735,9 +5803,31 @@ const compareOptions$1 = {
     {
       label: "\u5C0F\u4E8E\u7B49\u4E8E",
       value: "le"
+    },
+    {
+      label: "\u662Fnull\u503C",
+      value: "isNull"
+    },
+    {
+      label: "\u4E0D\u662Fnull\u503C",
+      value: "isNotNull"
     }
   ]
 };
+const updateCompareOptions = (_compareOptions) => {
+  compareOptions$1 = _compareOptions;
+};
+let noValueOptions = [
+  "isNull",
+  "isNotNull",
+  "isEmptyString",
+  "isNotEmptyString",
+  "isEmpty",
+  "isNotEmpty"
+];
+const updateCompareNoValueOptions = (_noValueOptions) => {
+  noValueOptions = _noValueOptions;
+};
 var index_vue_vue_type_style_index_0_scoped_true_lang$a = "";
 const _hoisted_1$g = { key: 1 };
 const _sfc_main$y = defineComponent({
@@ -5909,12 +5999,14 @@ const _sfc_main$y = defineComponent({
                 createElementVNode("div", {
                   class: normalizeClass(unref(createBEMName)("input"))
                 }, [
-                  createVNode(_component_el_input, {
+                  withDirectives(createVNode(_component_el_input, {
                     modelValue: item.value,
                     "onUpdate:modelValue": ($event) => item.value = $event,
                     placeholder: "\u8BF7\u8F93\u5165",
                     clearable: ""
-                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                    [vShow, !unref(noValueOptions).includes(item.condition)]
+                  ])
                 ], 2),
                 filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
                   key: 0,
@@ -5954,13 +6046,15 @@ const _sfc_main$y = defineComponent({
                 createElementVNode("div", {
                   class: normalizeClass(unref(createBEMName)("input"))
                 }, [
-                  createVNode(_component_el_input_number, {
+                  withDirectives(createVNode(_component_el_input_number, {
                     modelValue: item.value,
                     "onUpdate:modelValue": ($event) => item.value = $event,
                     "controls-position": "right",
                     clearable: "",
                     placeholder: "\u8BF7\u8F93\u5165"
-                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                    [vShow, !unref(noValueOptions).includes(item.condition)]
+                  ])
                 ], 2),
                 filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
                   key: 0,
@@ -6000,13 +6094,15 @@ const _sfc_main$y = defineComponent({
                 createElementVNode("div", {
                   class: normalizeClass(unref(createBEMName)("input"))
                 }, [
-                  createVNode(_component_el_date_picker, {
+                  withDirectives(createVNode(_component_el_date_picker, {
                     modelValue: item.value,
                     "onUpdate:modelValue": ($event) => item.value = $event,
                     placeholder: "\u8BF7\u9009\u62E9\u65E5\u671F",
                     "value-format": "YYYY-MM-DD",
                     clearable: ""
-                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                  }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                    [vShow, !unref(noValueOptions).includes(item.condition)]
+                  ])
                 ], 2),
                 filterMultiple.value ? (openBlock(), createBlock(_component_el_icon, {
                   key: 0,
@@ -6144,7 +6240,7 @@ const _sfc_main$y = defineComponent({
     };
   }
 });
-var FilterZone$1 = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-9b1b33b8"]]);
+var FilterZone$1 = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-076a0f3a"]]);
 var index_vue_vue_type_style_index_0_lang$7 = "";
 const _hoisted_1$f = ["data-key", "title"];
 const _hoisted_2$7 = {
@@ -6158,7 +6254,7 @@ const _hoisted_5$4 = {
   class: "el-table-cell_editable"
 };
 const _hoisted_6$3 = { class: "el-table-cell_editable-inputer" };
-const _hoisted_7$3 = {
+const _hoisted_7$2 = {
   key: 0,
   class: "el-table-cell_loading"
 };
@@ -6385,7 +6481,7 @@ const _sfc_main$x = defineComponent({
                         columnEl.columnKey,
                         row[tableManager.value.rowKey]
                       ) + "-loading"
-                    ) ? (openBlock(), createElementBlock("div", _hoisted_7$3, [
+                    ) ? (openBlock(), createElementBlock("div", _hoisted_7$2, [
                       createVNode(_component_el_icon, { class: "is-loading" }, {
                         default: withCtx(() => [
                           createVNode(unref(loading))
@@ -7543,12 +7639,6 @@ const _sfc_main$v = defineComponent({
           {
             label: "\u6C47\u603B"
           },
-          {
-            label: "\u5BBD\u5EA6"
-          },
-          {
-            label: "\u6700\u5C0F\u5BBD\u5EA6"
-          },
           {
             label: "\u56FA\u5B9A\u5217"
           }
@@ -7574,7 +7664,6 @@ const _sfc_main$v = defineComponent({
       const _component_el_switch = resolveComponent("el-switch");
       const _component_el_radio_button = resolveComponent("el-radio-button");
       const _component_el_radio_group = resolveComponent("el-radio-group");
-      const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_button = resolveComponent("el-button");
       return openBlock(), createBlock(_sfc_main$D, {
         modelValue: visible.value,
@@ -7693,30 +7782,6 @@ const _sfc_main$v = defineComponent({
                   !_ctx.onlyShow ? (openBlock(), createElementBlock("div", {
                     key: 2,
                     class: normalizeClass(unref(createBEMName)("cell"))
-                  }, [
-                    createVNode(_component_el_input_number, {
-                      modelValue: element.width,
-                      "onUpdate:modelValue": ($event) => element.width = $event,
-                      size: "small",
-                      controls: false,
-                      placeholder: "\u8F93\u5165\u6570\u5B57"
-                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                  ], 2)) : createCommentVNode("", true),
-                  !_ctx.onlyShow ? (openBlock(), createElementBlock("div", {
-                    key: 3,
-                    class: normalizeClass(unref(createBEMName)("cell"))
-                  }, [
-                    createVNode(_component_el_input_number, {
-                      modelValue: element.minWidth,
-                      "onUpdate:modelValue": ($event) => element.minWidth = $event,
-                      size: "small",
-                      controls: false,
-                      placeholder: "\u8F93\u5165\u6570\u5B57"
-                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                  ], 2)) : createCommentVNode("", true),
-                  !_ctx.onlyShow ? (openBlock(), createElementBlock("div", {
-                    key: 4,
-                    class: normalizeClass(unref(createBEMName)("cell"))
                   }, [
                     createVNode(_component_el_radio_group, {
                       modelValue: element.fixed,
@@ -7950,7 +8015,7 @@ const useUserConfig = () => {
 const tableChangeEmiter = new EventEmitter();
 var index_vue_vue_type_style_index_0_lang$6 = "";
 var index_vue_vue_type_style_index_1_scoped_true_lang$1 = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-1098de7a"), n = n(), popScopeId(), n);
+const _withScopeId$3 = (n) => (pushScopeId("data-v-5b551558"), n = n(), popScopeId(), n);
 const _hoisted_1$e = { title: "\u5168\u9009/\u53D6\u6D88" };
 const _hoisted_2$6 = /* @__PURE__ */ _withScopeId$3(() => /* @__PURE__ */ createElementVNode("i", {
   class: "pm-icon icon-drag-dot",
@@ -7964,20 +8029,25 @@ const _sfc_main$t = defineComponent({
   props: {
     els: {}
   },
-  emits: ["save-columns", "export"],
+  emits: ["save-columns"],
   setup(__props, { emit: __emit }) {
     const innerEls = ref([]);
     const { BEMSpace, createBEMName } = createBEMSpace("column-tools");
     const props = __props;
     const { els } = toRefs(props);
     const emit = __emit;
+    const isExternalChange = ref(false);
     watch(
       els,
       () => {
+        isExternalChange.value = true;
         innerEls.value = cloneDeep(props.els).map((a) => {
           a.userConfigShow = a.userConfigShow === false ? false : true;
           return a;
         });
+        setTimeout(() => {
+          isExternalChange.value = false;
+        }, 10);
       },
       {
         immediate: true,
@@ -7987,6 +8057,19 @@ const _sfc_main$t = defineComponent({
     const onSaveColumns = () => {
       emit("save-columns", innerEls.value);
     };
+    watch(
+      () => {
+        return innerEls.value;
+      },
+      () => {
+        if (!isExternalChange.value) {
+          onSaveColumns();
+        }
+      },
+      {
+        deep: true
+      }
+    );
     const {
       columnToolsSettingRef,
       showColumnToolsSetting,
@@ -7997,7 +8080,7 @@ const _sfc_main$t = defineComponent({
       emit("save-columns", columns);
     };
     const showSetting = () => {
-      showColumnToolsSetting(innerEls.value);
+      showColumnToolsSetting(jsonClone(innerEls.value));
     };
     const { userConfig, updateUserConfig } = useUserShowRowConfig(props.els);
     const onSubmitConfig = (config) => {
@@ -8013,9 +8096,6 @@ const _sfc_main$t = defineComponent({
     const onShowUserConfig = () => {
       showUserConfig(userConfig.value);
     };
-    const onExportData = () => {
-      emit("export");
-    };
     const isAllShow = computed({
       get() {
         return innerEls.value.every((item) => !!item.userConfigShow);
@@ -8049,7 +8129,6 @@ const _sfc_main$t = defineComponent({
     return (_ctx, _cache) => {
       const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_icon = resolveComponent("el-icon");
-      const _component_el_button = resolveComponent("el-button");
       return openBlock(), createElementBlock(Fragment, null, [
         createElementVNode("div", {
           class: normalizeClass(unref(createBEMName)("header"))
@@ -8133,31 +8212,6 @@ const _sfc_main$t = defineComponent({
             _: 1
           }, 8, ["modelValue", "class"])
         ], 2),
-        createElementVNode("div", {
-          class: normalizeClass(unref(createBEMName)("actions"))
-        }, [
-          createVNode(_component_el_button, {
-            size: "small",
-            link: "",
-            onClick: onExportData
-          }, {
-            default: withCtx(() => [
-              createTextVNode("\u5BFC\u51FA\u8868\u683C")
-            ]),
-            _: 1
-          }),
-          createVNode(_component_el_button, {
-            size: "small",
-            link: "",
-            type: "primary",
-            onClick: onSaveColumns
-          }, {
-            default: withCtx(() => [
-              createTextVNode("\u4FDD\u5B58\u4FEE\u6539")
-            ]),
-            _: 1
-          })
-        ], 2),
         unref(isRenderColumnToolsSetting) ? (openBlock(), createBlock(_sfc_main$v, {
           key: 0,
           ref_key: "columnToolsSettingRef",
@@ -8176,16 +8230,15 @@ const _sfc_main$t = defineComponent({
     };
   }
 });
-var ColumnTools$1 = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-1098de7a"]]);
+var ColumnTools$1 = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-5b551558"]]);
 var index_vue_vue_type_style_index_0_scoped_true_lang$9 = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-15dbe923"), n = n(), popScopeId(), n);
+const _withScopeId$2 = (n) => (pushScopeId("data-v-d12a7d22"), n = n(), popScopeId(), n);
 const _hoisted_1$d = { key: 0 };
-const _hoisted_2$5 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "export-wrod" }, "\u4ECE\u7B2C", -1));
-const _hoisted_3$4 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "export-wrod" }, "\u9875\u5F00\u59CB\u5BFC\u51FA\uFF0C\u6BCF\u9875", -1));
-const _hoisted_4$3 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "export-wrod" }, "\u6761\u6570\u636E", -1));
-const _hoisted_5$2 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
-const _hoisted_6$2 = { class: "export-columns" };
-const _hoisted_7$2 = { class: "bottom-box" };
+const _hoisted_2$5 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "export-wrod" }, "\u5BFC\u51FA", -1));
+const _hoisted_3$4 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "export-wrod" }, "\u6761\u6570\u636E", -1));
+const _hoisted_4$3 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
+const _hoisted_5$2 = { class: "export-columns" };
+const _hoisted_6$2 = { class: "bottom-box" };
 const _sfc_main$s = defineComponent({
   __name: "index",
   emits: ["closed"],
@@ -8204,15 +8257,13 @@ const _sfc_main$s = defineComponent({
     };
     const formData = reactive({
       filename: getDefaultFileName(),
-      pageIndex: 1,
-      pageSize: 99999,
+      pageSize: 100,
       fromApi: true,
       exportSelected: false
     });
     const resetFormData = () => {
       formData.filename = getDefaultFileName();
-      formData.pageIndex = 1;
-      formData.pageSize = 99999;
+      formData.pageSize = 100;
       formData.fromApi = true;
       formData.exportSelected = false;
     };
@@ -8220,6 +8271,8 @@ const _sfc_main$s = defineComponent({
     const libLoading = ref(false);
     const dataLoading = ref(false);
     const libLoadFail = ref(false);
+    const showProgress = ref(false);
+    const apiLoadingProgress = ref(0);
     const loadXlsx = async () => {
       libLoading.value = true;
       loadingText.value = "\u4F9D\u8D56\u52A0\u8F7D\u4E2D";
@@ -8245,43 +8298,85 @@ const _sfc_main$s = defineComponent({
       });
     };
     const doExport = async () => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       const manager = tableManager.manager;
       const config = manager.config;
       const method = (_a = config.getMethod) == null ? void 0 : _a.toLowerCase();
-      let list = [];
+      const checkedNodes = treeRef.value.getCheckedNodes();
+      const tableEls = checkedNodes.filter((a) => !a.children);
       if (formData.fromApi) {
         try {
           loadingText.value = "\u6570\u636E\u52A0\u8F7D\u4E2D";
           dataLoading.value = true;
           let searchFormManager = manager.searchFormManager;
+          const tableManager2 = manager.tableManager;
           let reqData = manager.getListReqData();
           if ((_b = config.searchForm) == null ? void 0 : _b.beforeSubmit) {
-            let result2 = config.searchForm.beforeSubmit.call(searchFormManager, reqData);
-            if (result2 instanceof Promise) {
-              result2 = await result2;
+            let result = config.searchForm.beforeSubmit.call(searchFormManager, reqData);
+            if (result instanceof Promise) {
+              result = await result;
             }
-            if (!result2) {
+            if (!result) {
               return false;
             }
-            reqData = result2;
+            reqData = result;
           }
-          let reqResult = await PageModelManager.request[method](
-            config.getUrl,
-            {
-              ...reqData,
-              pageIndex: formData.pageIndex,
-              pageSize: formData.pageSize
+          const exportPageSize = config.table.exportPageSize || 100;
+          const reqPageSize = formData.pageSize;
+          const perTimePageSize = Math.min(reqPageSize, exportPageSize);
+          const requestTimes = Math.ceil(reqPageSize / perTimePageSize);
+          const lastRequestPageSize = reqPageSize - (requestTimes - 1) * perTimePageSize;
+          const depLoadResult = await tableManager2.loadExcelDependence();
+          if (!depLoadResult) {
+            return false;
+          }
+          showProgress.value = true;
+          const { exportEls, excelData, cols } = tableManager2.getExcelDataHeader(tableEls);
+          for (let index2 = 0; index2 < requestTimes; index2++) {
+            apiLoadingProgress.value = Number((index2 / requestTimes * 100).toFixed(2));
+            let reqResult = await PageModelManager.request[method](
+              config.getUrl,
+              {
+                ...reqData,
+                [tableManager2.pageIndexKey]: index2 + 1,
+                [tableManager2.pageSizeKey]: perTimePageSize
+              }
+            );
+            let result = manager.proceessResult(reqResult);
+            let list = result.list;
+            let resultCount = list.length;
+            if (index2 === requestTimes - 1) {
+              list = list.slice(0, lastRequestPageSize);
             }
-          );
-          var result = manager.proceessResult(reqResult);
-          list = result.list;
+            const childrenKey = ((_d = (_c = tableManager2.table.props) == null ? void 0 : _c.treeProps) == null ? void 0 : _d.children) || "children";
+            let exportData = [];
+            if (childrenKey) {
+              exportData = tableManager2.patchChildrenData(list, childrenKey);
+            } else {
+              exportData = list;
+            }
+            tableManager2.insertExcelData(excelData, exportEls, exportData);
+            reqResult = null;
+            result = null;
+            list = null;
+            exportData = null;
+            if (resultCount < perTimePageSize) {
+              apiLoadingProgress.value = 100;
+              break;
+            }
+          }
+          tableManager2.exportDataToExcelByExcelData(formData.filename, excelData, cols, {
+            exportData: [],
+            exportEls
+          });
+          showProgress.value = false;
         } catch (error) {
           ElMessage.warning("\u6570\u636E\u83B7\u53D6\u5931\u8D25!");
         } finally {
           dataLoading.value = false;
         }
       } else {
+        let list = [];
         if (typeof config.table.getExportSelectableData === "function") {
           list = config.table.getExportSelectableData.call(tableManager);
         } else {
@@ -8295,16 +8390,14 @@ const _sfc_main$s = defineComponent({
           ElMessage.info("\u65E0\u5BFC\u51FA\u6570\u636E");
           return false;
         }
-      }
-      const checkedNodes = treeRef.value.getCheckedNodes();
-      const exportEls = checkedNodes.filter((a) => !a.children);
-      const exportResult = await tableManager.exportDataToExcel({
-        columns: exportEls,
-        data: list,
-        filename: formData.filename
-      });
-      if (!exportResult) {
-        return false;
+        const exportResult = await tableManager.exportDataToExcel({
+          columns: tableEls,
+          data: list,
+          filename: formData.filename
+        });
+        if (!exportResult) {
+          return false;
+        }
       }
     };
     const show = (data) => {
@@ -8337,24 +8430,27 @@ const _sfc_main$s = defineComponent({
       const _component_el_scrollbar = resolveComponent("el-scrollbar");
       const _component_el_form = resolveComponent("el-form");
       const _component_el_empty = resolveComponent("el-empty");
+      const _component_el_progress = resolveComponent("el-progress");
       const _component_el_button = resolveComponent("el-button");
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createBlock(_sfc_main$D, {
         modelValue: visible.value,
-        "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => visible.value = $event),
+        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => visible.value = $event),
         title: "\u5BFC\u51FA\u8868\u683C\u6570\u636E",
         width: "700px",
         "dialog-props": { appendToBody: true, destroyOnClose: true },
         "dialog-events": {
-          closed: onClosed
+          closed: onClosed,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
         }
       }, {
         bottom: withCtx(() => [
-          createElementVNode("div", _hoisted_7$2, [
+          createElementVNode("div", _hoisted_6$2, [
             createVNode(_component_el_button, {
-              disabled: libLoading.value || libLoadFail.value,
+              disabled: libLoading.value || dataLoading.value,
               type: "info",
-              onClick: _cache[5] || (_cache[5] = ($event) => visible.value = false)
+              onClick: _cache[4] || (_cache[4] = ($event) => visible.value = false)
             }, {
               default: withCtx(() => [
                 createTextVNode("\u53D6\u6D88")
@@ -8362,7 +8458,7 @@ const _sfc_main$s = defineComponent({
               _: 1
             }, 8, ["disabled"]),
             createVNode(_component_el_button, {
-              disabled: libLoading.value || libLoadFail.value,
+              disabled: libLoading.value || libLoadFail.value || dataLoading.value,
               type: "success",
               onClick: doExport
             }, {
@@ -8412,35 +8508,25 @@ const _sfc_main$s = defineComponent({
                         ]),
                         _: 1
                       }, 8, ["disabled"]),
-                      createVNode(_component_el_radio, {
-                        label: false,
-                        disabled: !unref(tableManager).table.selectable
-                      }, {
+                      createVNode(_component_el_radio, { label: false }, {
                         default: withCtx(() => [
                           createTextVNode("\u8868\u683C\u5F53\u524D\u9875\u6570\u636E")
                         ]),
                         _: 1
-                      }, 8, ["disabled"])
+                      })
                     ]),
                     _: 1
                   }, 8, ["modelValue"]),
                   formData.fromApi ? (openBlock(), createElementBlock("div", _hoisted_1$d, [
                     _hoisted_2$5,
-                    createVNode(_component_el_input_number, {
-                      modelValue: formData.pageIndex,
-                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.pageIndex = $event),
-                      min: 1,
-                      size: "small"
-                    }, null, 8, ["modelValue"]),
-                    _hoisted_3$4,
                     createVNode(_component_el_input_number, {
                       modelValue: formData.pageSize,
-                      "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => formData.pageSize = $event),
+                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.pageSize = $event),
                       min: 1,
                       size: "small"
                     }, null, 8, ["modelValue"]),
-                    _hoisted_4$3,
-                    _hoisted_5$2
+                    _hoisted_3$4,
+                    _hoisted_4$3
                   ])) : createCommentVNode("", true)
                 ]),
                 _: 1
@@ -8453,7 +8539,7 @@ const _sfc_main$s = defineComponent({
                 default: withCtx(() => [
                   createVNode(_component_el_radio_group, {
                     modelValue: formData.exportSelected,
-                    "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => formData.exportSelected = $event)
+                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => formData.exportSelected = $event)
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_el_radio, { label: false }, {
@@ -8479,7 +8565,7 @@ const _sfc_main$s = defineComponent({
               })) : createCommentVNode("", true),
               createVNode(_component_el_form_item, { label: "\u5BFC\u51FA\u5B57\u6BB5" }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_6$2, [
+                  createElementVNode("div", _hoisted_5$2, [
                     createVNode(_component_el_scrollbar, { height: "100%" }, {
                       default: withCtx(() => [
                         createVNode(_component_el_tree, {
@@ -8506,14 +8592,22 @@ const _sfc_main$s = defineComponent({
           ]),
           withDirectives(createVNode(_component_el_empty, { description: "\u4F9D\u8D56\u52A0\u8F7D\u5931\u8D25" }, null, 512), [
             [vShow, libLoadFail.value]
-          ])
+          ]),
+          showProgress.value ? (openBlock(), createBlock(_component_el_progress, {
+            key: 0,
+            class: "progress-box",
+            "stroke-width": 20,
+            "text-inside": true,
+            striped: "",
+            percentage: apiLoadingProgress.value
+          }, null, 8, ["percentage"])) : createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["modelValue", "dialog-events"]);
     };
   }
 });
-var ExportForm = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-15dbe923"]]);
+var ExportForm = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-d12a7d22"]]);
 const SAVE_NAME$2 = "table-columns";
 const columnsSaver$1 = new ConfigSaver(SAVE_NAME$2);
 const saveTableColumns = columnsSaver$1.setContents.bind(columnsSaver$1);
@@ -11876,12 +11970,14 @@ const _sfc_main$8 = defineComponent({
                     createElementVNode("div", {
                       class: normalizeClass(unref(createBEMName)("input"))
                     }, [
-                      createVNode(_component_el_input, {
+                      withDirectives(createVNode(_component_el_input, {
                         modelValue: item.value,
                         "onUpdate:modelValue": ($event) => item.value = $event,
                         placeholder: "\u8BF7\u8F93\u5165",
                         clearable: ""
-                      }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                      }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                        [vShow, !unref(noValueOptions).includes(item.condition)]
+                      ])
                     ], 2)
                   ], 64)) : item.filterType === unref(FilterItemTypeEnum$1).\u6570\u5B57 ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                     createVNode(_component_el_select, {
@@ -11904,13 +12000,15 @@ const _sfc_main$8 = defineComponent({
                     createElementVNode("div", {
                       class: normalizeClass(unref(createBEMName)("input"))
                     }, [
-                      createVNode(_component_el_input_number, {
+                      withDirectives(createVNode(_component_el_input_number, {
                         modelValue: item.value,
                         "onUpdate:modelValue": ($event) => item.value = $event,
                         "controls-position": "right",
                         clearable: "",
                         placeholder: "\u8BF7\u8F93\u5165"
-                      }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                      }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                        [vShow, !unref(noValueOptions).includes(item.condition)]
+                      ])
                     ], 2)
                   ], 64)) : item.filterType === unref(FilterItemTypeEnum$1).\u65E5\u671F ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                     createVNode(_component_el_select, {
@@ -11933,13 +12031,15 @@ const _sfc_main$8 = defineComponent({
                     createElementVNode("div", {
                       class: normalizeClass(unref(createBEMName)("input"))
                     }, [
-                      createVNode(_component_el_date_picker, {
+                      withDirectives(createVNode(_component_el_date_picker, {
                         modelValue: item.value,
                         "onUpdate:modelValue": ($event) => item.value = $event,
                         placeholder: "\u8BF7\u9009\u62E9\u65E5\u671F",
                         "value-format": "YYYY-MM-DD",
                         clearable: ""
-                      }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                      }, null, 8, ["modelValue", "onUpdate:modelValue"]), [
+                        [vShow, !unref(noValueOptions).includes(item.condition)]
+                      ])
                     ], 2)
                   ], 64)) : item.filterType === unref(FilterItemTypeEnum$1).\u5E03\u5C14\u503C ? (openBlock(), createElementBlock("div", {
                     key: 3,
@@ -12096,7 +12196,7 @@ const _sfc_main$8 = defineComponent({
     };
   }
 });
-var ColumnFilterTools = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-16a43018"]]);
+var ColumnFilterTools = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-47c894ea"]]);
 var index_vue_vue_type_style_index_0_scoped_true_lang$3 = "";
 const _withScopeId$1 = (n) => (pushScopeId("data-v-4c74a2a2"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", null, "\u8BBE\u7F6E\u6392\u5E8F\u6761\u4EF6", -1));
@@ -14367,7 +14467,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.15.1";
+const version = "3.16.1";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [
@@ -14447,4 +14547,4 @@ const ModelComponent = {
     saveTableColumns(content);
   }
 };
-export { ButtonsRenderer, _sfc_main$w as DraggableList, index as EditableTable, _sfc_main$D as FormDialog, _sfc_main$d as FormDrawer, PageModelForm, _sfc_main$A as TableCellRenderer, _sfc_main$v as TableColumnSetting, columnTools, ModelComponent as default, defineConfig, defineEditableTable, defineForm };
+export { ButtonsRenderer, _sfc_main$w as DraggableList, index as EditableTable, FilterItemTypeEnum$1 as FilterItemTypeEnum, FilterMatchModeEnum$1 as FilterMatchModeEnum, _sfc_main$D as FormDialog, _sfc_main$d as FormDrawer, PageModelForm, _sfc_main$A as TableCellRenderer, _sfc_main$v as TableColumnSetting, columnTools, ModelComponent as default, defineConfig, defineEditableTable, defineForm, updateCompareNoValueOptions, updateCompareOptions };