cloud-web-corejs 1.0.54-dev.604 → 1.0.54-dev.605

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.604",
+  "version": "1.0.54-dev.605",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/formVersion/compareDialog.vue

@@ -68,6 +68,7 @@
         :readonly="designerReadonly"
         :showFormScript="false"
         :historyFlag="true"
+        :jsonFlag="true"
         :formTemplate="currentFormTemplate"
       ></formDesignerDialog>
     </el-dialog>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -107,6 +107,7 @@
         :readonly="designerReadonly"
         :showFormScript="false"
         :historyFlag="true"
+        :jsonFlag="true"
         :formTemplate="currentFormTemplate"
       ></formDesignerDialog>
     </el-dialog>

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -24,6 +24,7 @@
           :columnFlag="columnFlag"
           :sourceData="sourceData"
           :formTemplate="formTemplate"
+          :jsonFlag="jsonFlag"
         ></designer>
       </el-tab-pane>
       <el-tab-pane :label="$t1('后端脚本')" name="second" v-if="showFormScript">
@@ -78,6 +79,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    jsonFlag: {
+      type: Boolean,
+      default: false,
+    },
     widgetList: Array,
     columnFlag: Boolean,
     sourceData: Object,

package/src/views/bd/setting/form_template/list.vue

@@ -187,7 +187,6 @@
       @reflushTemplateList="reflushTemplateList"
       :readonly="designerReadonly"
       :formTemplate="currentFormTemplate"
-      :historyFlag="historyFlag"
     ></formDesignerDialog>
     <el-dialog
       :title="$t1('流程设计')"

package/src/views/bd/setting/form_template/mixins/edit.js

@@ -226,11 +226,9 @@ modules = {
     },
     openDesignDialog() {
       let readonly = this.readonly || !this.menuKindAuth.editAuth
-      debugger
       this.$emit('openDesignDialog', {
         row: this.formTemplate,
         readonly,
-        historyFlag: !!this.hData,
         callback: () => {
           this.$baseReload()
         }

package/src/views/bd/setting/form_template/mixins/list.js

@@ -137,7 +137,6 @@ modules = {
       menuKindAuth: {},
       showTree: false,
       designerReadonly: false,
-      historyFlag: false,
     };
   },
   computed: {
@@ -211,19 +210,18 @@ modules = {
         });
       }
     },
-    openDesingerDialog(row, callback, readonly = false, historyFlag = false) {
+    openDesingerDialog(row, callback, readonly = false) {
       this.formCode = row.formCode;
       this.formName = row.formName;
-      this.historyFlag = historyFlag;
-      this.currentFormTemplate = historyFlag ? row : null;
+      this.currentFormTemplate = row;
       this.isFullscreen = false;
 
       this.designerReadonly = readonly
       this.showDesingerDialog = true;
       this.designerSaveCallback = callback ?? null;
     },
-    openDesingerDialogByChild({row, readonly, historyFlag, callback}) {
-      this.openDesingerDialog(row, callback, readonly, historyFlag);
+    openDesingerDialogByChild({row, readonly, callback}) {
+      this.openDesingerDialog(row, callback, readonly);
     },
     reflushTemplateList() {
       this.searchEvent();

package/src/views/user/form/vform/designer.vue

@@ -35,7 +35,7 @@ export default {
     widgetList: Array,
     columnFlag: Boolean,
     sourceData: Object,
-    historyFlag: Boolean,
+    jsonFlag: Boolean,
   },
   components: {
     VFormDesigner,
@@ -93,6 +93,7 @@ export default {
       return */
       debugger;
       let a = 1;
+      let b = 1;
       if (this.columnFlag) {
         this.reportTemplate = this.formTemplate;
         this.showDesinger = true;
@@ -103,7 +104,7 @@ export default {
           });
           this.$refs.designer.setFormJson(formJson);
         });
-      } else if (this.formTemplate && this.reportTemplate.formViewContent) {
+      } else if (this.jsonFlag && this.formTemplate) {
         this.reportTemplate = this.$baseLodash.cloneDeep(this.formTemplate);
         this.showDesinger = true;
         this.$nextTick(() => {