cloud-web-corejs 1.0.250 → 1.0.251

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

@@ -0,0 +1,171 @@
+<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"
+          :jsonFlag="jsonFlag"
+        ></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,
+    },
+    jsonFlag: {
+      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

@@ -140,6 +140,44 @@
                   :readonly="true"
                 ></projectTagView>
               </template>
+              <template #operation="{ row }">
+                <a
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="openDesingerDialogByAuth(row)"
+                >
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('表单设计')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="iconfont icon-liuchengguanli-shejiqi_liucheng" />
+                  </el-tooltip>
+                </a>
+                <formVersionButton
+                  objType="FormTemplate"
+                  :objCode="row.formCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+                <a
+                  v-if="exportArchiveEnabled"
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="jsonExportArchive(row)"
+                >
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('导出归档')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="el-icon-upload2" />
+                  </el-tooltip>
+                </a>
+              </template>
             </vxe-grid>
             <el-drawer
               :title="$t1('流程模板')"
@@ -178,48 +216,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"
@@ -292,35 +298,4 @@ export default {
   mixins: [mixin],
 };
 </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>
+<style scoped lang="scss"></style>

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

@@ -86,7 +86,7 @@ tmixins = {
           title: oriCol.title,
           width: 150
         };
-        if (index == 0) {
+        if (index === 0) {
           col.fixed = 'left';
         }
         return col;
@@ -108,7 +108,7 @@ tmixins = {
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.resOption = opts;
         this.$nextTick(() => {
-          let rows = this.resultType == 1 ? this.successRows : this.failRows;
+          let rows = this.resultType === 1 ? this.successRows : this.failRows;
           let tDatas = rows.map((item, index) => {
             return item;
           });
@@ -226,7 +226,7 @@ tmixins = {
             isLoading: true,
             failMsg: false,
             callback: res => {
-              if (res.type == "success") {
+              if (res.type === "success") {
                 item.resultMessage = that.$t1('成功')
                 item.resultType = res.type;
                 successNum++

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

@@ -11,12 +11,17 @@ modules = {
   props: {
     _dataId: [String, Number],
     currentFormType: Object,
-    readonly: Boolean,
+    // readonly: Boolean,
     otherFlag:Boolean,
-    extractedObj:{
+    extractedObj: {
       type:Object,
       default:()=> null
-    }
+    },
+    hData:{
+      type:Object,
+      default:()=> null
+    },
+    compareHData: Object,
   },
   components: {
     projectTagView,
@@ -41,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,
@@ -50,10 +66,17 @@ modules = {
         editAuth: 0
       },
       sid: null,
-      showOtherAuthDialog:false
+      showOtherAuthDialog:false,
+      readonly: false,
+      isCompare: false,
     };
   },
   created() {
+    if(this.hData){
+      this.readonly = true;
+    }else{
+      this.readonly = this.$attrs.readonly || false;
+    }
     if(this.extractedObj?.objx?.id){
       this.dataId = this.extractedObj.obj.id;
     }else if (this._dataId) {
@@ -78,8 +101,18 @@ modules = {
       });
     },
     getData() {
-      if(this.extractedObj?.objx){
-        this.initData(this.extractedObj.objx)
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs['oplogTable'].initData({
+          param: () => {
+            return {
+              logType: "FormTemplate",
+              logObjCode: this.formTemplate.formCode
+            };
+          }
+        });
       }else if (this.dataId) {
         this.$commonHttp({
           aes: true,
@@ -117,6 +150,16 @@ modules = {
             }); */
           }
         });
+      } else if (this.hData){
+        this.isEdit = true;
+        this.formTemplate = this.$baseLodash.cloneDeep(this.hData);
+        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;
@@ -177,12 +220,12 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: res => {
-          this.isDev = res.objx == 1
+          this.isDev = res.objx === 1
         }
       });
     },
     openDesignDialog() {
-      let readonly = !this.menuKindAuth.editAuth
+      let readonly = this.readonly || !this.menuKindAuth.editAuth
       this.$emit('openDesignDialog', {
         row: this.formTemplate,
         readonly,

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

@@ -32,7 +32,7 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },