cloud-web-corejs 1.0.54-dev.697 → 1.0.54-dev.699

package/package.json

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

package/src/components/jsonImport/exportUtil.js

@@ -44,56 +44,32 @@ function uniqueFileName(fileName, usedNames) {
   return `${fileName}_${usedNames[fileName]}`;
 }
 
-export const EXPORT_ARCHIVE_TYPES = {
+const ARCHIVE_TYPE = {
   FORM_SCRIPT: "formScript",
   FORM_TEMPLATE: "formTemplate",
   TABLE: "table",
 };
 
+const ARCHIVE_URL_MAP = [
+  { match: "/form_develop/exportFormScript", type: ARCHIVE_TYPE.FORM_SCRIPT },
+  { match: "/form_develop/exportFormTemplate", type: ARCHIVE_TYPE.FORM_TEMPLATE },
+  { match: "/form_develop/exportSzTaMb", type: ARCHIVE_TYPE.TABLE },
+];
+
 export function getExportArchiveType(url) {
   if (!url) return null;
-  if (url.includes("/form_develop/exportFormScript")) {
-    return EXPORT_ARCHIVE_TYPES.FORM_SCRIPT;
-  }
-  if (url.includes("/form_develop/exportFormTemplate")) {
-    return EXPORT_ARCHIVE_TYPES.FORM_TEMPLATE;
-  }
-  if (url.includes("/form_develop/exportSzTaMb")) {
-    return EXPORT_ARCHIVE_TYPES.TABLE;
-  }
-  return null;
+  const config = ARCHIVE_URL_MAP.find((item) => url.includes(item.match));
+  return config ? config.type : null;
 }
 
-function getFormScriptArchivePrefix(item) {
+function getFormScriptPrefix(item) {
   const scriptCode = item.scriptCode || "script";
   const formCode = item.formCode;
   return formCode ? `S-${scriptCode}-${formCode}` : `S-${scriptCode}`;
 }
 
-function processFormScriptArchiveItem(item) {
-  const prefix = getFormScriptArchivePrefix(item);
-  const extraFiles = [];
-
-  if (!isNull(item.script)) {
-    const formatted = formatJsonContent(item.script);
-    item.script = formatted;
-    extraFiles.push({
-      fileName: `${prefix}-Item`,
-      content: formatted,
-    });
-  }
-
-  return {
-    mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `${prefix}-Source`,
-    extraFiles,
-  };
-}
-
-function processFormTemplateArchiveItem(item) {
+function appendFormTemplateExtraFiles(item, extraFiles, usedNames) {
   const formCode = item.formCode || "form";
-  const extraFiles = [];
-  const usedNames = {};
 
   if (!isNull(item.formViewContent)) {
     const formatted = formatJsonContent(item.formViewContent);
@@ -104,8 +80,7 @@ function processFormTemplateArchiveItem(item) {
     });
   }
 
-  const formScriptDTOs = item.formScriptDTOs || [];
-  formScriptDTOs.forEach((scriptItem) => {
+  (item.formScriptDTOs || []).forEach((scriptItem) => {
     if (!scriptItem || isNull(scriptItem.script)) return;
     const scriptCode = scriptItem.scriptCode || "script";
     const scriptFormCode = scriptItem.formCode || formCode;
@@ -119,6 +94,50 @@ function processFormTemplateArchiveItem(item) {
       content: formatted,
     });
   });
+}
+
+function formatExportFields(item, archiveType) {
+  if (archiveType === ARCHIVE_TYPE.FORM_SCRIPT && !isNull(item.script)) {
+    item.script = formatJsonContent(item.script);
+    return;
+  }
+  if (archiveType === ARCHIVE_TYPE.FORM_TEMPLATE) {
+    if (!isNull(item.formViewContent)) {
+      item.formViewContent = formatJsonContent(item.formViewContent);
+    }
+    (item.formScriptDTOs || []).forEach((scriptItem) => {
+      if (scriptItem && !isNull(scriptItem.script)) {
+        scriptItem.script = formatJsonContent(scriptItem.script);
+      }
+    });
+  }
+}
+
+function processFormScriptArchive(item) {
+  const prefix = getFormScriptPrefix(item);
+  formatExportFields(item, ARCHIVE_TYPE.FORM_SCRIPT);
+  const extraFiles = [];
+
+  if (!isNull(item.script)) {
+    extraFiles.push({
+      fileName: `${prefix}-Item`,
+      content: item.script,
+    });
+  }
+
+  return {
+    mainContent: JSON.stringify(item, null, 2),
+    mainFileName: `${prefix}-Source`,
+    extraFiles,
+  };
+}
+
+function processFormTemplateArchive(item) {
+  const formCode = item.formCode || "form";
+  const extraFiles = [];
+  const usedNames = {};
+
+  appendFormTemplateExtraFiles(item, extraFiles, usedNames);
 
   return {
     mainContent: JSON.stringify(item, null, 2),
@@ -127,11 +146,10 @@ function processFormTemplateArchiveItem(item) {
   };
 }
 
-function processTableArchiveItem(item) {
-  const taBm = item.taBm || "table";
+function processTableArchive(item) {
   return {
     mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `T-${taBm}`,
+    mainFileName: `T-${item.taBm || "table"}`,
     extraFiles: [],
   };
 }
@@ -144,87 +162,29 @@ export function processArchiveExport(content, archiveType) {
 
   const item = list[0];
   switch (archiveType) {
-    case EXPORT_ARCHIVE_TYPES.FORM_SCRIPT:
-      return processFormScriptArchiveItem(item);
-    case EXPORT_ARCHIVE_TYPES.FORM_TEMPLATE:
-      return processFormTemplateArchiveItem(item);
-    case EXPORT_ARCHIVE_TYPES.TABLE:
-      return processTableArchiveItem(item);
+    case ARCHIVE_TYPE.FORM_SCRIPT:
+      return processFormScriptArchive(item);
+    case ARCHIVE_TYPE.FORM_TEMPLATE:
+      return processFormTemplateArchive(item);
+    case ARCHIVE_TYPE.TABLE:
+      return processTableArchive(item);
     default:
       return { mainContent: content, mainFileName: null, extraFiles: [] };
   }
 }
 
-export function getExportExtraConfig(url, options = {}) {
-  if (options.extraExport) {
-    return options.extraExport;
-  }
-  if (!url) return null;
-  if (url.includes("/form_develop/exportFormScript")) {
-    return {
-      field: "script",
-      getExtraFileName(item) {
-        const prefix = getFormScriptArchivePrefix(item);
-        return `${prefix}-Item`;
-      },
-    };
-  }
-  if (url.includes("/form_develop/exportFormTemplate")) {
-    return {
-      field: "formViewContent",
-      getExtraFileName(item) {
-        return `F-${item.formCode || "form"}-Item`;
-      },
-    };
-  }
-  return null;
-}
-
-export function processExportContent(content, extraConfig) {
-  if (!extraConfig) {
-    return { mainContent: content, extraFiles: [] };
+/** 批量导出：仅格式化主 JSON 中的大字段，不额外拆文件 */
+export function formatBatchExportContent(content, url) {
+  const archiveType = getExportArchiveType(url);
+  if (!archiveType || archiveType === ARCHIVE_TYPE.TABLE) {
+    return content;
   }
 
-  const { field, getExtraFileName } = extraConfig;
   const { list, isArray, invalid } = parseExportContent(content);
-
   if (invalid || !list.length) {
-    return { mainContent: content, extraFiles: [] };
+    return content;
   }
 
-  const extraFiles = [];
-  const usedNames = {};
-
-  list.forEach((item, index) => {
-    if (!item || isNull(item[field])) return;
-
-    const formatted = formatJsonContent(item[field]);
-    item[field] = formatted;
-
-    let fileName = getExtraFileName(item, index);
-    if (!fileName) return;
-
-    fileName = uniqueFileName(fileName, usedNames);
-    extraFiles.push({ fileName, content: formatted });
-
-    if (field === "formViewContent" && Array.isArray(item.formScriptDTOs)) {
-      item.formScriptDTOs.forEach((scriptItem) => {
-        if (!scriptItem || isNull(scriptItem.script)) return;
-        const scriptCode = scriptItem.scriptCode || "script";
-        const formCode = scriptItem.formCode || item.formCode || "form";
-        const scriptFormatted = formatJsonContent(scriptItem.script);
-        scriptItem.script = scriptFormatted;
-        extraFiles.push({
-          fileName: uniqueFileName(
-            `FS-${scriptCode}-${formCode}-Item`,
-            usedNames
-          ),
-          content: scriptFormatted,
-        });
-      });
-    }
-  });
-
-  const mainContent = JSON.stringify(isArray ? list : list[0], null, 2);
-  return { mainContent, extraFiles };
+  list.forEach((item) => formatExportFields(item, archiveType));
+  return JSON.stringify(isArray ? list : list[0], null, 2);
 }

package/src/components/jsonImport/index.js

@@ -3,12 +3,11 @@ import vue from "vue";
 import excelImport from "./index.vue";
 import exportDialog from "./exportDialog.vue";
 import { getBdEnv } from "@base/api/user";
-import { encrypt, decrypt } from "@base/utils/aes";
+import { encrypt } from "@base/utils/aes";
 import {
+  formatBatchExportContent,
   getExportArchiveType,
-  getExportExtraConfig,
   processArchiveExport,
-  processExportContent,
 } from "./exportUtil";
 
 import { getToken } from "../../utils/auth";
@@ -61,7 +60,6 @@ moudule.install = function (Vue) {
   Vue.prototype.$jsonImport = toDo;
 
   Vue.prototype.$jsonExport = async function (options) {
-    let reqData = {};
     let targetRef = options.targetRef;
     let abcEnabled = options.abcEnabled !== false;
     let editAuth = options.editAuth;
@@ -103,35 +101,24 @@ moudule.install = function (Vue) {
         success: (res) => {
           let content = res.objx;
           if (content && content !== "[]") {
-            let fileName;
             const archiveType = options.plaintext
               && getExportArchiveType(options.url);
 
             if (archiveType) {
               const processed = processArchiveExport(content, archiveType);
-              content = processed.mainContent;
-              fileName = processed.mainFileName || options.fileName;
-              downloadTxt(fileName, content);
+              downloadTxt(processed.mainFileName, processed.mainContent);
               downloadExtraFiles(processed.extraFiles);
             } else {
-              if (options.fileName) {
-                fileName = options.fileName;
-              } else {
-                let timeStr = res.time
+              content = formatBatchExportContent(content, options.url);
+              let fileName = options.fileName;
+              if (!fileName) {
+                const timeStr = res.time
                   .replaceAll(":", "")
                   .replaceAll("-", "")
                   .replaceAll(" ", "");
-                fileName = options.title + "(" + timeStr + ")";
-              }
-              const extraConfig = getExportExtraConfig(options.url, options);
-              if (extraConfig) {
-                const processed = processExportContent(content, extraConfig);
-                content = processed.mainContent;
-                downloadTxt(fileName, content);
-                downloadExtraFiles(processed.extraFiles);
-              } else {
-                downloadTxt(fileName, content);
+                fileName = `${options.title}(${timeStr})`;
               }
+              downloadTxt(fileName, content);
             }
           } else {
             this.$baseAlert(this.$t1("不存在需要导出的数据"));

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -280,11 +280,26 @@ export default {
             field: "remark",
             width: 150,
           },
+          {
+            title: this.$t1("创建人"),
+            field: "_createBy",
+            width: 150,
+          },  
           {
             title: this.$t1("创建时间"),
             field: "createDate",
             width: 150,
           },
+          {
+            title: this.$t1("更新人"),
+            field: "_modifyBy",
+            width: 150,
+          },
+          {
+            title: this.$t1("更新时间"),
+            field: "modifyDate",
+            width: 150,
+          },
           {
             width: 90,
             fixed: "right",

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

@@ -79,6 +79,7 @@
                 @reverCallback="searchEvent"
               ></formVersionButton>
               <a
+                v-if="exportArchiveEnabled"
                 href="javascript:void(0);"
                 class="a-link"
                 @click="jsonExportArchive(row)"

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

@@ -147,6 +147,7 @@
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a
+                  v-if="exportArchiveEnabled"
                   href="javascript:void(0);"
                   class="a-link"
                   @click="jsonExportArchive(row)"

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

@@ -3,6 +3,7 @@ import editView from "@base/views/bd/setting/form_script/edit.vue";
 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 = {
@@ -28,6 +29,15 @@ modules = {
       isDev: true,
     };
   },
+  computed: {
+    exportArchiveEnabled() {
+      return settingConfig.exportArchiveEnabled === true;
+    },
+    operationColumnWidth() {
+      const btnWidth = 47;
+      return this.exportArchiveEnabled ? btnWidth * 2 : btnWidth;
+    },
+  },
   mounted() {
     this.getBdEnv();
     this.initTableList();
@@ -155,7 +165,7 @@ modules = {
             width: 150,
           },
           {
-            width: 100,
+            width: this.operationColumnWidth,
             fixed: "right",
             title: "",
             sortable: false,

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

@@ -12,6 +12,7 @@ import {
   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 = {
@@ -92,6 +93,13 @@ modules = {
     otherFlag() {
       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" });
@@ -274,7 +282,7 @@ modules = {
             width: 150,
           },
           {
-            width: 100,
+            width: this.operationColumnWidth,
             fixed: "right",
             title: "",
             sortable: false,

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

@@ -162,6 +162,7 @@
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a
+                  v-if="exportArchiveEnabled"
                   href="javascript:void(0);"
                   class="a-link"
                   @click="jsonExportArchive(row)"

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

@@ -19,6 +19,7 @@ import {
   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 = {
@@ -153,6 +154,13 @@ modules = {
     otherFlag() {
       return this.currentFormType?.menuKindCode === "other";
     },
+    exportArchiveEnabled() {
+      return settingConfig.exportArchiveEnabled === true;
+    },
+    operationColumnWidth() {
+      const btnWidth = 47;
+      return this.exportArchiveEnabled ? btnWidth * 3 : btnWidth * 2;
+    },
   },
   watch: {
     formDesTabs(val) {
@@ -402,7 +410,7 @@ modules = {
             width: 150,
           },
           {
-            width: 135,
+            width: this.operationColumnWidth,
             fixed: "right",
             title: "",
             sortable: false,

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

@@ -151,6 +151,7 @@
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a
+                  v-if="exportArchiveEnabled"
                   href="javascript:void(0);"
                   class="a-link"
                   @click="jsonExportArchive(row)"

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

@@ -10,6 +10,7 @@ import {getBdFlag} from "@base/api/user";
 import {getJsxEditLink, getJsxStatus} from "@base/views/bd/setting/utils";
 import { mapGetters } from "vuex";
 import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
+import settingConfig from "@/settings";
 
 let modules = {};
 modules = {
@@ -103,6 +104,13 @@ modules = {
     ...mapGetters([
       "userFlag",
     ]),
+    exportArchiveEnabled() {
+      return settingConfig.exportArchiveEnabled === true;
+    },
+    operationColumnWidth() {
+      const btnWidth = 47;
+      return this.exportArchiveEnabled ? btnWidth * 2 : btnWidth;
+    },
   },
   methods: {
     searchEvent() {
@@ -249,7 +257,7 @@ modules = {
             width: 150
           },
           {
-            width: 100,
+            width: this.operationColumnWidth,
             fixed: 'right',
             title: '',
             sortable: false,