@pubinfo/core 2.0.0-beta.27 → 2.0.0-beta.28

package/src/pages/system/change-password/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PassStrengthValidator, PubinfoIcon, PubinfoProvider } from '@/components';
+import { PassStrengthValidator, PubinfoIcon } from '@/components';
 import ChangePasswordForm from './components/ChangePasswordForm/index.vue';
 
 defineOptions({
@@ -18,56 +18,48 @@ const newPassWord = computed({
 const route = useRoute();
 const token = route.params.changePassWordToken;
 const isValidate = ref(false);
-
-function loadIcon(name: string) {
-  const modules = (import.meta as any).glob('../../../assets/icons/*', { eager: true });
-  const path = `../../../assets/icons/${name}.svg`;
-  return modules[path]?.default;
-}
 </script>
 
 <template>
-  <PubinfoProvider :load-icon="loadIcon">
-    <div class="password-bg">
-      <main
-        flex="~ auto center"
-        w-full
-        h-0
+  <div class="password-bg">
+    <main
+      flex="~ auto center"
+      w-full
+      h-0
+    >
+      <div
+        h-full
+        flex="~"
+        justify-between
+        items-center
       >
-        <div
-          h-full
-          flex="~"
-          justify-between
-          items-center
-        >
-          <div w-650px mr-20px>
-            <PassStrengthValidator v-model="newPassWord" v-model:validate="isValidate" />
-          </div>
-          <div class="change-password-form">
-            <div flex="~ col center" mb-40px>
-              <div
-                w-88px
-                h-88px
-                flex="~ center"
-                rounded="50%"
-                mb-15px
-              >
-                <PubinfoIcon
-                  name="mima"
-                  color="transparent"
-                  :size="88"
-                />
-              </div>
-              <span text="18px" font="bold">
-                更改密码
-              </span>
+        <div w-650px mr-20px>
+          <PassStrengthValidator v-model="newPassWord" v-model:validate="isValidate" />
+        </div>
+        <div class="change-password-form">
+          <div flex="~ col center" mb-40px>
+            <div
+              w-88px
+              h-88px
+              flex="~ center"
+              rounded="50%"
+              mb-15px
+            >
+              <PubinfoIcon
+                name="mima"
+                color="transparent"
+                :size="88"
+              />
             </div>
-            <ChangePasswordForm ref="ChangePassWordForm" v-model:validate="isValidate" :token="token" />
+            <span text="18px" font="bold">
+              更改密码
+            </span>
           </div>
+          <ChangePasswordForm ref="ChangePassWordForm" v-model:validate="isValidate" :token="token" />
         </div>
-      </main>
-    </div>
-  </PubinfoProvider>
+      </div>
+    </main>
+  </div>
 </template>
 
 <style lang="scss" scoped>

package/src/route/routes.ts

@@ -4,13 +4,26 @@ import { readProject } from '@/context';
 import { useSettingsStore, useUserStore } from '@/stores';
 import { isUndefined } from 'lodash-es';
 
-let asyncRoutes: Route.recordMainRaw[] = [];
+interface AsyncRoutesOptions {
+  /** 路由排序 */
+  sort?: number
+}
+
+interface RawAsyncRoute extends Required<AsyncRoutesOptions> {
+  routes: Route.recordMainRaw[]
+}
+
+// #region --- 动态路由
+const rawAsyncRoutes: RawAsyncRoute[] = [];
 
 /**
  * 定义并注册动态路由
  */
-export function defineAsyncRoutes(routes: Route.recordMainRaw[]) {
-  asyncRoutes = [...asyncRoutes, ...routes];
+export function defineAsyncRoutes(routes: Route.recordMainRaw[], options?: AsyncRoutesOptions) {
+  rawAsyncRoutes.push({
+    routes,
+    sort: options?.sort ?? 0,
+  });
   return routes;
 }
 
@@ -18,9 +31,14 @@ export function defineAsyncRoutes(routes: Route.recordMainRaw[]) {
  * 读取注册的动态路由
  */
 export function getAsyncRoutes() {
-  return asyncRoutes;
+  return rawAsyncRoutes
+    .sort((a, b) => a?.sort - b?.sort)
+    .map(e => e.routes)
+    .flat();
 }
+// #endregion
 
+// #region --- 系统路由
 const systemRoutes: RouteRecordRaw[] = [
   {
     path: '/',
@@ -57,7 +75,7 @@ const systemRoutes: RouteRecordRaw[] = [
  * 定义并注册系统路由（含Layout）
  */
 export function defineSystemRoutes(routes: RouteRecordRaw[]) {
-  systemRoutes[0].children = [...(systemRoutes?.[0]?.children ?? []), ...routes];
+  systemRoutes[0].children?.push(...routes);
 }
 
 /**
@@ -66,10 +84,9 @@ export function defineSystemRoutes(routes: RouteRecordRaw[]) {
 export function getSystemRoutes() {
   return systemRoutes;
 }
+// #endregion
 
-/**
- * 内置静态路由
- */
+// #region --- 静态路由
 export const constantRoutes: RouteRecordRaw[] = [
   {
     path: '/change-password/:changePassWordToken',
@@ -122,3 +139,4 @@ export const constantRoutes: RouteRecordRaw[] = [
     },
   },
 ];
+// #endregion

package/src/stores/modules/route.ts

@@ -303,8 +303,16 @@ const useRouteStore = defineStore(
               delete arr[index].meta!.singleMenu;
             }
 
-            if (!arr[index].component) {
-              arr[index].component = Layout;
+            if (!item.component) {
+              item.component = Layout;
+            }
+
+            // 给一级路由设置 provider
+            if (route.meta?.provider) {
+              (item.meta as any) = {
+                ...(item.meta ?? {}),
+                provider: route.meta.provider,
+              };
             }
           });
         }

package/src/utils/index.ts

@@ -35,6 +35,20 @@ export function objectToPaths(obj: Record<string, any>, prefix = '') {
   }, [] as string[]);
 }
 
+/**
+ * 基于 `import.meta.glob` 读取 `iconMap`
+ */
+export function loadIconsFromGlob(modules: Record<string, { default: string }>): Record<string, string> {
+  return Object.fromEntries(
+    Object.entries(modules)
+      .map(([path, mod]) => {
+        const name = path.match(/([^/]+)(?=\.svg$)/)?.[1];
+        return name ? [name, mod.default] : null;
+      })
+      .filter(Boolean) as [string, string][],
+  );
+}
+
 export * from './cleanup';
 export * from './crypto';
 export { default as eventBus } from './eventBus';

package/types/vue-router.d.ts

@@ -25,6 +25,7 @@ export interface RouterMetaRawBaseOptions {
   breadcrumbNeste: Route.breadcrumb[]
   isDev: boolean
   enabled: boolean
+  provider?: any
 }
 
 type RouterMetaRaw = RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title'>;
@@ -37,7 +38,8 @@ export declare namespace Route {
     | 'icon'
     | 'activeIcon'
     | 'auth'
-    | 'enabled';
+    | 'enabled'
+    | 'provider';
 
   type recordMainRawBasicMeta = Partial<Pick<RouterMetaRawBaseOptions, mainMeta>>;
 

package/dist/index-64V9RiCt.js

@@ -1,240 +0,0 @@
-import { P as V, _ as R, a as F, b as T, c as j, d as z, e as B, f as S, g as W, h as M } from "./toolbar-collapse-BhNN4H7Y.js";
-import { defineComponent as N, mergeModels as $, useModel as I, reactive as O, ref as b, createElementBlock as q, openBlock as E, createVNode as t, unref as s, withCtx as _, createTextVNode as h, nextTick as D, computed as J, createBlock as Q, createElementVNode as u, isRef as P } from "vue";
-import { by as X, bz as A, u as G, aQ as H, v as K } from "./menu-D3oKigWX.js";
-import "pinia-plugin-persistedstate";
-import { useRouter as L, useRoute as Y } from "vue-router";
-import { P as Z } from "./index-CqQ-P_1q.js";
-import { J as ee, _ as se, M as oe } from "./index-hjeR7S9d.js";
-import { _ as te } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-var ae = "Expected a function";
-function re(l, i, r) {
-  if (typeof l != "function")
-    throw new TypeError(ae);
-  return setTimeout(function() {
-    l.apply(void 0, r);
-  }, i);
-}
-var ne = X(function(l, i, r) {
-  return re(l, A(i) || 0, r);
-});
-const le = /* @__PURE__ */ N({
-  name: "ChangePasswordForm",
-  __name: "index",
-  props: /* @__PURE__ */ $({
-    token: {}
-  }, {
-    validate: { type: Boolean, default: !1 },
-    validateModifiers: {}
-  }),
-  emits: ["update:validate"],
-  setup(l, { expose: i }) {
-    const r = l, x = I(l, "validate"), o = O({
-      password: "",
-      newPassword: "",
-      repeatNewPassword: ""
-    }), d = L(), f = b(), c = G();
-    async function a(p, e) {
-      if (!e)
-        return Promise.reject(new Error("请再次输入新密码"));
-      if (e !== o.newPassword)
-        return Promise.reject(new Error("两次输入的密码不匹配，请确保新密码在两个输入框中完全相同"));
-    }
-    async function n(p, e) {
-      if (await D(), !e)
-        return Promise.reject(new Error("请再次输入新密码"));
-      if (!x.value)
-        return Promise.reject(new Error("密码安全校验不通过"));
-    }
-    const w = {
-      password: [{
-        required: !0,
-        whitespace: !0,
-        message: "请输入密码"
-      }],
-      newPassword: [{ validator: n }],
-      repeatNewPassword: [{ validator: a }]
-    };
-    async function C() {
-      var p;
-      try {
-        await ((p = f.value) == null ? void 0 : p.validate()), await c.changeUserPassword({
-          oldPassword: o.password,
-          newPassword: o.newPassword,
-          token: r.token
-        }), K.success("密码修改成功"), ne(() => {
-          k();
-        }, 800);
-      } catch {
-      }
-    }
-    function k() {
-      d.go(-1);
-    }
-    return i({
-      formState: o
-    }), (p, e) => {
-      const g = oe, v = se, y = H, U = ee;
-      return E(), q("div", null, [
-        t(U, {
-          ref_key: "changePasswordForm",
-          ref: f,
-          model: s(o),
-          rules: w
-        }, {
-          default: _(() => [
-            t(v, { name: "password" }, {
-              default: _(() => [
-                t(g, {
-                  value: s(o).password,
-                  "onUpdate:value": e[0] || (e[0] = (m) => s(o).password = m),
-                  "allow-clear": "",
-                  size: "large",
-                  placeholder: "请输入旧密码",
-                  "visibility-toggle": ""
-                }, null, 8, ["value"])
-              ]),
-              _: 1
-            }),
-            t(v, { name: "newPassword" }, {
-              default: _(() => [
-                t(g, {
-                  value: s(o).newPassword,
-                  "onUpdate:value": e[1] || (e[1] = (m) => s(o).newPassword = m),
-                  "allow-clear": "",
-                  size: "large",
-                  placeholder: "请输入新密码",
-                  "visibility-toggle": ""
-                }, null, 8, ["value"])
-              ]),
-              _: 1
-            }),
-            t(v, { name: "repeatNewPassword" }, {
-              default: _(() => [
-                t(g, {
-                  value: s(o).repeatNewPassword,
-                  "onUpdate:value": e[2] || (e[2] = (m) => s(o).repeatNewPassword = m),
-                  "allow-clear": "",
-                  size: "large",
-                  placeholder: "请再次输入新密码",
-                  "visibility-toggle": ""
-                }, null, 8, ["value"])
-              ]),
-              _: 1
-            }),
-            t(v, null, {
-              default: _(() => [
-                t(y, {
-                  type: "primary",
-                  block: "",
-                  "h-48px": "",
-                  "mb-10px": "",
-                  onClick: C
-                }, {
-                  default: _(() => e[3] || (e[3] = [
-                    h(" 修改密码 ")
-                  ])),
-                  _: 1
-                }),
-                t(y, {
-                  block: "",
-                  "h-48px": "",
-                  onClick: k
-                }, {
-                  default: _(() => e[4] || (e[4] = [
-                    h(" 返回 ")
-                  ])),
-                  _: 1
-                })
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["model"])
-      ]);
-    };
-  }
-}), ie = { class: "password-bg" }, de = {
-  flex: "~ auto center",
-  "w-full": "",
-  "h-0": ""
-}, ue = {
-  "h-full": "",
-  flex: "~",
-  "justify-between": "",
-  "items-center": ""
-}, _e = {
-  "w-650px": "",
-  "mr-20px": ""
-}, ce = { class: "change-password-form" }, pe = {
-  flex: "~ col center",
-  "mb-40px": ""
-}, me = {
-  "w-88px": "",
-  "h-88px": "",
-  flex: "~ center",
-  rounded: "50%",
-  "mb-15px": ""
-}, fe = /* @__PURE__ */ N({
-  name: "ChangePassword",
-  __name: "index",
-  setup(l) {
-    const i = b(), r = J({
-      get() {
-        var c;
-        return (c = i.value) == null ? void 0 : c.formState.newPassword;
-      },
-      set() {
-      }
-    }), o = Y().params.changePassWordToken, d = b(!1);
-    function f(c) {
-      var w;
-      const a = /* @__PURE__ */ Object.assign({ "../../../assets/icons/403.svg": M, "../../../assets/icons/403_dark.svg": W, "../../../assets/icons/404.svg": S, "../../../assets/icons/404_dark.svg": B, "../../../assets/icons/change-org.svg": z, "../../../assets/icons/favorites.svg": j, "../../../assets/icons/mima.svg": T, "../../../assets/icons/toolbar-collapse.svg": F }), n = `../../../assets/icons/${c}.svg`;
-      return (w = a[n]) == null ? void 0 : w.default;
-    }
-    return (c, a) => (E(), Q(s(V), { "load-icon": f }, {
-      default: _(() => [
-        u("div", ie, [
-          u("main", de, [
-            u("div", ue, [
-              u("div", _e, [
-                t(s(Z), {
-                  modelValue: s(r),
-                  "onUpdate:modelValue": a[0] || (a[0] = (n) => P(r) ? r.value = n : null),
-                  validate: s(d),
-                  "onUpdate:validate": a[1] || (a[1] = (n) => P(d) ? d.value = n : null)
-                }, null, 8, ["modelValue", "validate"])
-              ]),
-              u("div", ce, [
-                u("div", pe, [
-                  u("div", me, [
-                    t(s(R), {
-                      name: "mima",
-                      color: "transparent",
-                      size: 88
-                    })
-                  ]),
-                  a[3] || (a[3] = u("span", {
-                    text: "18px",
-                    font: "bold"
-                  }, " 更改密码 ", -1))
-                ]),
-                t(le, {
-                  ref_key: "ChangePassWordForm",
-                  ref: i,
-                  validate: s(d),
-                  "onUpdate:validate": a[2] || (a[2] = (n) => P(d) ? d.value = n : null),
-                  token: s(o)
-                }, null, 8, ["validate", "token"])
-              ])
-            ])
-          ])
-        ])
-      ]),
-      _: 1
-    }));
-  }
-}), he = /* @__PURE__ */ te(fe, [["__scopeId", "data-v-ea9fbca0"]]);
-export {
-  he as default
-};

package/dist/index-BLvVzLOl.js

@@ -1,147 +0,0 @@
-import { P as z, _ as p, a as B, b as N, c as O, d as V, e as j, f as E, g as L, h as P } from "./toolbar-collapse-BhNN4H7Y.js";
-import { defineComponent as S, toRaw as T, computed as $, ref as A, createBlock as f, openBlock as r, unref as s, withCtx as a, createElementVNode as e, createElementBlock as b, Fragment as R, renderList as D, normalizeClass as F, createVNode as d, createCommentVNode as x, toDisplayString as Q, createTextVNode as u } from "vue";
-import { u as U, aQ as q, v as m } from "./menu-D3oKigWX.js";
-import "pinia-plugin-persistedstate";
-import { useRouter as G } from "vue-router";
-import { T as H } from "./index-CAjh59MN.js";
-import { _ as J } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const K = { class: "change-org" }, M = {
-  "w-full": "",
-  "h-full": "",
-  flex: "~",
-  "justify-center": ""
-}, W = {
-  "w-620px": "",
-  "pt-20vh": ""
-}, X = ["onClick"], Y = {
-  flex: "~",
-  "h-full": ""
-}, Z = {
-  flex: "~ col",
-  "h-full": "",
-  "justify-center": "",
-  ml: "18px"
-}, oo = {
-  text: "20px black dark:[#86909C]",
-  flex: "~",
-  "items-center": ""
-}, eo = { "mr-10px": "" }, to = /* @__PURE__ */ S({
-  name: "ChangeOrganization",
-  __name: "index",
-  setup(so) {
-    const i = U(), k = G(), h = T(i.user.orgList), v = $(() => h.map((o) => ({
-      orgId: o.orgId,
-      label: o.orgName,
-      ...o
-    }))), l = A(-1);
-    function C(t) {
-      l.value = t;
-    }
-    function I() {
-      k.go(-1);
-    }
-    async function y() {
-      const t = v.value[l.value], o = t == null ? void 0 : t.orgId;
-      o ? o === i.user.orgId ? m.error("请避免切换到当前已选组织") : (await i.changeOrg(o), m.success("组织切换成功")) : m.error("请选择要切换的组织");
-    }
-    function w(t) {
-      var n;
-      const o = /* @__PURE__ */ Object.assign({ "../../../assets/icons/403.svg": P, "../../../assets/icons/403_dark.svg": L, "../../../assets/icons/404.svg": E, "../../../assets/icons/404_dark.svg": j, "../../../assets/icons/change-org.svg": V, "../../../assets/icons/favorites.svg": O, "../../../assets/icons/mima.svg": N, "../../../assets/icons/toolbar-collapse.svg": B }), _ = `../../../assets/icons/${t}.svg`;
-      return (n = o[_]) == null ? void 0 : n.default;
-    }
-    return (t, o) => {
-      const _ = H, n = q;
-      return r(), f(s(z), { "load-icon": w }, {
-        default: a(() => [
-          e("div", K, [
-            e("div", M, [
-              e("div", W, [
-                o[4] || (o[4] = e("div", {
-                  text: "30px",
-                  font: "bold",
-                  "mb-40px": "",
-                  flex: "~",
-                  items: "center"
-                }, " 请选择组织 ", -1)),
-                (r(!0), b(R, null, D(s(v), (g, c) => (r(), b("div", {
-                  key: c,
-                  onClick: (no) => C(c)
-                }, [
-                  e("div", {
-                    class: F(["org-item", { active: c === s(l) }])
-                  }, [
-                    e("div", Y, [
-                      d(s(p), {
-                        name: "change-org",
-                        size: "48px"
-                      }),
-                      e("div", Z, [
-                        e("div", oo, [
-                          e("span", eo, Q(g.label), 1),
-                          s(i).user.orgId === g.orgId ? (r(), f(_, {
-                            key: 0,
-                            color: "blue"
-                          }, {
-                            default: a(() => o[0] || (o[0] = [
-                              u(" 当前使用组织 ")
-                            ])),
-                            _: 1
-                          })) : x("", !0),
-                          g.main ? (r(), f(_, {
-                            key: 1,
-                            color: "red"
-                          }, {
-                            default: a(() => o[1] || (o[1] = [
-                              u(" 主组织 ")
-                            ])),
-                            _: 1
-                          })) : x("", !0)
-                        ])
-                      ])
-                    ]),
-                    e("div", null, [
-                      d(s(p), {
-                        class: "arrow",
-                        name: "i-iconamoon-arrow-right-6-circle-duotone",
-                        color: c === s(l) ? "#1677ff" : "#8E97A3",
-                        size: "22px"
-                      }, null, 8, ["color"])
-                    ])
-                  ], 2)
-                ], 8, X))), 128)),
-                e("div", null, [
-                  d(n, {
-                    type: "primary",
-                    block: "",
-                    "h-40px": "",
-                    "mb-15px": "",
-                    onClick: y
-                  }, {
-                    default: a(() => o[2] || (o[2] = [
-                      u(" 确定 ")
-                    ])),
-                    _: 1
-                  }),
-                  d(n, {
-                    block: "",
-                    "h-40px": "",
-                    onClick: I
-                  }, {
-                    default: a(() => o[3] || (o[3] = [
-                      u(" 返回 ")
-                    ])),
-                    _: 1
-                  })
-                ])
-              ])
-            ])
-          ])
-        ]),
-        _: 1
-      });
-    };
-  }
-}), go = /* @__PURE__ */ J(to, [["__scopeId", "data-v-b22e34db"]]);
-export {
-  go as default
-};