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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.20",
+  "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>