cloud-web-corejs 1.0.54-dev.696 → 1.0.54-dev.698

package/package.json

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

package/src/components/jsonImport/exportUtil.js

@@ -35,68 +35,156 @@ function parseExportContent(content) {
   }
 }
 
-export function getExportExtraConfig(url, options = {}) {
-  if (options.extraExport) {
-    return options.extraExport;
+function uniqueFileName(fileName, usedNames) {
+  if (!usedNames[fileName]) {
+    usedNames[fileName] = 1;
+    return fileName;
   }
+  usedNames[fileName] += 1;
+  return `${fileName}_${usedNames[fileName]}`;
+}
+
+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 {
-      field: "script",
-      getExtraFileName(item) {
-        const scriptCode = item.scriptCode || "script";
-        const formCode = item.formCode;
-        return formCode
-          ? `${scriptCode} - ${formCode} - item(script)`
-          : `${scriptCode} - item(script)`;
-      },
-    };
-  }
-  if (url.includes("/form_develop/exportFormTemplate")) {
-    return {
-      field: "formViewContent",
-      getExtraFileName(item) {
-        return `${item.formCode || "form"} - item(form)`;
-      },
-    };
+  const config = ARCHIVE_URL_MAP.find((item) => url.includes(item.match));
+  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 appendFormTemplateExtraFiles(item, extraFiles, usedNames) {
+  const formCode = item.formCode || "form";
+
+  if (!isNull(item.formViewContent)) {
+    const formatted = formatJsonContent(item.formViewContent);
+    item.formViewContent = formatted;
+    extraFiles.push({
+      fileName: uniqueFileName(`F-${formCode}-Item`, usedNames),
+      content: formatted,
+    });
   }
-  return null;
+
+  (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({
+      fileName: uniqueFileName(
+        `FS-${scriptCode}-${scriptFormCode}-Item`,
+        usedNames
+      ),
+      content: formatted,
+    });
+  });
 }
 
-export function processExportContent(content, extraConfig) {
-  if (!extraConfig) {
-    return { mainContent: content, extraFiles: [] };
+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);
+      }
+    });
   }
+}
 
