cloud-web-corejs-haier 1.0.43 → 1.0.45

package/src/views/bd/setting/form_script/mixins/list1.js

@@ -5,28 +5,39 @@ import tableForm from "@base/components/table/tableForm.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import editView from "@base/views/bd/setting/form_script/edit1.vue";
-import {treeScollx} from "@base/utils/global";
-import {getBdFlag} from "@base/api/user";
-import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils/index";
+import { treeScollx } from "@base/utils/global";
+import { getBdFlag } from "@base/api/user";
+import {
+  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 = {
-  name: 'form_script:list1',
+  name: "form_script:list1",
   components: {
     projectTagView,
-    projectTagAddButton, projectTagDeleteButton, tableForm, projectTagDialog, MenuKindDialog, editView
+    projectTagAddButton,
+    projectTagDeleteButton,
+    tableForm,
+    projectTagDialog,
+    MenuKindDialog,
+    editView,
+    formVersionButton,
   },
   data() {
     return {
-      activeName: 'second',
+      activeName: "second",
       dataId: 0,
       showEdit: false,
       vxeOption: {},
       formData: {},
       defaultProps: {
-        label: 'name', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        label: "name", //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
         children: [],
-        isLeaf: 'leaf'
+        isLeaf: "leaf",
       },
       currentFormType: {},
       addProjectTagOption: {
@@ -35,17 +46,17 @@ modules = {
           return this.$refs["table-m1"].getCheckboxRecords(true);
         },
         reqData: (tagDatas, tableDatas) => {
-          let sids = tableDatas.map(item => item.sid);
-          let tagCodes = tagDatas.map(item => item.tagCode);
+          let sids = tableDatas.map((item) => item.sid);
+          let tagCodes = tagDatas.map((item) => item.tagCode);
           let reqData = {
             tagCodes,
-            sids
+            sids,
           };
           return reqData;
         },
         callback: () => {
-          this.searchEvent()
-        }
+          this.searchEvent();
+        },
       },
       deleteProjectTagOption: {
         url: USER_PREFIX + `/formScript/deleteTag`,
@@ -53,61 +64,67 @@ modules = {
           return this.$refs["table-m1"].getCheckboxRecords(true);
         },
         reqData: (tagDatas, tableDatas) => {
-          let sids = tableDatas.map(item => item.sid);
-          let tagCodes = tagDatas.map(item => item.tagCode);
+          let sids = tableDatas.map((item) => item.sid);
+          let tagCodes = tagDatas.map((item) => item.tagCode);
           let reqData = {
             tagCodes,
-            sids
+            sids,
           };
           return reqData;
         },
         callback: () => {
-          this.searchEvent()
-        }
+          this.searchEvent();
+        },
       },
       showProjectTagDialog3: false,
       checkTags: [],
       isDev: true,
       menuKindAuth: {},
-      showTree: false
+      showTree: false,
     };
   },
   computed: {
     currentMenuKindId() {
-      return this.currentFormType?.id || null
+      return this.currentFormType?.id || null;
     },
     currentMenuKindName() {
-      return this.currentFormType?.name || null
+      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 * 2 : btnWidth;
+    },
   },
   mounted() {
-    treeScollx({target: this, type: 'default'});
+    treeScollx({ target: this, type: "default" });
     this.getBdEnv();
     this.initTableList();
   },
   methods: {
     searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     resetEvent() {
       this.formData = {};
       this.checkTags = [];
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(row) {
-      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.$openEditView('showEdit');*/
 
       let dataId = row?.id || 0;
       if (!dataId) {
         this.dataId = dataId;
-        this.activeName = 'first';
-        this.$openEditView('showEdit');
+        this.activeName = "first";
+        this.$openEditView("showEdit");
       } else {
         this.$refs.xTabs.openEditTab(row);
       }
@@ -115,27 +132,30 @@ modules = {
     getSearchParam() {
       let tagCodes = null;
       if (this.checkTags.length) {
-        tagCodes = this.checkTags.map(item => item.tagCode);
+        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,
         menuKindCode,
-        scriptType: 1
+        scriptType: 1,
       };
     },
     initTableList() {
       let that = this;
       let tableOption = {
         vue: this,
-        tableRef: 'table-m1',
-        tableName: 'bd_form_script_list1-m1',
+        tableRef: "table-m1",
+        tableName: "bd_form_script_list1-m1",
         path: () => {
-          let url = USER_PREFIX + '/formScript/listPage';
+          let url = USER_PREFIX + "/formScript/listPage";
           if (this.otherFlag) {
-            url = USER_PREFIX + '/formScript/listOtherPage';
+            url = USER_PREFIX + "/formScript/listOtherPage";
           }
           return url;
         },
@@ -143,59 +163,75 @@ 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: 'scriptName',
+            title: this.$t1("脚本名称"),
+            field: "scriptName",
             width: 180,
-            fixed: 'left'
+            fixed: "left",
+            slots: {
+              default: ({ row }) => {
+                return getJsxEditLink({
+                  content: row.scriptName,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
           },
           {
-            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
-              exportVal: ({row}) => {
+            title: this.$t1("项目标签"),
+            field: "tag",
+            width: 250,
+            slots: { default: "tag" },
+            params: {
+              exportVal: ({ row }) => {
                 if (row.formScriptTagDTOs) {
-                  return row.formScriptTagDTOs.map(item => item.tagName).join(",")
+                  return row.formScriptTagDTOs
+                    .map((item) => item.tagName)
+                    .join(",");
                 }
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t1('脚本编码'),
-            field: 'scriptCode',
-            width: 180
+            title: this.$t1("脚本编码"),
+            field: "scriptCode",
+            width: 180,
           },
-          {title: this.$t1('表单分类'), field: 'menuKindName', width: 150},
+          { title: this.$t1("表单分类"), field: "menuKindName", width: 150 },
           {
-            title: this.$t1('表单模板编码'),
-            field: 'formCode',
-            width: 150
+            title: this.$t1("表单模板编码"),
+            field: "formCode",
+            width: 150,
           },
           {
-            title: this.$t1('Url路径'),
-            field: 'url',
+            title: this.$t1("Url路径"),
+            field: "url",
             width: 200,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 return `/${row.formCode}/${row.scriptCode}`;
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t1('脚本说明'),
-            field: 'scriptRemark',
-            width: 250
+            title: this.$t1("脚本说明"),
+            field: "scriptRemark",
+            width: 250,
           },
           {
-            title: this.$t1('自定义URL'),
-            field: 'uri',
-            width: 250
+            title: this.$t1("自定义URL"),
+            field: "uri",
+            width: 250,
           },
           {
             title: this.$t1("是否启用"),
             field: "enabled",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return getJsxStatus(null, this.$t1("启用"));
                 } else {
@@ -205,143 +241,185 @@ modules = {
             },
           },
           {
-            field: 'transactions',
-            title: this.$t1('开启事务'),
+            field: "transactions",
+            title: this.$t1("开启事务"),
             width: 150,
             slots: {
-              default: ({row}) => {
-                if (row.transactions == 1) {
-                  return getJsxStatus(null, this.$t1('是'))
+              default: ({ row }) => {
+                if (row.transactions === 1) {
+                  return getJsxStatus(null, this.$t1("是"));
                 } else {
-                  return getJsxStatus('s-3', this.$t1('否'))
+                  return getJsxStatus("s-3", this.$t1("否"));
                 }
-              }
-            }
+              },
+            },
           },
-          {field: 'serviceName', title: this.$t1('服务名'), width: 150},
+          { field: "serviceName", title: this.$t1("服务名"), width: 150 },
+          { field: "version", title: this.$t1("版本号"), width: 150 },
           {
-            field: 'sid',
-            title: this.$t1('唯一标识'),
-            width: 280
+            field: "sid",
+            title: this.$t1("唯一标识"),
+            width: 280,
           },
           {
-            field: 'createBy',
-            title: this.$t1('创建人'),
-            width: 150
+            field: "createBy",
+            title: this.$t1("创建人"),
+            width: 150,
           },
           {
-            field: 'createDate',
-            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: 47,
-            fixed: 'right',
-            title: '',
+            width: this.operationColumnWidth,
+            fixed: "right",
+            title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
-                return getJsxBtn({
-                  iconName: "el-icon-edit",
-                  content: this.$t1('查看'),
-                  onclick: () => {
-                    this.openEditDialog(row);
-                  }
-                });
-              }
-            }
-          }
+              default: "operation",
+            },
+          },
         ],
         searchColumns: [
           {
-            title: this.$t1('表单分类'),
+            title: this.$t1("表单分类"),
             field: "menuKindName",
             type: "input",
             common: true,
             disabled: true,
             defaultValueEnabled: false,
-            slot: "menuKindName"
+            slot: "menuKindName",
+          },
+          {
+            title: this.$t1("脚本名称"),
+            field: "scriptName",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("脚本编码"),
+            field: "scriptCode",
+            type: "input",
+            common: true,
           },
-          {title: this.$t1('脚本名称'), field: "scriptName", type: "input", common: true},
-          {title: this.$t1('脚本编码'), field: "scriptCode", type: "input", common: true},
           {
             title: this.$t1("是否启用"),
             field: "enabled",
             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 },
             ],
           },
-          {title: this.$t1('脚本说明'), field: "scriptRemark", type: "input", common: true},
-          {title: this.$t1('脚本'), field: "script", type: "input", common: true},
-          {title: this.$t1('表单模板编码'), field: "formCode", type: "input", common: true},
-          {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
-          {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: "scriptRemark",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("脚本"),
+            field: "script",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("表单模板编码"),
+            field: "formCode",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("项目标签"),
+            field: "tag",
+            type: "input",
+            common: true,
+            slot: "tag",
+          },
+          {
+            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: {
-            autoLoad: false
-          }
+            autoLoad: false,
+          },
         },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
         this.showTree = true;
       });
     },
     handleNodeClick(data, node, v) {
-      this.handleNodeData(node)
+      this.handleNodeData(node);
       this.$forceUpdate();
       this.searchEvent();
     },
     // 异步树叶子节点懒加载逻辑
     loadNode(node, resolve) {
-      let id = node && node.data && node.data.id ? node.data.id || '' : 0;
-      let param = {enabled: true};
-      let url = !id ? USER_PREFIX + '/menuKind/getAllList' : USER_PREFIX + '/menuKind/getChildren';
+      let id = node && node.data && node.data.id ? node.data.id || "" : 0;
+      let param = { enabled: true };
+      let url = !id
+        ? USER_PREFIX + "/menuKind/getAllList"
+        : USER_PREFIX + "/menuKind/getChildren";
       this.$http({
         aes: true,
         url: url,
-        method: 'post',
+        method: "post",
         data: {
           parent: id,
           enabled: true,
-          dataType: 3
+          dataType: 3,
         },
-        success: res => {
+        success: (res) => {
           let rows = res.objx || [];
-          rows.forEach(value => {
+          rows.forEach((value) => {
             value.leaf = !value.hasChild;
           });
           if (node.level === 0) {
@@ -349,8 +427,8 @@ modules = {
               id: "other",
               menuKindCode: "other",
               name: "其他分类",
-              leaf: true
-            })
+              leaf: true,
+            });
             if (rows.length > 0) {
               this.$nextTick(() => {
                 let firstNode = node.childNodes[0];
@@ -358,12 +436,12 @@ modules = {
                   firstNode.expand();
                 }
                 this.$refs.tree.setCurrentKey(firstNode.data);
-                this.handleNodeClick(firstNode.data, firstNode, this)
+                this.handleNodeClick(firstNode.data, firstNode, this);
               });
             }
           }
           resolve(rows);
-        }
+        },
       });
     },
     handleNodeData(node) {
@@ -377,47 +455,58 @@ modules = {
       this.checkTags = rows;
     },
     getTabNames() {
-      return this.checkTags.map(item => item.tagName).join(",");
+      return this.checkTags.map((item) => item.tagName).join(",");
     },
     jsonImport() {
       this.$jsonImport({
-        saveUrl: USER_PREFIX + '/form_develop/importFormScript',
+        saveUrl: USER_PREFIX + "/form_develop/importFormScript",
         showResult: true,
         resultColumns: [
           {
-            title: this.$t1('脚本名称'),
-            field: 'scriptName',
+            title: this.$t1("脚本名称"),
+            field: "scriptName",
             width: 180,
-            fixed: 'left'
+            fixed: "left",
           },
           {
-            title: this.$t1('脚本编码'),
-            field: 'scriptCode',
-            width: 180
-          }
+            title: this.$t1("脚本编码"),
+            field: "scriptCode",
+            width: 180,
+          },
         ],
         callback: () => {
           this.searchEvent();
-        }
+        },
       });
     },
     jsonExport() {
       this.$jsonExport({
-        title:"逻辑脚本",
+        title: "逻辑脚本",
         targetRef: "table-m1",
         url: USER_PREFIX + "/form_develop/exportFormScript",
         abcEnabled: true,
         editAuth: this.currentFormType.editAuth,
-        selectTypeAuth: this.currentFormType.selectTypeAuth
-      })
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "逻辑脚本",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportFormScript",
+        plaintext: 1,
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
     },
     getBdEnv() {
       getBdFlag({
-        success: res => {
-          this.isDev = res.objx == 1
-        }
+        success: (res) => {
+          this.isDev = res.objx === 1;
+        },
       });
-    }
-  }
+    },
+  },
 };
-export default modules
+export default modules;

package/src/views/bd/setting/form_script/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/batchWfObjConfigDialog.vue

@@ -52,7 +52,7 @@
       </div>
     </el-dialog>
     <el-dialog
-      :title="$t1(resultType==1?'结果(成功)':'结果(失败)')"
+      :title="$t1(resultType===1?'结果(成功)':'结果(失败)')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="falseValue"