cloud-web-corejs 1.0.54-dev.509 → 1.0.54-dev.510

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

@@ -212,7 +212,7 @@ modules = {
       formulaDialogVisible: false,
       baseFormulaDialogOption: null,
       baseFormulaDialogVisible: false,
-      globalConfig: {}
+      globalConfig: {},
     };
   },
   computed: {
@@ -257,41 +257,43 @@ modules = {
   watch: {
     //
   },
-  async created() {
+  created() {
     this.registerFormToRefList();
     this.currentFormData = this.formData;
-    let formConfig = this.formConfig;
-    await this.initUserInfo();
-    await this.initSaleOrgData();
-    await this.initUserRoleData();
-    await this.initBdService();
-    // this.handleAllTableColumnWidget();
-    this.initGlobalConfig();//初始化全局配置
+
+    this.initGlobalConfig(); //初始化全局配置
     this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
-    // this.hanldeCommonWidget();//处理组件显隐规则
-    if (formConfig.isLoadEntity) {
-      await this.loadDefaultEntityData(() => {
-        this.handleCustomEvent(formConfig.formScriptSuccess);
-      });
-    } else {
-      this.hanldeCommonWidget2(); //处理组件显隐，可编辑
-      this.handleShowContent();
-    }
-    this.handleOnCreated(),
-      // this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
-      this.initFormObject();
+
+    // this.handleOnCreated(),
+    this.initFormObject();
   },
   mounted() {
     this.initLocale();
-    this.handleOnMounted();
+    this.initBaseUserInfo().then(() => {
+      let formConfig = this.formConfig;
+      if (formConfig.isLoadEntity) {
+        this.loadDefaultEntityData(() => {
+          this.handleCustomEvent(formConfig.formScriptSuccess);
+        });
+      } else {
+        this.hanldeCommonWidget2(); //处理组件显隐，可编辑
+        this.handleShowContent();
+      }
+    });
   },
   methods: {
-    initGlobalConfig(){
+    initBaseUserInfo() {
+      return Promise.all([
+        this.initUserInfo(),
+        this.initSaleOrgData(),
+        this.initUserRoleData(),
+        this.initBdService(),
+      ]);
+    },
+    initGlobalConfig() {
       //初始化全局配置
-      this.globalConfig = this.handleCustomEvent(
-        this.formConfig.globalConfig
-      ) || {};
-
+      this.globalConfig =
+        this.handleCustomEvent(this.formConfig.globalConfig) || {};
     },
     /**
      * 数据对象key 驼峰下划线相互转化
@@ -458,10 +460,24 @@ modules = {
     },
     handleShowContent(callback) {
       // this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
-      this.showFormContent = true;
-      this.$nextTick(() => {
-        this.handleShowHideRule();
-        callback && callback();
+      this.handleBeforeMounted().then(()=>{
+        this.showFormContent = true;
+        this.$nextTick(() => {
+          this.handleOnMounted();
+          this.handleShowHideRule();
+          callback && callback();
+        });
+      });
+    },
+    handleBeforeMounted() {
+      return new Promise((resolve) => {
+        if(this.formConfig?.onFormBeforeMounted){
+          if(this.handleCustomEvent(this.formConfig?.onFormBeforeMounted,['done'],[resolve]) !== false){
+            resolve();
+          }
+        }else{
+          resolve();
+        }
       });
     },
     hasConfig(widget, configName) {
@@ -527,7 +543,8 @@ modules = {
       )
         return;
       let columnLoopDo = (t, e) => {
-        if(t.filterable===null || t.filterable===undefined) t.filterable = true;
+        if (t.filterable === null || t.filterable === undefined)
+          t.filterable = true;
         if (t.children && t.children.length) {
           for (let item of t.children) {
             columnLoopDo(item);
@@ -1128,7 +1145,7 @@ modules = {
       return hasModifyItem;
     },
     loadFormData(options) {
-      let config = options.config || {}
+      let config = options.config || {};
       let that = this;
       let formConfig = this.formConfig;
       let entity = formConfig.entity;
@@ -1223,18 +1240,24 @@ modules = {
                 }*/
                 this.hanldeCommonWidget2(); //处理组件显隐，可编辑
 
-                this.showFormContent = true;
-                this.$nextTick(() => {
-                  this.handleShowHideRule();
-                  /*if (hasWf) {
 
-                  }*/
+                this.handleShowContent(()=>{
                   setTimeout(() => {
                     callback && callback();
                     callback1 && callback1(wfParam);
                   }, 1000);
                   wfParam.done();
                 });
+
+                /* this.showFormContent = true;
+                this.$nextTick(() => {
+                  this.handleShowHideRule();
+                  setTimeout(() => {
+                    callback && callback();
+                    callback1 && callback1(wfParam);
+                  }, 1000);
+                  wfParam.done();
+                }); */
               },
             };
             if (formConfig.wfStartBindSave) {
@@ -1299,7 +1322,7 @@ modules = {
           };
         }
         return this.loadFormData({
-          config:{
+          config: {
             sync: false,
             wfConfig,
             success: (res) => {
@@ -1308,14 +1331,16 @@ modules = {
               if (!wfConfig) {
                 this.hanldeCommonWidget2(); //处理组件显隐，可编辑
                 this.setFormData(formData);
-                this.showFormContent = true;
+
+                this.handleShowContent(callback);
+                /* this.showFormContent = true;
                 this.$nextTick(() => {
                   this.handleShowHideRule();
                   callback && callback();
-                });
+                }); */
               }
-            }
-          }
+            },
+          },
         });
       } else {
         this.hanldeCommonWidget2(); //处理组件显隐，可编辑
@@ -1367,7 +1392,7 @@ modules = {
         this.addFieldChangeEventHandler(),
         this.addFieldValidateEventHandler(),
         this.registerFormToRefList(),
-        // this.handleOnCreated(),
+        this.handleOnCreated(),
         this.disabledMode &&
           this.$nextTick(function () {
             e.disableForm();
@@ -2471,10 +2496,10 @@ modules = {
       }
       return realFormData;
     },
-    closeDetailPage(){
+    closeDetailPage() {
       //关闭详情页
       let listPageRef = this.getListPageRef();
-      if(listPageRef){
+      if (listPageRef) {
         listPageRef.dataId = 0;
         listPageRef.showEdit = false;
       }
@@ -2491,28 +2516,31 @@ modules = {
       let listTabFormRef = parentTarget?.$refs?.list?.$refs?.vFormRef ?? null;
       return listTabFormRef;
     },
-    getFirstWidgetRef(){
+    getFirstWidgetRef() {
       //获取表单的第一个组件
       let target = null;
-      if(this.formJsonObj.widgetList && this.formJsonObj.widgetList.length > 0){
+      if (
+        this.formJsonObj.widgetList &&
+        this.formJsonObj.widgetList.length > 0
+      ) {
         target = this.getWidgetRef(this.formJsonObj.widgetList[0].options.name);
       }
-      return target
+      return target;
     },
-    switchToListTab(option){
+    switchToListTab(option) {
       //切换到列表页的tab
       let handleType = option?.handleType;
       let listPageRef = this.getListPageRef();
-      if(listPageRef){
+      if (listPageRef) {
         listPageRef.activeName = "second";
       }
-      if(handleType){
+      if (handleType) {
         let listTabFormRef = this.getListTabFormRef();
-        if(handleType == "reload"){
+        if (handleType == "reload") {
           listTabFormRef.reloadForm();
-        }else if(handleType == "searchEvent"){
+        } else if (handleType == "searchEvent") {
           listTabFormRef.getFirstWidgetRef().searchEvent();
-        }else if(handleType == "resethEvent"){
+        } else if (handleType == "resethEvent") {
           listTabFormRef.getFirstWidgetRef().resethEvent();
         }
       }

package/src/components/xform/utils/util.js

@@ -810,6 +810,7 @@ export function getDefaultFormConfig() {
     dataSources: [],
     onBeforeCreated: "",
     onFormCreated: "",
+    onFormBeforeMounted: "",
     onFormMounted: "",
     onFormDataChange: "",
     gridConfig: {
@@ -875,7 +876,7 @@ export function buildDefaultFormJson() {
 export function cloneFormConfigWithoutEventHandler(e) {
   var t = deepClone(e);
   return (
-    (t.onFormCreated = ""), (t.onFormMounted = ""), (t.onFormDataChange = ""), t
+    (t.onFormCreated = ""), (t.onFormBeforeMounted = ""), (t.onFormMounted = ""), (t.onFormDataChange = ""), t
   );
 }