-  const { field, getExtraFileName } = extraConfig;
-  const { list, isArray, invalid } = parseExportContent(content);
+function processFormScriptArchive(item) {
+  const prefix = getFormScriptPrefix(item);
+  formatExportFields(item, ARCHIVE_TYPE.FORM_SCRIPT);
+  const extraFiles = [];
 
-  if (invalid || !list.length) {
-    return { mainContent: content, 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 = {};
 
-  list.forEach((item, index) => {
-    if (!item || isNull(item[field])) return;
+  appendFormTemplateExtraFiles(item, extraFiles, usedNames);
 
-    const formatted = formatJsonContent(item[field]);
-    item[field] = formatted;
+  return {
+    mainContent: JSON.stringify(item, null, 2),
+    mainFileName: `F-${formCode}-Source`,
+    extraFiles,
+  };
+}
 
-    let fileName = getExtraFileName(item, index);
-    if (!fileName) return;
+function processTableArchive(item) {
+  return {
+    mainContent: JSON.stringify(item, null, 2),
+    mainFileName: `T-${item.taBm || "table"}`,
+    extraFiles: [],
+  };
+}
 
-    if (usedNames[fileName]) {
-      usedNames[fileName] += 1;
-      fileName = `${fileName}_${usedNames[fileName]}`;
-    } else {
-      usedNames[fileName] = 1;
-    }
+export function processArchiveExport(content, archiveType) {
+  const { list, invalid } = parseExportContent(content);
+  if (invalid || !list.length) {
+    return { mainContent: content, mainFileName: null, extraFiles: [] };
+  }
 
-    extraFiles.push({ fileName, content: formatted });
-  });
+  const item = list[0];
+  switch (archiveType) {
+    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: [] };
+  }
+}
+
+/** 批量导出：仅格式化主 JSON 中的大字段，不额外拆文件 */
+export function formatBatchExportContent(content, url) {
+  const archiveType = getExportArchiveType(url);
+  if (!archiveType || archiveType === ARCHIVE_TYPE.TABLE) {
+    return content;
+  }
+
+  const { list, isArray, invalid } = parseExportContent(content);
+  if (invalid || !list.length) {
+    return content;
+  }
 
-  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,10 +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 {
-  getExportExtraConfig,
-  processExportContent,
+  formatBatchExportContent,
+  getExportArchiveType,
+  processArchiveExport,
 } from "./exportUtil";
 
 import { getToken } from "../../utils/auth";
@@ -59,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;
@@ -101,27 +101,23 @@ moudule.install = function (Vue) {
         success: (res) => {
           let content = res.objx;
           if (content && content !== "[]") {
-            let fileName;
-            if (options.fileName) {
-              fileName = options.fileName;
-            } else {
-              let 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;
-              const extraFiles = resolveExtraFileNames(
-                processed.extraFiles,
-                options.fileName
-              );
-              downloadTxt(fileName, content);
-              downloadExtraFiles(extraFiles);
+            const archiveType = options.plaintext
+              && getExportArchiveType(options.url);
+
+            if (archiveType) {
+              const processed = processArchiveExport(content, archiveType);
+              downloadTxt(processed.mainFileName, processed.mainContent);
+              downloadExtraFiles(processed.extraFiles);
             } else {
+              content = formatBatchExportContent(content, options.url);
+              let fileName = options.fileName;
+              if (!fileName) {
+                const timeStr = res.time
+                  .replaceAll(":", "")
+                  .replaceAll("-", "")
+                  .replaceAll(" ", "");
+                fileName = `${options.title}(${timeStr})`;
+              }
               downloadTxt(fileName, content);
             }
           } else {
@@ -161,19 +157,6 @@ moudule.install = function (Vue) {
   };
 };
 
-function resolveExtraFileNames(extraFiles, mainFileName) {
-  if (!extraFiles || !extraFiles.length) return [];
-  return extraFiles.map((file) => {
-    if (mainFileName && file.fileName === mainFileName) {
-      return {
-        ...file,
-        fileName: `${file.fileName}-content`,
-      };
-    }
-    return file;
-  });
-}
-
 function downloadExtraFiles(extraFiles) {
   if (!extraFiles || !extraFiles.length) return;
   extraFiles.forEach((file, index) => {

package/src/layout/components/Sidebar/default.vue

@@ -142,9 +142,15 @@
           :key="'menuModule' + menuModule.id"
           @click.native="rourteTo(menuModule)"
         >
-          <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
+          <i
+            :class="getMenuClass(menuModule, 1)"
+            v-if="menuModule.children.length <= 0"
+          ></i>
           <template slot="title">
-            <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
+            <i
+              :class="getMenuClass(menuModule, 1)"
+              v-if="menuModule.children.length > 0"
+            ></i>
             <span>{{ getMenuName(menuModule) }}</span>
           </template>
           <component
@@ -173,7 +179,7 @@
             </el-menu-item>
           </component>
         </component>
-        <el-menu-item
+        <!-- <el-menu-item
           @click.native="openCreateCompanyDialog"
           index="xx"
           v-if="isFormDev"
@@ -182,7 +188,7 @@
             <i :class="getMenuClass({}, 1)"></i>
             <span>新建企业</span>
           </template>
-        </el-menu-item>
+        </el-menu-item> -->
       </el-scrollbar>
     </el-menu>
     <div class="menu-btn">
@@ -797,7 +803,7 @@ export default {
           if (sh >= 0) {
             $snav.style["margin-top"] = sh1 + "px";
           } else if (sh < 0) {
-            let bd = sh1 + sh ;
+            let bd = sh1 + sh;
 
             $snav.style["margin-top"] = bd + "px";
             $snav.querySelector(".ico-arrow").style["margin-top"] =
@@ -1057,30 +1063,49 @@ export default {
     position: relative;
     background-color: rgba(0, 0, 0, 0.2);
     word-break: break-word;
-    .el-scrollbar__view >{
-      .el-menu-item{padding:0 11px !important;
-        span{font-size:14px;}
+    .el-scrollbar__view > {
+      .el-menu-item {
+        padding: 0 11px !important;
+        span {
+          font-size: 14px;
+        }
       }
-      .el-submenu > .el-submenu__title{padding:0 11px !important;
-        span{font-size:14px;}
-        ~ .el-menu{
-          padding:5px 0;display: grid;
-          > .el-menu-item{
-             span{line-height:1.4;height: 26px;}
+      .el-submenu > .el-submenu__title {
+        padding: 0 11px !important;
+        span {
+          font-size: 14px;
+        }
+        ~ .el-menu {
+          padding: 5px 0;
+          display: grid;
+          > .el-menu-item {
+            span {
+              line-height: 1.4;
+              height: 26px;
+            }
           }
-          .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
-            span{color:$baseColor;}
-            i.iconfont{color:$baseColor}
+          .el-submenu.is-opened .el-submenu__title {
+            background-color: #fff;
+            opacity: 1;
+            span {
+              color: $baseColor;
+            }
+            i.iconfont {
+              color: $baseColor;
+            }
           }
         }
-
       }
     }
-    .el-submenu__title,.el-menu-item {
+    .el-submenu__title,
+    .el-menu-item {
       padding: 0 11px;
       height: 48px;
       line-height: 48px;
-      &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
+      &:hover,
+      &.is-active {
+        background-color: rgba(0, 0, 0, 0.29);
+      }
       i {
         color: #fff;
         font-size: 13px;
@@ -1119,18 +1144,22 @@ export default {
       &.is-opened .el-submenu__title {
         //background-color: rgba(27, 66, 97) !important;
       }
-      .el-submenu .el-menu{display:none}
+      .el-submenu .el-menu {
+        display: none;
+      }
     }
 
     .el-submenu {
-      &.is-opened{
-        > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
+      &.is-opened {
+        > .el-submenu__title {
+          background-color: rgba(0, 0, 0, 0.29);
+        }
       }
       .el-menu {
         background: rgba(0, 0, 0, 0.35);
         box-shadow: 0px -5px 8px #00000014 inset;
         //padding:4px 0;
-        .el-submenu__title{
+        .el-submenu__title {
           height: auto;
           line-height: 1.4;
           font-size: 12px;
@@ -1164,13 +1193,18 @@ export default {
             zoom: 0.8;
             display: none;
           }
-          span{height:auto;text-align: left !important;}
+          span {
+            height: auto;
+            text-align: left !important;
+          }
           &:hover,
           &.on {
             opacity: 1;
             background-color: #fbfdfe !important;
             color: $baseColor !important;
-            i.iconfont{color:$baseColor}
+            i.iconfont {
+              color: $baseColor;
+            }
             .el-icon-arrow-right {
               color: $baseColor;
             }
@@ -1178,7 +1212,7 @@ export default {
         }
       }
 
-      .el-menu-item{
+      .el-menu-item {
         height: auto;
         line-height: 1.4;
         padding-left: 33px !important;
@@ -1201,7 +1235,7 @@ export default {
           line-height: 20px;
           left: 7px;
           font-size: 18px;
-          color:#D0D6DB;
+          color: #d0d6db;
         }
 
         [class^="el-icon-"] {
@@ -1214,7 +1248,6 @@ export default {
           width: 14px;
           zoom: 0.8;
           display: none;
-
         }
 
         &:hover,
@@ -1223,7 +1256,8 @@ export default {
           background-color: #fbfdfe !important;
           color: $baseColor !important;
 
-          .el-icon-arrow-right,i.iconfont {
+          .el-icon-arrow-right,
+          i.iconfont {
             color: $baseColor;
           }
         }
@@ -1546,46 +1580,61 @@ export default {
 // .el-submenu .el-menu {
 //   height: auto !important;
 // }
-.el-menu--vertical{
-   > .el-menu--popup{overflow: auto;//不用atuo 超出不出滚动条
-      .el-submenu__title, .el-menu-item{
-        height: auto !important;
-        line-height: 1.4 !important;
-        padding: 8px 0;
-        text-align: left;
-        white-space: normal;
-        word-break: break-word;
-        background:none;
-        i.iconfont{color:#FFF;margin-right:8px;}
+.el-menu--vertical {
+  > .el-menu--popup {
+    overflow: auto; //不用atuo 超出不出滚动条
+    .el-submenu__title,
+    .el-menu-item {
+      height: auto !important;
+      line-height: 1.4 !important;
+      padding: 8px 0;
+      text-align: left;
+      white-space: normal;
+      word-break: break-word;
+      background: none;
+      i.iconfont {
+        color: #fff;
+        margin-right: 8px;
       }
-   }
-  .el-submenu{
-    .el-submenu__title{
-      .el-submenu__icon-arrow{display:none}
     }
-    &:hover{
-      .el-submenu__title{
+  }
+  .el-submenu {
+    .el-submenu__title {
+      .el-submenu__icon-arrow {
+        display: none;
+      }
+    }
+    &:hover {
+      .el-submenu__title {
         background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
 
-    &.is-opened{
-      .el-submenu__title{
+    &.is-opened {
+      .el-submenu__title {
         background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
   }
-  .el-menu-item{
-    &:hover{
-        background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+  .el-menu-item {
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.29) !important;
+      i.iconfont {
+        color: $baseColor;
+      }
     }
 
-    &.is-opened{
-        background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+    &.is-opened {
+      background-color: rgba(0, 0, 0, 0.29) !important;
+      i.iconfont {
+        color: $baseColor;
+      }
     }
   }
   // .el-menu-item{

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

@@ -286,9 +286,6 @@ modules = {
         data: [row.id],
         url: USER_PREFIX + "/form_develop/exportFormScript",
         plaintext: 1,
-        fileName: row.formCode
-          ? `${row.scriptCode} - ${row.formCode}(script)`
-          : `${row.scriptCode}(script)`,
         abcEnabled: true,
       });
     },

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

@@ -487,7 +487,6 @@ modules = {
         data: [row.id],
         url: USER_PREFIX + "/form_develop/exportFormScript",
         plaintext: 1,
-        fileName: `${row.scriptCode} - ${row.formCode}(script)`,
         abcEnabled: true,
         editAuth: this.currentFormType.editAuth,
         selectTypeAuth: this.currentFormType.selectTypeAuth,

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

@@ -696,7 +696,6 @@ modules = {
         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,

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

@@ -450,7 +450,6 @@ modules = {
         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,