@infly/libs 2.0.36 → 2.0.38

package/store/modules/user.js

@@ -188,61 +188,78 @@ const userModule = {
 };
 
 // 递归更新路由权限
-const updateRoutesPermission = (
-  routes = [],
-  userPermissions = [],
-  redirectRoute = {
-    level0: "",
-    level1: "",
-    level2: ""
-  },
-  lastNoVerPMRoute = {
-    level0: "",
-    level1: "",
-    level2: ""
-  },
-  level = 0
-) => {
-  const curLevelKey = `level${level}`;
-
+// 递归应用路由权限（设置 hidden）
+const applyRoutesPermission = (routes = []) => {
   routes.forEach((route) => {
-    const { path } = route;
-    if (route.meta && route.meta.permission && !route.hidden) {
+    if (route.meta?.permission && !route.hidden) {
       route.hidden = !Uts.getPM(route.meta.permission);
-
-      // 记录第一级有权限控制的路由，用于重定向
-      if (!route.hidden && !redirectRoute[curLevelKey]) {
-        redirectRoute[curLevelKey] = route.path;
-      }
     }
+    if (route.children?.length) {
+      applyRoutesPermission(route.children);
+    }
+  });
+};
+
+// 深度优先查找第一个可访问的叶子路由完整路径
+const getFirstAccessiblePath = (routes = [], parentPath = "") => {
+  for (const route of routes) {
+    if (route.hidden || !route.path) continue;
+
+    // 绝对路径直接用，相对路径拼接父路径
+    const fullPath = route.path.startsWith("/")
+      ? route.path
+      : parentPath
+        ? `${parentPath}/${route.path}`
+        : route.path;
 
-    // 记录最后一级没有权限控制的路由，用于重定向
-    if ((!route.meta || !route.meta.permission) && !route.hidden && path) {
-      lastNoVerPMRoute[`level${level}`] = path;
+    if (route.children?.length) {
+      const childPath = getFirstAccessiblePath(route.children, fullPath);
+      if (childPath) return childPath;
+    } else {
+      return fullPath;
     }
+  }
+  return "";
+};
 
-    if (route.children) {
-      updateRoutesPermission(route.children, userPermissions, redirectRoute, lastNoVerPMRoute, level + 1);
+// 更新路由权限并设置重定向
+const findAccessibleRouteByPath = (routes = [], targetPath, parentPath = "") => {
+  if (!targetPath) return null;
+
+  for (const route of routes) {
+    if (route.hidden || !route.path) continue;
+
+    const fullPath = route.path.startsWith("/")
+      ? route.path
+      : parentPath
+        ? `${parentPath}/${route.path}`
+        : route.path;
+
+    if (fullPath === targetPath) {
+      return route;
     }
 
-    // 处理重定向
-    if (path === "") {
-      let tempRoute = redirectRoute;
-      if (!redirectRoute.level0 && !redirectRoute.level1 && !redirectRoute.level2 && lastNoVerPMRoute.level0) {
-        tempRoute = lastNoVerPMRoute;
-      }
-      route.redirect = `${tempRoute.level1}/${tempRoute.level2}`;
-      if (!tempRoute.level2) {
-        route.redirect = `${tempRoute.level0}/${tempRoute.level1}`;
-      }
-
-      if (route.redirect === "/") {
-        route.redirect = "*";
-      }
-
-      CONFIG.redirectRoute = route || {};
+    if (route.children?.length) {
+      const matched = findAccessibleRouteByPath(route.children, targetPath, fullPath);
+      if (matched) return matched;
     }
-  });
+  }
+
+  return null;
+};
+
+const updateRoutesPermission = (routes = []) => {
+  applyRoutesPermission(routes);
+
+  const redirectRoute = routes.find((r) => r.path === "");
+  if (redirectRoute) {
+    const availableRoutes = routes.filter((r) => r.path !== "");
+    const initRoutePath = CONFIG.settings?.projectConfig?.initRoutePath;
+    const initRoute = findAccessibleRouteByPath(availableRoutes, initRoutePath);
+    const firstPath = getFirstAccessiblePath(availableRoutes);
+    redirectRoute.redirect = initRoute ? initRoutePath : firstPath || "*";
+    CONFIG.redirectRoute = redirectRoute;
+  }
 };
 
 export default {

package/tools/auto-export.js

@@ -0,0 +1,56 @@
+/**
+ * 自动导出目录下所有文件
+ * @param {Function} requireContext - require.context 返回的函数
+ * @param {RegExp} [filePattern=/\.vue$/] - 文件匹配正则
+ * @returns {Object} 导出对象，key 为文件名（不含扩展名），value 为模块内容
+ *
+ * @example
+ * // 在 components/Dialog/index.js 中使用
+ * import { autoExportFiles } from '@infly/libs/tools/auto-export.js';
+ * const components = autoExportFiles(require.context('./', false, /\.vue$/));
+ * Object.keys(components).forEach(name => {
+ *   module.exports[name] = components[name];
+ * });
+ *
+ * // 或者直接一行
+ * Object.assign(module.exports, autoExportFiles(require.context('./', false, /\.vue$/)));
+ */
+function autoExportFiles(requireContext, filePattern = /\.vue$/) {
+  if (!requireContext || typeof requireContext !== 'function') {
+    console.error('autoExportFiles: requireContext 必须是 require.context 返回的函数');
+    return {};
+  }
+
+  const exports = {};
+
+  requireContext.keys().forEach(fileName => {
+    // 跳过 index 文件自身
+    if (fileName.includes('index')) return;
+
+    const componentConfig = requireContext(fileName);
+    const componentName = fileName
+      .replace(/^\.\//, '')        // 移除 './'
+      .replace(/\.\w+$/, '');      // 移除扩展名
+
+    exports[componentName] = componentConfig.default || componentConfig;
+  });
+
+  return exports;
+}
+
+/**
+ * 简化版：直接挂载到 module.exports
+ * @param {Function} requireContext - require.context 返回的函数
+ * @param {Object} targetExports - 目标导出对象（通常是 module.exports）
+ *
+ * @example
+ * // 在 components/Dialog/index.js 中使用
+ * import { autoExportToModule } from '@infly/libs/tools/auto-export.js';
+ * autoExportToModule(require.context('./', false, /\.vue$/), module.exports);
+ */
+function autoExportToModule(requireContext, targetExports) {
+  const files = autoExportFiles(requireContext);
+  Object.assign(targetExports, files);
+}
+
+export { autoExportFiles, autoExportToModule };

package/tools/file-export.js

@@ -22,7 +22,9 @@ async function exportFile(config) {
     reqMethod = "get",
     Message = {},
     MessageBox = {},
-    Loading = {}
+    Loading = {},
+    hideConfirm = false,
+    confirmConfig = { message: "导出筛选后的所有文件, 是否继续?" }
   } = config || {};
 
   if (!url || !request) {
@@ -76,8 +78,8 @@ async function exportFile(config) {
 
   try {
     // 2. 确认框
-    if (MessageBox && Uts.isFunction(MessageBox.confirm)) {
-      await MessageBox.confirm("导出筛选后的所有文件, 是否继续?", "提示", {
+    if (MessageBox && Uts.isFunction(MessageBox.confirm) && !hideConfirm) {
+      await MessageBox.confirm(confirmConfig?.message, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -103,6 +105,11 @@ async function exportFile(config) {
         showMessage("error", "导出失败：不支持的请求方法！");
         return;
       }
+      const { code, message } = res || {};
+      if (code && (code != 0 || code != 200)) {
+        showMessage("error", message || "导出失败！");
+        return;
+      }
 
       const blob = new Blob([res], { type: "application/octet-stream" });
       const fullFileName = `${fileName}_${new Date().toISOString().slice(0, 10)}${suffix}`;
@@ -111,17 +118,17 @@ async function exportFile(config) {
       showMessage("success", "文件导出成功！");
     } catch (err) {
       console.error("导出错误：", err);
-      const { response } = err || {};
-      const { status, statusText } = response || {};
+      const { response, message: errMsg } = err || {};
+      const { status, statusText, message = errMsg } = response || {};
 
       if (status === 403 || statusText === "Forbidden") {
         showMessage("error", "无操作权限！");
       } else if (status === 404) {
         showMessage("error", "导出地址未找到！");
-      } else if (err.message && err.message.includes("timeout")) {
+      } else if (message && message.includes("timeout")) {
         showMessage("error", "导出超时，请稍后再试！");
       } else {
-        showMessage("error", "导出异常，请稍后再试！");
+        showMessage("error", message || "导出异常，请稍后再试！");
       }
     } finally {
       hideLoading(); // 隐藏加载
@@ -149,13 +156,10 @@ const fileExportMixin = {
         Loading: this.$loading || Loading,
         request: config.request || this.$axios
       };
-      
+
       return await exportFile(enhancedConfig);
     }
   }
 };
 
-export {
-  exportFile,
-  fileExportMixin
-};
+export { exportFile, fileExportMixin };

package/tools/project-preview.js

@@ -10,126 +10,139 @@ const projectRoot = process.cwd().replace(/\\node_modules.*$/g, "");
 const projectPkgPath = path.resolve(projectRoot, "package.json");
 const projectVueConfigPath = path.resolve(projectRoot, "vue.config.js");
 const projectConfig = fs.existsSync(projectVueConfigPath) ? require(projectVueConfigPath) : {};
+const projectPackage = fs.existsSync(projectPkgPath) ? require(projectPkgPath) : {};
 const rawArgv = process.argv.slice(2);
 const args = rawArgv.join(" ");
 
+function getBuildContext() {
+  try {
+    return JSON.parse(process.env.INFLY_BUILD_CONTEXT || "{}");
+  } catch {
+    return {};
+  }
+}
+
+const buildContext = getBuildContext();
+
+global.logColor = global.logColor || {
+  success: "\n\x1b[32m%s\x1b[0m",
+  error: "\n\x1b[31m%s\x1b[0m",
+  warning: "\n\x1b[33m%s\x1b[0m",
+  link: "\x1b[34m%s\x1b[0m",
+  info: "\n\x1b[36m%s\x1b[0m"
+};
+
 const DEFAULT_CONFIG = {
-    port: 9001,
-    publicPath: "/",
-    outputDir: "dist"
+  port: 9001,
+  publicPath: "/",
+  outputDir: "dist"
 };
 
 function scriptInit() {
-    if (fs.existsSync(projectVueConfigPath)) {
-        return;
-    }
-    scriptWrite(projectPkgPath, previewList);
+  if (fs.existsSync(projectVueConfigPath)) {
+    return;
+  }
+  scriptWrite(projectPkgPath, previewList);
 }
 
-/**
- * 检查端口是否可用
- * @param {number} port - 端口号
- * @returns {Promise<boolean>} - 端口是否可用
- */
 function isPortAvailable(port) {
-    return new Promise((resolve) => {
-        const server = net.createServer();
-        
-        server.listen(port, () => {
-            server.once('close', () => {
-                resolve(true);
-            });
-            server.close();
-        });
-
-        server.on('error', () => {
-            resolve(false);
-        });
+  return new Promise((resolve) => {
+    const server = net.createServer();
+
+    server.listen(port, () => {
+      server.once("close", () => {
+        resolve(true);
+      });
+      server.close();
+    });
+
+    server.on("error", () => {
+      resolve(false);
     });
+  });
 }
 
-/**
- * 查找可用端口
- * @param {number} startPort - 起始端口
- * @param {number} maxTries - 最大尝试次数
- * @returns {Promise<number>} - 可用端口
- */
 async function findAvailablePort(startPort, maxTries = 10) {
-    for (let i = 0; i < maxTries; i++) {
-        const port = startPort + i;
-        const available = await isPortAvailable(port);
-        
-        if (available) {
-            if (i > 0) {
-                console.log(global.logColor.warning, `⚠️  端口 ${startPort} 被占用，使用端口 ${port}`);
-            }
-            return port;
-        }
+  for (let i = 0; i < maxTries; i++) {
+    const port = startPort + i;
+    const available = await isPortAvailable(port);
+
+    if (available) {
+      if (i > 0) {
+        console.log(global.logColor.warning, `⚠️  端口 ${startPort} 被占用，使用端口 ${port}`);
+      }
+      return port;
     }
-    
-    throw new Error(`无法找到可用端口，已尝试从 ${startPort} 到 ${startPort + maxTries - 1}`);
+  }
+
+  throw new Error(`无法找到可用端口，已尝试从 ${startPort} 到 ${startPort + maxTries - 1}`);
 }
 
 async function init(skipBuild = false) {
-    try {
-        const { connect } = require("../lib/server/connect");
-        const { serveStatic } = require("../lib/server/serve-static");
-        const app = connect();
-        const noBuild = skipBuild || rawArgv.includes("--no-build");
-        const { devServer } = projectConfig || {};
-        const { port: devServerPort } = devServer || {};
-        projectConfig.port = devServerPort || DEFAULT_CONFIG.port;
-        const { publicPath, outputDir, port } = {
-            ...DEFAULT_CONFIG,
-            ...projectConfig
-        };
-        const baseListenPort = port - 1000;
-
-        if (!noBuild) {
-            buildProject();
-        }
-
-        // ✅ 查找可用端口
-        const listenPort = await findAvailablePort(baseListenPort);
-
-        app.use(
-            publicPath,
-            serveStatic(outputDir, {
-                index: ["index.html", "/"]
-            })
-        );
-
-        const server = app.listen(listenPort, function () {
-            console.log(global.logColor.success, `\x1b[42m\x1b[30m DONE \x1b[0m\x1b[32m  项目构建预览，CTRL + C结束：`);
-            console.log(global.logColor.link, `http://localhost:${listenPort}${publicPath}`);
-        });
-
-        // ✅ 处理服务器启动错误
-        server.on('error', (error) => {
-            if (error.code === 'EADDRINUSE') {
-                console.log(global.logColor.error, `❌ 端口 ${listenPort} 仍然被占用`);
-            } else {
-                console.log(global.logColor.error, `❌ 服务器启动失败：${error.message}`);
-            }
-        });
-
-        return server;
-    } catch (error) {
-        console.log(global.logColor.error, `❌ 预览项目失败：${error.message}`);
-        throw error;
+  try {
+    const { connect } = require("../lib/server/connect");
+    const { serveStatic } = require("../lib/server/serve-static");
+    const app = connect();
+    const noBuild = skipBuild || rawArgv.includes("--no-build");
+    const { devServer } = projectConfig || {};
+    const { port: devServerPort } = devServer || {};
+    projectConfig.port = devServerPort || DEFAULT_CONFIG.port;
+    const { publicPath, outputDir, port } = {
+      ...DEFAULT_CONFIG,
+      ...projectConfig
+    };
+    const baseListenPort = port - 1000;
+
+    if (!noBuild) {
+      buildProject();
     }
+
+    const listenPort = await findAvailablePort(baseListenPort);
+
+    app.use(
+      publicPath,
+      serveStatic(outputDir, {
+        index: ["index.html", "/"]
+      })
+    );
+
+    const server = app.listen(listenPort, function () {
+      const previewUrl = `http://localhost:${listenPort}${publicPath}`;
+
+      if (buildContext.batchPreview === true || process.env.INFLY_BATCH_PREVIEW === "1") {
+        console.log(global.logColor.link, `${projectPackage.name || path.basename(projectRoot)}: ${previewUrl}`);
+        return;
+      }
+
+      console.log(global.logColor.success, `\x1b[42m\x1b[30m DONE \x1b[0m\x1b[32m  项目构建预览，CTRL + C结束：`);
+      console.log(global.logColor.link, previewUrl);
+    });
+
+    server.on("error", (error) => {
+      if (error.code === "EADDRINUSE") {
+        console.log(global.logColor.error, `❌ 端口 ${listenPort} 仍然被占用`);
+      } else {
+        console.log(global.logColor.error, `❌ 服务器启动失败：${error.message}`);
+      }
+    });
+
+    return server;
+  } catch (error) {
+    console.log(global.logColor.error, `❌ 预览项目失败：${error.message}`);
+    throw error;
+  }
 }
 
 function buildProject() {
-    try {
-        execSync(`vue-cli-service build ${args}`, { stdio: "inherit" });
-    } catch (err) {
-        console.error(global.logColor.error, "❌ 构建失败:", err.message);
-        process.exit(1);
-    }
+  try {
+    execSync(`vue-cli-service build ${args}`, { stdio: "inherit" });
+  } catch (err) {
+    console.error(global.logColor.error, "❌ 构建失败:", err.message);
+    process.exit(1);
+  }
 }
 
 module.exports = {
-    init,
-    scriptInit
+  init,
+  scriptInit
 };

package/types/unused.index.d.ts

@@ -1,71 +0,0 @@
-// 去掉方便开发直接进入引用文件
-declare module "@infly/libs/module/Uts" {
-    const Uts: any;
-    export default Uts;
-}
-
-declare module "@infly/libs/module/Uts.js" {
-    const Uts: any;
-    export default Uts;
-}
-
-declare module "@infly/libs/dataInit/marketingActivitiesMap" {
-    const marketingActivitiesMap: any;
-    export default marketingActivitiesMap;
-}
-
-declare module "@infly/libs/dataInit/marketingActivitiesMap.js" {
-    const marketingActivitiesMap: any;
-    export default marketingActivitiesMap;
-}
-
-declare module "@infly/libs/dataInit/settlementMap" {
-    const settlementMap: any;
-    export default settlementMap;
-}
-
-declare module "@infly/libs/dataInit/settlementMap.js" {
-    const settlementMap: any;
-    export default settlementMap;
-}
-
-declare module "@infly/libs/dataInit/commonTypeMap" {
-    const commonTypeMap: any;
-    export default commonTypeMap;
-}
-
-declare module "@infly/libs/dataInit/commonTypeMap.js" {
-    const commonTypeMap: any;
-    export default commonTypeMap;
-}
-declare module "@infly/libs/tools/format" {
-    const FormatTools: any;
-    export default FormatTools;
-}
-
-declare module "@infly/libs/tools/format.js" {
-    const FormatTools: any;
-    export default FormatTools;
-}
-
-declare module "@infly/libs/module/REST" {
-    const REST: any;
-    export default REST;
-}
-
-declare module "@infly/libs/module/REST.js" {
-    const REST: any;
-    export default REST;
-}
-
-declare module "@infly/libs/module/Permission" {
-    // 根据实际导出内容细化类型，这里先用 any
-    const Permission: any;
-    export default Permission;
-}
-
-declare module "@infly/libs/module/Permission.js" {
-    // 根据实际导出内容细化类型，这里先用 any
-    const Permission: any;
-    export default Permission;
-}