@spacego/fe-components 0.0.2 → 0.0.4

package/lib/fe-layouts/basics-layout/components/basics-layout/setting-drawer.js

@@ -30,12 +30,16 @@ function z({ open: m, onClose: a }) {
       placement: "right",
       onClose: a,
       open: m,
-      width: 380,
-      closable: !1,
-      maskStyle: { backdropFilter: "none" },
+      closeIcon: null,
       className: "dark:bg-[#1a1c1f]!",
       extra: /* @__PURE__ */ e("div", { className: "cursor-pointer hover:text-primary transition-colors", onClick: a, children: /* @__PURE__ */ e(g, { className: "text-sm" }) }),
       styles: {
+        wrapper: {
+          width: 380
+        },
+        mask: {
+          backdropFilter: "none"
+        },
         header: {
           padding: "18px",
           borderBottom: "1px solid var(--border-color)"

package/lib/fe-layouts/basics-layout/index.js

@@ -1,5 +1,5 @@
 import { jsxs as f, jsx as s } from "react/jsx-runtime";
-import { useSelector as y } from "@spacego/zustand";
+import { useSelector as R } from "@spacego/zustand";
 import { Layout as g, Spin as Z } from "antd";
 import { useMemo as d, useEffect as $ } from "react";
 import { useLocation as ee, useNavigate as te, Outlet as oe } from "react-router-dom";
@@ -15,7 +15,7 @@ import { findRouteByPath as b, findMenuParentKeys as ue, buildRouteMap as fe, fi
 /* empty css           */
 const { Content: he } = g;
 function Se() {
-  const r = ee(), m = te(), { logout: R } = ne(), {
+  const r = ee(), m = te(), { logout: y } = ne(), {
     token: T,
     menus: a = [],
     routes: o = [],
@@ -32,7 +32,7 @@ function Se() {
     sidebarAfter: D,
     tabsBefore: I,
     tabsAfter: w
-  } = se(), { tabsAttribute: O, sidebarCollapsed: G, loadingConfig: P, ADD_TAB: V, REMOVE_TAB: j, SET_ACTIVE_TAB_KEY: E, SET_SIDEBAR_COLLAPSED: H } = re(y(["tabsAttribute", "sidebarCollapsed", "loadingConfig", "ADD_TAB", "REMOVE_TAB", "SET_ACTIVE_TAB_KEY", "SET_SIDEBAR_COLLAPSED"])), { tabsList: h, tabsActiveKey: i } = O, { theme: Y, TOGGLE_THEME: z } = ae(y(["theme", "TOGGLE_THEME"])), l = d(() => {
+  } = se(), { tabsAttribute: O, sidebarCollapsed: G, loadingConfig: P, ADD_TAB: V, REMOVE_TAB: j, SET_ACTIVE_TAB_KEY: E, SET_SIDEBAR_COLLAPSED: H } = re(R(["tabsAttribute", "sidebarCollapsed", "loadingConfig", "ADD_TAB", "REMOVE_TAB", "SET_ACTIVE_TAB_KEY", "SET_SIDEBAR_COLLAPSED"])), { tabsList: h, tabsActiveKey: i } = O, { theme: Y, TOGGLE_THEME: z } = ae(R(["theme", "TOGGLE_THEME"])), l = d(() => {
     var t;
     if (!o || o.length === 0)
       return i;
@@ -68,7 +68,7 @@ function Se() {
   }, p = d(() => !o || o.length === 0 ? null : (e) => b(e, o), [o]), W = () => {
     var t;
     const e = p == null ? void 0 : p(r.pathname);
-    if (e && e.id && !["root", "blank", "auth"].includes(e.id)) {
+    if (console.log("currentRoute:>> ", e), e && e.id && !["root", "blank", "auth"].includes(e.id)) {
       const n = e.id, c = ((t = e.handle) == null ? void 0 : t.title) || e.id;
       h.find((u) => u.key === n) ? E(n) : V({
         key: n,
@@ -95,7 +95,7 @@ function Se() {
         userMenuItems: k,
         theme: Y,
         onToggleTheme: z,
-        onLogout: R
+        onLogout: y
       }
     ),
     /* @__PURE__ */ f(g, { className: "flex-1 overflow-hidden", children: [

package/lib/router/index.js

@@ -1,43 +1,52 @@
-import { createBrowserRouter as c } from "react-router-dom";
-import { createPermissionHelpers as u } from "./permission.js";
-import { createDefaultRoutes as a } from "./routes.js";
+import { createBrowserRouter as a } from "react-router-dom";
+import { createPermissionHelpers as c } from "./permission.js";
+import { createDefaultRoutes as u } from "./routes.js";
 import "react";
-function h(t) {
-  const { modules: n, token: o, BaseLayout: e, routes: s = [] } = t, r = u(o), i = a(n, r, e);
+function R(s) {
+  const { modules: n, token: e, BaseLayout: t, routes: o = [] } = s, r = c(e), i = u(n, r, t);
   return {
     /** 最终合并后的路由配置 */
-    routes: f(i, s),
+    routes: m(i, o),
     /** 权限帮助函数，包含 ProtectedLoader 等，用于外部调用 processRoutes */
     permissionHelpers: r
   };
 }
-function f(t, n) {
-  const o = /* @__PURE__ */ new Map();
-  return t.forEach((e) => {
-    e.id && o.set(e.id, e);
-  }), n.forEach((e) => {
-    if (e.id)
-      if (e.id === "root" && o.has("root")) {
-        const s = o.get("root"), r = e, i = [
-          ...s.children || [],
+function m(s, n) {
+  const e = /* @__PURE__ */ new Map();
+  return s.forEach((t) => {
+    if (t.id)
+      e.set(t.id, t);
+    else {
+      const o = t.path || `route-${Math.random().toString(36).substring(2, 9)}`;
+      e.set(o, t);
+    }
+  }), n.forEach((t) => {
+    if (t.id)
+      if (t.id === "root" && e.has("root")) {
+        const o = e.get("root"), r = t, i = [
+          ...o.children || [],
           ...r.children || []
         ];
-        o.set("root", {
-          ...s,
+        e.set("root", {
+          ...o,
           ...r,
           // 属性以 customRoot 为准
           children: i
         });
       } else
-        o.set(e.id, e);
-  }), Array.from(o.values());
+        e.set(t.id, t);
+    else {
+      const o = `custom-${t.path || Math.random().toString(36).substring(2, 9)}`;
+      e.set(o, t);
+    }
+  }), Array.from(e.values());
 }
-function g(t) {
-  return c(t);
+function g(s) {
+  return a(s);
 }
 export {
-  a as createDefaultRoutes,
-  u as createPermissionHelpers,
-  h as createRouter,
+  u as createDefaultRoutes,
+  c as createPermissionHelpers,
+  R as createRouter,
   g as generateRouter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spacego/fe-components",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "🚀 A component library for fe to use.",
   "type": "module",
   "main": "lib/index.js",