cloud-web-corejs 1.0.54-dev.781 → 1.0.54-dev.783

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

@@ -8,6 +8,8 @@ modules = {
   data() {
     return {
       timerMap: {},
+      formSavePending: false,
+      formSaveReconcileTask: null,
     };
   },
   beforeDestroy() {
@@ -55,7 +57,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;
@@ -64,7 +66,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;
@@ -147,13 +153,14 @@ modules = {
         option?.config?.confirmText ||
         this.$t1("您确定要保存并提交流程吗？");
 
-      this.saveDefaultHandle({
+      return this.saveDefaultHandle({
         ...option,
         config: {
           ...option?.config,
           successMsg: option?.config?.successMsg ?? true,
           isConfirm: option?.config?.isConfirm ?? true,
           confirmText: option?.config?.confirmText || confirmText,
+          skipHostReloadAfterSave: true,
           success: (res) => {
             // ★ 保存成功后，只升级新增页签的「元数据」为编辑态（设 dataId/isAdd/formCode/标题），
             //   不重渲染详情内容。这样即便随后提交失败/取消候选人弹框，页签也已是编辑态，
@@ -183,35 +190,79 @@ modules = {
         },
       });
     },
-    saveDefaultHandle(option) {
+    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();
-          let callback = (res, response) => {
-            this.onAfterSaveHandle(reqData, res, response); //保存成功后处理
-            option?.callback && option.callback(res); //回调
+      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;
+
+        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);
           };
-          this.formHttp({
+          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,
@@ -219,16 +270,171 @@ modules = {
               if (editFormCode) {
                 updateParam.formCode = editFormCode;
               }
+              let reloadMethod
+                = typeof formRef.reloadSavedFormData === "function"
+                ? formRef.reloadSavedFormData
+                : formRef.reloadForm;
+              let runHostReload = async () => {
+                let currentFormCode = formRef.reportTemplate?.formCode;
+                if (
+                  skipHostReloadAfterSave
+                  || !editFormCode
+                  || editFormCode === currentFormCode
+                ) {
+                  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);
+              };
+              try {
+                await reloadMethod.call(formRef, { updateParam });
+              } catch (error) {
+                keepSaveLocked = true;
+                let retryPromise = null;
+                formRef.formSaveReconcileTask = () => {
+                  if (retryPromise) return retryPromise;
+                  retryPromise = (async () => {
+                    try {
+                      await reloadMethod.call(formRef, { updateParam });
+                    } catch (retryError) {
+                      showHostReloadFailure(true, retryError);
+                      retryPromise = null;
+                      return false;
+                    }
+                    let result = await runPostReloadCallbacks();
+                    try {
+                      await runHostReload();
+                    } catch (hostReloadError) {
+                      installHostReloadRetry(hostReloadError);
+                      return false;
+                    }
+                    clearReconcileState();
+                    return result;
+                  })();
+                  return retryPromise;
+                };
+                showHostReloadFailure(false, error);
+                rejectOnce(error);
+                return;
+              }
 
-              formRef.reloadForm({
-                updateParam,
-              });
+              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,
-            callback: callback,
           });
+          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);

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

@@ -122,7 +122,7 @@ modules = {
                 fixeData: reportGlobalMap,
                 ...reqData,
               },
-              success: (res) => {
+              success: (res, response) => {
                 if (res.objx) {
                   res.objx = this.handleDecryptData(res.objx);
                 }
@@ -133,7 +133,7 @@ modules = {
                     duration: 1000,
                   });
                 }
-                success && success(res);
+                success && success(res, response);
                 if (opts.wfConfig) {
                   let formTarget = this.getFormRef ? this.getFormRef() : this;
                   let wfConfig = opts.wfConfig(res);
@@ -157,8 +157,8 @@ modules = {
                 }
                 resolve(res);
               },
-              fail: (res) => {
-                fail && fail(res);
+              fail: (res, response) => {
+                fail && fail(res, response);
                 resolve(res);
               },
               error: (e) => {