@skyfox2000/webui 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.2.2",
+   "version": "1.2.4",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/index.ts

@@ -1,53 +1,7 @@
 import '@/assets/global.css';
 
-export {
-   Button,
-   Tooltip,
-   AppIcon,
-   Fullscreen,
-   Helper,
-   Icon,
-   LayoutIcon,
-   ProjectIcon,
-   ToolIcon,
-   Dialog,
-   Drawer,
-   Form,
-   FormItem,
-   Search,
-   SearchItem,
-   Table,
-   TableOperate,
-   Toolbar,
-   Icontool,
-   Tree,
-   AutoComplete,
-   Cascader,
-   Checkbox,
-   DatePicker,
-   Input,
-   InputIcon,
-   InputPassword,
-   InputNumber,
-   PropEditor,
-   Radio,
-   RadioStatus,
-   RangePicker,
-   Select,
-   Switch,
-   Textarea,
-   Transfer,
-   TransferTable,
-   TreeSelect,
-   UploadList,
-   Breadcrumb,
-   Content,
-   Datetime,
-   Header,
-   HeaderExits,
-   Menu,
-   MenuTabs,
-} from '@/components/index';
+export { pinia } from '@/stores/pinia';
+
 // 类型定义 - 明确导出
 export type {
    // 基础数据类型
@@ -243,10 +197,59 @@ export {
 
 import router from '@/router';
 export { router as AppRouter };
-export { routes } from '@/router';
+export { pendingNavigation, routes } from '@/router';
 
 export { useAppInfo } from '@/stores/appInfo';
 export { useHostInfo } from '@/stores/hostInfo';
 export { useUserInfo } from '@/stores/userInfo';
 export { usePageInfo } from '@/stores/pageInfo';
 export { useSettingInfo } from '@/stores/settingInfo';
+
+export {
+   Button,
+   Tooltip,
+   AppIcon,
+   Fullscreen,
+   Helper,
+   Icon,
+   LayoutIcon,
+   ProjectIcon,
+   ToolIcon,
+   Dialog,
+   Drawer,
+   Form,
+   FormItem,
+   Search,
+   SearchItem,
+   Table,
+   TableOperate,
+   Toolbar,
+   Icontool,
+   Tree,
+   AutoComplete,
+   Cascader,
+   Checkbox,
+   DatePicker,
+   Input,
+   InputIcon,
+   InputPassword,
+   InputNumber,
+   PropEditor,
+   Radio,
+   RadioStatus,
+   RangePicker,
+   Select,
+   Switch,
+   Textarea,
+   Transfer,
+   TransferTable,
+   TreeSelect,
+   UploadList,
+   Breadcrumb,
+   Content,
+   Datetime,
+   Header,
+   HeaderExits,
+   Menu,
+   MenuTabs,
+} from '@/components/index';

package/src/router/index.ts

@@ -56,7 +56,7 @@ export { routes };
  * @param isLogin 是否已登录
  * @returns 权限判断结果
  */
-export const hasPermission = (route: RouteRecord, isLogin: boolean): boolean => {
+const hasPermission = (route: RouteRecord, isLogin: boolean): boolean => {
    const roles = route.meta?.roles ?? [];
    const permission = route.meta?.permission;
 
@@ -114,7 +114,6 @@ export const pendingNavigation: Ref<{ to: RouteLocationNormalizedGeneric; next:
  */
 router.beforeEach((to, _from, next) => {
    const toRoute = to as unknown as RouteRecord;
-
    if (to.path.startsWith('/error/') || to.path.startsWith(LOGIN_PATH)) {
       return next();
    }

package/src/stores/appInfo.ts

@@ -195,7 +195,10 @@ export const useAppInfo = defineStore('appInfo', {
       async getRemoteAppList(): Promise<void> {
          // 从服务器获取
          return httpPost<AppInfo[]>(AppUrlList.appList, {
-            Query: {},
+            Query: {
+               AppCode: this.appInfo.AppCode,
+               Enabled: 1,
+            },
          }).then((result: ApiResponse<AppInfo[]> | null) => {
             if (result?.status === ResStatus.SUCCESS && result.data) {
                this.appList.length = 0;

package/src/stores/userInfo.ts

@@ -204,8 +204,8 @@ export const useUserInfo = defineStore('userInfo', {
        */
       init() {
          if (this.token && this.isLogin) {
-            setToken(this.token);
             checkToken(this.token, () => this.clean());
+            setToken(this.token);
          } else {
             this.clean();
          }
@@ -317,6 +317,21 @@ export const useUserInfo = defineStore('userInfo', {
          return this.userInfo;
       },
 
+      setUserInfo(userInfo: UserInfo, token: string) {
+         if (!checkToken(token)) {
+            this.clean();
+            return;
+         }
+
+         this.userInfo = {
+            ...this.userInfo,
+            ...userInfo,
+         };
+         this.token = token;
+         setToken(this.token);
+         this.isLogin = true;
+      },
+
       /**
        * 获取用户Token
        * @returns 用户Token