@pubinfo/core 2.0.0 → 2.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -26,8 +26,8 @@
     "pinia": "^3.0.3",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.0",
-    "@pubinfo/vite": "2.0.0"
+    "@pubinfo/config": "2.0.2",
+    "@pubinfo/vite": "2.0.2"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.16",
@@ -85,8 +85,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.0",
-    "@pubinfo/vite": "2.0.0"
+    "@pubinfo/config": "2.0.2",
+    "@pubinfo/vite": "2.0.2"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/built-in/authentication/pages/change-password/components/ChangePasswordForm/index.vue

@@ -62,7 +62,7 @@ const rules: Record<string, Rule[]> = {
 async function submit() {
   try {
     await changePasswordForm.value?.validate();
-    await userStore.changeUserPassword({
+    await userStore.changePassword({
       oldPassword: formState.password,
       newPassword: formState.newPassword,
       token: props.token,

package/src/built-in/layout-component/components/Header/TopMode/index.vue

@@ -120,10 +120,10 @@ onMounted(() => {
                 <template v-if="iconName(index === menuStore.actived, item.meta?.icon, item.meta?.activeIcon)">
                   <!-- 当存在 iconOptions 且 boxType 不为 'null' 时，展示带边框/渐变的盒子效果 -->
                   <PubinfoIcon
-                    v-if="item.meta?.iconOptions"
+                    v-if="item.meta?.iconOptions?.boxType && item.meta.iconOptions.boxType !== 'null'"
                     :name="iconName(index === menuStore.actived, item.meta?.icon, item.meta?.activeIcon)!"
                     small
-                    :box="(item.meta.iconOptions.boxType as any) || 'prism'"
+                    :box="item.meta.iconOptions.boxType as any"
                     :size="18"
                     :angle="item.meta.iconOptions.angle"
                     :background="item.meta.iconOptions.background"

package/src/built-in/layout-component/components/Menu/item.vue

@@ -57,10 +57,10 @@ const iconOptions = computed(() => ((props.item.meta as any)?.iconOptions) as un
   iconColor?: string
 });
 
-// 统一盒子类型：存在 iconOptions 时启用盒子，未指定或为 'null' 时默认 prism
-const computedBoxType = computed(() => {
-  const bt = iconOptions.value?.boxType as any;
-  return bt && bt !== 'null' ? bt : 'prism';
+// 统一盒子类型：仅当显式为 square/prism 时启用盒子
+const computedBoxType = computed<'square' | 'prism' | undefined>(() => {
+  const bt = iconOptions.value?.boxType;
+  return bt && bt !== 'null' ? bt : undefined;
 });
 
 // 统一安全的图标颜色（仅 AntD 图标使用）；无配置则为 undefined
@@ -112,10 +112,10 @@ defineExpose({
         <template v-if="icon && icon !== 'system-point'">
           <!-- 有 iconOptions 时启用带边框/渐变的盒子效果 -->
           <PubinfoIcon
-            v-if="iconOptions"
+            v-if="iconOptions && computedBoxType"
             small
             :name="icon"
-            :box="computedBoxType as any"
+            :box="computedBoxType!"
             :size="20"
             :angle="iconOptions?.angle"
             :background="iconOptions?.background"

package/src/built-in/layout-component/components/Topbar/Tabbar/MoreAction.vue

@@ -91,14 +91,7 @@ function stripPath(fullPath: string) {
   return fullPath.split(/[?#]/)[0];
 }
 
-// 查找与 tab 对应的路由记录
-function findRouteRecordByElement(element: Tabbar.recordRaw) {
-  const pathOnly = stripPath(element.fullPath);
-  const all = [...routeStore.flatSystemRoutes, ...routeStore.flatRoutes] as any[];
-  return all.find(r => r.path === pathOnly);
-}
-
-// 解析该 tab 的 iconOptions（优先当前路由，其次面包屑链路上最近的一个）
+// 解析该 tab 的 iconOptions（优先使用实际匹配的路由记录，兼容动态路由）
 function resolveIconOptions(element: Tabbar.recordRaw): undefined | {
   boxType?: 'square' | 'prism' | 'null'
   angle?: number | string
@@ -106,22 +99,47 @@ function resolveIconOptions(element: Tabbar.recordRaw): undefined | {
   radius?: number | string
   iconColor?: string
 } {
-  const r: any = findRouteRecordByElement(element);
-  let options = (r?.meta as any)?.iconOptions;
-  if (!options && r?.meta?.breadcrumbNeste?.length) {
-    const found = [...r.meta.breadcrumbNeste].reverse().find((it: any) => it?.iconOptions);
+  const resolved = router.resolve(element.fullPath);
+  const matched = [...(resolved.matched as any[])].reverse();
+  const matchedRecordWithIcon = matched.find(record => (record?.meta as any)?.iconOptions);
+  if (matchedRecordWithIcon?.meta?.iconOptions) {
+    return matchedRecordWithIcon.meta.iconOptions as any;
+  }
+
+  const pathOnly = stripPath(element.fullPath);
+  const all = [...routeStore.flatSystemRoutes, ...routeStore.flatRoutes] as any[];
+  let record = element.routeName
+    ? all.find(r => r.name === element.routeName)
+    : undefined;
+
+  if (!record) {
+    record = all.find(r => r.path === pathOnly);
+  }
+
+  let options = (record?.meta as any)?.iconOptions;
+  if (!options && record?.meta?.breadcrumbNeste?.length) {
+    const found = [...record.meta.breadcrumbNeste].reverse().find((it: any) => it?.iconOptions);
     options = found?.iconOptions;
   }
   return options;
 }
 
-function computeBoxType(options: ReturnType<typeof resolveIconOptions>) {
-  const bt = (options as any)?.boxType as any;
-  return bt && bt !== 'null' ? bt : 'prism';
+type ResolvedIconOptions = ReturnType<typeof resolveIconOptions>;
+
+const dropdownIconOptions = computed<Record<string, ResolvedIconOptions>>(() => {
+  return tabbarStore.list.reduce<Record<string, ResolvedIconOptions>>((acc, element) => {
+    acc[element.tabId] = resolveIconOptions(element);
+    return acc;
+  }, {} as Record<string, ResolvedIconOptions>);
+});
+
+function computeBoxType(options: ResolvedIconOptions): 'square' | 'prism' | undefined {
+  const bt = options?.boxType;
+  return bt && bt !== 'null' ? bt : undefined;
 }
 
-function getSafeIconColor(options: ReturnType<typeof resolveIconOptions>): string | undefined {
-  return (options as any)?.iconColor || undefined;
+function getSafeIconColor(options: ResolvedIconOptions): string | undefined {
+  return options?.iconColor || undefined;
 }
 </script>
 
@@ -165,21 +183,21 @@ function getSafeIconColor(options: ReturnType<typeof resolveIconOptions>): strin
               <div :key="element.tabId" class="title" :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title)" @click="router.push(element.fullPath)">
                 <template v-if="settingsStore.settings.tabbar.enableIcon && iconName(element.tabId === activedTabId, element.icon, element.activeIcon)">
                   <PubinfoIcon
-                    v-if="resolveIconOptions(element)"
+                    v-if="computeBoxType(dropdownIconOptions[element.tabId])"
                     small
                     :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
-                    :box="computeBoxType(resolveIconOptions(element)) as any"
+                    :box="(computeBoxType(dropdownIconOptions[element.tabId]) as 'square' | 'prism')"
                     :size="16"
-                    :angle="resolveIconOptions(element)?.angle"
-                    :background="resolveIconOptions(element)?.background"
-                    :radius="resolveIconOptions(element)?.radius"
-                    :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? (getSafeIconColor(resolveIconOptions(element)) || '#ffffff') : undefined"
+                    :angle="dropdownIconOptions[element.tabId]?.angle"
+                    :background="dropdownIconOptions[element.tabId]?.background"
+                    :radius="dropdownIconOptions[element.tabId]?.radius"
+                    :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? (getSafeIconColor(dropdownIconOptions[element.tabId]) || '#ffffff') : undefined"
                   />
                   <PubinfoIcon
                     v-else
                     :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
                     :size="16"
-                    :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? getSafeIconColor(resolveIconOptions(element)) : undefined"
+                    :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? getSafeIconColor(dropdownIconOptions[element.tabId]) : undefined"
                   />
                 </template>
                 {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title) }}

package/src/built-in/layout-component/components/Topbar/Tabbar/index.vue

@@ -246,14 +246,7 @@ function stripPath(fullPath: string) {
   return fullPath.split(/[?#]/)[0];
 }
 
-// 查找与 tab 对应的路由记录
-function findRouteRecordByElement(element: Tabbar.recordRaw) {
-  const pathOnly = stripPath(element.fullPath);
-  const all = [...routeStore.flatSystemRoutes, ...routeStore.flatRoutes] as any[];
-  return all.find(r => r.path === pathOnly);
-}
-
-// 解析该 tab 的 iconOptions（优先当前路由，其次面包屑链路上最近的一个）
+// 解析该 tab 的 iconOptions（优先使用实际匹配的路由记录，兼容动态路由）
 function resolveIconOptions(element: Tabbar.recordRaw): undefined | {
   boxType?: 'square' | 'prism' | 'null'
   angle?: number | string
@@ -261,24 +254,49 @@ function resolveIconOptions(element: Tabbar.recordRaw): undefined | {
   radius?: number | string
   iconColor?: string
 } {
-  const r: any = findRouteRecordByElement(element);
-  let options = (r?.meta as any)?.iconOptions;
-  if (!options && r?.meta?.breadcrumbNeste?.length) {
-    const found = [...r.meta.breadcrumbNeste].reverse().find((it: any) => it?.iconOptions);
+  const resolved = router.resolve(element.fullPath);
+  const matched = [...(resolved.matched as any[])].reverse();
+  const matchedRecordWithIcon = matched.find(record => (record?.meta as any)?.iconOptions);
+  if (matchedRecordWithIcon?.meta?.iconOptions) {
+    return matchedRecordWithIcon.meta.iconOptions as any;
+  }
+
+  const pathOnly = stripPath(element.fullPath);
+  const all = [...routeStore.flatSystemRoutes, ...routeStore.flatRoutes] as any[];
+  let record = element.routeName
+    ? all.find(r => r.name === element.routeName)
+    : undefined;
+
+  if (!record) {
+    record = all.find(r => r.path === pathOnly);
+  }
+
+  let options = (record?.meta as any)?.iconOptions;
+  if (!options && record?.meta?.breadcrumbNeste?.length) {
+    const found = [...record.meta.breadcrumbNeste].reverse().find((it: any) => it?.iconOptions);
     options = found?.iconOptions;
   }
   return options;
 }
 
-// 统一盒子类型：存在 iconOptions 时启用盒子；未指定或为 'null' 时默认 prism
-function computeBoxType(options: ReturnType<typeof resolveIconOptions>) {
-  const bt = (options as any)?.boxType as any;
-  return bt && bt !== 'null' ? bt : 'prism';
+type ResolvedIconOptions = ReturnType<typeof resolveIconOptions>;
+
+const tabIconOptions = computed<Record<string, ResolvedIconOptions>>(() => {
+  return tabbarStore.list.reduce<Record<string, ResolvedIconOptions>>((acc, element) => {
+    acc[element.tabId] = resolveIconOptions(element);
+    return acc;
+  }, {} as Record<string, ResolvedIconOptions>);
+});
+
+// 统一盒子类型：仅在显式指定为 square/prism 时启用盒子
+function computeBoxType(options: ResolvedIconOptions): 'square' | 'prism' | undefined {
+  const bt = options?.boxType;
+  return bt && bt !== 'null' ? bt : undefined;
 }
 
 // 仅 AntD 图标使用安全颜色；无配置则为 undefined
-function getSafeIconColor(options: ReturnType<typeof resolveIconOptions>): string | undefined {
-  return (options as any)?.iconColor || undefined;
+function getSafeIconColor(options: ResolvedIconOptions): string | undefined {
+  return options?.iconColor || undefined;
 }
 
 onMounted(() => {
@@ -368,15 +386,15 @@ onUnmounted(() => {
               <template v-if="settingsStore.settings.tabbar.enableIcon && iconName(element.tabId === activedTabId, element.icon, element.activeIcon)">
                 <!-- 有 iconOptions 时启用带边框/渐变的盒子效果，与 Menu 保持一致 -->
                 <PubinfoIcon
-                  v-if="resolveIconOptions(element)"
+                  v-if="computeBoxType(tabIconOptions[element.tabId])"
                   small
                   :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
-                  :box="computeBoxType(resolveIconOptions(element)) as any"
+                  :box="(computeBoxType(tabIconOptions[element.tabId]) as 'square' | 'prism')"
                   :size="16"
-                  :angle="resolveIconOptions(element)?.angle"
-                  :background="resolveIconOptions(element)?.background"
-                  :radius="resolveIconOptions(element)?.radius"
-                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? (getSafeIconColor(resolveIconOptions(element)) || '#ffffff') : undefined"
+                  :angle="tabIconOptions[element.tabId]?.angle"
+                  :background="tabIconOptions[element.tabId]?.background"
+                  :radius="tabIconOptions[element.tabId]?.radius"
+                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? (getSafeIconColor(tabIconOptions[element.tabId]) || '#ffffff') : undefined"
                   class="icon"
                 />
                 <!-- 无 iconOptions 时保持原样（纯图标），但若提供图标色也生效 -->
@@ -384,7 +402,7 @@ onUnmounted(() => {
                   v-else
                   :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
                   :size="16"
-                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? getSafeIconColor(resolveIconOptions(element)) : undefined"
+                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? getSafeIconColor(tabIconOptions[element.tabId]) : undefined"
                   class="icon"
                 />
               </template>

package/src/features/stores/modules/user.ts

@@ -37,7 +37,7 @@ export interface UserStore {
   logout: () => void
 
   /** 修改密码 */
-  changeUserPassword: (form: API.putRbacUserChangePasswordParams & {
+  changePassword: (form: API.putRbacUserChangePasswordParams & {
     token?: string | string[]
   }) => Promise<API.ResponseDataVoid>
 
@@ -174,7 +174,7 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
      * @param form - 包含要修改的密码和令牌的表单数据
      * @returns 修改密码的结果
      */
-    async function changeUserPassword(form: API.putRbacUserChangePasswordParams & { token?: string | string[] }) {
+    async function changePassword(form: API.putRbacUserChangePasswordParams & { token?: string | string[] }) {
       const headers = {} as AxiosRequestHeaders;
       if (form.token) {
         headers.authorization = form.token;
@@ -232,7 +232,7 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
       getPermissions,
       login,
       logout,
-      changeUserPassword,
+      changePassword,
       changeOrg,
       setToken,
       clean,

package/types/menu.d.ts

@@ -30,7 +30,7 @@ export declare namespace Menu {
           from: string
           to: string
         }
-        boxType?: 'square' | 'prism'
+        boxType?: 'square' | 'prism' | 'null'
         iconColor?: string
         radius?: number | string
       }

package/types/user.d.ts

@@ -29,9 +29,9 @@ declare interface User {
    */
   token: string
 
-  /*
-  * 刷新token
-  */
+  /**
+   * 刷新token
+   */
   refreshToken: string
 
   /**