cloud-web-corejs-haier 1.0.42 → 1.0.44

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

@@ -9,16 +9,17 @@ 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 { 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 { getBdFlag } from "@base/api/user";
 import {
   getJsxBtnList,
+  getJsxEditLink,
   getJsxStatus,
 } from "@base/views/bd/setting/utils/index";
+import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
+import settingConfig from "@/settings";
 
 let modules = {};
 modules = {
@@ -35,9 +36,10 @@ modules = {
     ftHistoryDialog,
     itemList,
     formTypeEditDialog,
-    formScriptList,
     projectTagDialog,
-    designer,
+    formDesignerDialog: () =>
+      import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
+    formVersionButton,
   },
   data() {
     return {
@@ -139,7 +141,7 @@ modules = {
       isDev: true,
       menuKindAuth: {},
       showTree: false,
-      designerReadonly: false
+      designerReadonly: false,
     };
   },
   computed: {
@@ -150,18 +152,25 @@ modules = {
       return this.currentFormType?.name || null;
     },
     otherFlag() {
-      return this.currentFormType?.menuKindCode == "other"
-    }
+      return this.currentFormType?.menuKindCode === "other";
+    },
+    exportArchiveEnabled() {
+      return settingConfig.exportArchiveEnabled === true;
+    },
+    operationColumnWidth() {
+      const btnWidth = 47;
+      return this.exportArchiveEnabled ? btnWidth * 3 : btnWidth * 2;
+    },
   },
   watch: {
     formDesTabs(val) {
-      if (this.showFormScriptList == false && val == "second") {
+      if (this.showFormScriptList === false && val === "second") {
         this.showFormScriptList = true;
       }
     },
   },
   mounted() {
-    treeScollx({target: this, type: "default"});
+    treeScollx({ target: this, type: "default" });
     this.getBdEnv();
     this.initTableList();
     this.initWfWinParam();
@@ -177,7 +186,7 @@ modules = {
     },
     openEditDialog(row) {
       let formCode = row?.formCode || null;
-      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
@@ -195,7 +204,7 @@ modules = {
       } else {
         this.getOtherMenuKindAuth(row, (editAuth) => {
           this.openDesingerDialog(row, null, !editAuth);
-        })
+        });
       }
     },
     getOtherMenuKindAuth(row, callback) {
@@ -204,11 +213,11 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/form_template_auth/getAuth",
           method: `post`,
-          data: {stringOne: row.sid},
+          data: { stringOne: row.sid },
           isLoading: true,
           success: (res) => {
             let menuKindAuth = res.objx || {};
-            callback(!!menuKindAuth.editAuth)
+            callback(!!menuKindAuth.editAuth);
           },
         });
       }
@@ -219,11 +228,11 @@ modules = {
       this.currentFormTemplate = row;
       this.isFullscreen = false;
 
-      this.designerReadonly = readonly
+      this.designerReadonly = readonly;
       this.showDesingerDialog = true;
       this.designerSaveCallback = callback ?? null;
     },
