cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601

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

@@ -75,12 +75,18 @@
                       prop="formName"
                       :rules="[{ required: true, trigger: 'blur' }]"
                     >
-                      <el-input
-                        type="text"
-                        autocomplete="off"
-                        v-model="formTemplate.formName"
-                        clearable
-                      />
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.formName"
+                        :newVal="formTemplate.formName"
+                      >
+                        <el-input
+                          type="text"
+                          autocomplete="off"
+                          v-model="formTemplate.formName"
+                          clearable
+                        />
+                      </fieldCompare>
                     </el-form-item>
                   </td>
                 </tr>
@@ -111,15 +117,29 @@
                       prop="enabled"
                       :rules="[{ required: false, trigger: 'blur' }]"
                     >
-                      <el-radio-group v-model="formTemplate.enabled">
-                        <el-radio :label="true">{{ $t1("启用") }}</el-radio>
-                        <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
-                      </el-radio-group>
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.enabled"
+                        :newVal="formTemplate.enabled"
+                      >
+                        <el-radio-group v-model="formTemplate.enabled">
+                          <el-radio :label="true">{{ $t1("启用") }}</el-radio>
+                          <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
+                        </el-radio-group>
+                      </fieldCompare>
                     </el-form-item>
                   </td>
                   <th>{{ $t1("启用流程") }}</th>
                   <td>
-                    {{ formTemplate.hasWf ? $t1("是") : $t1("否") }}
+                    <el-form-item>
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.hasWf"
+                        :newVal="formTemplate.hasWf"
+                      >
+                        {{ formTemplate.hasWf ? $t1("是") : $t1("否") }}
+                      </fieldCompare>
+                    </el-form-item>
                   </td>
                 </tr>
                 <tr>
@@ -132,38 +152,52 @@
                       prop="menuKindName"
                       :rules="[{ required: true, trigger: ['blur', 'change'] }]"
                     >
-                      <el-input
-                        class="search-input"
-                        max="200"
-                        v-model="formTemplate.menuKindName"
-                        @clear="
-                          formTemplate.menuKindCode = '';
-                          $forceUpdate();
-                        "
-                        v-el-readonly
-                        clearable
-                        :disabled="otherFlag"
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.menuKindName"
+                        :newVal="formTemplate.menuKindName"
                       >
-                        <i
-                          slot="suffix"
-                          class="el-input__icon el-icon-search"
-                          @click="showMenuKindDialog = true"
-                        ></i>
-                      </el-input>
+                        <el-input
+                          class="search-input"
+                          max="200"
+                          v-model="formTemplate.menuKindName"
+                          @clear="
+                            formTemplate.menuKindCode = '';
+                            $forceUpdate();
+                          "
+                          v-el-readonly
+                          clearable
+                          :disabled="otherFlag"
+                        >
+                          <i
+                            slot="suffix"
+                            class="el-input__icon el-icon-search"
+                            @click="showMenuKindDialog = true"
+                          ></i>
+                        </el-input>
+                      </fieldCompare>
                     </el-form-item>
                   </td>
                 </tr>
                 <tr>
                   <th>{{ $t1("备注") }}</th>
                   <td colspan="5">
-                    <el-input
-                      type="textarea"
-                      :rows="2"
-                      :placeholder="$t1('请输入内容')"
-                      size="small"
-                      v-model="formTemplate.remark"
-                      clearable
-                    ></el-input>
+                    <el-form-item>
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.remark"
+                        :newVal="formTemplate.remark"
+                      >
+                        <el-input
+                          type="textarea"
+                          :rows="2"
+                          :placeholder="$t1('请输入内容')"
+                          size="small"
+                          v-model="formTemplate.remark"
+                          clearable
+                        ></el-input>
+                      </fieldCompare>
+                    </el-form-item>
                   </td>
                 </tr>
                 <tr>
@@ -188,6 +222,27 @@
                     {{ formTemplate.sid }}
                   </td>
                 </tr>
+                <tr v-if="!!hData">
+                  <th>{{ $t1("表单模板JSON") }}</th>
+                  <td colspan="7">
+                    <el-form-item>
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormTemplate.formViewContent"
+                        :newVal="formTemplate.formViewContent"
+                      >
+                        <el-input
+                          type="textarea"
+                          :rows="12"
+                          :placeholder="$t1('请输入内容')"
+                          size="small"
+                          v-model="formTemplate.formViewContent"
+                          :disabled="true"
+                        ></el-input>
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                </tr>
                 <tr>
                   <th>{{ $t1("创建人") }}</th>
                   <td>{{ formTemplate.createBy }}</td>
@@ -287,12 +342,14 @@
 import mixin from "./mixins/edit";
 import formVersionButton from "@base/views/bd/setting/formVersion/button.vue";
 import reverButton from "@base/views/bd/setting/formVersion/reverButton.vue";
