cloud-web-corejs 1.0.79 → 1.0.81

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

@@ -10,7 +10,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="$baseReload()" v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -38,6 +38,7 @@ export default {
   },
   mixins: [],
   inject: ["getFormConfig"],
+
   mounted() {
 
   },
@@ -59,7 +60,8 @@ export default {
       conditionParam: null,
       formInsData: null,
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
+      dataId:null
     };
   },
   computed: {
@@ -104,6 +106,10 @@ export default {
     }
   },
   created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
     let currentFormConfig = this.getFormConfig();
     this.currentLayoutType = currentFormConfig.layoutType
 
@@ -111,7 +117,13 @@ export default {
     this.getReportTemplate();
   },
   methods: {
-    async getReportTemplate() {
+    reload(e,option){
+      let updateParam = option?.updateParam || {};
+      Object.assign(this.formConfig,updateParam)
+      this.showRender = false;
+      this.getReportTemplate();
+    },
+    async getReportTemplate(callback) {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
         objId: this.$attrs.objId,

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

@@ -4,7 +4,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="$baseReload()" :param="dialogParam"
+                     @reload="reload" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -105,6 +105,10 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    reload(){
+      this.showRender = false;
+      this.getReportTemplate();
+    },
     async getReportTemplate() {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,

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

@@ -63,7 +63,8 @@
       custom-class="dialog-style"
       width="501px"
       height="250px"
-      @close="dialogClose2"
+      :beforeClose="handleBeforeClose"
+      @close="handleClose2"
       v-el-drag-dialog
     >
       <div>