-    openDesingerDialogByChild({row, readonly, callback}) {
+    openDesingerDialogByChild({ row, readonly, callback }) {
       this.openDesingerDialog(row, callback, readonly);
     },
     reflushTemplateList() {
@@ -259,8 +268,11 @@ modules = {
       if (this.checkTags.length) {
         tagCodes = this.checkTags.map((item) => item.tagCode);
       }
-      let currentFormType = this.currentFormType || {}
-      let menuKindCode = currentFormType.menuKindCode && !this.otherFlag ? currentFormType.menuKindCode : null;
+      let currentFormType = this.currentFormType || {};
+      let menuKindCode =
+        currentFormType.menuKindCode && !this.otherFlag
+          ? currentFormType.menuKindCode
+          : null;
       return {
         ...this.formData,
         tagCodes,
@@ -275,9 +287,9 @@ modules = {
         tableRef: "table-m1",
         tableName: "bd_form_template_list-m1",
         path: () => {
-          let url = USER_PREFIX + '/formTemplate/listPage';
+          let url = USER_PREFIX + "/formTemplate/listPage";
           if (this.otherFlag) {
-            url = USER_PREFIX + '/formTemplate/listOtherPage';
+            url = USER_PREFIX + "/formTemplate/listOtherPage";
           }
           return url;
         },
@@ -285,20 +297,30 @@ modules = {
           return this.getSearchParam();
         },
         columns: [
-          {type: "checkbox", width: 48, resizable: false, fixed: "left"},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
             title: this.$t1("模板名称"),
             field: "formName",
             width: 150,
             fixed: "left",
+            slots: {
+              default: ({ row }) => {
+                return getJsxEditLink({
+                  content: row.formName,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
           },
           {
             title: this.$t1("项目标签"),
             field: "tag",
             width: 250,
-            slots: {default: "tag"},
+            slots: { default: "tag" },
             params: {
-              exportVal: ({row}) => {
+              exportVal: ({ row }) => {
                 if (row.formTemplateTagDTOs) {
                   return row.formTemplateTagDTOs
                     .map((item) => item.tagName)
@@ -312,11 +334,6 @@ modules = {
             field: "formCode",
             width: 150,
           },
-          {
-            title: this.$t1("模板版本"),
-            field: "formVersion",
-            width: 150,
-          },
           {
             title: this.$t1("表单分类"),
             field: "menuKindName",
@@ -327,7 +344,7 @@ modules = {
             field: "enabled",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return getJsxStatus(null, this.$t1("启用"));
                 } else {
@@ -341,7 +358,7 @@ modules = {
             field: "hasWf",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.hasWf) {
                   return getJsxStatus(null, this.$t1("是"));
                 } else {
@@ -365,52 +382,40 @@ modules = {
             field: "remark",
             width: 150,
           },
-          {field: "serviceName", title: this.$t1("服务名"), width: 150},
-          {title: this.$t1("唯一标识"), field: "sid", width: 280},
+          { field: "serviceName", title: this.$t1("服务名"), width: 150 },
           {
-            field: 'createBy',
-            title: this.$t1('创建人'),
-            width: 150
+            title: this.$t1("版本号"),
+            field: "version",
+            width: 150,
           },
+          { title: this.$t1("唯一标识"), field: "sid", width: 280 },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
+            field: "createBy",
+            title: this.$t1("创建人"),
+            width: 150,
+          },
+          {
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
           },
           {
-            field: 'modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
+            field: "modifyBy",
+            title: this.$t1("更新人"),
+            width: 150,
           },
           {
-            field: 'modifyDate',
-            title: this.$t1('更新时间'),
-            width: 150
+            field: "modifyDate",
+            title: this.$t1("更新时间"),
+            width: 150,
           },
           {
-            width: 100,
+            width: this.operationColumnWidth,
             fixed: "right",
             title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
-                return getJsxBtnList([
-                  {
-                    iconName: "el-icon-edit",
-                    content: this.$t1("查看"),
-                    onclick: () => {
-                      this.openEditDialog(row);
-                    },
-                  },
-                  {
-                    iconName: "iconfont icon-liuchengguanli-shejiqi_liucheng",
-                    content: this.$t1("表单设计"),
-                    onclick: () => {
-                      this.openDesingerDialogByAuth(row);
-                    },
-                  },
-                ]);
-              },
+              default: "operation",
             },
           },
         ],
@@ -442,8 +447,8 @@ modules = {
             type: "select",
             common: true,
             itemOption: [
-              {label: this.$t1("启用"), value: true},
-              {label: this.$t1("禁用"), value: false},
+              { label: this.$t1("启用"), value: true },
+              { label: this.$t1("禁用"), value: false },
             ],
           },
           {
@@ -459,26 +464,42 @@ modules = {
             type: "input",
             common: false,
           },
-          {title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
-          {title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
           {
-            title: this.$t1('创建时间'),
+            title: this.$t1("创建人"),
+            field: "createBy",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("更新人"),
+            field: "modifyBy",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("操作日志"),
+            field: "logContent",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("创建时间"),
             field: "startCreateDate",
             field2: "endCreateDate",
             type: "dateRange",
             common: false,
             widgetType: "datetime",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
-            title: this.$t1('更新时间'),
+            title: this.$t1("更新时间"),
             field: "startModifyDate",
             field2: "endModifyDate",
             type: "dateRange",
             common: false,
             widgetType: "datetime",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+          },
         ],
         config: {
           proxyConfig: {
@@ -579,7 +600,7 @@ modules = {
     // 异步树叶子节点懒加载逻辑
     loadNode(node, resolve) {
       let id = node && node.data && node.data.id ? node.data.id || "" : 0;
-      let param = {enabled: true};
+      let param = { enabled: true };
       let url = !id
         ? USER_PREFIX + "/menuKind/getAllList"
         : USER_PREFIX + "/menuKind/getChildren";
@@ -590,7 +611,7 @@ modules = {
         data: {
           parent: id,
           enabled: true,
-          dataType: 2
+          dataType: 2,
         },
         success: (res) => {
           let rows = res.objx || [];
@@ -602,8 +623,8 @@ modules = {
               id: "other",
               menuKindCode: "other",
               name: "其他分类",
-              leaf: true
-            })
+              leaf: true,
+            });
             if (rows.length > 0) {
               this.$nextTick(() => {
                 let firstNode = node.childNodes[0];
@@ -641,15 +662,15 @@ modules = {
         saveUrl: USER_PREFIX + "/form_develop/importFormTemplate",
         showResult: true,
         resultColumns: [
-          {title: this.$t1("模板名称"), field: "formName", width: 200},
-          {title: this.$t1("模板编码"), field: "formCode", width: 200},
+          { title: this.$t1("模板名称"), field: "formName", width: 200 },
+          { title: this.$t1("模板编码"), field: "formCode", width: 200 },
           {
             title: this.$t1("结果信息"),
             field: "impReturnMsg",
             width: 300,
             showOverflow: false,
             slots: {
-              default: ({row}, h) => {
+              default: ({ row }, h) => {
                 let impReturnMsg = row.impReturnMsg;
                 let items = impReturnMsg
                   .split(";")
@@ -659,7 +680,7 @@ modules = {
                   });
                 return h("div", {}, items);
               },
-            }
+            },
           },
         ],
         callback: () => {
@@ -677,10 +698,21 @@ modules = {
         selectTypeAuth: this.currentFormType.selectTypeAuth,
       });
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "表单模板",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportFormTemplate",
+        plaintext: 1,
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: (res) => {
-          this.isDev = res.objx == 1;
+          this.isDev = res.objx === 1;
         },
       });
     },

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

@@ -133,7 +133,7 @@ modules = {
   },
   watch: {
     formDesTabs(val) {
-      if (this.showFormScriptList == false && val == 'second') {
+      if (this.showFormScriptList === false && val === 'second') {
         this.showFormScriptList = true;
       }
     }
@@ -154,7 +154,7 @@ modules = {
     },
     openEditDialog(row) {
       let formCode = row?.formCode || null;
-      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
@@ -395,7 +395,7 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: res => {
-          this.isDev = res.objx == 1
+          this.isDev = res.objx === 1
         }
       });
     },

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

@@ -56,7 +56,7 @@ modules = {
     initBdEnv() {
       return getBdEnv({
         success: res => {
-          this.isDev = res.objx == "dev"
+          this.isDev = res.objx === "dev"
         }
       });
     },

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 {
@@ -140,7 +136,7 @@ modules = {
   },
   watch: {
     formDesTabs(val) {
-      if (this.showFormScriptList == false && val == 'second') {
+      if (this.showFormScriptList === false && val === 'second') {
         this.showFormScriptList = true;
       }
     }
@@ -161,7 +157,7 @@ modules = {
     },
     openEditDialog(row) {
       let formCode = row?.formCode || null;
-      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
@@ -398,7 +394,7 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: res => {
-          this.isDev = res.objx == 1
+          this.isDev = res.objx === 1
         }
       });
     },