cloud-web-corejs 1.0.258 → 1.0.259

package/src/components/baseInputExport/mixins.js

@@ -1,10 +1,10 @@
-import {getToken} from "../../utils/auth";
-import {openCnPrint} from "../../components/cnPrint/index";
-import {openHiPrint} from "../../components/hiprint/index";
-import {openJdPrint} from "../../components/jdPrint/index";
-import {openPddPrint} from "../../components/pddPrint/index";
-import {openVipPrint} from "../../components/vipPrint/index";
-import {openXhsPrint} from "../../components/xhsPrint/index";
+import { getToken } from "../../utils/auth";
+import { openCnPrint } from "../../components/cnPrint/index";
+import { openHiPrint } from "../../components/hiprint/index";
+import { openJdPrint } from "../../components/jdPrint/index";
+import { openPddPrint } from "../../components/pddPrint/index";
+import { openVipPrint } from "../../components/vipPrint/index";
+import { openXhsPrint } from "../../components/xhsPrint/index";
 
 let modules;
 let configUtil = {
@@ -29,7 +29,7 @@ modules = {
   },
   computed: {
     buttonName() {
-      if(this.option.label){
+      if (this.option.label) {
         return this.option.label;
       }
       let exportTemplates = this.exportTemplates;
@@ -143,14 +143,13 @@ modules = {
     },
     getTableGrid() {
       let grid = null;
-      let tableTarget = this.option.tableTarget
+      let tableTarget = this.option.tableTarget;
       if (tableTarget) {
         if (typeof tableTarget === "function") {
           grid = tableTarget();
         } else {
           grid = tableTarget;
         }
-
       } else if (this.option.tableRef) {
         grid = this.parentTarget.$refs[this.option.tableRef];
       }
@@ -160,23 +159,22 @@ modules = {
       let checkRows = [];
       let $grid = this.getTableGrid();
 
-
       let condition = null;
-      if(this.option.customCondition){
+      if (this.option.customCondition) {
         let condition1 = this.option.customCondition(item);
-        if(condition1)condition = condition1;
+        if (condition1) condition = condition1;
       }
-      if(!condition){
+      if (!condition) {
         if ($grid) {
           checkRows = $grid.getCheckboxRecords(true);
         } else {
-          checkRows
-            = typeof this.option.param === "function"
-            ? this.option.param(item)
-            : this.option.param;
+          checkRows =
+            typeof this.option.param === "function"
+              ? this.option.param(item)
+              : this.option.param;
         }
         let ids = checkRows ? checkRows.map((row) => row.id) : [];
-        condition = ids.length ? {id: ids} : null;
+        condition = ids.length ? { id: ids } : null;
       }
       return condition;
 
@@ -222,7 +220,12 @@ modules = {
       if ($grid) {
         checkRows = $grid.getCheckboxRecords(true);
         if (!checkRows.length) {
-          this.$baseAlert(this.$t2("请选择需要导出/打印的数据", "components.baseInputExport.selectDataTip"));
+          this.$baseAlert(
+            this.$t2(
+              "请选择需要导出/打印的数据",
+              "components.baseInputExport.selectDataTip"
+            )
+          );
           return;
         }
       }
@@ -238,7 +241,9 @@ modules = {
       } else if (this.exportTypes.includes(etType)) {
         //导出excel
         let conditions = this.tableDefalutHandle(exportTemplate) || [];
-        this.$baseConfirm(this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")).then(() => {
+        this.$baseConfirm(
+          this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")
+        ).then(() => {
           let condition = $grid
             ? this.tableDefalutHandle(exportTemplate)
             : this.tableDefalutHandle(exportTemplate);
@@ -371,16 +376,28 @@ modules = {
       }
 
       function downLoadFile(row, that) {
-        let realFileName = fileName ? fileName + "-" + row.uuid : row.uuid;
-        let fileUrl
-          = configUtil.baseUrl
-          + that.option.prefix
-          + "/export_ins/download?uuid="
-          + row.uuid
-          + "&ippaaapp="
-          + row.ippaaapp
-          + "&n="
-          + realFileName;
+        let realFileName;
+        if (row.filename) {
+          //后台返回了文件名，用文件名+文件格式（格式取自uuid的后缀），不再拼接uuid
+          let uuid = row.uuid || "";
+          let dotIndex = uuid.lastIndexOf(".");
+          let suffix = dotIndex > -1 ? uuid.slice(dotIndex) : "";
+          realFileName =
+            suffix && row.filename.slice(-suffix.length) !== suffix
+              ? row.filename + suffix
+              : row.filename;
+        } else {
+          realFileName = fileName ? fileName + "-" + row.uuid : row.uuid;
+        }
+        let fileUrl =
+          configUtil.baseUrl +
+          that.option.prefix +
+          "/export_ins/download?uuid=" +
+          row.uuid +
+          "&ippaaapp=" +
+          row.ippaaapp +
+          "&n=" +
+          realFileName;
         var params = {};
         that.parentTarget.$http({
           method: "post",

package/src/components/baseInputNumber/index.vue

@@ -1,10 +1,10 @@
-<template>
-	<el-input-number class="noButton" autocomplete="off" size="small" v-limit-number="$attrs.scale" v-bind="$attrs" v-on="$listeners" />
-</template>
-
-<script>
-export default {
-	name: 'baseInputNumber'
-};
-</script>
+<template>
+	<el-input-number class="noButton" autocomplete="off" :size="$attrs.size || 'small'" v-limit-number="$attrs.scale" v-bind="$attrs" v-on="$listeners" />
+</template>
+
+<script>
+export default {
+	name: 'baseInputNumber'
+};
+</script>
 <style></style>

package/src/components/baseTabs/index.vue

@@ -1,27 +1,35 @@
 <template>
   <div>
-    <div class="slide-wrap" v-if="$attrs.showNav!==false">
+    <div class="slide-wrap" v-if="$attrs.showNav !== false">
       <template v-for="(item, index) in navList">
-        <div :key="index" v-show="item.visible!==false">
-          <a href="javascript:void(0)" class="slide-nav" @click="handleChange(index)">
+        <div :key="index" v-show="item.visible !== false">
+          <a
+            href="javascript:void(0)"
+            class="slide-nav"
+            @click="handleChange(index)"
+          >
             <p>{{ item.label }}</p>
           </a>
         </div>
       </template>
     </div>
-    <div class="d-cont">
+    <div class="d-cont" :class="{ 'full-width': $attrs.showNav === false }">
       <slot></slot>
     </div>
   </div>
 </template>
 
 <script>
-import {baseTabsMixin} from './mixins.js';
+import { baseTabsMixin } from "./mixins.js";
 
 export default {
-  name: 'baseTabs',
-  mixins: [baseTabsMixin]
+  name: "baseTabs",
+  mixins: [baseTabsMixin],
 };
 </script>
 
-<style></style>
+<style>
+div.d-cont.full-width .d-item {
+  padding-right: 16px !important;
+}
+</style>

package/src/components/code-editor/async.js

@@ -0,0 +1,29 @@
+/**
+ * code-editor 的异步组件定义（ace 体积较大，保持独立 chunk）。
+ *
+ * 普通 `() => import(...)` 在 chunk 加载失败时会静默渲染成空白，与“编辑器渲染了但内容
+ * 为空”无法区分，排查成本很高，故统一走带 error 占位的高级异步组件形式。
+ */
+export default function createCodeEditorAsyncComponent() {
+  return {
+    component: import("./index.vue"),
+    error: {
+      name: "CodeEditorLoadError",
+      render(h) {
+        return h(
+          "div",
+          {
+            staticClass: "ace-editor",
+            style: {
+              padding: "12px",
+              color: "#f56c6c",
+              fontSize: "12px",
+            },
+          },
+          "代码编辑器加载失败，请刷新页面重试"
+        );
+      },
+    },
+    timeout: 30000,
+  };
+}

package/src/components/code-editor/index.vue

@@ -22,6 +22,7 @@ import "ace-builds/src-min-noconflict/mode-javascript"; // 默认设置的语言
 import "ace-builds/src-min-noconflict/mode-json"; //
 import "ace-builds/src-min-noconflict/mode-css"; //
 import "ace-builds/src-min-noconflict/mode-java"; //
+import "ace-builds/src-min-noconflict/mode-text"; //
 import "ace-builds/src-min-noconflict/ext-language_tools";
 const ACE_BASE_PATH = window.WEB_PREFIX + "/base/ace/src-min-noconflict";
 import indexUtil from "../../utils/index.js";
@@ -55,7 +56,7 @@ export default {
     },
     height: {
       type: String,
-      default: "450px;",
+      default: "450px",
     },
     resize: {
       //是否开启语法检查，默认开启
@@ -65,7 +66,10 @@ export default {
   },
   computed: {
     editorStyle: function () {
-      return "height:" + this.height;
+      // 对象形式绑定，避免调用方传入的 height 拼出非法 CSS。
+      // 历史调用方存在 height="414px;" 这种带分号的写法，对象形式下会被浏览器丢弃，需先清理。
+      let height = (this.height || "").trim().replace(/;+$/, "").trim();
+      return { height: height || "450px" };
     },
     modePath: function () {
       return "ace/mode/" + this.mode;
@@ -156,6 +160,20 @@ export default {
       //this.$emit('update:value', this.aceEditor.getValue())  // 触发更新事件, 实现.sync双向绑定！！
       this.$emit("input", this.aceEditor.getValue());
     });
+
+    this.observeSizeChange();
+  },
+  activated() {
+    // keep-alive 页签切回时 DOM 重新插入，需重新测量，否则内容不渲染
+    this.refresh();
+  },
+  beforeDestroy() {
+    this.disconnectObserver();
+    if (this.aceEditor) {
+      // ace 仅在 destroy 时才解绑它自己注册的 window resize 监听
+      this.aceEditor.destroy();
+      this.aceEditor = null;
+    }
   },
   data() {
     return {
@@ -163,10 +181,79 @@ export default {
       themePath: "ace/theme/sqlserver", // 不导入 webpack-resolver，该模块路径会报错
       // modePath: 'ace/mode/javascript', // 同上
       codeValue: this.value || "",
+      resizeObserver: null,
+      resizeRaf: null,
+      refreshPending: false,
     };
   },
-  watch: {},
+  watch: {
+    value(val) {
+      if (!this.aceEditor) {
+        // 实例尚未创建（异步组件解析中）时不能丢弃，否则这次赋值永久丢失
+        this.codeValue = val || "";
+        return;
+      }
+      const newVal = val || "";
+      if (this.aceEditor.getValue() !== newVal) {
+        this.aceEditor.setValue(newVal, -1);
+        this.aceEditor.clearSelection();
+        this.aceEditor.resize();
+      }
+    },
+    mode() {
+      if (!this.aceEditor) return;
+      if (this.mode === "json") {
+        this.setJsonMode();
+      } else if (this.mode === "css") {
+        this.setCssMode();
+      } else {
+        this.aceEditor.getSession().setMode(this.modePath);
+      }
+    },
+    height() {
+      this.$nextTick(() => {
+        this.refresh();
+      });
+    },
+  },
   methods: {
+    /**
+     * ace 在 mounted 时同步初始化，若此刻祖先为 display:none（隐藏字段、非激活 tab、
+     * 未展开的弹窗等），字符与容器尺寸都会被测成 0，之后没有任何时机重新测量
+     * —— ace 自身只监听 window 的 resize。这里观测编辑器元素本身，尺寸一旦可用就重测。
+     */
+    observeSizeChange() {
+      if (typeof ResizeObserver !== "function" || !this.$refs.ace) return;
+      this.resizeObserver = new ResizeObserver(() => {
+        this.refresh();
+      });
+      this.resizeObserver.observe(this.$refs.ace);
+    },
+    disconnectObserver() {
+      if (this.resizeRaf !== null) {
+        cancelAnimationFrame(this.resizeRaf);
+        this.resizeRaf = null;
+      }
+      this.refreshPending = false;
+      if (this.resizeObserver) {
+        this.resizeObserver.disconnect();
+        this.resizeObserver = null;
+      }
+    },
+    /** 重新测量并重绘。尺寸不可用时跳过，等下一次可见再触发。 */
+    refresh() {
+      if (this.refreshPending) return;
+      this.refreshPending = true;
+      this.resizeRaf = requestAnimationFrame(() => {
+        this.refreshPending = false;
+        this.resizeRaf = null;
+        const el = this.$refs.ace;
+        if (!this.aceEditor || !el) return;
+        // 仍不可见时跳过，等真正显示后 ResizeObserver 会再次触发
+        if (!el.offsetWidth || !el.offsetHeight) return;
+        this.aceEditor.resize(true);
+      });
+    },
     addAutoCompletion(ace) {
       let acData = this.acData;
       let langTools = ace.require("ace/ext/language_tools");
@@ -193,7 +280,9 @@ export default {
       return this.aceEditor.getSession().getAnnotations();
     },
     setValue(val) {
-      this.aceEditor.setValue(val);
+      if (!this.aceEditor) return;
+      this.aceEditor.setValue(val || "", -1);
+      this.aceEditor.clearSelection();
     },
     btnMouseDown(event) {
       let rootDom = document.body.querySelector("#app");

package/src/components/errorMsg/index.js

@@ -1,12 +1,12 @@
 const modules = {};
-import vue from "vue"
-import errorMsg from './index.vue'
+import vue from "vue";
+import errorMsg from "./index.vue";
 
 const MessageBoxInstance = vue.extend(errorMsg);
 let currentMsg;
 const initInstance = () => {
   // 实例化vue实例
-  currentMsg = new MessageBoxInstance({i18n: window.$vueRoot._i18n});
+  currentMsg = new MessageBoxInstance({ i18n: window.$vueRoot._i18n });
   let msgBoxEl = currentMsg.$mount().$el;
   document.body.appendChild(msgBoxEl);
 };
@@ -15,27 +15,28 @@ function msg(options) {
   if (!currentMsg) {
     initInstance();
   }
-  if (typeof options === 'string') {
+  if (typeof options === "string") {
     currentMsg.content = options;
-  } else if (typeof options === 'object') {
+  } else if (typeof options === "object") {
     Object.assign(currentMsg, options);
   }
-  return currentMsg.showMsgBox()
-    .then(val => {
+  return currentMsg
+    .showMsgBox()
+    .then((val) => {
       currentMsg.showWrap = false;
       currentMsg.$destroy();
       currentMsg.$el.remove();
       currentMsg = null;
       return Promise.resolve(val);
     })
-    .catch(err => {
+    .catch((err) => {
       currentMsg.showWrap = false;
       currentMsg.$destroy();
       currentMsg.$el.remove();
       currentMsg = null;
       return Promise.reject(err);
     });
-};
+}
 
 // 定义插件对象
 // vue的install方法，用于定义vue插件

package/src/components/errorMsg/mixins.js

@@ -1,19 +1,19 @@
 /**version-1.0*/
 let tmixins = {};
-import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
-import { getErrorMsg } from '@base/utils/index.js'
+import PopupManager from "element-ui/src/utils/popup/popup-manager.js";
+import { getErrorMsg } from "@base/utils/index.js";
 
 tmixins = {
-  name: 'errorMsg',
+  name: "errorMsg",
   props: {
     rmid: {
-      default: ''
+      default: "",
     },
     content: {
-      default: ''
+      default: "",
     },
     objx: Object,
-    _errorMsg: null
+    _errorMsg: null,
   },
   created() {
     if (this.$baseEventBus.isMobile) {
@@ -23,13 +23,13 @@ tmixins = {
   data() {
     return {
       res: {},
-      title: this.$t2('提示', 'components.errorMsg.title'),
-      text1: '',
-      text2: '',
+      title: this.$t2("提示", "components.errorMsg.title"),
+      text1: "",
+      text2: "",
       showWrap: false,
       showTextFlag: false,
-      zIndex: null
-    }
+      zIndex: null,
+    };
   },
   beforeDestroy() {
     this.removeEnterEvent();
@@ -47,14 +47,14 @@ tmixins = {
       }
     },
     addEnterEvent() {
-      window.addEventListener('keydown', this.keyDown, true);
+      window.addEventListener("keydown", this.keyDown, true);
     },
     removeEnterEvent() {
-      window.removeEventListener('keydown', this.keyDown, true);
+      window.removeEventListener("keydown", this.keyDown, true);
     },
-    getShowText(text){
-      if(!text)return text
-      return text.replace(/(\r\n|\n|\r)/gm, "<br />")
+    getShowText(text) {
+      if (!text) return text;
+      return text.replace(/(\r\n|\n|\r)/gm, "<br />");
     },
     showMsgBox: function () {
       this.removeEnterEvent();
@@ -73,11 +73,13 @@ tmixins = {
             }
           }
         } */
-        text = getErrorMsg(content)
-        this.text1 = this.getShowText(!!this.$t ? this.$t(text, this.objx) : text);
-        if(this._errorMsg){
+        text = getErrorMsg(content);
+        this.text1 = this.getShowText(
+          !!this.$t ? this.$t(text, this.objx) : text
+        );
+        if (this._errorMsg) {
           this.text2 = this.getShowText(this._errorMsg);
-        }else{
+        } else {
           this.text2 = this.getShowText(content);
         }
       }
@@ -95,7 +97,7 @@ tmixins = {
       });
       // 返回promise对象
       return this.promise;
-    }
-  }
+    },
+  },
 };
-export const mixins = tmixins
+export const mixins = tmixins;

package/src/components/excelExport/exportFieldDialog.vue

@@ -72,9 +72,9 @@ export default {
       });
     },
     generateId() {
-      return Math.floor(
-        Math.random() * 100000 + Math.random() * 20000 + Math.random() * 5000
-      );
+      // 自增序号保证唯一：随机数范围小，列多时会碰撞导致树勾选(node-key)错乱
+      this.idSeed = (this.idSeed || 0) + 1;
+      return "expcol_" + Date.now() + "_" + this.idSeed;
     },
     filterExportVisible(items) {
       if (!Array.isArray(items)) return [];
@@ -92,6 +92,20 @@ export default {
           return item;
         });
     },
+    filterNonDataExportColumns(items) {
+      if (!Array.isArray(items)) return [];
+      return items.reduce((result, item) => {
+        if (item.params?.exportDisabled) return result;
+        if (Array.isArray(item.children) && item.children.length) {
+          let children = this.filterNonDataExportColumns(item.children);
+          if (!children.length) return result;
+          result.push({ ...item, children });
+        } else {
+          result.push(item);
+        }
+        return result;
+      }, []);
+    },
     init() {
       let target = this.getGrid();
       let { fullColumn, collectColumn: column1s } = target.getTableColumn();
@@ -143,6 +157,7 @@ export default {
       } else {
         columns = column1s;
       }
+      columns = this.filterNonDataExportColumns(columns);
 
       let exportItem = this.param.type === "exportItem";
 
@@ -170,7 +185,7 @@ export default {
         //导出主表数据
 
         fullColumn.forEach((column) => {
-          if (column.field) {
+          if (column.field && !column.params?.exportDisabled) {
             if (yesFields.includes(column.field)) {
               defaultCheckedKeys.push(column.id);
             } else if (!noFields.includes(column.field) && column.visible) {
@@ -284,33 +299,40 @@ export default {
       let collectColumn = !exportItem
         ? target.getTableColumn().collectColumn
         : originOption.exportItemConfig?.columns;
+      // 按勾选后的实际层级算表头总行数（item.level 在导出明细列上不存在，不可依赖）
       let maxRowspan = 1;
-      leafColumns.forEach((item) => {
-        maxRowspan = Math.max(maxRowspan, item.level);
-      });
+      let depthDo = (items, depth) => {
+        (items || []).forEach((item) => {
+          if (!checkIds.includes(item.id)) return;
+          if (item.children && item.children.length > 0) {
+            depthDo(item.children, depth + 1);
+          } else if (depth > maxRowspan) {
+            maxRowspan = depth;
+          }
+        });
+      };
+      depthDo(collectColumn, 1);
 
-      let loopDo = (items, parent) => {
+      let loopDo = (items, depth) => {
         let datas = [];
         items.forEach((item) => {
-          if (checkIds.includes(item.id)) {
+          if (checkIds.includes(item.id) && !item.params?.exportDisabled) {
             let column = this.$baseLodash.cloneDeep(item);
             if (item.children && item.children.length > 0) {
-              let children = this.$baseLodash.cloneDeep(loopDo(item.children));
+              let children = loopDo(item.children, depth + 1);
               column.children = children;
-              if (children.length) {
-                column.colSpan = children.length;
-              } else {
-                column.colSpan = 1;
-              }
-            } else if (!column.parentId) {
-              column.rowSpan = maxRowspan;
+              column.colSpan = children.length ? children.length : 1;
+              column.rowSpan = 1;
+            } else {
+              // 任意层级的叶子列都要跨到表头底行，否则多层分组表头导出错位
+              column.rowSpan = maxRowspan - depth + 1;
             }
             datas.push(column);
           }
         });
         return datas;
       };
-      let columns = loopDo(collectColumn, null);
+      let columns = loopDo(collectColumn, 1);
       this.$emit("confirm", { columns, leafColumns });
       this.addTableExportColumns();
       this.dialogClose();