@fmdeui/fmui 1.0.35 → 1.0.36

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/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/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.35 */
+/*! 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() {
@@ -22845,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();
@@ -22874,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);