cloud-web-corejs 1.1.0-dev.10 → 1.1.0-dev.13

package/src/store/modules/tagsView.js

@@ -1,217 +1,241 @@
-import store from "../index.js";
-import _ from "lodash";
-import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
-
-let state, mutations, actions;
-state = {
-  visitedViews: [],
-  cachedViews: [],
-};
-
-mutations = {
-  ADD_VISITED_VIEW: (state, view) => {
-    let title = view.meta.title;
-    let add_routes = store.getters.add_routes;
-    if (add_routes && add_routes.children && add_routes.children.length > 0) {
-      let syncRoutes = add_routes.children[0].children;
-      let tRoutes = syncRoutes.some((route) => {
-        let flag = view.fullPath == route.path;
-        if (flag) {
-          title = route.meta.title;
-          return flag;
-        }
-      });
-    }
-    const key = viewKey(view);
-    if (state.visitedViews.some((v) => viewKey(v) === key)) return;
-    // 可重复打开时，记录同一菜单的序号，展示时用于区分标签
-    let repeatIndex = 0;
-    if (isRepeatable(view)) {
-      const sameCount = state.visitedViews.filter((v) => v.path === view.path);
-      repeatIndex = sameCount.length + 1;
-    }
-    state.visitedViews.push(
-      Object.assign({}, view, {
-        title: title || "no-name",
-        repeatIndex,
-      })
-    );
-  },
-  ADD_CACHED_VIEW: (state, view) => {
-    // 缓存键与 keepAlive.js 的 getComponentName 保持一致（viewKey）：
-    // 可重复打开的视图按 fullPath 各自独立缓存，其余按 path。
-    const key = viewKey(view);
-    if (state.cachedViews.includes(key)) return;
-    if (!view.meta.noCache) {
-      state.cachedViews.push(key);
-    }
-  },
-
-  DEL_VISITED_VIEW: (state, view) => {
-    const key = viewKey(view);
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (viewKey(v) === key) {
-        state.visitedViews.splice(i, 1);
-        break;
-      }
-    }
-  },
-  DEL_CACHED_VIEW: (state, view) => {
-    // 兼容刷新场景（路径带 /redirect 前缀）与仅按 name 传入的情况，
-    // 归一到与缓存键一致的 viewKey 再移除。
-    let target = view;
-    let str = "/redirect";
-    if (view.path && view.path.startsWith(str)) {
-      let realPath = view.path.substr(str.length);
-      let realFullPath = (view.fullPath || view.path).substr(str.length);
-      target = { ...view, path: realPath, fullPath: realFullPath };
-    } else if (!view.path && view.name) {
-      let cView = state.visitedViews.find((item) => item.name == view.name);
-      target = cView || view;
-    }
-    const key = viewKey(target);
-    if (key) {
-      const index = state.cachedViews.indexOf(key);
-      index > -1 && state.cachedViews.splice(index, 1);
-    }
-  },
-
-  DEL_OTHERS_VISITED_VIEWS: (state, view) => {
-    const key = viewKey(view);
-    state.visitedViews = state.visitedViews.filter((v) => {
-      return v.meta.affix || viewKey(v) === key;
-    });
-  },
-  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
-    // const index = state.cachedViews.indexOf(view.name)
-    const index = state.cachedViews.indexOf(viewKey(view));
-    if (index > -1) {
-      state.cachedViews = state.cachedViews.slice(index, index + 1);
-    } else {
-      // if index = -1, there is no cached tags
-      state.cachedViews = [];
-    }
-  },
-
-  DEL_ALL_VISITED_VIEWS: (state) => {
-    // keep affix tags
-    const affixTags = state.visitedViews.filter((tag) => tag.meta.affix);
-    state.visitedViews = affixTags;
-  },
-  DEL_ALL_CACHED_VIEWS: (state) => {
-    state.cachedViews = [];
-  },
-
-  UPDATE_VISITED_VIEW: (state, view) => {
-    const key = viewKey(view);
-    for (let v of state.visitedViews) {
-      if (viewKey(v) === key) {
-        v = Object.assign(v, view);
-        break;
-      }
-    }
-  },
-};
-
-actions = {
-  addView({ dispatch }, view) {
-    dispatch("addVisitedView", view);
-    dispatch("addCachedView", view);
-  },
-  addVisitedView({ commit }, view) {
-    commit("ADD_VISITED_VIEW", view);
-  },
-  addCachedView({ commit }, view) {
-    commit("ADD_CACHED_VIEW", view);
-  },
-
-  delView({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delVisitedView", view);
-      dispatch("delCachedView", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delVisitedView({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_VISITED_VIEW", view);
-      resolve([...state.visitedViews]);
-    });
-  },
-  delCachedView({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_CACHED_VIEW", view);
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  delOthersViews({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delOthersVisitedViews", view);
-      dispatch("delOthersCachedViews", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delOthersVisitedViews({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_OTHERS_VISITED_VIEWS", view);
-      resolve([...state.visitedViews]);
-    });
-  },
-  delOthersCachedViews({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_OTHERS_CACHED_VIEWS", view);
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  delAllViews({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delAllVisitedViews", view);
-      dispatch("delAllCachedViews", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delAllVisitedViews({ commit, state }) {
-    return new Promise((resolve) => {
-      commit("DEL_ALL_VISITED_VIEWS");
-      resolve([...state.visitedViews]);
-    });
-  },
-  delAllCachedViews({ commit, state }) {
-    return new Promise((resolve) => {
-      commit("DEL_ALL_CACHED_VIEWS");
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  updateVisitedView({ commit }, view) {
-    commit("UPDATE_VISITED_VIEW", view);
-  },
-  updateVisitedView2({ commit }, { view, title }) {
-    let src = view || window.$vueRoot.$route;
-    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
-    let newView0 = { ...src };
-    delete newView0.matched;
-    newView0.meta = { ...(src.meta || {}), title };
-    let newView = _.cloneDeep(newView0);
-
-    commit("UPDATE_VISITED_VIEW", newView);
-  },
-};
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
-};
+import store from "../index.js";
+import _ from "lodash";
+import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
+
+/**
+ * 页签是否「不可被批量关闭」：
+ * - meta.affix：菜单本身维护的固定页签；
+ * - meta.user_affix：运行期临时锁（如导出期间锁住当前页签）。
+ * 临时锁不能再写 meta.affix —— affix 会让 isRepeatable 翻转、viewKey 从 fullPath
+ * 塌成 path，页签缓存直接失配。所以这里两个标记都要判。
+ * @param {Object} view 页签对象
+ * @returns {Boolean}
+ */
+function isPinned(view) {
+  const meta = (view && view.meta) || {};
+  return !!(meta.affix || meta.user_affix);
+}
+
+let state, mutations, actions;
+state = {
+  visitedViews: [],
+  cachedViews: [],
+};
+
+mutations = {
+  ADD_VISITED_VIEW: (state, view) => {
+    let title = view.meta.title;
+    let add_routes = store.getters.add_routes;
+    if (add_routes && add_routes.children && add_routes.children.length > 0) {
+      let syncRoutes = add_routes.children[0].children;
+      let tRoutes = syncRoutes.some((route) => {
+        let flag = view.fullPath == route.path;
+        if (flag) {
+          title = route.meta.title;
+          return flag;
+        }
+      });
+    }
+    const key = viewKey(view);
+    if (state.visitedViews.some((v) => viewKey(v) === key)) return;
+    // 可重复打开时，记录同一菜单的序号，展示时用于区分标签
+    let repeatIndex = 0;
+    if (isRepeatable(view)) {
+      const sameCount = state.visitedViews.filter((v) => v.path === view.path);
+      repeatIndex = sameCount.length + 1;
+    }
+    state.visitedViews.push(
+      Object.assign({}, view, {
+        title: title || "no-name",
+        repeatIndex,
+        // meta 必须另拷一份：直接浅拷贝的话页签的 meta 与路由记录的 meta 是同一个
+        // 对象，任何往页签 meta 上写状态的代码（如导出锁写 user_affix）都会连带
+        // 改到 $route.meta —— 曾因此把 affix 写进路由，导致 isRepeatable 翻转、
+        // viewKey 从 fullPath 塌成 path，页签缓存失配、切回来整页重建。
+        meta: { ...(view.meta || {}) },
+      })
+    );
+  },
+  ADD_CACHED_VIEW: (state, view) => {
+    // 缓存键与 keepAlive.js 的 getComponentName 保持一致（viewKey）：
+    // 可重复打开的视图按 fullPath 各自独立缓存，其余按 path。
+    const key = viewKey(view);
+    if (state.cachedViews.includes(key)) return;
+    if (!view.meta.noCache) {
+      state.cachedViews.push(key);
+    }
+  },
+
+  DEL_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
+    for (const [i, v] of state.visitedViews.entries()) {
+      if (viewKey(v) === key) {
+        state.visitedViews.splice(i, 1);
+        break;
+      }
+    }
+  },
+  DEL_CACHED_VIEW: (state, view) => {
+    // 兼容刷新场景（路径带 /redirect 前缀）与仅按 name 传入的情况，
+    // 归一到与缓存键一致的 viewKey 再移除。
+    let target = view;
+    let str = "/redirect";
+    if (view.path && view.path.startsWith(str)) {
+      let realPath = view.path.substr(str.length);
+      let realFullPath = (view.fullPath || view.path).substr(str.length);
+      target = { ...view, path: realPath, fullPath: realFullPath };
+    } else if (!view.path && view.name) {
+      let cView = state.visitedViews.find((item) => item.name == view.name);
+      target = cView || view;
+    }
+    const key = viewKey(target);
+    if (key) {
+      const index = state.cachedViews.indexOf(key);
+      index > -1 && state.cachedViews.splice(index, 1);
+    }
+  },
+
+  DEL_OTHERS_VISITED_VIEWS: (state, view) => {
+    const key = viewKey(view);
+    state.visitedViews = state.visitedViews.filter((v) => {
+      return isPinned(v) || viewKey(v) === key;
+    });
+  },
+  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
+    // const index = state.cachedViews.indexOf(view.name)
+    const index = state.cachedViews.indexOf(viewKey(view));
+    if (index > -1) {
+      state.cachedViews = state.cachedViews.slice(index, index + 1);
+    } else {
+      // if index = -1, there is no cached tags
+      state.cachedViews = [];
+    }
+  },
+
+  DEL_ALL_VISITED_VIEWS: (state) => {
+    // keep affix tags
+    const affixTags = state.visitedViews.filter((tag) => isPinned(tag));
+    state.visitedViews = affixTags;
+  },
+  DEL_ALL_CACHED_VIEWS: (state) => {
+    state.cachedViews = [];
+  },
+
+  UPDATE_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
+    for (let v of state.visitedViews) {
+      if (viewKey(v) === key) {
+        // 同 ADD_VISITED_VIEW：meta 走合并而不是整体替换，
+        // 否则一次 update 就把页签 meta 换回路由那个共享对象，
+        // 并且会抹掉只存在于页签上的标记（user_affix 等）。
+        v = Object.assign(v, view, {
+          meta: { ...(v.meta || {}), ...(view.meta || {}) },
+        });
+        break;
+      }
+    }
+  },
+};
+
+actions = {
+  addView({ dispatch }, view) {
+    dispatch("addVisitedView", view);
+    dispatch("addCachedView", view);
+  },
+  addVisitedView({ commit }, view) {
+    commit("ADD_VISITED_VIEW", view);
+  },
+  addCachedView({ commit }, view) {
+    commit("ADD_CACHED_VIEW", view);
+  },
+
+  delView({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delVisitedView", view);
+      dispatch("delCachedView", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delVisitedView({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_VISITED_VIEW", view);
+      resolve([...state.visitedViews]);
+    });
+  },
+  delCachedView({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_CACHED_VIEW", view);
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  delOthersViews({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delOthersVisitedViews", view);
+      dispatch("delOthersCachedViews", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delOthersVisitedViews({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_OTHERS_VISITED_VIEWS", view);
+      resolve([...state.visitedViews]);
+    });
+  },
+  delOthersCachedViews({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_OTHERS_CACHED_VIEWS", view);
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  delAllViews({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delAllVisitedViews", view);
+      dispatch("delAllCachedViews", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delAllVisitedViews({ commit, state }) {
+    return new Promise((resolve) => {
+      commit("DEL_ALL_VISITED_VIEWS");
+      resolve([...state.visitedViews]);
+    });
+  },
+  delAllCachedViews({ commit, state }) {
+    return new Promise((resolve) => {
+      commit("DEL_ALL_CACHED_VIEWS");
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  updateVisitedView({ commit }, view) {
+    commit("UPDATE_VISITED_VIEW", view);
+  },
+  updateVisitedView2({ commit }, { view, title }) {
+    let src = view || window.$vueRoot.$route;
+    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
+    let newView0 = { ...src };
+    delete newView0.matched;
+    newView0.meta = { ...(src.meta || {}), title };
+    let newView = _.cloneDeep(newView0);
+
+    commit("UPDATE_VISITED_VIEW", newView);
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

package/src/utils/importLimit.js

@@ -0,0 +1,72 @@
+/**
+ * 导入文件闸门。
+ *
+ * 导入侧是整文件 readAsBinaryString 读进内存 → XLSX.read（占用通常是文件体积的
+ * 5~20 倍）→ 再逐格建行数组，全程同步且没有任何让步。此前没有大小与行数校验，
+ * 几十 MB 的 xlsx 会直接把标签页撑爆，且崩在 FileReader / XLSX 内部，用户看到的
+ * 同样是"页面崩溃"而不是一句提示。
+ *
+ * 阈值都可以由导入配置覆盖（maxFileSize / maxRowNum，也支持写在 importOption 上），
+ * 传 0 表示不限制。
+ */
+
+/** 导入文件大小上限（字节）。 */
+export const DEFAULT_IMPORT_FILE_SIZE = 20 * 1024 * 1024;
+
+/** 导入数据行数上限（不含模板前 3 行表头）。 */
+export const DEFAULT_IMPORT_ROW_NUM = 20000;
+
+const readOption = (option, key) => {
+  if (option && option[key] !== undefined) return option[key];
+  if (option && option.importOption && option.importOption[key] !== undefined) {
+    return option.importOption[key];
+  }
+  return undefined;
+};
+
+const resolveLimit = (value, defaultValue) => {
+  let num = Number(value);
+  if (!isFinite(num) || num < 0) return defaultValue;
+  return num;
+};
+
+/** @param {Object} option 导入配置。@returns {Number} 文件大小上限，0 表示不限制。 */
+export function getImportFileSizeLimit(option) {
+  return resolveLimit(readOption(option, "maxFileSize"), DEFAULT_IMPORT_FILE_SIZE);
+}
+
+/** @param {Object} option 导入配置。@returns {Number} 行数上限，0 表示不限制。 */
+export function getImportRowLimit(option) {
+  return resolveLimit(readOption(option, "maxRowNum"), DEFAULT_IMPORT_ROW_NUM);
+}
+
+/** @param {File} file 待导入文件。@param {Object} option 导入配置。@returns {Boolean} */
+export function isImportFileOversize(file, option) {
+  let limit = getImportFileSizeLimit(option);
+  return limit > 0 && !!file && file.size > limit;
+}
+
+/** @param {Number} rowNum 数据行数。@param {Object} option 导入配置。@returns {Boolean} */
+export function isImportRowsOverLimit(rowNum, option) {
+  let limit = getImportRowLimit(option);
+  return limit > 0 && rowNum > limit;
+}
+
+/** @param {Number} bytes 字节数。@returns {Number} 保留一位小数的 MB 数。 */
+export function toFileSizeMb(bytes) {
+  return Math.round(((bytes || 0) / 1024 / 1024) * 10) / 10;
+}
+
+/**
+ * 取单元格文本：w（格式化文本）缺失时回退 v（原始值）。
+ * 模板里手工粘贴或公式生成的数值格常常只有 v，直接 w.trim() 会 TypeError，
+ * 而调用点外层的 catch 会把它吞成"点了导入没反应"。
+ * @param {Object} cell xlsx 单元格。
+ * @returns {String|undefined}
+ */
+export function getImportCellText(cell) {
+  if (cell === undefined || cell === null) return undefined;
+  let text = cell.w !== undefined && cell.w !== null ? cell.w : cell.v;
+  if (text === undefined || text === null) return undefined;
+  return String(text).trim();
+}

package/src/utils/pdfUtil.js

@@ -11,6 +11,8 @@ const PAGE_MARGIN = 10;
 //超过之后 toDataURL 直接返回空白图——长详情页很容易撞上，这里按内容尺寸回退 scale。
 const MAX_CANVAS_SIDE = 16384;
 const MAX_CANVAS_AREA = 268435456;
+//回退倍率的下限。再往下字就糊到认不出了，与其导出一份看不清的 PDF，不如让它明确失败
+const MIN_SCALE = 0.2;
 
 const JPEG_QUALITY = 0.92;
 
@@ -103,7 +105,10 @@ function pickScale(width, height, expected) {
     MAX_CANVAS_SIDE / height,
     Math.sqrt(MAX_CANVAS_AREA / (width * height))
   );
-  return Math.max(scale, 1);
+  //下限不能取 1：内容高度超过 16384 CSS px 的长页面(整页导出的常态)算出来的上限本就 <1，
+  //抬回 1 等于把上面这段保护整个作废——canvas 照样越界，toDataURL 返回空白图，
+  //正是 MAX_CANVAS_SIDE 想拦的那个失败。html2canvas 支持 scale < 1，糊一点也要出得来。
+  return Math.max(scale, MIN_SCALE);
 }
 
 //Safari(WebKit) 的 getComputedStyle 会把颜色序列化成 color(srgb …) / color(display-p3 …)，

package/src/utils/request.js

@@ -92,6 +92,15 @@ service.interceptors.request.use(
         background: "unset",
       });
     }
+
+    // 被取消的请求走不到响应/错误拦截器里的 removeModel —— Cancel 对象不带 config，
+    // 那边无从知道该清理哪一个请求。不收口的话上面这两样会永久留在页面上（一个关不掉
+    // 的转圈遮罩）。挂到令牌自己的 promise 上，取消时精确清理本次请求创建的那份。
+    if (config.cancelToken && (config.ajaxOverlay || config.loadingInstance)) {
+      config.cancelToken.promise.then(function () {
+        removeModel(config);
+      });
+    }
     return config;
   },
   (error) => {
@@ -383,6 +392,14 @@ service.interceptors.response.use(
     }
   },
   (error) => {
+    // 主动取消（axios.CancelToken）不是错误，必须最先短路返回。
+    // axios 0.18 取消时 reject 的是 Cancel 对象，它**不带 config**，会一路落到下面
+    // 那个 else 分支无条件弹 ErroreBox —— 而 ErroreBox 是弹窗不是 toast，取消 N 个
+    // 在途请求就会连弹 N 个错误框。config.errorMsg 那条逃生口在 if (config) 里面，
+    // Cancel 走不到，所以只能在这里拦。调用方按需自行 catch。
+    if (axios.isCancel(error)) {
+      return Promise.reject(error);
+    }
     let config = error.config;
     if (
       error.response &&