cloud-web-corejs 1.1.0-dev.17 → 1.1.0-dev.18

package/package.json

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

package/src/components/errorMsg/index.vue

@@ -6,7 +6,7 @@
       v-if="showWrap"
       :close-on-click-modal="false"
       width="501px"
-      custom-class="dialog-style tips-dialog error"
+      custom-class="dialog-style tips-dialog error "
       :append-to-body="true"
       :modal="false"
       @close="closeDialog"
@@ -39,7 +39,7 @@
     </el-dialog>
   </div>
   <div v-else-if="showWrap">
-    <div class="pop-tipsBox error" :style="'display: block;z-index:' + zIndex">
+    <div class="pop-tipsBox error h5-pop-tips" :style="'display: block;z-index:' + zIndex">
       <div>
         <i class="icon"></i>
         <div class="cont">

package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue

@@ -91,7 +91,9 @@
         </div>
         <div v-show="!importLoading" class="import-box" style="margin-bottom: 30px;">
           <div class="tips">
-            {{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
+          {{ backendValidating
+            ? $t1('后台校验中，请勿关闭当前窗口')
+            : $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
             <!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
           </div>
           <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
@@ -116,11 +118,14 @@
           /
           <span class="dataSize">{{ dataSize }}</span>
         </div>
-        <el-button type="primary" plain class="button-sty" @click="dialogClose2" v-if="!param.importOption.hideCancelButton">
+        <el-button type="primary" plain class="button-sty" @click="dialogClose2"
+                   :disabled="backendValidating"
+                   v-if="!param.importOption.hideCancelButton">
           <i class="el-icon-close el-icon"></i>
           {{ $t2('取 消', 'system.button.cancel2') }}
         </el-button>
-        <el-button type="primary" class="button-sty" @click="dialogPrimary2">
+        <el-button type="primary" class="button-sty" @click="dialogPrimary2"
+                   :disabled="backendValidating">
           <i class="el-icon-check el-icon"></i>
           {{ $t2('确 定', 'system.button.confirm2') }}
         </el-button>

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -34,6 +34,13 @@ const IMPORT_META_FIELDS = [
   "_resultType",
   "_resultContent",
 ];
+// 后台校验回包里的协议字段，合并补数时不能盖掉原行的序号
+const BACKEND_VALIDATE_SKIP_FIELDS = [
+  "impSeq",
+  "impNumber",
+  "impReturnType",
+  "impReturnMsg",
+];
 // 一格里填多个附件的分隔符，与 attachmentValueUtil 的 URL_SEPARATOR_REG 同口径
 const IMPORT_ATTACH_SEPARATOR_REG = /[,\n\r]+/;
 // 可用的附件地址：带协议（或协议相对）的绝对 URL，或以 / 开头的存储路径
@@ -75,6 +82,7 @@ tmixins = {
       urlAttachFields: {},
       importLoading: false,
       loadingTitle: null,
+      backendValidating: false,
 
       percent1: 0,
       percent2: 0,
@@ -347,6 +355,12 @@ tmixins = {
       return;
     },
     handleBeforeClose(hide) {
+      if (this.backendValidating) {
+        this.isEnd = true;
+        this.backendValidating = false;
+        hide();
+        return;
+      }
       this.option.onCancel &&
         this.option.onCancel(this.getCallbackData(), this.fileRaw);
       let importOption = this.option.importOption;
@@ -359,6 +373,7 @@ tmixins = {
       hide();
     },
     dialogClose2() {
+      if (this.backendValidating) return;
       this.showImportDialog2 = false;
       this.option.onBeforeCancel &&
         this.option.onBeforeCancel(this.getCallbackData(), this.fileRaw);
@@ -371,6 +386,7 @@ tmixins = {
       this.handleTableCallback();
     },
     handleClose2() {
+      this.backendValidating = false;
       this.clearImportTimer();
       this.showImportDialog2 = false;
       this.showContent = false;
@@ -381,6 +397,7 @@ tmixins = {
       this.dialogClose1();
     },
     dialogPrimary2() {
+      if (this.backendValidating) return;
       let importOption = this.option.importOption;
       this.showImportDialog2 = false;
       this.option.onBeforeConfirm &&
@@ -1001,18 +1018,23 @@ tmixins = {
      * 与 syncDataForImport 的分工：后端通道有"批量"与"唯一键分组"两种发包形态，
      * 一步推进的行数不固定，循环仍留在那边；这里只服务"一行一步"的前端通道。
      *
-     * @param {Object} opts { rows, handler, onFinish }
+     * @param {Object} opts { rows, handler, onFinish, progress, deferFinish }
+     *   progress     复用已有记账（后台校验后的第二段不能清掉前台失败行）
+     *   deferFinish  第一段只收集通过行时不收尾，等后台回来再 finish
      */
     runImportRows(opts) {
       let that = this;
       let rows = opts.rows || [];
       let handler = opts.handler;
       let size = rows.length;
-      let progress = this.createImportProgress(size);
+      let progress = opts.progress || this.createImportProgress(size);
+      this.importProgress = progress;
       let index = 0;
       let finish = () => {
-        progress.setPercent(100);
-        progress.finish();
+        if (!opts.deferFinish) {
+          progress.setPercent(100);
+          progress.finish();
+        }
         opts.onFinish && opts.onFinish(that.getCallbackData());
       };
       let step = () => {
@@ -1022,18 +1044,23 @@ tmixins = {
           return;
         }
         let row = rows[index];
-        row.impSeq = index;
-        row.impNumber = index + 4;
+        // 第二段（后台补数后入表）行上已有 Excel 序号，不能按子集下标重写
+        if (row.impSeq == null) {
+          row.impSeq = index;
+          row.impNumber = index + 4;
+        }
         let settled = false;
         let done = (result) => {
           // handler 重复调 done 不能把进度推两格
           if (settled) return;
           settled = true;
           // done() 不传参直接算成功；只有显式 success:false 才记失败
+          // done({ defer: true }) 只推进、不记账——前台校验通过、等后台结果时用
           let failed = !!(result && result.success === false);
+          let deferred = !!(result && result.defer);
           if (failed) {
             progress.markError(row, result.message);
-          } else {
+          } else if (!deferred) {
             progress.markSuccess(row, result && result.message);
           }
           index = index + 1;
@@ -1341,6 +1368,7 @@ tmixins = {
     },
     /** 导入无法继续时的统一收口：停循环、停计时器、给一次明确提示、关掉进度框。 */
     handleImportAbort(message) {
+      this.backendValidating = false;
       this.isEnd = true;
       this.clearImportTimer();
       this.$baseAlert(message);
@@ -1562,23 +1590,72 @@ tmixins = {
     },
 
     /**
-     * 前端通道的逐行执行：校验 → 逐行处理 → 通过的行一次性入表。
-     * 从 startFrontImport 里拆出来，好让内嵌图片三段式插在它前面。
+     * 前端通道的逐行执行。
+     * 默认：校验 → 逐行处理 → 通过的行一次性入表。
+     * 开了后台校验：先收集前台通过行（失败立刻记账），整批一次 formHttp，
+     * 按 impSeq 合并补数后再走入表 / 逐行脚本（不再重复前台校验）。
      * @param {Object} resultData readExcel 的解析信封。
      */
     runFrontImportRows(resultData) {
       let that = this;
-      let importOption = this.option.importOption;
-      let rows = resultData?.data || [];
+      let importOption = this.option.importOption || {};
+      if (importOption.backendValidateEnabled) {
+        if (!importOption.importScriptCode) {
+          this.handleImportAbort(
+            this.$t1("后台校验脚本编码（importScriptCode）未配置，无法校验")
+          );
+          return;
+        }
+        let passedRows = [];
+        this.runImportRows({
+          rows: resultData?.data || [],
+          deferFinish: true,
+          handler: (row, index, done) => {
+            let errorInfo = that.validateImportRow(row, index, {
+              data: resultData,
+            });
+            if (errorInfo) {
+              done({ success: false, message: errorInfo });
+              return;
+            }
+            passedRows.push(row);
+            done({ defer: true });
+          },
+          onFinish: () => {
+            that.requestBackendValidate(resultData, passedRows);
+          },
+        });
+        return;
+      }
+      this.applyFrontImportRows(resultData, resultData?.data || [], {});
+    },
+
+    /**
+     * 入表 / 逐行脚本。skipValidate 时不再跑前台校验（后台那步已经滤过）。
+     * @param {Object} resultData readExcel 的解析信封。
+     * @param {Array} rows 待处理行。
+     * @param {Object} opts { skipValidate, progress }
+     */
+    applyFrontImportRows(resultData, rows, opts) {
+      let that = this;
+      let importOption = this.option.importOption || {};
       let isScriptMode = importOption.importMode === "script";
+      let skipValidate = !!(opts && opts.skipValidate);
       let passedRows = [];
       this.runImportRows({
-        rows: rows,
+        rows: rows || [],
+        progress: opts && opts.progress,
         handler: (row, index, done) => {
-          let errorInfo = that.validateImportRow(row, index, { data: resultData });
-          if (errorInfo) {
-            done({ success: false, message: errorInfo });
-            return;
+          // 后台补数后只跑通过的子集，循环下标会从 0 重计；脚本要用 Excel 行序
+          let rowIndex = row.impSeq != null ? row.impSeq : index;
+          if (!skipValidate) {
+            let errorInfo = that.validateImportRow(row, rowIndex, {
+              data: resultData,
+            });
+            if (errorInfo) {
+              done({ success: false, message: errorInfo });
+              return;
+            }
           }
           if (isScriptMode) {
             // 逐行脚本模式：脚本只写"这一行怎么处理"，循环/让步/进度归壳管。
@@ -1592,7 +1669,7 @@ tmixins = {
               .handleCustomEvent(
                 importOption.onImportRow,
                 ["row", "index", "done"],
-                [row, index, done]
+                [row, rowIndex, done]
               );
             return;
           }
@@ -1618,6 +1695,151 @@ tmixins = {
       });
     },
 
+    /** 当前表单的 formCode / formVersion；formImport 通道没有 getReportTemplate，改从配置取。 */
+    getImportFormMeta() {
+      let importOption = this.option.importOption || {};
+      let reportTemplate =
+        typeof this.getReportTemplate === "function"
+          ? this.getReportTemplate()
+          : null;
+      return {
+        formCode: reportTemplate?.formCode || importOption.formCode,
+        formVersion: reportTemplate?.formVersion,
+      };
+    },
+
+    /** onImportParams 整批一次，非对象则当 {}。 */
+    getBackendValidateParams(resultData) {
+      let importOption = this.option.importOption || {};
+      if (!importOption.onImportParams) return {};
+      let result = this.getFieldTarget().handleCustomEvent(
+        importOption.onImportParams,
+        ["resultData", "file"],
+        [resultData, this.fileRaw]
+      );
+      if (!result || typeof result !== "object" || Array.isArray(result)) {
+        return {};
+      }
+      return result;
+    },
+
+    /** 送给后台的行：剥掉进度记账字段，保留 impSeq / impNumber 供回包对位。 */
+    buildBackendValidatePayloadRows(rows) {
+      return (rows || []).map((row) => {
+        let item = this.stripImportMeta(row);
+        item.impSeq = row.impSeq;
+        item.impNumber = row.impNumber;
+        return item;
+      });
+    },
+
+    mergeBackendValidateRow(row, item) {
+      if (!item) return;
+      Object.keys(item).forEach((key) => {
+        if (BACKEND_VALIDATE_SKIP_FIELDS.indexOf(key) >= 0) return;
+        row[key] = item[key];
+      });
+    },
+
+    /**
+     * 按 impSeq 把后台逐行结果合并进原行。
+     * 没返回的行、impReturnType=error 的行记失败，不入后续入表。
+     */
+    applyBackendValidateResult(passedRows, objx) {
+      let progress = this.importProgress;
+      let list = Array.isArray(objx) ? objx : [];
+      let map = {};
+      list.forEach((item) => {
+        if (item && item.impSeq != null) map[item.impSeq] = item;
+      });
+      let enriched = [];
+      (passedRows || []).forEach((row) => {
+        let item = map[row.impSeq];
+        if (!item) {
+          progress.markError(row, this.$t1("后台未返回该行结果"));
+          return;
+        }
+        if (item.impReturnType === "error") {
+          progress.markError(
+            row,
+            item.impReturnMsg || this.$t1("数据校验未通过")
+          );
+          return;
+        }
+        this.mergeBackendValidateRow(row, item);
+        enriched.push(row);
+      });
+      return enriched;
+    },
+
+    /**
+     * 前台通过的行整批一次送给后台校验 + 补数。
+     * 不要求 importEntity、不套附件信封；data 就是行数组，params 来自 onImportParams。
+     */
+    requestBackendValidate(resultData, passedRows) {
+      let that = this;
+      let finishProgress = () => {
+        that.backendValidating = false;
+        if (that.importProgress) that.importProgress.finish();
+      };
+      if (!passedRows || !passedRows.length) {
+        finishProgress();
+        return;
+      }
+      let importOption = this.option.importOption || {};
+      let scriptCode = importOption.importScriptCode;
+      if (!scriptCode) {
+        this.handleImportAbort(
+          this.$t1("后台校验脚本编码（importScriptCode）未配置，无法校验")
+        );
+        return;
+      }
+      let formMeta = this.getImportFormMeta();
+      let params;
+      try {
+        params = this.getBackendValidateParams(resultData);
+      } catch (et) {
+        console.error(et);
+        this.handleImportAbort(this.$t1("请求额外参数脚本异常"));
+        return;
+      }
+      this.backendValidating = true;
+      this.formHttp({
+        scriptCode: scriptCode,
+        data: {
+          formCode: formMeta.formCode,
+          formVersion: formMeta.formVersion,
+          data: this.buildBackendValidatePayloadRows(passedRows),
+          params: params,
+        },
+        modal: false,
+        failMsg: false,
+        callback: (resultMsg) => {
+          that.backendValidating = false;
+          if (that.isEnd || !that.showContent) return;
+          if (!resultMsg || resultMsg.type !== "success") {
+            that.handleImportAbort(
+              (resultMsg && resultMsg.content) || that.$t1("后台校验失败")
+            );
+            return;
+          }
+          let enriched = that.applyBackendValidateResult(
+            passedRows,
+            resultMsg.objx
+          );
+          that.applyFrontImportRows(resultData, enriched, {
+            skipValidate: true,
+            progress: that.importProgress,
+          });
+        },
+        error: (et) => {
+          that.backendValidating = false;
+          console.error(et);
+          that.handleImportAbort(that.$t1("后台校验失败"));
+        },
+      });
+    },
+
     //begin
     fileParse(file, type = "base64", callback) {
       let fileRead = new FileReader();

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

@@ -54,6 +54,47 @@
         <el-option label="逐行脚本处理" value="script"></el-option>
       </el-select>
     </el-form-item>
+    <el-form-item
+      label="启用后台校验"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog"
+    >
+      <el-switch v-model="optionModel.backendValidateEnabled"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          打开后，前台校验通过的行整批一次送给后台脚本：校验并补字段。<br/>
+          通过的行再按「每行处理方式」入表或走逐行脚本。<br/>
+          失败行进结果表，不入表格。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item
+      label="执行后台脚本编码"
+      class="form-item-label-top el-form-item-second"
+      v-if="optionModel.showProgressDialog && optionModel.backendValidateEnabled"
+    >
+      <el-input v-model="optionModel.importScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item
+      label="请求额外参数脚本"
+      label-width="150px"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog && optionModel.backendValidateEnabled"
+    >
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onImportParams', onImportParamsParams)">
+        <span>{{ optionModel.onImportParams }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          发请求前整批跑一次，返回对象作为 params。<br/>
+          不要在脚本里自己发请求。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
     <el-form-item
       label="启用图片处理"
       class="el-form-item-second"
@@ -86,6 +127,8 @@
         <div slot="content">
           每行调一次，必须调 done：done() 表示成功；<br/>
           done({success:false, message:"未匹配到编码"}) 表示失败。<br/>
+          若启用了后台校验，row 已含后台补数字段。<br/>
+          更新：this.getWidgetRef(表格名) 比对后改现有行；插入可 addTableData([row])。<br/>
           循环、让步与进度由组件负责，脚本里不要自己写整趟 for。
         </div>
         <i class="el-icon-question label-tip-icon"></i>
@@ -158,7 +201,8 @@ export default {
       onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
       onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file'],
       onImportRowParams: ["dataId", "formCode", "row", "index", "done"],
-      onValidateRowParams: ["dataId", "formCode", "row", "index"]
+      onValidateRowParams: ["dataId", "formCode", "row", "index"],
+      onImportParamsParams: ["dataId", "formCode", "resultData", "file"]
     };
   },
   methods: {

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

@@ -3507,6 +3507,10 @@ export const advancedFields = [
       showProgressDialog: false,
       // 进度框形态下每行怎么处理："table" 塞入关联表格；"script" 交给 onImportRow 逐行脚本
       importMode: "table",
+      // 前台校验通过后，整批一次送给后台校验并补字段；默认关＝不发请求
+      backendValidateEnabled: false,
+      importScriptCode: "",
+      onImportParams: "",
       // 内嵌图片三段式：把 Excel 里贴的图取回来填进 attachments_ 列。
       // 依赖进度框，仅在 showProgressDialog 打开时生效
       enabledImportPreHandle: false,