cloud-web-corejs 1.0.54-dev.705 → 1.0.54-dev.706

package/package.json

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

package/src/components/jsonImport/exportUtil.js

@@ -1,25 +1,3 @@
-function isNull(val) {
-  return val == null || val === "" || val === undefined;
-}
-
-export function formatJsonContent(content) {
-  if (isNull(content)) return "";
-  if (typeof content === "object") {
-    try {
-      return JSON.stringify(content, null, 2);
-    } catch (e) {
-      return String(content);
-    }
-  }
-  const text = String(content).trim();
-  if (!text) return "";
-  try {
-    return JSON.stringify(JSON.parse(text), null, 2);
-  } catch (e) {
-    return text;
-  }
-}
-
 function parseExportContent(content) {
   if (!content) {
     return { list: [], isArray: true };
@@ -62,129 +40,59 @@ export function getExportArchiveType(url) {
   return config ? config.type : null;
 }
 
-function getFormScriptPrefix(item) {
-  const scriptCode = item.scriptCode || "script";
-  const formCode = item.formCode;
-  return formCode ? `S-${scriptCode}-${formCode}` : `S-${scriptCode}`;
+function getFormScriptFileName(scriptCode, formCode) {
+  const code = scriptCode || "script";
+  return formCode ? `S&${code}&${formCode}` : `S&${code}`;
 }
 
-function appendFormTemplateExtraFiles(item, extraFiles, usedNames) {
+function buildFormTemplateScriptExtras(item) {
   const formCode = item.formCode || "form";
+  const usedNames = {};
 
-  if (!isNull(item.formViewContent)) {
-    const formatted = formatJsonContent(item.formViewContent);
-    item.formViewContent = formatted;
-    extraFiles.push({
-      fileName: uniqueFileName(`F-${formCode}-Item`, usedNames),
-      content: formatted,
-    });
-  }
-
-  (item.formScriptDTOs || []).forEach((scriptItem) => {
-    if (!scriptItem || isNull(scriptItem.script)) return;
-    const scriptCode = scriptItem.scriptCode || "script";
-    const scriptFormCode = scriptItem.formCode || formCode;
-    const formatted = formatJsonContent(scriptItem.script);
-    scriptItem.script = formatted;
-    extraFiles.push({
+  return (item.formScriptDTOs || []).reduce((files, scriptItem) => {
+    if (!scriptItem) return files;
+    files.push({
       fileName: uniqueFileName(
-        `FS-${scriptCode}-${scriptFormCode}-Item`,
+        getFormScriptFileName(scriptItem.scriptCode, scriptItem.formCode || formCode),
         usedNames
       ),
-      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,
+      content: JSON.stringify(scriptItem, null, 2),
     });
-  }
-
-  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),
-    mainFileName: `F-${formCode}-Source`,
-    extraFiles,
-  };
-}
-
-function processTableArchive(item) {
-  return {
-    mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `T-${item.taBm || "table"}`,
-    extraFiles: [],
-  };
+    return files;
+  }, []);
 }
 
-export function processArchiveExport(content, archiveType) {
-  const { list, invalid } = parseExportContent(content);
-  if (invalid || !list.length) {
-    return { mainContent: content, mainFileName: null, extraFiles: [] };
-  }
+function buildArchiveResult(item, archiveType) {
+  const mainContent = JSON.stringify(item, null, 2);
 
-  const item = list[0];
   switch (archiveType) {
     case ARCHIVE_TYPE.FORM_SCRIPT:
-      return processFormScriptArchive(item);
+      return {
+        mainContent,
+        mainFileName: getFormScriptFileName(item.scriptCode, item.formCode),
+        extraFiles: [],
+      };
     case ARCHIVE_TYPE.FORM_TEMPLATE:
-      return processFormTemplateArchive(item);
+      return {
+        mainContent,
+        mainFileName: `F&${item.formCode || "form"}`,
+        extraFiles: buildFormTemplateScriptExtras(item),
+      };
     case ARCHIVE_TYPE.TABLE:
-      return processTableArchive(item);
+      return {
+        mainContent,
+        mainFileName: `T&${item.taBm || "table"}`,
+        extraFiles: [],
+      };
     default:
-      return { mainContent: content, mainFileName: null, extraFiles: [] };
+      return { mainContent, mainFileName: null, extraFiles: [] };
   }
 }
 
-/** 批量导出：仅格式化主 JSON 中的大字段，不额外拆文件 */
-export function formatBatchExportContent(content, url) {
-  const archiveType = getExportArchiveType(url);
-  if (!archiveType || archiveType === ARCHIVE_TYPE.TABLE) {
-    return content;
-  }
-
-  const { list, isArray, invalid } = parseExportContent(content);
+export function processArchiveExport(content, archiveType) {
+  const { list, invalid } = parseExportContent(content);
   if (invalid || !list.length) {
-    return content;
+    return { mainContent: content, mainFileName: null, extraFiles: [] };
   }
-
-  list.forEach((item) => formatExportFields(item, archiveType));
-  return JSON.stringify(isArray ? list : list[0], null, 2);
+  return buildArchiveResult(list[0], archiveType);
 }

package/src/components/jsonImport/index.js

@@ -5,7 +5,6 @@ import exportDialog from "./exportDialog.vue";
 import { getBdEnv } from "@base/api/user";
 import { encrypt } from "@base/utils/aes";
 import {
-  formatBatchExportContent,
   getExportArchiveType,
   processArchiveExport,
 } from "./exportUtil";
@@ -107,9 +106,12 @@ moudule.install = function (Vue) {
             if (archiveType) {
               const processed = processArchiveExport(content, archiveType);
               downloadTxt(processed.mainFileName, processed.mainContent);
-              downloadExtraFiles(processed.extraFiles);
+              (processed.extraFiles || []).forEach((file, index) => {
+                setTimeout(() => {
+                  downloadTxt(file.fileName, file.content);
+                }, (index + 1) * 300);
+              });
             } else {
-              content = formatBatchExportContent(content, options.url);
               let fileName = options.fileName;
               if (!fileName) {
                 const timeStr = res.time
@@ -157,15 +159,6 @@ moudule.install = function (Vue) {
   };
 };
 
-function downloadExtraFiles(extraFiles) {
-  if (!extraFiles || !extraFiles.length) return;
-  extraFiles.forEach((file, index) => {
-    setTimeout(() => {
-      downloadTxt(file.fileName, file.content);
-    }, (index + 1) * 300);
-  });
-}
-
 function downloadTxt(fileName, content) {
   // 创建Blob对象
   const blob = new Blob([content], { type: "text/plain;charset=utf-8" });