cloud-web-corejs 1.0.258 → 1.0.259

package/src/components/hiprint/view/design/index.vue

@@ -6,6 +6,7 @@
           <template v-for="(value, type) in paperTypes">
             <el-button
               size="mini"
+              class="button-sty"
               :type="curPaperType === type ? 'primary' : ' '"
               @click="setPaper(type, value)"
               :key="type"
@@ -88,13 +89,14 @@
         <el-button type="warning" class="button-sty" icon="el-icon-view" @click="preView"
           >预览</el-button
         >
-        <el-popover width="180" v-model="visible" @confirm="clearPaper">
+        <el-popover width="219" v-model="visible" @confirm="clearPaper">
           <p><i class="el-icon-warning-outline f-red"></i> 是否确认清空?？</p>
           <div style="text-align: right; margin: 0">
-            <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+            <el-button size="mini" type="primary" plain @click="visible = false" class="button-sty">取消</el-button>
             <el-button
               type="primary"
               size="mini"
+              class="button-sty"
               @click="
                 clearPaper();
                 visible = false;
@@ -430,4 +432,7 @@ export default {
   overflow-x: auto;
   overflow-y: auto;
 }
+button.el-button{
+    &.button-sty{color:#FFF;font-size: 12px;line-height: 26px;padding:0 12px;}
+}
 </style>

package/src/components/jsonImport/exportUtil.js

@@ -0,0 +1,106 @@
+function parseExportContent(content) {
+  if (!content) {
+    return { list: [], isArray: true };
+  }
+  try {
+    const parsed = JSON.parse(content);
+    if (Array.isArray(parsed)) {
+      return { list: parsed, isArray: true };
+    }
+    return { list: [parsed], isArray: false };
+  } catch (e) {
+    return { list: [], isArray: true, invalid: true };
+  }
+}
+
+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;
+  const config = ARCHIVE_URL_MAP.find((item) => url.includes(item.match));
+  return config ? config.type : null;
+}
+
+function getFormScriptFileName(scriptCode, formCode) {
+  const code = scriptCode || "script";
+  return formCode ? `S&${code}&${formCode}` : `S&${code}`;
+}
+
+function buildFormTemplateScriptExtras(item) {
+  const formCode = item.formCode || "form";
+  const usedNames = {};
+
+  return (item.formScriptDTOs || []).reduce((files, scriptItem) => {
+    if (!scriptItem) return files;
+    files.push({
+      fileName: uniqueFileName(
+        getFormScriptFileName(scriptItem.scriptCode, scriptItem.formCode || formCode),
+        usedNames
+      ),
+      content: JSON.stringify(scriptItem, null, 2),
+    });
+    return files;
+  }, []);
+}
+
+function buildArchiveResult(item, archiveType) {
+  switch (archiveType) {
+    case ARCHIVE_TYPE.FORM_SCRIPT:
+      return {
+        mainContent: JSON.stringify(item, null, 2),
+        mainFileName: getFormScriptFileName(item.scriptCode, item.formCode),
+        extraFiles: [],
+      };
+    case ARCHIVE_TYPE.FORM_TEMPLATE: {
+      const extraFiles = buildFormTemplateScriptExtras(item);
+      const formTemplate = {
+        ...item,
+        formScriptDTOs: null,
+      };
+      return {
+        mainContent: JSON.stringify(formTemplate, null, 2),
+        mainFileName: `F&${item.formCode || "form"}`,
+        extraFiles,
+      };
+    }
+    case ARCHIVE_TYPE.TABLE:
+      return {
+        mainContent: JSON.stringify(item, null, 2),
+        mainFileName: `T&${item.taBm || "table"}`,
+        extraFiles: [],
+      };
+    default:
+      return {
+        mainContent: JSON.stringify(item, null, 2),
+        mainFileName: null,
+        extraFiles: [],
+      };
+  }
+}
+
+export function processArchiveExport(content, archiveType) {
+  const { list, invalid } = parseExportContent(content);
+  if (invalid || !list.length) {
+    return { mainContent: content, mainFileName: null, extraFiles: [] };
+  }
+  return buildArchiveResult(list[0], archiveType);
+}

