cloud-web-corejs 1.1.0-dev.21 → 1.1.0-dev.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.21",
+  "version": "1.1.0-dev.22",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/excelExport/conditionExportConfig.js

@@ -0,0 +1,112 @@
+import { getLogicParamValue } from "@base/api/user";
+
+export const CONDITION_EXPORT_PARAM_CODE = "conditionExportParams";
+export const CONDITION_EXPORT_SEARCH_COUNT_CODE
+  = "conditionExportSearchCount";
+
+export const DEFAULT_CONDITION_EXPORT_CONFIG = Object.freeze({
+  maxQueryTotal: 300000,
+  pageSize: 1000,
+  limitFileSize: 100000,
+  searchCount: true,
+});
+
+function parsePositiveInteger(value, fallback) {
+  let text = String(value == null ? "" : value).trim();
+  if (!/^\d+$/.test(text)) return fallback;
+  let result = Number(text);
+  if (!Number.isSafeInteger(result) || result <= 0) return fallback;
+  return result;
+}
+
+/**
+ * 解析「最大查询总数;每页查询数量;单文件最大数据量」。每一项独立回落默认值，
+ * 避免一项填错导致另外两项已生效的配置也被丢弃。
+ */
+export function parseConditionExportParams(rawValue) {
+  let values = typeof rawValue === "string" ? rawValue.split(";") : [];
+  return {
+    maxQueryTotal: parsePositiveInteger(
+      values[0],
+      DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal
+    ),
+    pageSize: parsePositiveInteger(
+      values[1],
+      DEFAULT_CONDITION_EXPORT_CONFIG.pageSize
+    ),
+    limitFileSize: parsePositiveInteger(
+      values[2],
+      DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize
+    ),
+  };
+}
+
+export function parseConditionExportSearchCount(rawValue, fallback = true) {
+  if (typeof rawValue === "boolean") return rawValue;
+  if (typeof rawValue !== "string") return fallback;
+  let value = rawValue.trim().toLowerCase();
+  if (value === "true") return true;
+  if (value === "false") return false;
+  return fallback;
+}
+
+function readLogicParam(paramCode) {
+  return getLogicParamValue({
+    data: { paramCode },
+    modal: false,
+    failMsg: false,
+    errorMsg: false,
+  })
+    .then((res) => (res && res.type === "success" ? res.objx : ""))
+    .catch(() => "");
+}
+
+/** 读取两条全局逻辑参数；接口异常时静默使用内置默认值。 */
+export function loadConditionExportConfig() {
+  return Promise.all([
+    readLogicParam(CONDITION_EXPORT_PARAM_CODE),
+    readLogicParam(CONDITION_EXPORT_SEARCH_COUNT_CODE),
+  ]).then(([paramsRaw, searchCountRaw]) => ({
+    ...parseConditionExportParams(paramsRaw),
+    searchCount: parseConditionExportSearchCount(searchCountRaw, true),
+  }));
+}
+
+/**
+ * 从导出按钮 options 取出条件导出的三项覆盖值。空值转成 null，交给
+ * resolveConditionExportConfig 回落到全局逻辑参数。
+ */
+export function pickConditionExportOverrides(fieldOptions = {}) {
+  return {
+    pageSize: fieldOptions.exportPageSize || null,
+    maxQueryTotal: fieldOptions.maxQueryTotal || null,
+    limitFileSize: fieldOptions.limitFileSize || null,
+  };
+}
+
+/**
+ * 单次导出参数优先于全局逻辑参数。按钮参数与脚本参数在进入导出器前已经合并，且脚本
+ * 位于展开表达式右侧，所以这里读取到的 option 天然满足「脚本 > 按钮 > 全局」。
+ */
+export function resolveConditionExportConfig(globalConfig, option = {}) {
+  let base = globalConfig || DEFAULT_CONDITION_EXPORT_CONFIG;
+  let searchCountOverride
+    = option.conditionExportSearchCount !== undefined
+      ? option.conditionExportSearchCount
+      : option.searchCount;
+  return {
+    maxQueryTotal: parsePositiveInteger(
+      option.maxQueryTotal,
+      base.maxQueryTotal
+    ),
+    pageSize: parsePositiveInteger(option.pageSize, base.pageSize),
+    limitFileSize: parsePositiveInteger(
+      option.limitFileSize,
+      base.limitFileSize
+    ),
+    searchCount: parseConditionExportSearchCount(
+      searchCountOverride,
+      base.searchCount
+    ),
+  };
+}

package/src/components/excelExport/exportType.js

@@ -39,6 +39,14 @@ export function isRowExport(type) {
   return type === EXPORT_TYPE.SELECTED || type === EXPORT_TYPE.CURRENT;
 }
 
