cloud-web-corejs 1.0.54-dev.434 → 1.0.54-dev.436

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

@@ -180,7 +180,7 @@ import {
 } from "@base/components/xform/utils/formula-util";
 
 export default {
-  name: "formula-editor",
+  name: "formula-editor2",
   mixins: [i18n],
   components: {},
   props: {

package/src/components/xform/form-render/indexMixin.js

@@ -1117,6 +1117,50 @@ modules = {
 
       return hasModifyItem;
     },
+    loadFormData(options) {
+      let config = options.config || {}
+      let that = this;
+      let formConfig = this.formConfig;
+      let entity = formConfig.entity;
+      let dataId = this.dataId;
+      let reportTemplate = this.reportTemplate;
+      let scriptCode = formConfig.formScriptCode || "getOne";
+
+      let formData = {};
+      if (scriptCode) {
+        let formCode = reportTemplate.formCode;
+
+        let formScriptParam = this.handleCustomEvent(
+          this.formConfig.formScriptParam
+        );
+
+        let defaultOption = {
+          addCreateInfo: true,
+          queryCreateInfo:
+            window.$vueRoot.$store.getters.queryCreateInfo || "0",
+        };
+        return this.formHttp({
+          // url: "/" + reportTemplate.serviceName + "/form_ins/getOne",
+          scriptCode: scriptCode,
+          data: {
+            formCode: formCode,
+            formVersion: reportTemplate.formVersion,
+            taBm: entity,
+            data: {
+              id: dataId,
+              ...formScriptParam,
+            },
+          },
+          ...defaultOption,
+          success: (res) => {
+            formData = res.objx || {};
+            this.setFormData(formData);
+            options.callback && options.callback(formData);
+          },
+          ...config,
+        });
+      }
+    },
     loadDefaultEntityData(callback) {
       let that = this;
       let formConfig = this.formConfig;
@@ -1132,8 +1176,8 @@ modules = {
       if (entity && dataId && scriptCode) {
         let formCode = reportTemplate.formCode;
         let otherParam = {};
-        let wfCode = reportTemplate.objTypeCode;
         if (wfEnabled) {
+          let wfCode = reportTemplate.objTypeCode;
           wfConfig = (res) => {
             let wfConfig1 = null;
             let callback1 = null;
@@ -1243,44 +1287,24 @@ modules = {
             return resOption;
           };
         }
-
-        let formScriptParam = this.handleCustomEvent(
-          this.formConfig.formScriptParam
-        );
-
-        let defaultOption = {
-          addCreateInfo: true,
-          queryCreateInfo:
-            window.$vueRoot.$store.getters.queryCreateInfo || "0",
-        };
-        return this.formHttp({
-          // url: "/" + reportTemplate.serviceName + "/form_ins/getOne",
-          scriptCode: scriptCode,
-          data: {
-            formCode: formCode,
-            formVersion: reportTemplate.formVersion,
-            taBm: entity,
-            data: {
-              id: dataId,
-              ...formScriptParam,
-            },
-          },
-          ...defaultOption,
-          sync: false,
-          wfConfig,
-          success: (res) => {
-            formData = res.objx || {};
-            // this.currentFormData = res.objx || {};
-            if (!wfConfig) {
-              this.hanldeCommonWidget2(); //处理组件显隐，可编辑
-              this.setFormData(formData);
-              this.showFormContent = true;
-              this.$nextTick(() => {
-                this.handleShowHideRule();
-                callback && callback();
-              });
+        return this.loadFormData({
+          config:{
+            sync: false,
+            wfConfig,
+            success: (res) => {
+              formData = res.objx || {};
+              // this.currentFormData = res.objx || {};
+              if (!wfConfig) {
+                this.hanldeCommonWidget2(); //处理组件显隐，可编辑
+                this.setFormData(formData);
+                this.showFormContent = true;
+                this.$nextTick(() => {
+                  this.handleShowHideRule();
+                  callback && callback();
+                });
+              }
             }
-          },
+          }
         });
       } else {
         this.hanldeCommonWidget2(); //处理组件显隐，可编辑
@@ -1816,9 +1840,9 @@ modules = {
             foundW.widget.type === "grid-sub-form"
           ) {
             foundW.disableGridSubForm();
-          }else if (!!foundW.widget && foundW.widget.type === "data-table") {
+          } else if (!!foundW.widget && foundW.widget.type === "data-table") {
             foundW.disableGridForm();
-          }  else {
+          } else {
             !!foundW.setDisabled && foundW.setDisabled(true);
           }
         }
@@ -1840,7 +1864,7 @@ modules = {
             foundW.widget.type === "grid-sub-form"
           ) {
             foundW.enableGridSubForm();
-          }else if (!!foundW.widget && foundW.widget.type === "data-table") {
+          } else if (!!foundW.widget && foundW.widget.type === "data-table") {
             foundW.enableGridForm();
           } else {
             !!foundW.setDisabled && foundW.setDisabled(false);
@@ -2772,7 +2796,7 @@ modules = {
       this.showFormDialog = true;
     },
     closeFormDialog() {
-      if(this.showFormDialog){
+      if (this.showFormDialog) {
         this.$refs.formDialog.close();
       }
     },