package/src/components/jsonImport/index.js

@@ -1,17 +1,19 @@
 const moudule = {};
-import vue from "vue"
-import excelImport from './index.vue'
+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 { getBdEnv } from "@base/api/user";
+import { encrypt } from "@base/utils/aes";
 import {
-  getToken
-} from '../../utils/auth'
+  getExportArchiveType,
+  processArchiveExport,
+} from "./exportUtil";
+
+import { getToken } from "../../utils/auth";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
-  getToken
+  getToken,
 };
 const ExcelImportInstance = vue.extend(excelImport);
 const ExportDialogInstance = vue.extend(exportDialog);
@@ -19,9 +21,9 @@ const initInstance = function (containter, flag) {
   // 实例化vue实例
   let currentInstance;
   if (flag == 1) {
-    currentInstance = new ExcelImportInstance({i18n: window.$vueRoot._i18n});
+    currentInstance = new ExcelImportInstance({ i18n: window.$vueRoot._i18n });
   } else {
-    currentInstance = new ExportDialogInstance({i18n: window.$vueRoot._i18n});
+    currentInstance = new ExportDialogInstance({ i18n: window.$vueRoot._i18n });
   }
   let dom = currentInstance.$mount().$el;
   containter.appendChild(dom);
@@ -34,9 +36,9 @@ function toDo(options) {
   let vueTarget = this && this.$el ? this : window.$vueRoot;
   let currentInstance = initInstance(containter, 1);
   currentInstance.param = {};
-  Object.assign(currentInstance.param, {vue: vueTarget}, options);
+  Object.assign(currentInstance.param, { vue: vueTarget }, options);
   return currentInstance.exc();
-};
+}
 
 function openExportDialog(options, callback) {
   // let containter = this && this.$el ? this.$el : document.body;
@@ -44,9 +46,11 @@ function openExportDialog(options, callback) {
   let vueTarget = this && this.$el ? this : window.$vueRoot;
   let currentInstance = initInstance(containter, 2);
   currentInstance.param = {};
-  Object.assign(currentInstance.param, {vue: vueTarget}, options, {confirm: callback});
+  Object.assign(currentInstance.param, { vue: vueTarget }, options, {
+    confirm: callback,
+  });
   // return currentInstance.exc();
-};
+}
 
 // 定义插件对象
 // vue的install方法，用于定义vue插件
@@ -55,77 +59,98 @@ 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;
     let selectTypeAuth = options.selectTypeAuth;
     let that = this;
 
-    let ids = []
+    let ids = [];
     if (options.data) {
-      ids = options.data
+      ids = options.data;
     } else if (targetRef) {
-      let url = options
+      let url = options;
       let checkRows = this.$refs[targetRef].getCheckboxRecords(true);
       if (!checkRows.length) {
-        this.$baseAlert(this.$t1('请选择需要导出的数据'))
-        return
+        this.$baseAlert(this.$t1("请选择需要导出的数据"));
+        return;
       }
-      ids = checkRows.map(item => item.id);
+      ids = checkRows.map((item) => item.id);
     }
 
     let handle = function (abc) {
       let reqData = {
-        ids
-      }
+        ids,
+      };
       if (abc) {
         reqData.abc = abc;
       }