+import fieldCompare from "@base/views/bd/setting/formVersion/fieldCompare.vue";
 export default {
   name: "bd_form_templateEdit",
   mixins: [mixin],
   components: {
     formVersionButton,
     reverButton,
+    fieldCompare,
   },
 };
 </script>

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

@@ -0,0 +1,166 @@
+<template>
+  <el-drawer
+    :title="$t1('表单设计({formName})', { formName })"
+    :visible.sync="showDesingerDialog"
+    :modal="false"
+    :destroy-on-close="true"
+    size="100%"
+    direction="rtl"
+    :before-close="closeFormDesignwinEvent"
+    :append-to-body="false"
+    class="designer-drawer"
+    :class="[isFullscreen ? 'is-fullscreen' : '']"
+    @close="handleFormDesignClose"
+  >
+    <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
+      <el-tab-pane :label="$t1('设计器')" name="first">
+        <designer
+          ref="designer"
+          :formCode.sync="formCode"
+          @reflushTemplateList="reflushTemplateList"
+          :readonly="readonly"
+          :historyFlag="historyFlag"
+          :widgetList="widgetList"
+          :columnFlag="columnFlag"
+          :sourceData="sourceData"
+          :formTemplate="formTemplate"
+        ></designer>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('后端脚本')" name="second" v-if="showFormScript">
+        <formScriptList
+          :formCode="formCode"
+          :formTemplate="formTemplate"
+          v-if="showFormScriptList"
+        ></formScriptList>
+      </el-tab-pane>
+    </el-tabs>
+    <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
+      <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+        <i class="iconfont icon-quanping"></i>
+      </el-tooltip>
+    </el-button>
+    <el-button class="isFullIcon" v-else @click="handleFullscreen">
+      <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+        <i class="iconfont icon-suoxiao"></i>
+      </el-tooltip>
+    </el-button>
+  </el-drawer>
+</template>
+<script>
+import indexUtil from "@base/utils";
+export default {
+  props: {
+    visiable: {
+      type: Boolean,
+      default: false,
+    },
+    formName: {
+      type: String,
+      default: "",
+    },
+    formCode: {
+      type: String,
+      default: "",
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    formTemplate: {
+      type: Object,
+      default: () => {},
+    },
+    showFormScript: {
+      type: Boolean,
+      default: true,
+    },
+    historyFlag: {
+      type: Boolean,
+      default: false,
+    },
+    widgetList: Array,
+    columnFlag: Boolean,
+    sourceData: Object,
+  },
+  components: {
+    designer: () => import("@base/views/user/form/vform/designer.vue"),
+    formScriptList: () => import("@base/views/bd/setting/form_script/form_list.vue"),
+  },
+  data() {
+    return {
+      showDesingerDialog: true,
+      isFullscreen: false,
+      formDesTabs: "first",
+      currentFormTemplate: {},
+      designerReadonly: false,
+      showFormScriptList: false,
+    };
+  },
+  watch: {
+    formDesTabs(val) {
+      if (this.showFormScriptList == false && val == "second") {
+        this.showFormScriptList = true;
+      }
+    },
+  },
+  methods: {
+    handleFormDesignClose() {
+      this.showDesingerDialog = false;
+      this.formDesTabs = "first";
+      this.showFormScriptList = false;
+      this.$emit("close");
+      this.$emit("update:visiable", false);
+    },
+    handleFullscreen() {
+      let isFullscreen = this.isFullscreen;
+      if (!isFullscreen) {
+        indexUtil.addClass(document.body, "hideMenu");
+      } else {
+        indexUtil.removeClass(document.body, "hideMenu");
+      }
+      this.isFullscreen = !isFullscreen;
+    },
+    closeFormDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
+        indexUtil.removeClass(document.body, "hideMenu");
+        done && done();
+      });
+    },
+    reflushTemplateList() {
+      this.$emit("reflushTemplateList");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+::v-deep .tab-boxOnly > .el-tabs__header {
+  position: absolute;
+  right: 130px;
+  top: 0;
+}
+
+::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 158px) !important;
+  }
+
+  .grid-height {
+    height: calc(100vh - 126px) !important;
+  }
+}
+
+::v-deep
+  .designer-drawer.is-fullscreen
+  .tab-boxOnly
+  > .el-tabs__content
+  .el-tab-pane
+  .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 116px) !important;
+  }
+
+  .grid-height {
+    height: calc(100vh - 84px) !important;
+  }
+}
+</style>

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

@@ -178,48 +178,16 @@
         </el-tab-pane>
       </template>
     </x-tabs>
