+
- ${dot}
+
${$t('system.title')}
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 5a295d8f..86bb8e16 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -30,6 +30,99 @@ export function createStaticRoutes() {
};
}
+const dynamicConstantRoutes: ElegantRoute[] = [
+ {
+ name: 'home',
+ path: '/home',
+ component: 'layout.base$view.home',
+ meta: {
+ title: 'home',
+ i18nKey: 'route.home',
+ icon: 'mdi:monitor-dashboard',
+ order: 1
+ }
+ },
+ {
+ name: '403',
+ path: '/403',
+ component: 'layout.blank$view.403',
+ meta: {
+ title: '403',
+ i18nKey: 'route.403',
+ constant: true,
+ hideInMenu: true
+ }
+ },
+ {
+ name: '404',
+ path: '/404',
+ component: 'layout.blank$view.404',
+ meta: {
+ title: '404',
+ i18nKey: 'route.404',
+ constant: true,
+ hideInMenu: true
+ }
+ },
+ {
+ name: '500',
+ path: '/500',
+ component: 'layout.blank$view.500',
+ meta: {
+ title: '500',
+ i18nKey: 'route.500',
+ constant: true,
+ hideInMenu: true
+ }
+ },
+ {
+ name: 'login',
+ path: '/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?',
+ component: 'layout.blank$view.login',
+ props: true,
+ meta: {
+ title: 'login',
+ i18nKey: 'route.login',
+ constant: true,
+ hideInMenu: true
+ }
+ },
+ {
+ name: 'iframe-page',
+ path: '/iframe-page/:url',
+ component: 'layout.base$view.iframe-page',
+ props: true,
+ meta: {
+ title: 'iframe-page',
+ i18nKey: 'route.iframe-page',
+ constant: true,
+ hideInMenu: true,
+ keepAlive: true,
+ icon: 'material-symbols:iframe-outline'
+ }
+ }
+];
+
+/** create routes when the auth route mode is static */
+export function createDynamicRoutes() {
+ const constantRoutes: ElegantConstRoute[] = [];
+
+ const authRoutes: ElegantConstRoute[] = [];
+
+ [...customRoutes, ...dynamicConstantRoutes].forEach(item => {
+ if (item.meta?.constant) {
+ constantRoutes.push(item);
+ } else {
+ authRoutes.push(item);
+ }
+ });
+
+ return {
+ constantRoutes,
+ authRoutes
+ };
+}
+
/**
* Get auth vue routes
*
diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts
index 1ffcf2bf..e4f78d77 100644
--- a/src/service/api/auth.ts
+++ b/src/service/api/auth.ts
@@ -1,48 +1,41 @@
import { request } from '../request';
+/** Get tenant list */
+export function fetchTenantList() {
+ return request
({
+ url: '/auth/tenant/list',
+ method: 'get'
+ });
+}
+
+/** Get image code */
+export function fetchCaptchaCode() {
+ return request({
+ url: '/auth/code',
+ method: 'get'
+ });
+}
+
/**
* Login
*
- * @param userName User name
+ * @param username User name
* @param password Password
*/
-export function fetchLogin(userName: string, password: string) {
+export function fetchLogin(data: Api.Auth.LoginData) {
return request({
url: '/auth/login',
method: 'post',
- data: {
- userName,
- password
- }
+ headers: {
+ isToken: false,
+ isEncrypt: true,
+ repeatSubmit: false
+ },
+ data
});
}
/** Get user info */
export function fetchGetUserInfo() {
- return request({ url: '/auth/getUserInfo' });
-}
-
-/**
- * Refresh token
- *
- * @param refreshToken Refresh token
- */
-export function fetchRefreshToken(refreshToken: string) {
- return request({
- url: '/auth/refreshToken',
- method: 'post',
- data: {
- refreshToken
- }
- });
-}
-
-/**
- * return custom backend error
- *
- * @param code error code
- * @param msg error message
- */
-export function fetchCustomBackendError(code: string, msg: string) {
- return request({ url: '/auth/error', params: { code, msg } });
+ return request({ url: '/system/user/getInfo' });
}
diff --git a/src/service/api/route.ts b/src/service/api/route.ts
index 0956a7a8..30c7fb67 100644
--- a/src/service/api/route.ts
+++ b/src/service/api/route.ts
@@ -1,20 +1,7 @@
+import type { ElegantConstRoute } from '@elegant-router/types';
import { request } from '../request';
-/** get constant routes */
-export function fetchGetConstantRoutes() {
- return request({ url: '/route/getConstantRoutes' });
-}
-
-/** get user routes */
-export function fetchGetUserRoutes() {
- return request({ url: '/route/getUserRoutes' });
-}
-
-/**
- * whether the route is exist
- *
- * @param routeName route name
- */
-export function fetchIsRouteExist(routeName: string) {
- return request({ url: '/route/isRouteExist', params: { routeName } });
+/** get routes */
+export function fetchGetRoutes() {
+ return request({ url: '/system/menu/getRouters' });
}
diff --git a/src/service/api/system/menu.ts b/src/service/api/system/menu.ts
new file mode 100644
index 00000000..631da2de
--- /dev/null
+++ b/src/service/api/system/menu.ts
@@ -0,0 +1,10 @@
+import { request } from '@/service/request';
+
+/** get menu list */
+export function fetchGetMenuList(params?: Api.System.MenuSearchParams) {
+ return request({
+ url: '/system/menu/list',
+ method: 'get',
+ params
+ });
+}
diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 638c3a9b..1b942eb0 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -1,30 +1,50 @@
-import type { AxiosResponse } from 'axios';
-import { BACKEND_ERROR_CODE, createFlatRequest, createRequest } from '@sa/axios';
+import type { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { BACKEND_ERROR_CODE, createFlatRequest } from '@sa/axios';
import { useAuthStore } from '@/store/modules/auth';
import { $t } from '@/locales';
-import { localStg } from '@/utils/storage';
+import { localStg, sessionStg } from '@/utils/storage';
import { getServiceBaseURL } from '@/utils/service';
+import { decryptBase64, decryptWithAes, encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto';
+import { decrypt, encrypt } from '@/utils/jsencrypt';
import { handleRefreshToken, showErrorMsg } from './shared';
import type { RequestInstanceState } from './type';
+const encryptHeader = 'encrypt-key';
const isHttpProxy = import.meta.env.DEV && import.meta.env.VITE_HTTP_PROXY === 'Y';
-const { baseURL, otherBaseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
+const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
export const request = createFlatRequest(
{
baseURL,
- headers: {
- apifoxToken: 'XL299LiMEDZ0H5h3A29PxwQXdMJqWyY2'
+ 'axios-retry': {
+ retries: 0
}
},
{
async onRequest(config) {
const { headers } = config;
+ // 对应国际化资源文件后缀
+ config.headers['Content-Language'] = 'zh_CN';
+
+ const isToken = config.headers?.isToken === false;
+
// set token
const token = localStg.get('token');
- const Authorization = token ? `Bearer ${token}` : null;
- Object.assign(headers, { Authorization });
+ if (token && !isToken) {
+ config.headers.Clientid = import.meta.env.VITE_APP_CLIENT_ID;
+ const Authorization = token ? `Bearer ${token}` : null;
+ Object.assign(headers, { Authorization });
+ }
+
+ handleRepeatSubmit(config);
+
+ handleEncrypt(config);
+
+ // FormData数据去请求头Content-Type
+ if (config.data instanceof FormData) {
+ delete config.headers['Content-Type'];
+ }
return config;
},
@@ -98,6 +118,31 @@ export const request = createFlatRequest(
- {
- baseURL: otherBaseURL.demo
- },
- {
- async onRequest(config) {
- const { headers } = config;
+function handleRepeatSubmit(config: InternalAxiosRequestConfig) {
+ // 是否需要防止数据重复提交
+ const isRepeatSubmit = config.headers?.repeatSubmit === false;
- // set token
- const token = localStg.get('token');
- const Authorization = token ? `Bearer ${token}` : null;
- Object.assign(headers, { Authorization });
-
- return config;
- },
- isBackendSuccess(response) {
- // when the backend response code is "200", it means the request is success
- // you can change this logic by yourself
- return response.data.status === '200';
- },
- async onBackendFail(_response) {
- // when the backend response code is not "200", it means the request is fail
- // for example: the token is expired, refresh token and retry request
- },
- transformBackendResponse(response) {
- return response.data.result;
- },
- onError(error) {
- // when the request is fail, you can show error message
-
- let message = error.message;
-
- // show backend error message
- if (error.code === BACKEND_ERROR_CODE) {
- message = error.response?.data?.message || message;
+ if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+ const requestObj = {
+ url: config.url!,
+ data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+ time: new Date().getTime()
+ };
+ const sessionObj = sessionStg.get('sessionObj');
+ if (!sessionObj) {
+ sessionStg.set('sessionObj', requestObj);
+ } else {
+ const s_url = sessionObj.url; // 请求地址
+ const s_data = sessionObj.data; // 请求数据
+ const s_time = sessionObj.time; // 请求时间
+ const interval = 500; // 间隔时间(ms)，小于此时间视为重复提交
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ const message = '数据正在处理，请勿重复提交';
+ console.warn(`[${s_url}]: ${message}`);
+ throw new Error(message);
}
-
- window.$message?.error(message);
+ sessionStg.set('sessionObj', requestObj);
}
}
-);
+}
+
+function handleEncrypt(config: InternalAxiosRequestConfig) {
+ // 是否需要加密
+ const isEncrypt = config.headers?.isEncrypt === 'true';
+
+ if (import.meta.env.VITE_APP_ENCRYPT === 'true') {
+ // 当开启参数加密
+ if (isEncrypt && (config.method === 'post' || config.method === 'put')) {
+ // 生成一个 AES 密钥
+ const aesKey = generateAesKey();
+ config.headers[encryptHeader] = encrypt(encryptBase64(aesKey));
+ config.data =
+ typeof config.data === 'object'
+ ? encryptWithAes(JSON.stringify(config.data), aesKey)
+ : encryptWithAes(config.data, aesKey);
+ }
+ }
+}
diff --git a/src/service/request/shared.ts b/src/service/request/shared.ts
index decd63d0..965e307a 100644
--- a/src/service/request/shared.ts
+++ b/src/service/request/shared.ts
@@ -1,7 +1,6 @@
import type { AxiosRequestConfig } from 'axios';
import { useAuthStore } from '@/store/modules/auth';
-import { localStg } from '@/utils/storage';
-import { fetchRefreshToken } from '../api';
+// import { localStg } from '@/utils/storage';
import type { RequestInstanceState } from './type';
/**
@@ -9,22 +8,11 @@ import type { RequestInstanceState } from './type';
*
* @param axiosConfig - request config when the token is expired
*/
-export async function handleRefreshToken(axiosConfig: AxiosRequestConfig) {
+export async function handleRefreshToken(_: AxiosRequestConfig) {
const { resetStore } = useAuthStore();
- const refreshToken = localStg.get('refreshToken') || '';
- const { error, data } = await fetchRefreshToken(refreshToken);
- if (!error) {
- localStg.set('token', data.token);
- localStg.set('refreshToken', data.refreshToken);
-
- const config = { ...axiosConfig };
- if (config.headers) {
- config.headers.Authorization = data.token;
- }
-
- return config;
- }
+ // request
+ // const refreshToken = localStg.get('refreshToken') || '';
resetStore();
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index 61308e22..e8e948c9 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -6,7 +6,7 @@ import { SetupStoreId } from '@/enum';
import { useRouterPush } from '@/hooks/common/router';
import { fetchGetUserInfo, fetchLogin } from '@/service/api';
import { localStg } from '@/utils/storage';
-import { $t } from '@/locales';
+// import { $t } from '@/locales';
import { useRouteStore } from '../route';
import { useTabStore } from '../tab';
import { clearAuthStorage, getToken } from './shared';
@@ -21,10 +21,9 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const token = ref(getToken());
const userInfo: Api.Auth.UserInfo = reactive({
- userId: '',
- userName: '',
+ user: undefined,
roles: [],
- buttons: []
+ permissions: []
});
/** is super role in static route */
@@ -56,14 +55,20 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
/**
* Login
*
- * @param userName User name
- * @param password Password
* @param [redirect=true] Whether to redirect after login. Default is `true`
*/
- async function login(userName: string, password: string, redirect = true) {
+ async function login(loginForm: Api.Auth.LoginForm, redirect = true) {
startLoading();
- const { data: loginToken, error } = await fetchLogin(userName, password);
+ const { VITE_APP_CLIENT_ID } = import.meta.env;
+
+ const loginData: Api.Auth.LoginData = {
+ ...loginForm,
+ clientId: VITE_APP_CLIENT_ID!,
+ grantType: 'password'
+ };
+
+ const { data: loginToken, error } = await fetchLogin(loginData);
if (!error) {
const pass = await loginByToken(loginToken);
@@ -76,11 +81,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
}
if (routeStore.isInitAuthRoute) {
- window.$notification?.success({
- title: $t('page.login.common.loginSuccess'),
- content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
- duration: 4500
- });
+ // window.$notification?.success({
+ // title: $t('page.login.common.loginSuccess'),
+ // content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
+ // duration: 4500
+ // });
}
}
} else {
@@ -88,18 +93,20 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
}
endLoading();
+
+ return error ? Promise.reject(error) : Promise.resolve();
}
async function loginByToken(loginToken: Api.Auth.LoginToken) {
// 1. stored in the localStorage, the later requests need it in headers
- localStg.set('token', loginToken.token);
- localStg.set('refreshToken', loginToken.refreshToken);
+ localStg.set('token', loginToken.access_token);
+ localStg.set('refreshToken', loginToken.refresh_token);
// 2. get user info
const pass = await getUserInfo();
if (pass) {
- token.value = loginToken.token;
+ token.value = loginToken.access_token;
return true;
}
diff --git a/src/store/modules/notice/index.ts b/src/store/modules/notice/index.ts
new file mode 100644
index 00000000..9505f328
--- /dev/null
+++ b/src/store/modules/notice/index.ts
@@ -0,0 +1,43 @@
+import { defineStore } from 'pinia';
+import { reactive } from 'vue';
+
+interface NoticeItem {
+ title?: string;
+ read: boolean;
+ message: any;
+ time: string;
+}
+
+export const useNoticeStore = defineStore('notice', () => {
+ const state = reactive({
+ notices: [] as NoticeItem[]
+ });
+
+ const addNotice = (notice: NoticeItem) => {
+ state.notices.push(notice);
+ };
+
+ const removeNotice = (notice: NoticeItem) => {
+ state.notices.splice(state.notices.indexOf(notice), 1);
+ };
+
+ // 实现全部已读
+ const readAll = () => {
+ state.notices.forEach((item: any) => {
+ item.read = true;
+ });
+ };
+
+ const clearNotice = () => {
+ state.notices = [];
+ };
+ return {
+ state,
+ addNotice,
+ removeNotice,
+ readAll,
+ clearNotice
+ };
+});
+
+export default useNoticeStore;
diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index d3feea55..dca1452d 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -5,10 +5,10 @@ import { useBoolean } from '@sa/hooks';
import type { CustomRoute, ElegantConstRoute, LastLevelRouteKey, RouteKey, RouteMap } from '@elegant-router/types';
import { SetupStoreId } from '@/enum';
import { router } from '@/router';
-import { createStaticRoutes, getAuthVueRoutes } from '@/router/routes';
+import { createDynamicRoutes, createStaticRoutes, getAuthVueRoutes } from '@/router/routes';
import { ROOT_ROUTE } from '@/router/routes/builtin';
import { getRouteName, getRoutePath } from '@/router/elegant/transform';
-import { fetchGetConstantRoutes, fetchGetUserRoutes, fetchIsRouteExist } from '@/service/api';
+import { fetchGetRoutes } from '@/service/api';
import { useAppStore } from '../app';
import { useAuthStore } from '../auth';
import { useTabStore } from '../tab';
@@ -75,6 +75,17 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
authRoutesMap.set(route.name, route);
});
+ const dynamicRoutes = createDynamicRoutes();
+
+ dynamicRoutes.authRoutes.forEach(route => {
+ const parent = authRoutesMap.get(route.name);
+ if (parent && route.children) {
+ parent.children?.push(...route.children);
+ return;
+ }
+ authRoutesMap.set(route.name, route);
+ });
+
authRoutes.value = Array.from(authRoutesMap.values());
}
@@ -201,14 +212,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
if (authRouteMode.value === 'static') {
addConstantRoutes(staticRoute.constantRoutes);
} else {
- const { data, error } = await fetchGetConstantRoutes();
-
- if (!error) {
- addConstantRoutes(data);
- } else {
- // if fetch constant routes failed, use static constant routes
- addConstantRoutes(staticRoute.constantRoutes);
- }
+ addConstantRoutes(staticRoute.constantRoutes);
}
handleConstantAndAuthRoutes();
@@ -246,18 +250,16 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
/** Init dynamic auth route */
async function initDynamicAuthRoute() {
- const { data, error } = await fetchGetUserRoutes();
+ const { data, error } = await fetchGetRoutes();
if (!error) {
- const { routes, home } = data;
-
- addAuthRoutes(routes);
+ addAuthRoutes(data);
handleConstantAndAuthRoutes();
- setRouteHome(home);
+ setRouteHome('home');
- handleUpdateRootRouteRedirect(home);
+ handleUpdateRootRouteRedirect('home');
setIsInitAuthRoute(true);
} else {
@@ -335,14 +337,8 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
return false;
}
- if (authRouteMode.value === 'static') {
- const { authRoutes: staticAuthRoutes } = createStaticRoutes();
- return isRouteExistByRouteName(routeName, staticAuthRoutes);
- }
-
- const { data } = await fetchIsRouteExist(routeName);
-
- return data;
+ const { authRoutes: staticAuthRoutes } = createStaticRoutes();
+ return isRouteExistByRouteName(routeName, staticAuthRoutes);
}
/**
diff --git a/src/theme/settings.ts b/src/theme/settings.ts
index 8fa6098e..dbae7247 100644
--- a/src/theme/settings.ts
+++ b/src/theme/settings.ts
@@ -4,7 +4,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
grayscale: false,
colourWeakness: false,
recommendColor: false,
- themeColor: '#646cff',
+ themeColor: '#2080f0',
otherColor: {
info: '#2080f0',
success: '#52c41a',
diff --git a/src/typings/api.d.ts b/src/typings/api/api.d.ts
similarity index 53%
rename from src/typings/api.d.ts
rename to src/typings/api/api.d.ts
index bb3d8757..c7b3f75a 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api/api.d.ts
@@ -8,40 +8,38 @@ declare namespace Api {
/** common params of paginating */
interface PaginatingCommonParams {
/** current page number */
- current: number;
+ pageNum: number;
/** page size */
- size: number;
+ pageSize: number;
/** total count */
total: number;
}
/** common params of paginating query list data */
interface PaginatingQueryRecord extends PaginatingCommonParams {
- records: T[];
+ rows: T[];
}
/**
* enable status
*
- * - "1": enabled
- * - "2": disabled
+ * - "0": enabled
+ * - "1": disabled
*/
- type EnableStatus = '1' | '2';
+ type EnableStatus = '0' | '1';
/** common record */
type CommonRecord = {
- /** record id */
- id: number;
/** record creator */
createBy: string;
+ /** record dept */
+ createDept?: any;
/** record create time */
createTime: string;
/** record updater */
updateBy: string;
/** record update time */
updateTime: string;
- /** record status */
- status: EnableStatus | null;
} & T;
}
@@ -51,16 +49,53 @@ declare namespace Api {
* backend api module: "auth"
*/
namespace Auth {
+ interface LoginData {
+ tenantId?: string;
+ username?: string;
+ password?: string;
+ rememberMe?: boolean;
+ socialCode?: string;
+ socialState?: string;
+ source?: string;
+ code?: string;
+ uuid?: string;
+ clientId: string;
+ grantType: string;
+ }
+
+ type LoginForm = Pick;
+
interface LoginToken {
- token: string;
- refreshToken: string;
+ access_token: string;
+ client_id: string;
+ expire_in: number;
+ openid: string;
+ refresh_expire_in: number;
+ refresh_token: string;
+ scope: string;
}
interface UserInfo {
- userId: string;
- userName: string;
+ user?: Api.System.User;
roles: string[];
- buttons: string[];
+ permissions: string[];
+ }
+
+ interface Tenant {
+ companyName: string;
+ domain: string;
+ tenantId: string;
+ }
+
+ interface TenantList {
+ tenantEnabled: boolean;
+ voList: Tenant[];
+ }
+
+ interface CaptchaCode {
+ captchaEnabled: boolean;
+ uuid?: string;
+ img?: string;
}
}
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
new file mode 100644
index 00000000..c86e3d16
--- /dev/null
+++ b/src/typings/api/system.api.d.ts
@@ -0,0 +1,123 @@
+/**
+ * Namespace Api
+ *
+ * All backend api type
+ */
+declare namespace Api {
+ /**
+ * namespace System
+ *
+ * backend api module: "system"
+ */
+ namespace System {
+ type CommonSearchParams = Pick;
+
+ /** role */
+ type Role = Common.CommonRecord<{
+ roleId: string | number;
+ roleName: string;
+ roleKey: string;
+ roleSort: number;
+ dataScope: string;
+ menuCheckStrictly: boolean;
+ deptCheckStrictly: boolean;
+ status: string;
+ delFlag: string;
+ remark?: any;
+ flag: boolean;
+ menuIds?: Array;
+ deptIds?: Array;
+ admin: boolean;
+ }>;
+
+ /** role search params */
+ type RoleSearchParams = CommonType.RecordNullable<
+ Pick & CommonSearchParams
+ >;
+
+ /** role list */
+ type RoleList = Common.PaginatingQueryRecord;
+
+ /** all role */
+ type AllRole = Pick;
+
+ /**
+ * user gender
+ *
+ * - "1": "male"
+ * - "2": "female"
+ */
+ type UserGender = '1' | '2';
+
+ /** user */
+ type User = Common.CommonRecord<{
+ userId: string | number;
+ deptId: number;
+ userName: string;
+ nickName: string;
+ userType: string;
+ email: string;
+ phonenumber: string;
+ sex: string;
+ avatar: string;
+ status: string;
+ delFlag: string;
+ loginIp: string;
+ loginDate: string;
+ remark: string;
+ deptName: string;
+ roles: Role[];
+ roleIds: any;
+ postIds: any;
+ roleId: any;
+ admin: boolean;
+ }>;
+
+ /** user search params */
+ type UserSearchParams = CommonType.RecordNullable<
+ Pick & CommonSearchParams
+ >;
+
+ /** user list */
+ type UserList = Common.PaginatingQueryRecord;
+
+ /**
+ * menu type
+ *
+ * - "M": "目录"
+ * - "C": "菜单"
+ * - "F": "按钮"
+ */
+ type MenuType = 'M' | 'C' | 'F';
+
+ type Menu = Common.CommonRecord<
+ {
+ parentName: string;
+ parentId: string | number;
+ children: Menu[];
+ menuId: string | number;
+ menuName: string;
+ orderNum: number;
+ path: string;
+ component: string;
+ queryParam: string;
+ isFrame: string;
+ isCache: string;
+ menuType: MenuType;
+ visible: string;
+ status: Common.EnableStatus;
+ perms: string;
+ icon: string;
+ componentInfo: string;
+ remark: string;
+ keywords?: string;
+ } & Pick
+ >;
+
+ /** menu list */
+ type MenuList = Common.PaginatingQueryRecord
- 
-
-
-> [!NOTE]
-> If you think `SoybeanAdmin` is helpful to you, or you like our project, please give us a ⭐️ on GitHub. Your support is the driving force for us to continue to improve and add new features! Thank you for your support!
-
-## Introduction
-
-[`SoybeanAdmin`](https://github.com/soybeanjs/soybean-admin) is a clean, elegant, beautiful and powerful admin template, based on the latest front-end technology stack, including Vue3, Vite5, TypeScript, Pinia and UnoCSS. It has built-in rich theme configuration and components, strict code specifications, and an automated file routing system. In addition, it also uses the online mock data solution based on ApiFox. `SoybeanAdmin` provides you with a one-stop admin solution, no additional configuration, and out of the box. It is also a best practice for learning cutting-edge technologies quickly.
-
-
-## Features
-
-- **Cutting-edge technology application**: using the latest popular technology stack such as Vue3, Vite5, TypeScript, Pinia and UnoCSS.
-- **Clear project architecture**: using pnpm monorepo architecture, clear structure, elegant and easy to understand.
-- **Strict code specifications**: follow the [SoybeanJS specification](https://docs.soybeanjs.cn/standard), integrate eslint, prettier and simple-git-hooks to ensure the code is standardized.
-- **TypeScript**: support strict type checking to improve code maintainability.
-- **Rich theme configuration**: built-in a variety of theme configurations, perfectly integrated with UnoCSS.
-- **Built-in internationalization solution**: easily realize multi-language support.
-- **Automated file routing system**: automatically generate route import, declaration and type. For more details, please refer to [Elegant Router](https://github.com/soybeanjs/elegant-router).
-- **Flexible permission routing**: support both front-end static routing and back-end dynamic routing.
-- **Rich page components**: built-in a variety of pages and components, including 403, 404, 500 pages, as well as layout components, tag components, theme configuration components, etc.
-- **Command line tool**: built-in efficient command line tool, git commit, delete file, release, etc.
-- **Mobile adaptation**: perfectly support mobile terminal to realize adaptive layout.
-
-
-## Version
-
-- **NaiveUI Version:**
- - [Preview Link](https://naive.soybeanjs.cn/)
- - [Github Repository](https://github.com/soybeanjs/soybean-admin)
- - [Gitee Repository](https://gitee.com/honghuangdc/soybean-admin)
-
-- **AntDesignVue Version:**
- - [Preview Link](https://antd.soybeanjs.cn/)
- - [Github Repository](https://github.com/soybeanjs/soybean-admin-antd)
- - [Gitee Repository](https://gitee.com/honghuangdc/soybean-admin-antd)
-
-- **Legacy Version:**
- - [Preview Link](https://legacy.soybeanjs.cn/)
- - [Github Repository](https://github.com/soybeanjs/soybean-admin/tree/legacy)
-
-
-## Documentation
-
-- [Link](https://docs.soybeanjs.cn)
-- [Legacy Docs](https://legacy-docs.soybeanjs.cn)
-
-## Example Images
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Usage
-
-**Environment Preparation**
-
-Make sure your environment meets the following requirements:
-
-- **git**: you need git to clone and manage project versions.
-- **NodeJS**: >=18.12.0, recommended 18.19.0 or higher.
-- **pnpm**: >= 8.7.0, recommended 8.14.0 or higher.
-
-**Clone Project**
-
-```bash
-git clone https://github.com/soybeanjs/soybean-admin.git
-```
-
-**Install Dependencies**
-
-```bash
-pnpm i
-```
-> Since this project uses the pnpm monorepo management method, please do not use npm or yarn to install dependencies.
-
-**Start Project**
-
-```bash
-pnpm dev
-```
-
-**Build Project**
-
-```bash
-pnpm build
-```
-
-## Ecosystem
-
-- [electron-mock-admin](https://github.com/lixin59/electron-mock-api): A Mock Api management system that helps front-end developers quickly implement interface mocks.
-- [T-Shell](https://github.com/TheBlindM/T-Shell): A terminal emulator and SSH client with configurable command prompts.
-- [pea](https://github.com/haitang1894/pea) : Adopting SpringBoot3.2 + JDK21, MyBatis-Plus, SpringSecurity security framework, etc., suitable for the simple permission system developed by [soybean-admin](https://gitee.com/honghuangdc/soybean-admin).
-- [MalusAdmin](https://github.com/pridejoy/MalusAdmin): A backend management framework developed based on Vue3/TypeScript/NaiveUI and NET7 & Sqlsugar. It is implemented in the most original and simplest way, with a fresh and elegant front-end, a clear and elegant backend structure, and powerful functions.
-- [PanisAdmin](https://github.com/paynezhuang/panis-admin): Adopting SpringBoot 3, SaToken, MySQL and other frameworks to develop and modify [soybean-admin](https://github.com/soybeanjs/soybean-admin) for the second time, adapting dynamic menu/button-level authorization. Retaining the original flavor, fresh and elegant, high-value back-end management system scaffold.
-- [snail-job](https://github.com/aizuda/snail-job): A distributed task retry and task scheduling platform with "high performance, high value and high activity".
-- [SuperApi](https://github.com/TmmTop/SuperApi): Quickly turn your idea into an online stable product! Entity-less library and table building, add, delete, change and check entity-less library table, support 15 kinds of condition query, as well as paging, list, unlimited tree list and other functions of the API deployment! With interface documentation, Auth authorisation, interface flow restriction, access to the client's real IP, advanced server caching components, dynamic APIs and other features, we look forward to your experience!
-- [FastSoyAdmin](https://github.com/sleep1223/fast-soy-admin): A modern Management Platform based on FastAPI+Vue3+Naive UI.
-
-
-## How to Contribute
-
-We warmly welcome and appreciate all forms of contributions. If you have any ideas or suggestions, please feel free to share them by submitting [pull requests](https://github.com/soybeanjs/soybean-admin/pulls) or creating GitHub [issue](https://github.com/soybeanjs/soybean-admin/issues/new).
-
-## Git Commit Guidelines
-
-This project has built-in `commit` command, you can execute `pnpm commit` to generate commit information that conforms to [Conventional Commits](https://www.conventionalcommits.org/) specification. When submitting PR, please be sure to use `commit` command to create commit information to ensure the standardization of information.
-
-## Browser Support
-
-It is recommended to use the latest version of Chrome in development for a better experience.
-
-| [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) |
-| --- | --- | --- | --- | --- |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## OpenSource Author
-
-[Soybean](https://github.com/honghuangdc)
-
-## Contributors
-
-Thanks the following people for their contributions. If you want to contribute to this project, please refer to [How to Contribute](#how-to-contribute).
-
-
- 
- 
- 
- 
diff --git a/src/hooks/business/auth.ts b/src/hooks/business/auth.ts
index f8fc7496..5abe579a 100644
--- a/src/hooks/business/auth.ts
+++ b/src/hooks/business/auth.ts
@@ -9,10 +9,10 @@ export function useAuth() {
}
if (typeof codes === 'string') {
- return authStore.userInfo.buttons.includes(codes);
+ return authStore.userInfo.permissions.includes(codes);
}
- return codes.some(code => authStore.userInfo.buttons.includes(code));
+ return codes.some(code => authStore.userInfo.permissions.includes(code));
}
return {
diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts
index e4a2733d..57434e36 100644
--- a/src/hooks/common/form.ts
+++ b/src/hooks/common/form.ts
@@ -38,7 +38,8 @@ export function useFormRules() {
phone: [createRequiredRule($t('form.phone.required')), patternRules.phone],
pwd: [createRequiredRule($t('form.pwd.required')), patternRules.pwd],
code: [createRequiredRule($t('form.code.required')), patternRules.code],
- email: [createRequiredRule($t('form.email.required')), patternRules.email]
+ email: [createRequiredRule($t('form.email.required')), patternRules.email],
+ tenantId: [createRequiredRule('请选择/输入公司名称')]
} satisfies Record