-      let data = {
-        datas: encrypt(JSON.stringify(reqData))
+      if (options.plaintext) {
+        reqData.plaintext = options.plaintext;
       }
+      let data = {
+        datas: encrypt(JSON.stringify(reqData)),
+      };
 
       that.$http({
         url: options.url,
         method: `post`,
         data: data,
         isLoading: true,
-        success: res => {
-          let content = res.objx
+        success: (res) => {
+          let content = res.objx;
           if (content && content !== "[]") {
-            let timeStr = res.time.replaceAll(":", "").replaceAll("-", "").replaceAll(" ", "");
-            let fileName = options.title +"("+timeStr+")";
-            downloadTxt(fileName, content)
+            const archiveType = options.plaintext
+              && getExportArchiveType(options.url);
+
+            if (archiveType) {
+              const processed = processArchiveExport(content, archiveType);
+              downloadTxt(processed.mainFileName, processed.mainContent);
+              (processed.extraFiles || []).forEach((file, index) => {
+                setTimeout(() => {
+                  downloadTxt(file.fileName, file.content);
+                }, (index + 1) * 300);
+              });
+            } else {
+              let fileName = options.fileName;
+              if (!fileName) {
+                const timeStr = res.time
+                  .replaceAll(":", "")
+                  .replaceAll("-", "")
+                  .replaceAll(" ", "");
+                fileName = `${options.title}(${timeStr})`;
+              }
+              downloadTxt(fileName, content);
+            }
           } else {
-            this.$baseAlert(this.$t1('不存在需要导出的数据'))
+            this.$baseAlert(this.$t1("不存在需要导出的数据"));
           }
-        }
+        },
       });
-    }
+    };
     let isDev = true;
     if (abcEnabled) {
       await getBdEnv({
         isLoading: true,
-        success: res => {
-          isDev = res.objx == "dev"
-        }
+        success: (res) => {
+          isDev = res.objx == "dev";
+        },
       });
     }
     if (isDev && abcEnabled && editAuth === 1 && selectTypeAuth == 1) {
       openExportDialog(options, (abc) => {
-        handle(abc)
-      })
+        handle(abc);
+      });
     } else {
-      this.$baseConfirm(this.$t1('您确定要导出吗？')).then(() => {
-        let abc = null
+      this.$baseConfirm(this.$t1("您确定要导出吗？")).then(() => {
+        let abc = null;
         if (abcEnabled) {
           if (isDev) {
             if (!editAuth || !selectTypeAuth) {
-              abc = "B"
+              abc = "B";
             }
           } else {
-            abc = "A"
+            abc = "A";
           }
         }
         handle(abc);
@@ -136,13 +161,13 @@ moudule.install = function (Vue) {
 
 function downloadTxt(fileName, content) {
   // 创建Blob对象
-  const blob = new Blob([content], {type: 'text/plain;charset=utf-8'});
+  const blob = new Blob([content], { type: "text/plain;charset=utf-8" });
   // 创建URL
   const url = URL.createObjectURL(blob);
   // 创建a标签
-  const link = document.createElement('a');
+  const link = document.createElement("a");
   link.href = url;
-  link.setAttribute('download', fileName + '.txt');
+  link.setAttribute("download", fileName + ".txt");
   document.body.appendChild(link);
   // 触发下载
   link.click();
@@ -156,11 +181,11 @@ function download(ippaaapp, uuid) {
   let params = {
     // n: fileName
   };
-  params['access_token'] = getToken();
+  params["access_token"] = getToken();
 
-  let form = document.createElement('form');
+  let form = document.createElement("form");
 
-  let randomNum = (new Date()).valueOf() + Math.floor(Math.random() * 1000000);
+  let randomNum = new Date().valueOf() + Math.floor(Math.random() * 1000000);
   let formId = "formId-" + randomNum;
   let formName = "formName-" + randomNum;
 
@@ -170,8 +195,8 @@ function download(ippaaapp, uuid) {
   document.body.appendChild(form);
   for (let obj in params) {
     if (params.hasOwnProperty(obj)) {
-      let input = document.createElement('input');
-      input.tpye = 'hidden';
+      let input = document.createElement("input");
+      input.tpye = "hidden";
       input.name = obj;
       input.value = params[obj];
       form.appendChild(input);