-    <el-drawer
-      :title="$t1('表单设计({formName})', { formName })"
-      :visible.sync="showDesingerDialog"
-      :modal="false"
-      :destroy-on-close="true"
-      size="100%"
-      direction="rtl"
-      :before-close="closeFormDesignwinEvent"
-      :append-to-body="false"
-      class="designer-drawer"
-      :class="[isFullscreen ? 'is-fullscreen' : '']"
-      @close="handleFormDesignClose"
-    >
-      <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
-        <el-tab-pane :label="$t1('设计器')" name="first">
-          <designer
-            ref="designer"
-            :formCode.sync="formCode"
-            @reflushTemplateList="reflushTemplateList"
-            :readonly="designerReadonly"
-          ></designer>
-        </el-tab-pane>
-        <el-tab-pane :label="$t1('后端脚本')" name="second">
-          <formScriptList
-            :formCode="formCode"
-            :formTemplate="currentFormTemplate"
-            v-if="showFormScriptList"
-          ></formScriptList>
-        </el-tab-pane>
-      </el-tabs>
-      <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
-        <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
-          <i class="iconfont icon-quanping"></i>
-        </el-tooltip>
-      </el-button>
-      <el-button class="isFullIcon" v-else @click="handleFullscreen">
-        <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
-          <i class="iconfont icon-suoxiao"></i>
-        </el-tooltip>
-      </el-button>
-    </el-drawer>
-
+    <formDesignerDialog
+      ref="formDesignerDialog"
+      v-if="showDesingerDialog"
+      :visiable.sync="showDesingerDialog"
+      :formName="formName"
+      :formCode="formCode"
+      @reflushTemplateList="reflushTemplateList"
+      :readonly="designerReadonly"
+      :formTemplate="currentFormTemplate"
+    ></formDesignerDialog>
     <el-dialog
       :title="$t1('流程设计')"
       :append-to-body="true"

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

@@ -20,7 +20,8 @@ modules = {
     hData:{
       type:Object,
       default:()=> null
-    }
+    },
+    compareHData: Object,
   },
   components: {
     projectTagView,
@@ -45,6 +46,17 @@ modules = {
         formTemplateTagDTOs: [],
         hasWf: false
       },
+      oldFormTemplate: {
+        enabled: true,
+        history: false,
+        serviceId: 'user',
+        formTypeCode: null,
+        menuKindName: null,
+        menuKindCode: null,
+        serviceName: null,
+        formTemplateTagDTOs: [],
+        hasWf: false
+      },
       isInited: false,
       serviceIds: ['user'],
       showMenuKindDialog: false,
@@ -55,7 +67,8 @@ modules = {
       },
       sid: null,
       showOtherAuthDialog:false,
-      readonly: false
+      readonly: false,
+      isCompare: false,
     };
   },
   created() {
@@ -133,6 +146,10 @@ modules = {
         this.dataId = this.hData.id
         this.isInited = true;
         this.getMenuKindAuth(this.formTemplate.menuKindCode);
+        if (this.compareHData && this.$attrs.isCompare) {
+          this.oldFormTemplate = this.$baseLodash.cloneDeep(this.compareHData);
+          this.isCompare = true;
+        }
       } else {
         this.getMenuKindAuth(this.formTemplate.menuKindCode);
         this.isInited = true;

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

@@ -9,12 +9,10 @@ import scriptDescriptionDialog from "@base/components/scriptDescription/dialog.v
 import ftHistoryDialog from "@base/views/bd/setting/form_template/ftHistoryDialog.vue";
 import itemList from "@base/views/bd/setting/form_template/itemList.vue";
 import formTypeEditDialog from "@base/views/user/form/form_type/editDialog.vue";
-import formScriptList from "@base/views/bd/setting/form_script/form_list.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import {treeScollx} from "@base/utils/global";
 import indexUtil from "@base/utils";
 import {getBdFlag} from "@base/api/user";
-import designer from "@base/views/user/form/vform/designer.vue";
 import {
   getJsxBtnList,
   getJsxStatus,
@@ -35,9 +33,8 @@ modules = {
     ftHistoryDialog,
     itemList,
     formTypeEditDialog,
-    formScriptList,
     projectTagDialog,
-    designer,
+    formDesignerDialog: () => import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
   },
   data() {
     return {
@@ -214,6 +211,7 @@ modules = {
       }
     },
     openDesingerDialog(row, callback, readonly = false) {
+      debugger;
       this.formCode = row.formCode;
       this.formName = row.formName;
       this.currentFormTemplate = row;

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

@@ -1,10 +1,8 @@
 import tableForm from "@base/components/table/tableForm.vue";
 import editView from "@base/views/bd/setting/form_template/edit.vue";
 import itemList from "@base/views/bd/setting/form_template/itemList.vue";
-import formScriptList from "@base/views/bd/setting/form_script/form_list.vue";
 import indexUtil from "@base/utils";
 import {getBdFlag} from "@base/api/user";
-import designer from "@base/views/user/form/vform/designer.vue";
 import {getJsxBtnList, getJsxStatus} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
@@ -14,8 +12,6 @@ modules = {
     tableForm,
     editView,
     itemList,
-    formScriptList,
-    designer
   },
   data() {
     return {