cloud-web-corejs 1.0.54-dev.693 → 1.0.54-dev.694

package/package.json

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

package/src/components/jsonImport/index.js

@@ -82,6 +82,9 @@ moudule.install = function (Vue) {
       if (abc) {
         reqData.abc = abc;
       }
+      if (options.plaintext) {
+        reqData.plaintext = options.plaintext;
+      }
       let data = {
         datas: encrypt(JSON.stringify(reqData))
       }
@@ -94,8 +97,20 @@ moudule.install = function (Vue) {
         success: res => {
           let content = res.objx
           if (content && content !== "[]") {
-            let timeStr = res.time.replaceAll(":", "").replaceAll("-", "").replaceAll(" ", "");
-            let fileName = options.title +"("+timeStr+")";
+            let fileName;
+            if (options.fileName) {
+              fileName = options.fileName;
+            } else {
+              let timeStr = res.time.replaceAll(":", "").replaceAll("-", "").replaceAll(" ", "");
+              fileName = options.title +"("+timeStr+")";
+            }
+            if (options.plaintext) {
+              try {
+                content = JSON.stringify(JSON.parse(content), null, 2);
+              } catch (e) {
+                // content is not valid JSON, keep original
+              }
+            }
             downloadTxt(fileName, content)
           } else {
             this.$baseAlert(this.$t1('不存在需要导出的数据'))

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

@@ -72,23 +72,27 @@
               </tableForm>
             </template>
             <template #operation="{ row }">
-              <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
+              <formVersionButton
+                objType="FormScript"
+                :objCode="row.scriptCode"
+                :relationCode="row.formCode"
+                @reverCallback="searchEvent"
+              ></formVersionButton>
+              <a
+                href="javascript:void(0);"
+                class="a-link"
+                @click="jsonExportArchive(row)"
+              >
                 <el-tooltip
                   :enterable="false"
                   effect="dark"
-                  :content="$t1('查看')"
+                  :content="$t1('导出归档')"
                   placement="top"
                   popper-class="tooltip-skin"
                 >
-                  <i class="el-icon-edit" />
+                  <i class="el-icon-upload2" />
                 </el-tooltip>
               </a>
-              <formVersionButton
-                objType="FormScript"
-                :objCode="row.scriptCode"
-                :relationCode="row.formCode"
-                @reverCallback="searchEvent"
-              ></formVersionButton>
             </template>
           </vxe-grid>
         </div>

package/src/views/bd/setting/form_script/list1.vue

@@ -140,23 +140,27 @@
                 ></projectTagView>
               </template>
               <template #operation="{ row }">
-                <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
+                <formVersionButton
+                  objType="FormScript"
+                  :objCode="row.scriptCode"
+                  :relationCode="row.formCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+                <a
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="jsonExportArchive(row)"
+                >
                   <el-tooltip
                     :enterable="false"
                     effect="dark"
-                    :content="$t1('查看')"
+                    :content="$t1('导出归档')"
                     placement="top"
                     popper-class="tooltip-skin"
                   >
-                    <i class="el-icon-edit" />
+                    <i class="el-icon-upload2" />
                   </el-tooltip>
                 </a>
-                <formVersionButton
-                  objType="FormScript"
-                  :objCode="row.scriptCode"
-                  :relationCode="row.formCode"
-                  @reverCallback="searchEvent"
-                ></formVersionButton>
               </template>
             </vxe-grid>
           </div>

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

@@ -1,7 +1,7 @@
 import tableForm from "@base/components/table/tableForm.vue";
 import editView from "@base/views/bd/setting/form_script/edit.vue";
 import { getBdFlag } from "@base/api/user";
-import { getJsxBtn, getJsxStatus } from "@base/views/bd/setting/utils/index";
+import { getJsxEditLink, getJsxStatus } from "@base/views/bd/setting/utils/index";
 import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
 
 let modules = {};
@@ -78,6 +78,16 @@ modules = {
             field: "scriptName",
             width: 180,
             fixed: "left",
+            slots: {
+              default: ({ row }) => {
+                return getJsxEditLink({
+                  content: row.scriptName,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
           },
           {
             title: this.$t1("脚本编码"),
@@ -270,6 +280,16 @@ modules = {
         abcEnabled: true,
       });
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "通用脚本",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportFormScript",
+        plaintext: 1,
+        fileName: row.scriptCode + "(script)",
+        abcEnabled: true,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: (res) => {

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

@@ -7,7 +7,10 @@ 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 {
+  getJsxEditLink,
+  getJsxStatus,
+} from "@base/views/bd/setting/utils/index";
 import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
 
 let modules = {};
@@ -158,6 +161,16 @@ modules = {
             field: "scriptName",
             width: 180,
             fixed: "left",
+            slots: {
+              default: ({ row }) => {
+                return getJsxEditLink({
+                  content: row.scriptName,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
           },
           {
             title: this.$t1("项目标签"),
@@ -266,7 +279,7 @@ modules = {
             title: "",
             sortable: false,
             slots: {
-              default: "operation"
+              default: "operation",
             },
           },
         ],
@@ -468,6 +481,18 @@ modules = {
         selectTypeAuth: this.currentFormType.selectTypeAuth,
       });
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "逻辑脚本",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportFormScript",
+        plaintext: 1,
+        fileName: row.scriptCode + "(script)",
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: (res) => {

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

@@ -141,17 +141,6 @@
                 ></projectTagView>
               </template>
               <template #operation="{ row }">
-                <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
-                  <el-tooltip
-                    :enterable="false"
-                    effect="dark"
-                    :content="$t1('查看')"
-                    placement="top"
-                    popper-class="tooltip-skin"
-                  >
-                    <i class="el-icon-edit" />
-                  </el-tooltip>
-                </a>
                 <a
                   href="javascript:void(0);"
                   class="a-link"
@@ -172,6 +161,21 @@
                   :objCode="row.formCode"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
+                <a
+                  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

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

@@ -10,11 +10,12 @@ import ftHistoryDialog from "@base/views/bd/setting/form_template/ftHistoryDialo
 import itemList from "@base/views/bd/setting/form_template/itemList.vue";
 import formTypeEditDialog from "@base/views/user/form/form_type/editDialog.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 { 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";
@@ -35,7 +36,8 @@ modules = {
     itemList,
     formTypeEditDialog,
     projectTagDialog,
-    formDesignerDialog: () => import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
+    formDesignerDialog: () =>
+      import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
     formVersionButton,
   },
   data() {
@@ -149,8 +151,8 @@ modules = {
       return this.currentFormType?.name || null;
     },
     otherFlag() {
-      return this.currentFormType?.menuKindCode === "other"
-    }
+      return this.currentFormType?.menuKindCode === "other";
+    },
   },
   watch: {
     formDesTabs(val) {
@@ -160,7 +162,7 @@ modules = {
     },
   },
   mounted() {
-    treeScollx({target: this, type: "default"});
+    treeScollx({ target: this, type: "default" });
     this.getBdEnv();
     this.initTableList();
     this.initWfWinParam();
@@ -194,7 +196,7 @@ modules = {
       } else {
         this.getOtherMenuKindAuth(row, (editAuth) => {
           this.openDesingerDialog(row, null, !editAuth);
-        })
+        });
       }
     },
     getOtherMenuKindAuth(row, callback) {
@@ -203,11 +205,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);
           },
         });
       }
@@ -218,11 +220,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() {
@@ -258,8 +260,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,
@@ -274,9 +279,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;
         },
@@ -284,20 +289,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)
@@ -321,7 +336,7 @@ modules = {
             field: "enabled",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return getJsxStatus(null, this.$t1("启用"));
                 } else {
@@ -335,7 +350,7 @@ modules = {
             field: "hasWf",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.hasWf) {
                   return getJsxStatus(null, this.$t1("是"));
                 } else {
@@ -359,35 +374,35 @@ modules = {
             field: "remark",
             width: 150,
           },
-          {field: "serviceName", title: this.$t1("服务名"), width: 150},
+          { field: "serviceName", title: this.$t1("服务名"), width: 150 },
           {
             title: this.$t1("版本号"),
             field: "version",
             width: 150,
           },
-          {title: this.$t1("唯一标识"), field: "sid", width: 280},
+          { title: this.$t1("唯一标识"), field: "sid", 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: 140,
+            width: 135,
             fixed: "right",
             title: "",
             sortable: false,
@@ -424,8 +439,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 },
             ],
           },
           {
@@ -441,27 +456,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('操作日志'), field: "logContent", 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: {
@@ -562,7 +592,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";
@@ -573,7 +603,7 @@ modules = {
         data: {
           parent: id,
           enabled: true,
-          dataType: 2
+          dataType: 2,
         },
         success: (res) => {
           let rows = res.objx || [];
@@ -585,8 +615,8 @@ modules = {
               id: "other",
               menuKindCode: "other",
               name: "其他分类",
-              leaf: true
-            })
+              leaf: true,
+            });
             if (rows.length > 0) {
               this.$nextTick(() => {
                 let firstNode = node.childNodes[0];
@@ -624,15 +654,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(";")
@@ -642,7 +672,7 @@ modules = {
                   });
                 return h("div", {}, items);
               },
-            }
+            },
           },
         ],
         callback: () => {
@@ -660,6 +690,18 @@ modules = {
         selectTypeAuth: this.currentFormType.selectTypeAuth,
       });
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "表单模板",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportFormTemplate",
+        plaintext: 1,
+        fileName: row.formCode + "(form)",
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: (res) => {

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

@@ -145,22 +145,26 @@
                 ></projectTagView>
               </template>
               <template #operation="{ row }">
-                <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
+                <formVersionButton
+                  objType="SzTaMb"
+                  :objCode="row.taCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+                <a
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="jsonExportArchive(row)"
+                >
                   <el-tooltip
                     :enterable="false"
                     effect="dark"
-                    :content="$t1('查看')"
+                    :content="$t1('导出归档')"
                     placement="top"
                     popper-class="tooltip-skin"
                   >
-                    <i class="el-icon-edit" />
+                    <i class="el-icon-upload2" />
                   </el-tooltip>
                 </a>
-                <formVersionButton
-                  objType="SzTaMb"
-                  :objCode="row.taCode"
-                  @reverCallback="searchEvent"
-                ></formVersionButton>
               </template>
             </vxe-grid>
           </div>

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

@@ -7,7 +7,7 @@ import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import {treeScollx} from "@base/utils/global";
 import {getBdFlag} from "@base/api/user";
-import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils";
+import {getJsxEditLink, getJsxStatus} from "@base/views/bd/setting/utils";
 import { mapGetters } from "vuex";
 import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
 
@@ -157,7 +157,22 @@ modules = {
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('实体名称'), field: 'taEn', width: 150, fixed: 'left'},
+          {
+            title: this.$t1('实体名称'),
+            field: 'taEn',
+            width: 150,
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return getJsxEditLink({
+                  content: row.taEn,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
+          },
           {
             title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
@@ -429,6 +444,18 @@ modules = {
         selectTypeAuth: this.currentFormType.selectTypeAuth
       })
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "数据表",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportSzTaMb",
+        plaintext: 1,
+        fileName: row.taBm + "(table)",
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: res => {

package/src/views/bd/setting/utils/index.js

@@ -48,6 +48,21 @@ export function getJsxLink({content, onclick}) {
   }, content)]
 }
 
+export function getJsxEditLink({content, onclick}) {
+  let h = window.$vueRoot.$createElement;
+  return [h("a", {
+    staticClass: "a-link",
+    on: {
+      click: (event) => {
+        onclick && onclick(event);
+      }
+    }
+  }, [
+    h("i", {staticClass: "el-icon-edit"}),
+    h("span", {}, content)
+  ])]
+}
+
 export function getJsxBtnList(list) {
   let arr = [];
   list.forEach(item => {