+/**
+ * 是否条件导出。主表条件导出的历史 type 是 null/undefined；明细条件导出有独立类型。
+ * 明细选择导出虽然也走后端分页，但不受条件导出全局上限与查总数开关影响。
+ */
+export function isConditionExport(type) {
+  return type == null || type === EXPORT_TYPE.ITEM_CONDITION;
+}
+
 /**
  * 是否必须先勾选行：空勾选要拦截，且以勾选行 id 作为查询条件。
  * @param {String|null} type 导出模式。

package/src/components/excelExport/index.vue

@@ -41,6 +41,12 @@
       <div class="export-box">
         <div class="tips">
           {{ $t2("导出中，请勿关闭当前窗口", "components.excelExport.tip") }}
+          <template v-if="conditionExportMode">
+            ，{{
+              $t2("导出最大数据量", "components.excelExport.maxDataSize")
+            }}：{{ conditionExportConfig.maxQueryTotal
+            }}{{ $t2("条", "components.excelExport.rowUnit") }}
+          </template>
         </div>
         <el-progress
           :text-inside="true"
@@ -62,7 +68,7 @@
         <div class="fl import-count">
           <span class="f-red doneNum">{{ doneSize }}</span>
           /
-          <span class="dataSize">{{ tTotalSize }}</span>
+          <span class="dataSize">{{ exportTotalText }}</span>
         </div>
         <el-button type="primary" plain class="button-sty" @click="dialogClose2">
           <i class="el-icon-close el-icon"></i>

package/src/components/excelExport/mixins.js

@@ -5,9 +5,19 @@ import { getToken } from "../../utils/auth";
 import indexUtil from "../../utils/index.js";
 import exportFieldDialog from "./exportFieldDialog.vue";
 import { getCellValue } from "@base/components/table/util/index";
-import { isItemExport, isRowExport, requiresCheckedRows } from "./exportType";
-import { getExportItemColumns } from "./exportItemConfigUtil";
-import { viewKey } from "@base/utils/repeatOpen";
+import {
+  isConditionExport,
+  isItemExport,
+  isRowExport,
+  requiresCheckedRows,
+} from "./exportType";
+import { getExportItemColumns } from "./exportItemConfigUtil";
+import { viewKey } from "@base/utils/repeatOpen";
+import {
+  DEFAULT_CONDITION_EXPORT_CONFIG,
+  loadConditionExportConfig,
+  resolveConditionExportConfig,
+} from "./conditionExportConfig";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
@@ -130,8 +140,14 @@ function getGrid(that, tableRef) {
         showExportFieldDialog: false,
         leafColumns: [],
         columns: [],
-        queryParam: {},
-        isMinimize: false,
+        queryParam: {},
+        isMinimize: false,
+        // 条件导出在本次任务内使用的配置快照。逻辑参数只在开始时读取一次，避免中途变更
+        // 导致前后页使用不同的分页/分卷口径。
+        conditionExportMode: false,
+        conditionExportConfig: { ...DEFAULT_CONDITION_EXPORT_CONFIG },
+        // 不查总数时，处理过程中分母显示「...」；文件合并成功后才回填实际完成数。
+        totalSizeKnown: true,
         // 定时器必须放实例上：模块级共享会导致并发导出互相清除对方的定时器
         exportTimer: null,
         countTimer: null,
@@ -146,9 +162,14 @@ function getGrid(that, tableRef) {
         // $route.path」现查，用户在导出期间切了页签（弹框可最小化，切走完全合法）
         // 解的就是另一把锁 —— 原页签会永久 affix，而 tagsView 的 delOthersViews /
         // delAllViews 都保留 affix，「关闭其他」「全部关闭」也删不掉它，只能刷新页面。
-        lockedView: null,
-      };
-    },
+        lockedView: null,
+      };
+    },
+    computed: {
+      exportTotalText() {
+        return this.totalSizeKnown ? this.tTotalSize : "...";
+      },
+    },
     created() {},
     mounted() {
       // this.exc();
@@ -256,13 +277,29 @@ function getGrid(that, tableRef) {
           this.param.destroyComponent(loadingObj);
         }, 0);
       },
-      dialogPrimary2() {
+      dialogPrimary2() {
         // this.showUserDialog=false
         this.$emit("confirm");
         this.$emit("close");
-        this.clearExportTimer();
-      },
-      startProcess() {
+        this.clearExportTimer();
+      },
+      /**
+       * 读取并固化本次条件导出的全局配置。单次按钮/脚本参数已经在 option 中完成合并，
+       * resolveConditionExportConfig 会让它们覆盖同名的全局配置。
+       */
+      prepareConditionExportConfig() {
+        this.conditionExportMode = isConditionExport(this.option.type);
+        this.totalSizeKnown = true;
+        if (!this.conditionExportMode) return Promise.resolve();
+        return loadConditionExportConfig().then((globalConfig) => {
+          this.conditionExportConfig = resolveConditionExportConfig(
+            globalConfig,
+            this.option
+          );
+          this.totalSizeKnown = this.conditionExportConfig.searchCount;
+        });
+      },
+      startProcess() {
         this.lockMenu();
         this.createCountTimer();
         this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
@@ -296,47 +333,62 @@ function getGrid(that, tableRef) {
             this.$t1("无法确定导出服务前缀，请在导出配置中指定 prefix")
           );
           return;
-        }
-        this.CURRENT_PREFIX = options.prefix;
-        // 取数走 originOption.exportAjax 时请求由 xform 侧构造，前端拿不到那个 config，
-        // 只能把令牌顺着导出参数带过去（data-table-mixin 的 exportAjax 会塞进
-        // customParam.config，最终由 formHttp 的 ...opts 透传给 axios）
-        options.cancelToken = this.getCancelToken();
-
-        this.title = title;
-        that.tTotalPage = 0;
-        that.tTotalSize = 0;
-        that
-          .createExcelFile()
-          .then((resultMsg) => {
-            if (that.isExportStopped()) return;
-            if (resultMsg.type === "success") {
-              let aObj = resultMsg.objx;
-              that.uuid = aObj.uuid;
-              that.nowDate = aObj.nowDate;
-              that.ippaaapp = aObj.ippaaapp;
-              setTimeout(function () {
-                /*num = 1;
-              loopToDo(0, num);*/
-                if (that.isExportStopped()) return;
-                that.handleLoopToDo();
-              }, 300);
-            } else {
-              that.abortExport();
-              that.showImportDialog = false;
-              that.showImportDialog2 = false;
-            }
-          })
-          .catch((error) => {
-            if (that.isExportStopped()) return;
-            console.error(error);
-            that.abortExport(that.$t1("创建导出文件失败，导出已中止"));
-            that.showImportDialog = false;
-            that.showImportDialog2 = false;
-          });
-      },
-      getExportPageSize() {
-        let pageSize = Math.min(this.option.pageSize || 1000, 1000);
+        }
+        this.CURRENT_PREFIX = options.prefix;
+        this.title = title;
+        that.tTotalPage = 0;
+        that.tTotalSize = 0;
+        that.prepareConditionExportConfig().then(() => {
+          if (that.isExportStopped()) return;
+          // 取数走 originOption.exportAjax 时请求由 xform 侧构造，前端拿不到那个 config，
+          // 只能把令牌顺着导出参数带过去（data-table-mixin 的 exportAjax 会塞进
+          // customParam.config，最终由 formHttp 的 ...opts 透传给 axios）
+          options.cancelToken = that.getCancelToken();
+          that
+            .createExcelFile()
+            .then((resultMsg) => {
+              if (that.isExportStopped()) return;
+              if (resultMsg.type === "success") {
+                let aObj = resultMsg.objx;
+                that.uuid = aObj.uuid;
+                that.nowDate = aObj.nowDate;
+                that.ippaaapp = aObj.ippaaapp;
+                setTimeout(function () {
+                  if (that.isExportStopped()) return;
+                  that.handleLoopToDo();
+                }, 300);
+              } else {
+                that.abortExport();
+                that.showImportDialog = false;
+                that.showImportDialog2 = false;
+              }
+            })
+            .catch((error) => {
+              if (that.isExportStopped()) return;
+              console.error(error);
+              that.abortExport(that.$t1("创建导出文件失败，导出已中止"));
+              that.showImportDialog = false;
+              that.showImportDialog2 = false;
+            });
+        });
+      },
+      getExportPageSize() {
+        let configuredPageSize = this.conditionExportMode
+          ? this.conditionExportConfig.pageSize
+          : this.option.pageSize || 1000;
+        // 条件导出的按钮/脚本值已经按优先级写进配置快照，不再用全局默认值 1000
+        // 反向封顶；非条件导出保持原有最多 1000 的行为。
+        let pageSize = this.conditionExportMode
+          ? configuredPageSize
+          : Math.min(configuredPageSize, 1000);
+        if (this.conditionExportMode) {
+          // 单页本身不能突破总量或单文件上限，否则无法在页级合并时兑现硬上限。
+          pageSize = Math.min(
+            pageSize,
+            this.conditionExportConfig.maxQueryTotal,
+            this.conditionExportConfig.limitFileSize
+          );
+        }
         let showImageAtTable = this.option.showImageAtTable || false;
         let hasExportImage = !!this.leafColumns.find((item) => {
           let exportType = item?.params?.exportType;
@@ -359,17 +411,19 @@ function getGrid(that, tableRef) {
         }
         return pageSize;
       },
-      hadleMergeExcel(pPageSize) {
+      hadleMergeExcel(pPageSize) {
         if (this.isExportStopped()) return;
         let that = this;
         let title = this.title;
         let options = this.option;
         // let pPageSize = this.getExportPageSize();
-        let limitFileSize = options.limitFileSize || 100000;
+        let limitFileSize = this.conditionExportMode
+          ? this.conditionExportConfig.limitFileSize
+          : options.limitFileSize || 100000;
         let limitThreadNum = options.limitThreadNum || 5;
         let totalPages = this.tTotalPage || 1;
 
-        let kTotalPages = parseInt(limitFileSize / pPageSize);
+        let kTotalPages = Math.max(parseInt(limitFileSize / pPageSize), 1);
 
         let fileNum = parseInt(totalPages / kTotalPages);
         if (totalPages % kTotalPages !== 0) {
@@ -438,20 +492,195 @@ function getGrid(that, tableRef) {
               });
             // 注意：此处不能同步 clearExportTimer，否则计时统计会在合并完成前被提前停掉
           }
-        };
-        loopDo();
-      },
-      handleLoopToDo() {
-        let that = this;
-        let uuid;
-        let num = 0;
-        let title = this.title;
-
-        let options = this.option;
-
-        let pPageSize = this.getExportPageSize();
-        let limitFileSize = options.limitFileSize || 100000;
-        let limitThreadNum = options.limitThreadNum || 5;
+        };
+        loopDo();
+      },
+      /** 统一组装一页条件导出的取数请求，保证两种查总数模式使用完全相同的查询条件。 */
+      async requestExportPage(pageNumber, pageSize, searchCount) {
+        let options = this.option;
+        let originOption = this.tableTarget.params.originOption;
+        let url = originOption.exportPath || originOption.path;
+        let params = this.$baseLodash.cloneDeep(this.queryParam);
+        let aParam = {
+          current: pageNumber,
+          size: pageSize,
+          nowDate: this.nowDate ?? options.nowDate,
+          searchCount,
+        };
+        let cpParam;
+        if (originOption.vform === true) {
+          params.conditions = params.conditions || {};
+          cpParam = params.conditions;
+        } else {
+          cpParam = params;
+        }
+        Object.assign(cpParam, aParam);
+
+        if (originOption.exportAjax) {
+          return originOption.exportAjax(aParam, {
+            ...options,
+            exportQuerySnapshot: this.$baseLodash.cloneDeep(this.queryParam),
+          });
+        }
+        // URL 上若写死 searchCount，会与本次模式冲突；实际值统一由请求体控制。
+        let resolvedUrl = typeof url === "function" ? url() : url;
+        if (typeof resolvedUrl !== "string" || !resolvedUrl) {
+          throw new Error("无效的导出查询地址");
+        }
+        let requestUrl = resolvedUrl
+          .replace("searchCount=false", "1=1")
+          .replace("searchCount=true", "1=1");
+        let finalParams = params;
+        if (originOption.paramHandle) {
+          finalParams = originOption.paramHandle(params) || {};
+        }
+        return this.$commonHttp({
+          aes: originOption.aes || false,
+          url: requestUrl,
+          method: "post",
+          data: finalParams,
+          modal: false,
+          queryCreateInfo: originOption.queryCreateInfo,
+          addCreateInfo: originOption.addCreateInfo,
+          cancelToken: this.getCancelToken(),
+        });
+      },
+      /** 导出尚在取数/合并时最多显示 99%，100% 只由 completeExport 设置。 */
+      updateExportProgress(doneSize, progressTotal) {
+        this.doneSize = parseInt(doneSize);
+        let percentage = progressTotal > 0 ? (doneSize * 100) / progressTotal : 99;
+        if (percentage > 0 && percentage < 1) percentage = 1;
+        if (percentage >= 100) percentage = 99;
+        this.percentageNum = parseInt(percentage);
+      },
+      /**
+       * 不查询总数：每页都发 searchCount=false，以 records.length < pageSize 判定末页。
+       * 取数与写入按页串行，确保发现末页或达到最大查询总数后不会继续派发多余请求。
+       */
+      handleLoopWithoutCount(pageSize) {
+        let that = this;
+        let maxQueryTotal = this.conditionExportConfig.maxQueryTotal;
+        let maxPages = Math.max(Math.ceil(maxQueryTotal / pageSize), 1);
+        let doneSize = 0;
+        this.tTotalPage = 0;
+        this.tTotalSize = 0;
+        this.totalSizeKnown = false;
+
+        let finish = function (lastPage) {
+          if (that.isExportStopped()) return;
+          that.tTotalPage = Math.max(lastPage, 1);
+          that.hadleMergeExcel(pageSize);
+        };
+
+        let fetchPage = function (pageNumber, retryCount = 0) {
+          if (that.isExportStopped()) return Promise.resolve(null);
+          return that
+            .requestExportPage(pageNumber, pageSize, false)
+            .then((resultMsg) => {
+              if (resultMsg && resultMsg.type === "success") return resultMsg;
+              if (retryCount < 1) {
+                return new Promise((resolve) => {
+                  setTimeout(
+                    () => resolve(fetchPage(pageNumber, retryCount + 1)),
+                    500
+                  );
+                });
+              }
+              that.abortExport();
+              return null;
+            })
+            .catch((error) => {
+              if (that.isExportStopped()) return null;
+              if (retryCount < 1) {
+                return new Promise((resolve) => {
+                  setTimeout(
+                    () => resolve(fetchPage(pageNumber, retryCount + 1)),
+                    500
+                  );
+                });
+              }
+              console.error(error);
+              that.abortExport(
+                that.$t1("第{n}页数据拉取失败，导出已中止", {
+                  n: pageNumber,
+                })
+              );
+              return null;
+            });
+        };
+
+        let appendPage = function (pageNumber) {
+          fetchPage(pageNumber).then((resultMsg) => {
+            if (!resultMsg || that.isExportStopped()) return;
+            let page = resultMsg.objx || {};
+            let actualSize = Number(page.size || page.pageSize || pageSize);
+            if (!Number.isSafeInteger(actualSize) || actualSize <= 0
+              || actualSize > pageSize || (pageNumber > 1 && actualSize !== pageSize)) {
+              that.abortExport(that.$t1("服务端分页大小发生变化，导出已中止"));
+              return;
+            }
+            pageSize = actualSize;
+            maxPages = Math.max(Math.ceil(maxQueryTotal / pageSize), 1);
+            let rawRows = Array.isArray(page.records) ? page.records : [];
+            let hasNext = rawRows.length >= pageSize;
+
+            // 整页数据需要再探测一页；探测到的空页不写入，也不参与合并。
+            if (pageNumber > 1 && rawRows.length === 0) {
+              finish(pageNumber - 1);
+              return;
+            }
+
+            let remaining = Math.max(maxQueryTotal - doneSize, 0);
+            let rows = rawRows.slice(0, remaining);
+            let reachedLimit = rows.length >= remaining;
+            page.current = pageNumber;
+            page.pageNumber = pageNumber;
+            page.size = pageSize;
+            page.pageSize = pageSize;
+            page.records = rows;
+
+            that
+              .addExcelData({ rows, pageNumber })
+              .then((appendResult) => {
+                if (that.isExportStopped()) return;
+                if (!appendResult || appendResult.type !== "success") {
+                  if (appendResult && appendResult.type === "abort") return;
+                  that.abortExport();
+                  return;
+                }
+                doneSize += rows.length;
+                that.updateExportProgress(doneSize, maxQueryTotal);
+                if (reachedLimit || !hasNext || pageNumber >= maxPages) {
+                  finish(pageNumber);
+                  return;
+                }
+                appendPage(pageNumber + 1);
+              })
+              .catch((error) => {
+                if (that.isExportStopped()) return;
+                console.error(error);
+                that.abortExport(that.$t1("导出数据写入失败，导出已中止"));
+              });
+          });
+        };
+
+        appendPage(1);
+      },
+      handleLoopToDo() {
+        let that = this;
+        let num = 0;
+        let options = this.option;
+
+        let pPageSize = this.getExportPageSize();
+        let limitThreadNum = options.limitThreadNum || 5;
+
+        if (
+          this.conditionExportMode
+          && this.conditionExportConfig.searchCount === false
+        ) {
+          this.handleLoopWithoutCount(pPageSize);
+          return;
+        }
 
         /**处理返回值*/
         this.doneSize = 0;
@@ -478,39 +707,15 @@ function getGrid(that, tableRef) {
               rows: resultMsg.objx.records,
               pageNumber: pageNumber,
             })
