cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/xform/mixins/defaultHandle.js

@@ -1,10 +1,24 @@
 import moment from "moment";
+import { saveUserLog } from "@base/api/user";
+import settingConfig from "@/settings";
+import { openStartWfDialog } from "../../../components/wf/wfUtil";
+import { getWfButtonNames } from "../../../components/wf/wfButtonName";
+import {
+  isWfAutoConfirm,
+  loadWfAutoConfirm,
+} from "../../../components/wf/wfAutoConfirm";
+import {
+  isWfUserRangeEnabled,
+  loadWfUserRange,
+} from "../../../components/wf/wfUserRange";
 
 let modules = {};
 modules = {
   data() {
     return {
       timerMap: {},
+      formSavePending: false,
+      formSaveReconcileTask: null,
     };
   },
   beforeDestroy() {
@@ -52,7 +66,7 @@ modules = {
       if (!reqFormData) reqFormData = this.getReqFormData();
       return reqFormData.data[entity];
     },
-    getReqFormData() {
+    getReqFormData(formDataOverride) {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;
       let entity = formConfig.entity;
@@ -61,7 +75,11 @@ modules = {
       let reportTemplate = formRef?.reportTemplate;
       let formCode = reportTemplate?.formCode;
 
-      let formData = this.$baseLodash.cloneDeep(formRef.getRealFormData());
+      let sourceFormData
+        = arguments.length > 0
+        ? formDataOverride
+        : formRef.getRealFormData();
+      let formData = this.$baseLodash.cloneDeep(sourceFormData);
       let mainData = formData[formCode] || {};
       delete formData[formCode];
       formData[entity] = mainData;
@@ -73,6 +91,23 @@ modules = {
       delete mainData._createBy;
       delete mainData._modifyBy;
 
+      // 移除对比功能给各子表行加的快照字段 hData，避免提交到后端
+      let stripHData = (obj) => {
+        if (!obj || typeof obj !== "object") return;
+        if (Array.isArray(obj)) {
+          obj.forEach(stripHData);
+          return;
+        }
+        if (Object.prototype.hasOwnProperty.call(obj, "hData")) {
+          delete obj.hData;
+        }
+        Object.keys(obj).forEach((k) => {
+          let v = obj[k];
+          if (v && typeof v === "object") stripHData(v);
+        });
+      };
+      stripHData(formData);
+
       let reqData = {
         formCode: formCode,
         formVersion: reportTemplate.formVersion,
@@ -81,31 +116,188 @@ modules = {
       };
       return reqData;
     },
-    saveDefaultHandle(option) {
+    onAfterSaveHandle(reqData, res, response) {
+      //保存成功后处理
+      this.writeSaveLog(reqData, res, response); //写入保存日志
+    },
+    writeSaveLog(reqData, res, response) {
+      //写入保存日志
+      if (settingConfig.formSaveLogEnabled && res.type === "success") {
+        let responseConfig = response.config || {};
+        let formRef = this.getFormRef ? this.getFormRef() : this;
+        let reportTemplate = formRef ? formRef.reportTemplate : null;
+        if (!reportTemplate) return;
+        let isAdd = !formRef.dataId;
+        let formName = reportTemplate?.formName;
+        let formCode = reportTemplate?.formCode;
+        let action = isAdd ? "新增成功" : "更新成功";
+        let content = `${formName}(${formCode}),${action}`;
+        let path = responseConfig.url.replace(responseConfig.baseURL, "");
+        saveUserLog({
+          data: {
+            path: path,
+            businessCode: content,
+            content: content,
+          },
+        });
+      }
+    },
+    async saveAndSubmitWfHandle(option) {
+      let formRef = this.getFormRef ? this.getFormRef() : this;
+      let formConfig = formRef.formConfig;
+      let reportTemplate = formRef.reportTemplate;
+      let wfParam = formRef.wfParam || {};
+
+      if (!formConfig?.wfEnabled) return;
+      if (
+        formRef.hasWf ||
+        wfParam.hasWf ||
+        wfParam.wfInfo?.procInstId
+      ) {
+        return;
+      }
+
+      // 提示语跟随后台 param18 下发的按钮名；没配就保持原文案不变。
+      // 只能用 $t1(找不到 key 原样返回)，$t2 在 i18n 命中 key 时会把拼进去的名字吞掉。
+      let btnName = getWfButtonNames().saveSubmitBtn;
+      let confirmText =
+        option?.confirmText ||
+        option?.config?.confirmText ||
+        (btnName
+          ? this.$t1(`您确定要${btnName}吗？`)
+          : this.$t1("您确定要保存并提交流程吗？"));
+
+      // param19 + param12 都开：这道「保存前」的确认框不弹，把确认交给 wfStartDialog——
+      // 它在保存之后才探 preStart，探到候选人就由「修改候选人」弹框顶替，探不到才弹确认框。
+      // 任一为 false 都当场弹：param12 关着后面不可能有候选人弹框，延后没有意义。
+      await Promise.all([loadWfAutoConfirm(this), loadWfUserRange(this)]);
+      let autoConfirm = isWfAutoConfirm() && isWfUserRangeEnabled();
+
+      return this.saveDefaultHandle({
+        ...option,
+        config: {
+          ...option?.config,
+          successMsg: option?.config?.successMsg ?? true,
+          isConfirm: option?.config?.isConfirm ?? !autoConfirm,
+          confirmText: option?.config?.confirmText || confirmText,
+          skipHostReloadAfterSave: true,
+          //提交前置处理(与「提交流程」按钮共用同一个表单脚本)
+          beforeConfirm: () =>
+            formRef.runBeforeSubmitWf
+              ? formRef.runBeforeSubmitWf("saveSubmit")
+              : true,
+          success: (res) => {
+            // ★ 保存成功后，只升级新增页签的「元数据」为编辑态（设 dataId/isAdd/formCode/标题），
+            //   不重渲染详情内容。这样即便随后提交失败/取消候选人弹框，页签也已是编辑态，
+            //   再次提交只会更新、不会重复入库；而详情内容的刷新交给最终的提交后行为（避免刷两次）。
+            let editFormCode = formConfig.editFormCode;
+            let listPageRef = formRef.getListPageRef && formRef.getListPageRef();
+            if (listPageRef && listPageRef.promoteActiveAddTab) {
+              listPageRef.promoteActiveAddTab(res.objx, editFormCode, formRef);
+            }
+
+            openStartWfDialog(formRef, {
+              objId: res.objx,
+              wfCode: reportTemplate.objTypeCode,
+              formCode: reportTemplate.formCode,
+              serviceId: reportTemplate.serviceName,
+              // 上面确认过就不再弹第二次；上面因 param19 跳过了，就得让弹框自己去确认
+              skipStartConfirm: !autoConfirm,
+              // 提交后行为复用 xform 侧统一方法：
+              //  成功 → onWfStartSuccess（关页签/刷新本页）；失败/取消 → onWfStartAbort（刷新到编辑态）
+              onStartSuccess: () =>
+                formRef.onWfStartSuccess && formRef.onWfStartSuccess(),
+              onStartFail: () =>
+                formRef.onWfStartAbort && formRef.onWfStartAbort(),
+              onCancel: () => formRef.onWfStartAbort && formRef.onWfStartAbort(),
+            });
+            option?.config?.success && option.config.success(res);
+          },
+        },
+      });
+    },
+    async saveDefaultHandle(option) {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;
       let entity = formConfig.entity;
       if (!entity) return;
-      let dataId = formRef?.dataId;
-      let reportTemplate = formRef?.reportTemplate;
-      let formCode = reportTemplate?.formCode;
       let scriptCode = formConfig.saveScriptCode || "saveUpdate";
-      let config = option?.config;
-      // formRef.clearValidate();
-      // formRef.$forceUpdate();
-      // let formDataModel = formRef.formDataModel;
-
-      formRef.validate((valid) => {
-        if (valid) {
-          let reqData = this.getReqFormData();
-          this.formHttp({
+      let config = { ...(option?.config || {}) };
+      let skipHostReloadAfterSave
+        = config.skipHostReloadAfterSave === true;
+      delete config.skipHostReloadAfterSave;
+      if (typeof formRef.formSaveReconcileTask === "function") {
+        return formRef.formSaveReconcileTask();
+      }
+      if (formRef.formSavePending) {
+        this.$message.warning(this.$t1("数据正在保存，请勿重复操作"));
+        return false;
+      }
+
+      formRef.formSavePending = true;
+      let keepSaveLocked = false;
+      try {
+        let valid = await new Promise((resolve, reject) => {
+          try {
+            formRef.validate(resolve);
+          } catch (error) {
+            reject(error);
+          }
+        });
+        if (!valid) return false;
+
+        // 提交前置处理：校验通过后、确认框之前拦截。只有「保存并提交流程」入口会传，
+        // 普通保存不受影响。返回 false 即中止(finally 里会释放 formSavePending)。
+        let beforeConfirm = config.beforeConfirm;
+        delete config.beforeConfirm; //不能透传给 formHttp
+        if (typeof beforeConfirm === "function") {
+          let pass = await beforeConfirm();
+          if (pass === false) return false;
+        }
+
+        let submitFormData
+          = typeof formRef.buildSubmitPayload === "function"
+          ? await formRef.buildSubmitPayload()
+          : formRef.getRealFormData();
+        let reqData = this.getReqFormData(submitFormData);
+        let shouldConfirm = config.isConfirm ?? true;
+        let confirmText
+          = config.confirmText || this.$t1("您确定要保存吗？");
+        if (shouldConfirm) {
+          try {
+            await this.$baseConfirm(confirmText);
+          } catch (error) {
+            return false;
+          }
+        }
+
+        let userSuccess = config.success;
+        let userFail = config.fail;
+        let userError = config.error;
+        let userCallback = config.callback;
+
+        return await new Promise((resolve, reject) => {
+          let settled = false;
+          let resolveOnce = (value) => {
+            if (settled) return;
+            settled = true;
+            resolve(value);
+          };
+          let rejectOnce = (error) => {
+            if (settled) return;
+            settled = true;
+            reject(error);
+          };
+          let requestTask = this.formHttp({
             // url: "/" + reportTemplate.serviceName + "/form_ins/saveUpdate",
             scriptCode: scriptCode,
             data: reqData,
             successMsg: true,
-            isConfirm: true,
-            confirmText: this.$t1("您确定要保存吗？"),
-            success: (res) => {
+            ...config,
+            isConfirm: false,
+            confirmText,
+            callback: undefined,
+            success: async (res, response) => {
               let editFormCode = formConfig.editFormCode;
               let updateParam = {
                 dataId: res.objx,
@@ -113,15 +305,160 @@ modules = {
               if (editFormCode) {
                 updateParam.formCode = editFormCode;
               }
-
-              formRef.reloadForm({
-                updateParam,
-              });
+              // 保存成功后一律让宿主整页重挂载(toggle v-if):新增/编辑都需要出流程信息、
+              // 切编辑模板、按新状态重算显隐与只读——这些就地取数做不到。
+              // 唯一例外是「保存并提交」路径(skipHostReloadAfterSave=true),
+              // 它的刷新交给流程结束后的 onWfStartSuccess / onWfStartAbort,避免刷两次。
+              //
+              // 刷新前只同步「元数据」,绝不做整单 setFormData:表单已挂载时那是逐字段同步
+              // 广播赋值,每个字段的 onChange 会当场执行,先赋值组件的脚本读到的是后赋值
+              // 组件的旧值,公式与 keyName 联动乱序,子表还会被整体清空(getOne 不返回子表)。
+              // 首屏之所以正确,靠的是「先填满 formDataModel 再挂载组件」,就地整单赋值破坏
+              // 了这个前提,故整单刷新只能走重挂载。
+              let syncSavedMeta = () => {
+                let nextDataId = updateParam.dataId;
+                if (
+                  nextDataId !== undefined
+                  && nextDataId !== null
+                  && nextDataId !== ""
+                ) {
+                  // 提交报文的主表以 currentFormData 打底(见 form-render getSubData2),
+                  // 主键 id 不是表单控件,只能在此回写;否则 skip 路径下再次保存会重复入库。
+                  if (
+                    formRef.currentFormData
+                    && formRef.currentFormData.id == null
+                  ) {
+                    formRef.currentFormData.id = nextDataId;
+                  }
+                  formRef.$emit("update:dataId", nextDataId);
+                }
+                if (updateParam.formCode) {
+                  formRef.$emit("update:formCode", updateParam.formCode);
+                }
+              };
+              let runHostReload = async () => {
+                if (skipHostReloadAfterSave) return;
+                await formRef.reloadForm({ updateParam });
+              };
+              let callbacksStarted = false;
+              let runPostReloadCallbacks = async () => {
+                if (callbacksStarted) return res;
+                callbacksStarted = true;
+                let callbacks = [
+                  () => this.onAfterSaveHandle(reqData, res, response),
+                  typeof userSuccess === "function"
+                    ? () => userSuccess(res)
+                    : null,
+                  typeof option?.callback === "function"
+                    ? () => option.callback(res)
+                    : null,
+                  typeof userCallback === "function"
+                    ? () => userCallback(res, response)
+                    : null,
+                ].filter(Boolean);
+                let hasCallbackError = false;
+                let firstCallbackError;
+                for (let index = 0; index < callbacks.length; index++) {
+                  try {
+                    await callbacks[index]();
+                  } catch (error) {
+                    if (!hasCallbackError) {
+                      hasCallbackError = true;
+                      firstCallbackError = error;
+                    }
+                  }
+                }
+                if (hasCallbackError) {
+                  let detail
+                    = firstCallbackError?.message || firstCallbackError;
+                  let message = this.$t1("已保存，后续处理失败");
+                  this.$message.error(
+                    detail ? `${message}：${detail}` : message
+                  );
+                }
+                return res;
+              };
+              let clearReconcileState = () => {
+                formRef.formSaveReconcileTask = null;
+                formRef.formSavePending = false;
+              };
+              let showHostReloadFailure = (retry, error) => {
+                let detail = error?.message;
+                let message = this.$t1(
+                  retry
+                    ? "重新加载仍未成功，请手动刷新后再操作"
+                    : "保存成功，但重新加载失败，请手动刷新后再操作"
+                );
+                this.$message.error(
+                  detail ? `${message}：${detail}` : message
+                );
+              };
+              let installHostReloadRetry = (error) => {
+                keepSaveLocked = true;
+                let hostRetryPromise = null;
+                formRef.formSaveReconcileTask = () => {
+                  if (hostRetryPromise) return hostRetryPromise;
+                  hostRetryPromise = (async () => {
+                    try {
+                      await runHostReload();
+                      clearReconcileState();
+                      return res;
+                    } catch (retryError) {
+                      showHostReloadFailure(true, retryError);
+                      return false;
+                    } finally {
+                      hostRetryPromise = null;
+                    }
+                  })();
+                  return hostRetryPromise;
+                };
+                showHostReloadFailure(false, error);
+              };
+              syncSavedMeta();
+              await runPostReloadCallbacks();
+              try {
+                await runHostReload();
+              } catch (hostReloadError) {
+                installHostReloadRetry(hostReloadError);
+                rejectOnce(hostReloadError);
+                return;
+              }
+              resolveOnce(res);
+            },
+            fail: (res, response) => {
+              this.onAfterSaveHandle(reqData, res, response);
+              if (typeof option?.callback === "function") {
+                option.callback(res);
+              }
+              if (typeof userCallback === "function") {
+                userCallback(res, response);
+              }
+              Promise.resolve(
+                typeof userFail === "function" ? userFail(res) : null
+              ).then(() => resolveOnce(res), rejectOnce);
+            },
+            error: (error) => {
+              Promise.resolve(
+                typeof userError === "function" ? userError(error) : null
+              ).then(() => rejectOnce(error), rejectOnce);
             },
-            ...config,
           });
+          if (requestTask && typeof requestTask.catch === "function") {
+            requestTask.catch(rejectOnce);
+          }
+        });
+      } catch (error) {
+        if (!keepSaveLocked) {
+          let message
+            = error?.message || error || this.$t1("保存失败");
+          this.$message.error(message);
         }
-      });
+        return false;
+      } finally {
+        if (!keepSaveLocked) {
+          formRef.formSavePending = false;
+        }
+      }
     },
     setInterval(callback, millis) {
       let timer = setInterval(callback, millis);
@@ -325,9 +662,9 @@ modules = {
       seqField = "seq",
       refField = "super_seq"
     ) {
-      // 边界检查
+      // 边界检查（返回结构与正常分支保持一致：list1/list2）
       if (rowIdx < 0 || rowIdx >= masters.length) {
-        return { masters: [...masters], slaves: [...slaves] };
+        return { list1: [...masters], list2: [...slaves] };
       }
 
       // 创建副本

package/src/components/xform/mixins/scriptHttp.js

@@ -1,7 +1,6 @@
-import {initWf} from '../../../components/wf/wfUtil'
-import {getReportGlobalMap} from "../../../components/xform/utils/util";
-import {decrypt} from "@base/utils/aes";
-
+import { initWf } from "../../../components/wf/wfUtil";
+import { getReportGlobalMap } from "../../../components/xform/utils/util";
+import { decrypt } from "@base/utils/aes";
 
 let modules = {};
 modules = {
@@ -14,24 +13,25 @@ modules = {
     handleDecryptData(data) {
       if (data) {
         if (Array.isArray(data)) {
-          data.forEach(item => {
-            this.handleDecryptData(item)
-          })
+          data.forEach((item) => {
+            this.handleDecryptData(item);
+          });
         } else if (Object.prototype.toString.call(data) === "[object Object]") {
-          Object.keys(data).forEach(key => {
-
+          Object.keys(data).forEach((key) => {
             let value = data[key];
             if (value !== null && value !== undefined) {
-              if (Object.prototype.toString.call(data[key]) === "[object String]") {
+              if (
+                Object.prototype.toString.call(data[key]) === "[object String]"
+              ) {
                 let str = "ATEN*-";
                 if (value.startsWith(str)) {
                   data[key] = decrypt(value.slice(str.length));
                 }
               } else {
-                this.handleDecryptData(data[key])
+                this.handleDecryptData(data[key]);
               }
             }
-          })
+          });
         } else if (Object.prototype.toString.call(data) === "[object String]") {
           let str = "ATEN*-";
           if (data.startsWith(str)) {
@@ -54,29 +54,29 @@ modules = {
       let error = opts.error;
 
       let that = this;
-      let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+      let reportTemplate = that.getFormRef
+        ? that.getFormRef().reportTemplate
+        : that.reportTemplate;
       if (scriptCode && !formCode) {
-        let arr = scriptCode.split("/").filter(item => item)
+        let arr = scriptCode.split("/").filter((item) => item);
         if (arr.length > 1) {
           formCode = arr[0];
           scriptCode = arr[1];
         }
       }
       if (!formCode) {
-        formCode = reportTemplate.formCode
+        formCode = reportTemplate.formCode;
       }
 
-      delete opts.data
-      delete opts.scriptCode
-      delete opts.formCode
-      delete opts.isLoading
-      delete opts.success
-      delete opts.fail
-      delete opts.error
-
+      delete opts.data;
+      delete opts.scriptCode;
+      delete opts.formCode;
+      delete opts.isLoading;
+      delete opts.success;
+      delete opts.fail;
+      delete opts.error;
 
       let getServiceName = (callback) => {
-
         if (formCode && formCode !== reportTemplate.formCode) {
           this.getHttpTarget().$http({
             aes: true,
@@ -84,35 +84,34 @@ modules = {
             method: `post`,
             data: {
               formCode,
-              scriptCode
+              scriptCode,
             },
             isLoading,
             // loadingTarget: this.getLoadingTarget(),
             // modalStrictly: true,
-            success: res => {
+            success: (res) => {
               let serviceName = res.objx;
               if (serviceName) {
-                callback(serviceName)
+                callback(serviceName);
               } else {
-                this.$baseAlert("服务名不存在")
+                this.$baseAlert("服务名不存在");
               }
-            }
+            },
           });
         } else {
-          callback(reportTemplate.serviceName)
+          callback(reportTemplate.serviceName);
         }
-
-      }
+      };
       let toDo = () => {
         return new Promise((resolve, reject) => {
-          getServiceName(searviceName => {
+          getServiceName((searviceName) => {
             let reqData;
             reqData = data;
 
             let reportGlobalMap = getReportGlobalMap() || {};
             let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
             return this.getHttpTarget().$http({
-              aes: true,
+              // aes: true,
               url: url,
               method: `post`,
               // loadingTarget: this.getLoadingTarget(),
@@ -121,51 +120,55 @@ modules = {
               data: {
                 // scriptCode: scriptCode,
                 fixeData: reportGlobalMap,
-                ...reqData
+                ...reqData,
               },
-              success: res => {
+              success: (res, response) => {
                 if (res.objx) {
                   res.objx = this.handleDecryptData(res.objx);
                 }
                 if (opts.successMsg) {
                   this.$message({
                     message: res.content,
-                    type: 'success',
-                    duration: 1000
+                    type: "success",
+                    duration: 1000,
                   });
                 }
-                success && success(res);
+                success && success(res, response);
                 if (opts.wfConfig) {
                   let formTarget = this.getFormRef ? this.getFormRef() : this;
                   let wfConfig = opts.wfConfig(res);
                   if (wfConfig) {
                     // let reportTemplate = this.getFormRef ? this.getFormRef().reportTemplate : this.reportTemplate;
-                    let serviceId = wfConfig.serviceId || reportTemplate?.serviceName;
+                    let serviceId =
+                      wfConfig.serviceId || reportTemplate?.serviceName;
                     let opt2 = Object.assign({}, wfConfig, {
-                      serviceId: serviceId
+                      serviceId: serviceId,
                     });
                     //初始化流程
                     /*let target1 = formTarget.$attrs['parent-target'];
                     let target2 = target1?.$attrs['parent-target'];
                     let target = !target2 ? this : target1;*/
                     let target = formTarget;
+                    // 暴露启动流程所需的 option 与上下文,供 detail-item 声明式渲染启动按钮(替代 DOM 强制注入)
+                    target.wfStartOption = opt2;
+                    target.wfStartCtx = target;
                     initWf.call(target, opt2);
                   }
                 }
                 resolve(res);
               },
-              fail: res => {
-                fail && fail(res);
+              fail: (res, response) => {
+                fail && fail(res, response);
                 resolve(res);
               },
-              error: e => {
+              error: (e) => {
                 error && error(e);
                 reject(e);
-              }
+              },
             });
-          })
-        })
-      }
+          });
+        });
+      };
       if (opts.isConfirm) {
         this.$baseConfirm(opts.confirmText).then(() => {
           return toDo();
@@ -173,7 +176,7 @@ modules = {
       } else {
         return toDo();
       }
-    }
-  }
-}
+    },
+  },
+};
 export default modules;