@fmdeui/fmui 1.0.34 → 1.0.36

package/README.md

@@ -438,7 +438,7 @@ const watermark = new Watermark({
 
 ## 版本信息
 
-当前版本：`1.0.26`
+当前版本：`1.0.35`
 
 ## 注意事项
 

package/es/index.mjs

@@ -20,7 +20,7 @@ export { auth, authAll, auths, hAuth, hAuthAll, hAuths } from './packages/hooks/
 export { base64ToFile, blobToFile, dataURLtoBlob, fileToBase64, urlToBase64 } from './packages/utils/base64Conver.mjs';
 export { buildLocaleContext, buildTranslator, translate, useLocale } from './packages/hooks/useLocale.mjs';
 export { clone, isObjectValueEqual, judgementSameArr, removeDuplicate } from './packages/utils/arrayOperation.mjs';
-export { configureRoutes, setPathPrefix, staticRoutes } from './packages/router/route.mjs';
+export { configureRoutes, staticRoutes } from './packages/router/route.mjs';
 export { destroyIdleTimeout, initIdleTimeout, updateIdleTimeout } from './packages/hooks/idleTimeout.mjs';
 export { downloadByBase64, downloadByData, downloadByOnlineUrl, downloadByUrl, downloadStreamFile, getFileName, openWindow } from './packages/utils/download.mjs';
 export { default as en } from './packages/locale/lang/en.mjs';

package/es/packages/router/backEnd.mjs

@@ -35,6 +35,14 @@ async function initBackEndControlRoutes() {
   const res = await getBackEndControlRoutes();
   if (res == void 0 || res.length <= 0) return Promise.resolve(true);
   useRequestOldRoutes().setRequestOldRoutes(res);
+  if (dynamicRoutes.length === 0) {
+    dynamicRoutes.push({
+      path: "/",
+      name: "Layout",
+      component: () => import('../components/fm-layout/src/index.vue.mjs'),
+      children: []
+    });
+  }
   dynamicRoutes[0].children = await backEndComponent(res);
   await setAddRoute();
   setFilterMenuAndCacheTagsViewRoutes();
@@ -67,35 +75,64 @@ async function setBackEndControlRefreshRoutes() {
   await getBackEndControlRoutes();
 }
 function backEndComponent(routes) {
-  if (!routes) return;
+  if (!routes) return [];
   return routes.map((item) => {
     if (!item.path) item.path = "";
-    if (item.component) item.component = dynamicImport(dynamicViewsModules, item.component);
-    item.children && backEndComponent(item.children);
+    if (item.component && typeof item.component === "string") {
+      item.component = dynamicImport(dynamicViewsModules, item.component);
+      if (!item.component) {
+        item.component = () => import('../components/fm-layout/src/index.vue.mjs');
+        console.warn(`Using default component for route: ${item.path}`);
+      }
+    }
+    if (item.children) {
+      item.children = backEndComponent(item.children);
+    }
     return item;
   });
 }
 function dynamicImport(dynamicViewsModules2, component) {
   const keys = Object.keys(dynamicViewsModules2);
-  const matchKeys = keys.filter((key) => {
+  let matchKeys = [];
+  matchKeys = keys.filter((key) => key.includes(component));
+  if (matchKeys.length === 0) {
     const REMOVE_PREFIXES = [
       "../../../../packages/fmasyspage/views",
       "../../../../packages/fmwlpage/views",
       "../../../../packages/fmreliefpage/views",
       "../views",
       "./views",
+      "./layout/routerView",
+      "../layout/routerView",
       ".."
     ].map((p) => p.replace(/\./g, "\\.").replace(/\//g, "\\/")).join("|");
-    const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
-    return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
-  });
+    matchKeys = keys.filter((key) => {
+      const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
+      return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+    });
+  }
   if ((matchKeys == null ? void 0 : matchKeys.length) === 1) {
     const matchKey = matchKeys[0];
     return dynamicViewsModules2[matchKey];
   }
   if ((matchKeys == null ? void 0 : matchKeys.length) > 1) {
-    return false;
+    const exactMatch = matchKeys.find((key) => key.endsWith(`${component}.vue`) || key.endsWith(`${component}.tsx`));
+    if (exactMatch) {
+      return dynamicViewsModules2[exactMatch];
+    }
+    return dynamicViewsModules2[matchKeys[0]];
+  }
+  if (dynamicViewsModules2[component]) {
+    return dynamicViewsModules2[component];
+  }
+  if (component.startsWith("/")) {
+    const relativeComponent = component.substring(1);
+    if (dynamicViewsModules2[relativeComponent]) {
+      return dynamicViewsModules2[relativeComponent];
+    }
   }
+  console.warn(`No component found for: ${component}`);
+  console.warn("Available modules:", Object.keys(dynamicViewsModules2));
 }
 
 export { backEndComponent, dynamicImport, getBackEndControlRoutes, initBackEndControlRoutes, setAddRoute, setBackEndControlRefreshRoutes, setCacheTagsViewRoutes, setDynamicViewsModules, setFilterMenuAndCacheTagsViewRoutes, setFilterRouteEnd };

package/es/packages/router/index.mjs

@@ -2,7 +2,7 @@ import { storeToRefs } from 'pinia';
 import { useRoutesList } from '../stores/routesList.mjs';
 import { useThemeConfig } from '../stores/themeConfig.mjs';
 import { Session, Local } from '../utils/storage.mjs';
-export { configureRoutes, setPathPrefix, staticRoutes } from './route.mjs';
+export { configureRoutes, staticRoutes } from './route.mjs';
 import { initFrontEndControlRoutes } from './frontEnd.mjs';
 import { initBackEndControlRoutes } from './backEnd.mjs';
 export { setDynamicViewsModules } from './backEnd.mjs';

package/es/packages/router/route.mjs

@@ -1,122 +1,6 @@
-let pathPrefix = "/@";
-function setPathPrefix(prefix) {
-  pathPrefix = prefix;
-}
-function getPath(path) {
-  return `${pathPrefix}${path}`;
-}
-let dynamicRoutes = [
-  {
-    path: "/",
-    name: "/",
-    component: () => import(getPath("/layout/index.vue")),
-    redirect: "/dashboard/home",
-    meta: {
-      isKeepAlive: true
-    },
-    children: []
-  },
-  {
-    path: "/llm/aiChat",
-    name: "aiChat",
-    component: () => import(getPath("/views/aiChat/index.vue")),
-    meta: {
-      title: "AI\u5BF9\u8BDD",
-      isKeepAlive: true
-    }
-  },
-  {
-    path: "/platform/job/dashboard",
-    name: "jobDashboard",
-    component: () => import(getPath("/views/system/job/dashboard.vue")),
-    meta: {
-      title: "\u4EFB\u52A1\u770B\u677F",
-      isLink: window.__env__.VITE_API_URL + "/schedule",
-      isHide: true,
-      isKeepAlive: true,
-      isAffix: false,
-      isIframe: true,
-      icon: "ele-Clock"
-    }
-  },
-  {
-    path: "/develop/database/visual",
-    name: "databaseVisual",
-    component: () => import(getPath("/views/system/database/component/visualTable.vue")),
-    meta: {
-      title: "\u5E93\u8868\u53EF\u89C6\u5316",
-      isHide: true,
-      isKeepAlive: true,
-      isAffix: false,
-      // isIframe: true,
-      icon: "ele-View"
-    }
-  },
-  {
-    path: "/report/view/:reportConfigId/:tagsViewName?",
-    name: "sysReportView",
-    component: () => import(getPath("/views/system/reportConfig/component/reportView.vue")),
-    meta: {
-      title: "\u62A5\u8868\u67E5\u770B",
-      isHide: true,
-      isKeepAlive: true,
-      isAffix: false,
-      isIframe: false,
-      icon: ""
-    }
-  }
-];
-let notFoundAndNoPower = [
-  {
-    path: "/:path(.*)*",
-    name: "notFound",
-    component: () => import(getPath("/views/error/404.vue")),
-    meta: {
-      title: "message.staticRoutes.notFound",
-      isHide: true
-    }
-  },
-  {
-    path: "/401",
-    name: "noPower",
-    component: () => import(getPath("/views/error/401.vue")),
-    meta: {
-      title: "message.staticRoutes.noPower",
-      isHide: true
-    }
-  }
-];
-let staticRoutes = [
-  {
-    path: "/login",
-    name: "login",
-    component: () => import(getPath("/views/login/index.vue")),
-    meta: {
-      title: "Login",
-      isPublic: true
-    }
-  }
-  /**
-   * 提示：写在这里的为全屏界面，不建议写在这里
-   * 请写在 `dynamicRoutes` 路由数组中
-   */
-  // {
-  //  path: '/visualizingDemo1',
-  //  name: 'visualizingDemo1',
-  //  component: () => import('/@/views/visualizing/demo1.vue'),
-  //  meta: {
-  //      title: 'message.router.visualizingLinkDemo1',
-  //  },
-  // },
-  // {
-  //  path: '/visualizingDemo2',
-  //  name: 'visualizingDemo2',
-  //  component: () => import('/@/views/visualizing/demo2.vue'),
-  //  meta: {
-  //      title: 'message.router.visualizingLinkDemo2',
-  //  },
-  // },
-];
+let dynamicRoutes = [];
+let notFoundAndNoPower = [];
+let staticRoutes = [];
 function configureRoutes(options) {
   if (options.dynamicRoutes) {
     if (options.merge) {
@@ -139,9 +23,6 @@ function configureRoutes(options) {
       notFoundAndNoPower = options.notFoundAndNoPower;
     }
   }
-  if (options.pathPrefix) {
-    setPathPrefix(options.pathPrefix);
-  }
 }
 
-export { configureRoutes, dynamicRoutes, notFoundAndNoPower, setPathPrefix, staticRoutes };
+export { configureRoutes, dynamicRoutes, notFoundAndNoPower, staticRoutes };

package/es/router/backEnd.d.ts

@@ -60,4 +60,4 @@ export declare function backEndComponent(routes: any): any;
  * @param component 当前要处理项 component
  * @returns 返回处理成函数后的 component
  */
-export declare function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string): false | Function | undefined;
+export declare function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string): Function | undefined;

package/es/router/index.d.ts

@@ -1,4 +1,4 @@
-import { configureRoutes, setPathPrefix, staticRoutes } from './route';
+import { configureRoutes, staticRoutes } from './route';
 import { initFrontEndControlRoutes } from './frontEnd';
 import { initBackEndControlRoutes, setDynamicViewsModules } from './backEnd';
 import { router } from './createRouter';
@@ -9,4 +9,4 @@ import { Router } from 'vue-router';
  */
 export declare function initRouter(): Router;
 export default router;
-export { configureRoutes, staticRoutes, setPathPrefix, setDynamicViewsModules, initBackEndControlRoutes, initFrontEndControlRoutes };
+export { configureRoutes, staticRoutes, setDynamicViewsModules, initBackEndControlRoutes, initFrontEndControlRoutes };

package/es/router/route.d.ts

@@ -27,11 +27,6 @@ declare module 'vue-router' {
         isPublic?: boolean;
     }
 }
-/**
- * 设置路径前缀
- * @param prefix 路径前缀
- */
-export declare function setPathPrefix(prefix: string): void;
 /**
  * 定义动态路由
  * 前端添加路由，请在顶级节点的 `children 数组` 里添加

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.34 */
+/*! fmdeui-fmui v1.0.36 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('vue-router'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('nprogress'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'vue-router', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'nprogress', 'axios'], factory) :
@@ -22516,6 +22516,11 @@
 	  }
 	});
 
+	var index$4 = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		default: _sfc_main$o
+	});
+
 	const FLayout = _sfc_main$o;
 
 	function commonFunction() {
@@ -22688,125 +22693,9 @@
 	  };
 	}
 
-	let pathPrefix = "/@";
-	function setPathPrefix(prefix) {
-	  pathPrefix = prefix;
-	}
-	function getPath(path) {
-	  return `${pathPrefix}${path}`;
-	}
-	let dynamicRoutes = [
-	  {
-	    path: "/",
-	    name: "/",
-	    component: () => import(getPath("/layout/index.vue")),
-	    redirect: "/dashboard/home",
-	    meta: {
-	      isKeepAlive: true
-	    },
-	    children: []
-	  },
-	  {
-	    path: "/llm/aiChat",
-	    name: "aiChat",
-	    component: () => import(getPath("/views/aiChat/index.vue")),
-	    meta: {
-	      title: "AI\u5BF9\u8BDD",
-	      isKeepAlive: true
-	    }
-	  },
-	  {
-	    path: "/platform/job/dashboard",
-	    name: "jobDashboard",
-	    component: () => import(getPath("/views/system/job/dashboard.vue")),
-	    meta: {
-	      title: "\u4EFB\u52A1\u770B\u677F",
-	      isLink: window.__env__.VITE_API_URL + "/schedule",
-	      isHide: true,
-	      isKeepAlive: true,
-	      isAffix: false,
-	      isIframe: true,
-	      icon: "ele-Clock"
-	    }
-	  },
-	  {
-	    path: "/develop/database/visual",
-	    name: "databaseVisual",
-	    component: () => import(getPath("/views/system/database/component/visualTable.vue")),
-	    meta: {
-	      title: "\u5E93\u8868\u53EF\u89C6\u5316",
-	      isHide: true,
-	      isKeepAlive: true,
-	      isAffix: false,
-	      // isIframe: true,
-	      icon: "ele-View"
-	    }
-	  },
-	  {
-	    path: "/report/view/:reportConfigId/:tagsViewName?",
-	    name: "sysReportView",
-	    component: () => import(getPath("/views/system/reportConfig/component/reportView.vue")),
-	    meta: {
-	      title: "\u62A5\u8868\u67E5\u770B",
-	      isHide: true,
-	      isKeepAlive: true,
-	      isAffix: false,
-	      isIframe: false,
-	      icon: ""
-	    }
-	  }
-	];
-	let notFoundAndNoPower = [
-	  {
-	    path: "/:path(.*)*",
-	    name: "notFound",
-	    component: () => import(getPath("/views/error/404.vue")),
-	    meta: {
-	      title: "message.staticRoutes.notFound",
-	      isHide: true
-	    }
-	  },
-	  {
-	    path: "/401",
-	    name: "noPower",
-	    component: () => import(getPath("/views/error/401.vue")),
-	    meta: {
-	      title: "message.staticRoutes.noPower",
-	      isHide: true
-	    }
-	  }
-	];
-	exports.staticRoutes = [
-	  {
-	    path: "/login",
-	    name: "login",
-	    component: () => import(getPath("/views/login/index.vue")),
-	    meta: {
-	      title: "Login",
-	      isPublic: true
-	    }
-	  }
-	  /**
-	   * 提示：写在这里的为全屏界面，不建议写在这里
-	   * 请写在 `dynamicRoutes` 路由数组中
-	   */
-	  // {
-	  //  path: '/visualizingDemo1',
-	  //  name: 'visualizingDemo1',
-	  //  component: () => import('/@/views/visualizing/demo1.vue'),
-	  //  meta: {
-	  //      title: 'message.router.visualizingLinkDemo1',
-	  //  },
-	  // },
-	  // {
-	  //  path: '/visualizingDemo2',
-	  //  name: 'visualizingDemo2',
-	  //  component: () => import('/@/views/visualizing/demo2.vue'),
-	  //  meta: {
-	  //      title: 'message.router.visualizingLinkDemo2',
-	  //  },
-	  // },
-	];
+	let dynamicRoutes = [];
+	let notFoundAndNoPower = [];
+	exports.staticRoutes = [];
 	function configureRoutes(options) {
 	  if (options.dynamicRoutes) {
 	    if (options.merge) {
@@ -22829,9 +22718,6 @@
 	      notFoundAndNoPower = options.notFoundAndNoPower;
 	    }
 	  }
-	  if (options.pathPrefix) {
-	    setPathPrefix(options.pathPrefix);
-	  }
 	}
 
 	function formatFlatteningRoutes(arr) {
@@ -22964,6 +22850,14 @@
 	  const res = await getBackEndControlRoutes();
 	  if (res == void 0 || res.length <= 0) return Promise.resolve(true);
 	  useRequestOldRoutes().setRequestOldRoutes(res);
+	  if (dynamicRoutes.length === 0) {
+	    dynamicRoutes.push({
+	      path: "/",
+	      name: "Layout",
+	      component: () => Promise.resolve().then(function () { return index$4; }),
+	      children: []
+	    });
+	  }
 	  dynamicRoutes[0].children = await backEndComponent(res);
 	  await setAddRoute();
 	  setFilterMenuAndCacheTagsViewRoutes();
@@ -22993,35 +22887,64 @@
 	  return resData;
 	}
 	function backEndComponent(routes) {
-	  if (!routes) return;
+	  if (!routes) return [];
 	  return routes.map((item) => {
 	    if (!item.path) item.path = "";
-	    if (item.component) item.component = dynamicImport(dynamicViewsModules, item.component);
-	    item.children && backEndComponent(item.children);
+	    if (item.component && typeof item.component === "string") {
+	      item.component = dynamicImport(dynamicViewsModules, item.component);
+	      if (!item.component) {
+	        item.component = () => Promise.resolve().then(function () { return index$4; });
+	        console.warn(`Using default component for route: ${item.path}`);
+	      }
+	    }
+	    if (item.children) {
+	      item.children = backEndComponent(item.children);
+	    }
 	    return item;
 	  });
 	}
 	function dynamicImport(dynamicViewsModules2, component) {
 	  const keys = Object.keys(dynamicViewsModules2);
-	  const matchKeys = keys.filter((key) => {
+	  let matchKeys = [];
+	  matchKeys = keys.filter((key) => key.includes(component));
+	  if (matchKeys.length === 0) {
 	    const REMOVE_PREFIXES = [
 	      "../../../../packages/fmasyspage/views",
 	      "../../../../packages/fmwlpage/views",
 	      "../../../../packages/fmreliefpage/views",
 	      "../views",
 	      "./views",
+	      "./layout/routerView",
+	      "../layout/routerView",
 	      ".."
 	    ].map((p) => p.replace(/\./g, "\\.").replace(/\//g, "\\/")).join("|");
-	    const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
-	    return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
-	  });
+	    matchKeys = keys.filter((key) => {
+	      const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
+	      return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+	    });
+	  }
 	  if ((matchKeys == null ? void 0 : matchKeys.length) === 1) {
 	    const matchKey = matchKeys[0];
 	    return dynamicViewsModules2[matchKey];
 	  }
 	  if ((matchKeys == null ? void 0 : matchKeys.length) > 1) {
-	    return false;
+	    const exactMatch = matchKeys.find((key) => key.endsWith(`${component}.vue`) || key.endsWith(`${component}.tsx`));
+	    if (exactMatch) {
+	      return dynamicViewsModules2[exactMatch];
+	    }
+	    return dynamicViewsModules2[matchKeys[0]];
+	  }
+	  if (dynamicViewsModules2[component]) {
+	    return dynamicViewsModules2[component];
+	  }
+	  if (component.startsWith("/")) {
+	    const relativeComponent = component.substring(1);
+	    if (dynamicViewsModules2[relativeComponent]) {
+	      return dynamicViewsModules2[relativeComponent];
+	    }
 	  }
+	  console.warn(`No component found for: ${component}`);
+	  console.warn("Available modules:", Object.keys(dynamicViewsModules2));
 	}
 
 	const storesThemeConfig = useThemeConfig(pinia);
@@ -29046,7 +28969,6 @@
 	exports.setDynamicViewsModules = setDynamicViewsModules;
 	exports.setIntroduction = setIntroduction;
 	exports.setJsCdn = setJsCdn;
-	exports.setPathPrefix = setPathPrefix;
 	exports.setupI18n = setupI18n;
 	exports.signalR = signalR;
 	exports.signatureByKSort = signatureByKSort;