-            .then(function (resultMsg2) {
-              releaseWindow();
-              let data = resultMsg.objx;
-              let total = data.total;
-
-              let pageNumber = data.pageNumber || 1;
-              let totalPages = that.tTotalPage || 1;
-              if (resultMsg2.type === "success") {
-                excedNum++;
-                let pageNumber = data.pageNumber || 1;
-                let k = (excedNum * 100) / totalPages;
-                if (k > 0 && k < 1) {
-                  k = 1;
-                }
-                if (k > 100) k = 100;
-                let cTotal = that.tTotalSize;
-                let pageSize = data.pageSize;
-                // let datas = data.records;
-                let size = data.records.length;
-                cSize = cSize + size;
-
-                let ttNum = cSize + "/" + cTotal;
-                let percentageStr = parseInt(k) + "%";
-
-                let percentageNum = k;
-                if (percentageNum >= 100) {
-                  percentageNum = 99;
-                }
-                // that.$set(that, "doneSize", parseInt(cSize));
-                // that.$set(that, "percentageNum", parseInt(percentageNum));
-
-                that.doneSize = parseInt(cSize);
-                that.percentageNum = parseInt(percentageNum);
+            .then(function (resultMsg2) {
+              releaseWindow();
+              let data = resultMsg.objx;
+              let totalPages = that.tTotalPage || 1;
+              if (resultMsg2.type === "success") {
+                excedNum++;
+                let size = data.records.length;
+                cSize = cSize + size;
+                that.updateExportProgress(cSize, that.tTotalSize);
 
                 if (totalPages === 0 || excedNum >= totalPages) {
                   that.hadleMergeExcel(data.pageSize);
@@ -605,113 +810,49 @@ function getGrid(that, tableRef) {
             });
         };
 
-        let waitReqNum = 0;
-        let promise;
-        let loopToDo = function (flag, pageNumber, retryCount = 0) {
-          // 取消后不再发起新页，也不再重试（重试是从 .catch 里递归回来的）
-          if (that.isExportStopped()) return;
-          let maxWaitNum = limitThreadNum;
-          // 分页取数的时间快照：createExcelTemplate 返回后存在 this.nowDate（见
-          // startProcess），此前这里读的是 options.nowDate —— 那是调用方入参，全库
-          // 没有任何调用方维护它，于是每页请求的 nowDate 恒为 undefined、被
-          // JSON.stringify 丢掉，后端拿不到快照点。导出期间数据发生增删时，分页会
-          // 整体前后错位，合出来的文件既漏行又重行，且全程不报错。
-          // 仍保留 options.nowDate 兜底：服务端未返回快照时，调用方若显式指定了一个，
-          // 用它总好过不带。
-          // 两条取数通道都要带：通用表格随请求体平铺下发；xform 走 exportAjax，快照
-          // 顺 aParam 进去后由 data-table-mixin.loadDefaultQueryList 提到信封层（与
-          // formCode 同级），不能留在内层 data —— 那是业务查询条件的地盘。
-          let nowDate = that.nowDate ?? options.nowDate;
-          if (flag === 1) {
-            /*if (num > that.tTotalPage) {
-              let size = page.records.length;
-              if (size === 0 || page.totalPages === 0 || (page.pageNumber >= page.totalPages)) {
-                that.clearExportTimer();
-                return;
-              }
-            }*/
-          } else {
-            waitReqNum = 0;
-          }
-
-          let target = that.tableTarget;
-          let originOption = target.params.originOption;
-          let url = originOption.exportPath || originOption.path;
-
-          // let params = originOption.param() || {};
-          // 每页必须独立参数对象。此前所有页共享 that.queryParam 这一个对象，下面的
-          // Object.assign 把 current 写进去后，靠"派发间隔 100ms、微任务已 flush"侥幸
-          // 不冲突；请求拦截器一旦变成异步（token 续期等），并发的两页会带上同一个
-          // current —— 合并出的文件重复页 + 缺页，且全程不报错。
-          let params = that.$baseLodash.cloneDeep(that.queryParam);
-          let aParam = {
-            current: pageNumber,
-            size: pPageSize,
-            nowDate: nowDate,
-            searchCount: flag !== 1,
-          };
-          let cpParam;
-          if (originOption.vform === true) {
-            params.conditions = params.conditions || {};
-            cpParam = params.conditions;
-          } else {
-            cpParam = params;
-          }
-          Object.assign(cpParam, aParam);
-
-          if (!originOption.exportAjax) {
-            let turl = url.replace("searchCount=false", "1=1");
-            let finaParams = params;
-            if (originOption.paramHandle) {
-              finaParams = originOption.paramHandle
-                ? originOption.paramHandle(params) || {}
-                : {};
-            }
-            promise = that.$commonHttp({
-              aes: originOption.aes || false,
-              url: turl,
-              method: "post",
-              data: finaParams,
-              modal: false,
-              queryCreateInfo: originOption.queryCreateInfo,
-              addCreateInfo: originOption.addCreateInfo,
-              cancelToken: that.getCancelToken(),
-            });
-          } else {
-            promise = originOption.exportAjax(aParam, options);
-          }
-
-          promise
-            .then(function (resultMsg) {
-              if (resultMsg.type === "success") {
-                let objx = resultMsg.objx;
-                objx.pageNumber = objx.current || 1;
-                objx.totalPages = objx.pages || 1;
-                objx.pageSize = objx.size;
-                let size = objx.records.length;
-                if (flag === 0) {
-                  that.tTotalPage = objx.pages;
-                  // that.tTotalSize = objx.total;
-                  setTimeout(function () {
-                    that.$set(that, "tTotalSize", objx.total);
-                  }, 0);
-                  let tTotalPage = objx.pages;
-                  let tTotalSize = objx.total;
-                  let ttNum = 0 + "/" + objx.total;
-
-                  let opNum = limitFileSize;
-                  let kTotalPages = parseInt(opNum / objx.size);
-
-                  let fileNum = parseInt(tTotalPage / kTotalPages);
-                  if (tTotalPage % kTotalPages !== 0) {
-                    fileNum = fileNum + 1;
-                  }
-                  if (
-                    size > 0 ||
-                    objx.totalPages > 0 ||
-                    objx.pageNumber < objx.totalPages
-                  ) {
-                    that.exportTimer = setInterval(function () {
+        let waitReqNum = 0;
+        let loopToDo = function (flag, pageNumber, retryCount = 0) {
+          // 取消后不再发起新页，也不再重试（重试是从 .catch 里递归回来的）
+          if (that.isExportStopped()) return;
+          let maxWaitNum = limitThreadNum;
+          if (flag !== 1) waitReqNum = 0;
+
+          that
+            .requestExportPage(pageNumber, pPageSize, flag !== 1)
+            .then(function (resultMsg) {
+              if (resultMsg.type === "success") {
+                let objx = resultMsg.objx || {};
+                objx.records = Array.isArray(objx.records) ? objx.records : [];
+                objx.pageNumber = objx.current || pageNumber;
+                objx.pageSize = objx.size || pPageSize;
+                let actualSize = Number(objx.pageSize);
+                if (!Number.isSafeInteger(actualSize) || actualSize <= 0
+                  || actualSize > pPageSize || (flag !== 0 && actualSize !== pPageSize)) {
+                  that.abortExport(that.$t1("服务端分页大小发生变化，导出已中止"));
+                  return;
+                }
+                pPageSize = actualSize;
+                objx.pageSize = actualSize;
+                let size = objx.records.length;
+                if (flag === 0) {
+                  let rawTotal = Number(objx.total);
+                  if (!Number.isFinite(rawTotal) || rawTotal < 0) {
+                    rawTotal = size;
+                  }
+                  let exportTotal = that.conditionExportMode
+                    ? Math.min(
+                        rawTotal,
+                        that.conditionExportConfig.maxQueryTotal
+                      )
+                    : rawTotal;
+                  that.tTotalPage = that.conditionExportMode
+                    ? Math.max(Math.ceil(exportTotal / pPageSize), 1)
+                    : objx.pages;
+                  objx.totalPages = that.tTotalPage || 1;
+                  that.tTotalSize = exportTotal;
+                  let tTotalPage = that.tTotalPage || 1;
+                  if (tTotalPage > 1) {
+                    that.exportTimer = setInterval(function () {
                       if (waitReqNum < maxWaitNum && num < tTotalPage) {
                         waitReqNum++;
                         num++;
@@ -726,9 +867,15 @@ function getGrid(that, tableRef) {
                     }, 100);
                   } else {
                     clearInterval(that.exportTimer);
-                    that.exportTimer = null;
-                  }
-                }
+                    that.exportTimer = null;
+                  }
+                }
+                if (that.conditionExportMode) {
+                  // 总数超过有效上限时，最后一页只写允许范围内的数据。
+                  let rowOffset = (pageNumber - 1) * pPageSize;
+                  let allowedRows = Math.max(that.tTotalSize - rowOffset, 0);
+                  objx.records = objx.records.slice(0, allowedRows);
+                }
                 // 注意：此处不再释放并发窗口。拉取完成只是这一页做完了一半，
                 // 窗口由 handleData 在上送(addExcelData)落地后释放，见那里的注释。
 
@@ -898,14 +1045,14 @@ function getGrid(that, tableRef) {
         }
         let cUUid = this.uuid;
         let ippaaapp = this.ippaaapp;
-        let url1 =
-          this.CURRENT_PREFIX +
-          "/excel/appendExcelData?uuid=" +
-          cUUid +
-          "&ippaaapp=" +
-          ippaaapp +
-          "&pageNumber=" +
-          pageNumber;
+        let url1
+          = this.CURRENT_PREFIX
+          + "/excel/appendExcelData?uuid="
+          + cUUid
+          + "&ippaaapp="
+          + ippaaapp
+          + "&pageNumber="
+          + pageNumber;
         return this.$http({
           url: url1,
           method: "post",
@@ -919,12 +1066,12 @@ function getGrid(that, tableRef) {
         });
       },
       mergeExcel(startPage, endPage, loading) {
-        let url1 =
-          this.CURRENT_PREFIX +
-          "/excel/mergeExcel?uuid=" +
-          this.uuid +
-          "&ippaaapp=" +
-          this.ippaaapp;
+        let url1
+          = this.CURRENT_PREFIX
+          + "/excel/mergeExcel?uuid="
+          + this.uuid
+          + "&ippaaapp="
+          + this.ippaaapp;
         return this.$http({
           url: url1 + "&startPage=" + startPage + "&endPage=" + endPage,
           method: "post",
@@ -954,8 +1101,12 @@ function getGrid(that, tableRef) {
        * 合法的状态，那时页签必须能正常关闭 —— 解锁此前只挂在 beforeDestroy 上，
        * 用户不点「取消/确定」就永远解不开，正是「导出完成后页签关不掉」的来源。
        */
-      completeExport() {
-        setTimeout(() => {
+      completeExport() {
+        if (!this.totalSizeKnown) {
+          this.tTotalSize = this.doneSize;
+          this.totalSizeKnown = true;
+        }
+        setTimeout(() => {
           if (this.isExportStopped()) return;
           this.percentageNum = parseInt(100);
         }, 100);
@@ -1011,10 +1162,10 @@ function getGrid(that, tableRef) {
           return column.slots.filterVal(params);
         }
         let slotDefault = column.slots && column.slots.default;
-        let hasRenderFn =
-          !!column.renderCell ||
-          typeof slotDefault === "function" ||
-          typeof slotDefault === "string";
+        let hasRenderFn
+          = !!column.renderCell
+          || typeof slotDefault === "function"
+          || typeof slotDefault === "string";
         if (!hasRenderFn) {
           let cellValue = params.row[column.field];
           if (typeof column.formatter === "function") {
@@ -1072,8 +1223,8 @@ function getGrid(that, tableRef) {
                 //  _columnIndex
               };
               let exportType = column.params?.exportType;
-              let exportVal =
-                column.params && column.params.exportVal
+              let exportVal
+                = column.params && column.params.exportVal
                   ? column.params.exportVal
                   : null;
               if (exportVal) {
@@ -1089,16 +1240,16 @@ function getGrid(that, tableRef) {
               } else if (exportType === "Number") {
                 resultStr = that.getExportCellValue(params);
                 if (
-                  resultStr !== null &&
-                  resultStr !== undefined &&
-                  resultStr !== "" &&
-                  !(resultStr + "").startsWith("[EXPNUM]")
+                  resultStr !== null
+                  && resultStr !== undefined
+                  && resultStr !== ""
+                  && !(resultStr + "").startsWith("[EXPNUM]")
                 ) {
                   resultStr = "[EXPNUM]" + resultStr;
                 }
               } else if (
-                exportType === "Image" ||
-                (showImageAtTable && exportType === "Image2")
+                exportType === "Image"
+                || (showImageAtTable && exportType === "Image2")
               ) {
                 // 取值刻意延到"确实用得上"的那条分支才做：附件的正常形态是数组，
                 // 那条分支会用 row[column.field] 自己拼 [EXPIMG]，把取值结果整个覆盖；
@@ -1111,9 +1262,9 @@ function getGrid(that, tableRef) {
                       that.isPicture(item.extension)
                     );
                     if (items.length > 0) {
-                      resultStr =
-                        "[EXPIMG]" +
-                        items
+                      resultStr
+                        = "[EXPIMG]"
+                        + items
                           .map((item) => {
                             let url = item.large || item.medium;
                             return item.domain + url;
@@ -1131,10 +1282,10 @@ function getGrid(that, tableRef) {
                       )
                     ) {
                       if (
-                        resultStr !== null &&
-                        resultStr !== undefined &&
-                        resultStr !== "" &&
-                        !(resultStr + "").startsWith("[EXPIMG]")
+                        resultStr !== null
+                        && resultStr !== undefined
+                        && resultStr !== ""
+                        && !(resultStr + "").startsWith("[EXPIMG]")
                       ) {
                         resultStr = "[EXPIMG]" + resultStr;
                       }
@@ -1185,13 +1336,13 @@ function getGrid(that, tableRef) {
         let cUUid = encodeURIComponent(row.uuid);
         let ippaaapp = this.ippaaapp;
         let fileName = row.title;
-        let fileUrl =
-          configUtil.baseUrl +
-          this.CURRENT_PREFIX +
-          "/excel/download?uuid=" +
-          cUUid +
-          "&ippaaapp=" +
-          ippaaapp;
+        let fileUrl
+          = configUtil.baseUrl
+          + this.CURRENT_PREFIX
+          + "/excel/download?uuid="
+          + cUUid
+          + "&ippaaapp="
+          + ippaaapp;
 
         function downLoadFile2() {
           let params = {
@@ -1201,8 +1352,8 @@ function getGrid(that, tableRef) {
 
           let form = document.createElement("form");
 
-          let randomNum =
-            new Date().valueOf() + Math.floor(Math.random() * 1000000);
+          let randomNum
+            = new Date().valueOf() + Math.floor(Math.random() * 1000000);
           let formId = "formId-" + randomNum;
           let formName = "formName-" + randomNum;
 
@@ -1287,8 +1438,8 @@ function getGrid(that, tableRef) {
         this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
         let that = this;
         let options = this.option;
-        let title =
-          options.title || this.$t2("导出", "components.excelExport.title");
+        let title
+          = options.title || this.$t2("导出", "components.excelExport.title");
         if (!options.prefix && options.prefix !== "") {
           let originOption = this.tableTarget.params.originOption;
           let path = originOption.exportPath || originOption.path;

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -44,6 +44,7 @@ import i18n from "../../../utils/i18n";
 import fieldMixin from "./fieldMixin";
 import StaticContentWrapper from "./static-content-wrapper.vue";
 import { EXPORT_TYPE } from "../../../../excelExport/exportType";
+import { pickConditionExportOverrides } from "@base/components/excelExport/conditionExportConfig";
 
 export default {
   name: "select-export-item-button-widget",
@@ -101,8 +102,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: this.field.options.exportPageSize || null,
         showImageAtTable: this.field.options.showImageAtTable || null,
+        ...pickConditionExportOverrides(this.field.options),
         // 明细导出的列 / 脚本编码 / 取数参数三项各自独立：按钮上维护了哪项就以哪项为准，
         // 留空的那项沿用数据表格属性上那套。参数脚本原样下发，由数据表格求值（this 是
         // 表格组件，与配在表格属性上时同义）

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -32,6 +32,7 @@ import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+import { pickConditionExportOverrides } from "@base/components/excelExport/conditionExportConfig";
 
 export default {
   name: "table-export-button-widget",
@@ -81,8 +82,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: this.field.options.exportPageSize || null,
         showImageAtTable: this.field.options.showImageAtTable || null,
+        ...pickConditionExportOverrides(this.field.options),
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = { ...opt, ...tableExportParam, type: type };

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/empty-number-input.vue

@@ -0,0 +1,51 @@
+<template>
+  <base-input-number
+    :value="innerValue"
+    v-bind="$attrs"
+    v-on="listeners"
+    @input="onInput"
+  />
+</template>
+
+<script>
+/**
+ * 未配置（null / undefined / 非正数）时显示空白，而不是 el-input-number 默认的 0。
+ * 清空后回写 null，运行时会回落到全局逻辑参数。
+ */
+function toDisplayNumber(value) {
+  if (value == null || value === "") return undefined;
+  let num = Number(value);
+  if (!Number.isFinite(num) || num <= 0) return undefined;
+  return num;
+}
+
+function toStoredNumber(value) {
+  if (value == null || value === "") return null;
+  let num = Number(value);
+  if (!Number.isFinite(num) || num <= 0) return null;
+  return num;
+}
+
+export default {
+  name: "empty-number-input",
+  inheritAttrs: false,
+  props: {
+    value: {},
+  },
+  computed: {
+    innerValue() {
+      return toDisplayNumber(this.value);
+    },
+    listeners() {
+      let listeners = Object.assign({}, this.$listeners);
+      delete listeners.input;
+      return listeners;
+    },
+  },
+  methods: {
+    onInput(val) {
+      this.$emit("input", toStoredNumber(val));
+    },
+  },
+};
+</script>

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -19,10 +19,29 @@
       ></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number
+      <empty-number-input
         v-model="optionModel.exportPageSize"
         :max="optionModel.showImageAtTable ? 150 : 1000"
-      ></base-input-number>
+        :placeholder="'默认 ' + defaultPageSize"
+      ></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.maxQueryTotal"
+        :placeholder="'默认 ' + defaultMaxQueryTotal"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.limitFileSize"
+        :placeholder="'默认 ' + defaultLimitFileSize"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a
@@ -80,12 +99,15 @@
 import i18n from "../../../../utils/i18n";
 import eventMixin from "../event-handler/eventMixin";
 import exportItemColumnsDialog from "../container-data-table/exportItemColumns-dialog.vue";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "select-export-item-button-editor",
   mixins: [i18n, eventMixin],
   components: {
     exportItemColumnsDialog,
+    emptyNumberInput,
   },
   props: {
     designer: Object,
@@ -98,6 +120,9 @@ export default {
       // 与数据表格属性面板同一套：脚本里可直接用 dataId / formCode
       tableConfigParams: ["dataId", "formCode"],
       showExportItemColumnsDialog: false,
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -13,8 +13,23 @@
       <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number v-model="optionModel.exportPageSize"
-                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+      <empty-number-input v-model="optionModel.exportPageSize"
+                          :max="optionModel.showImageAtTable?150:1000"
+                          :placeholder="'默认 ' + defaultPageSize"></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.maxQueryTotal"
+                          :placeholder="'默认 ' + defaultMaxQueryTotal"></empty-number-input>
+      <div class="export-limit-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.limitFileSize"
+                          :placeholder="'默认 ' + defaultLimitFileSize"></empty-number-input>
+      <div class="export-limit-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
@@ -30,10 +45,15 @@
 import i18n from "../../../../../../components/xform/utils/i18n";
 import eventMixin
   from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "table-export-button-editor",
   mixins: [i18n, eventMixin],
+  components: {
+    emptyNumberInput,
+  },
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -42,6 +62,9 @@ export default {
   data() {
     return {
       eventParams: [],
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {
@@ -57,4 +80,11 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.export-limit-tip {
+  line-height: 18px;
+  color: #909399;
+  font-size: 12px;
+  margin-top: 4px;
+}
+</style>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3287,6 +3287,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       tableExportFlag: 1,
 
       onCreated: "",
@@ -3351,6 +3354,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       selectExportItemFlag: 1,
       exportItemConditionEnabled: !1,
       // 按钮级明细导出配置：三项各自独立，留空的那项沿用数据表格属性上维护的

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -2798,7 +2798,9 @@ modules = {
                 if (
                   customParam?.exportParam?.type !== EXPORT_TYPE.ITEM_SELECTED
                 ) {
-                  formData = tableOption.param ? tableOption.param() || {} : {};
+                  formData = customParam?.exportParam?.exportQuerySnapshot !== undefined
+                    ? this.$baseLodash.cloneDeep(customParam.exportParam.exportQuerySnapshot)
+                    : tableOption.param ? tableOption.param() || {} : {};
                 }
                 const queryParams = Object.assign({}, formData);