Compare commits

..

1 Commits

Author SHA1 Message Date
Soybean
159d1145b5 feat(projects): release v1.0.0 tauri branch 2024-03-31 17:29:53 +08:00
28 changed files with 450 additions and 551 deletions

View File

@@ -1,85 +1,6 @@
# Changelog # Changelog
## [v1.0.3](https://github.com/soybeanjs/soybean-admin/compare/v1.0.2...v1.0.3) (24-04-16)
###    🚀 Features
- **hooks**: deleting the route export of useRoutePush, use vue-router &nbsp;-&nbsp; by **paynezhuang** [<samp>(c6648)</samp>](https://github.com/soybeanjs/soybean-admin/commit/c6648b6)
### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
- **projects**:
- fix menu edit rules &nbsp;-&nbsp; by **paynezhuang** [<samp>(00105)</samp>](https://github.com/soybeanjs/soybean-admin/commit/001059c)
- fix SvgIcon inheritAttrs warning &nbsp;-&nbsp; by @honghuangdc [<samp>(efc0e)</samp>](https://github.com/soybeanjs/soybean-admin/commit/efc0e25)
- fix axios createRequest: add default state &nbsp;-&nbsp; by @honghuangdc [<samp>(d6eda)</samp>](https://github.com/soybeanjs/soybean-admin/commit/d6eda8f)
- update union-key.d.ts &nbsp;-&nbsp; by @honghuangdc [<samp>(60bef)</samp>](https://github.com/soybeanjs/soybean-admin/commit/60beff7)
- fix update theme color &nbsp;-&nbsp; by @honghuangdc [<samp>(27c53)</samp>](https://github.com/soybeanjs/soybean-admin/commit/27c53cd)
### &nbsp;&nbsp;&nbsp;🔥 Performance
- **projects**: perf code &nbsp;-&nbsp; by @honghuangdc [<samp>(b7f07)</samp>](https://github.com/soybeanjs/soybean-admin/commit/b7f0749)
### &nbsp;&nbsp;&nbsp;💅 Refactors
- **projects**: update naive-ui.d.ts &nbsp;-&nbsp; by @honghuangdc [<samp>(bb74d)</samp>](https://github.com/soybeanjs/soybean-admin/commit/bb74d99)
### &nbsp;&nbsp;&nbsp;📖 Documentation
- **projects**: update README.md &nbsp;-&nbsp; by @honghuangdc [<samp>(f4a9c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/f4a9cf8)
### &nbsp;&nbsp;&nbsp;🏡 Chore
- **release**: release tauri v1.0.2 &nbsp;-&nbsp; by @honghuangdc [<samp>(ebdef)</samp>](https://github.com/soybeanjs/soybean-admin/commit/ebdef72)
### &nbsp;&nbsp;&nbsp;❤️ Contributors
[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
[paynezhuang](mailto:paynezhuang@gmail.com)
## [v1.0.2](https://github.com/soybeanjs/soybean-admin/compare/v1.0.1...v1.0.2) (24-04-08)
### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
- **projects**: unify border-radius of Tag. fixed #378 &nbsp;-&nbsp; by @honghuangdc in https://github.com/soybeanjs/soybean-admin/issues/378 [<samp>(2f15a)</samp>](https://github.com/soybeanjs/soybean-admin/commit/2f15a2a)
- **styles**: fix css var is inserted repeatedly &nbsp;-&nbsp; by **燕博文** [<samp>(769d8)</samp>](https://github.com/soybeanjs/soybean-admin/commit/769d84a)
### &nbsp;&nbsp;&nbsp;💅 Refactors
- **projects**: refactor addThemeVarsToHtml &nbsp;-&nbsp; by @honghuangdc [<samp>(41e47)</samp>](https://github.com/soybeanjs/soybean-admin/commit/41e470e)
### &nbsp;&nbsp;&nbsp;🏡 Chore
- **deps**: update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(a1b48)</samp>](https://github.com/soybeanjs/soybean-admin/commit/a1b484a)
- **projects**: disabled unocss eslint rule: order-attributify &nbsp;-&nbsp; by @honghuangdc [<samp>(1c72d)</samp>](https://github.com/soybeanjs/soybean-admin/commit/1c72dc7)
### &nbsp;&nbsp;&nbsp;❤️ Contributors
[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
[燕博文](mailto:349952469@qq.com)
## [v1.0.1](https://github.com/soybeanjs/soybean-admin/compare/v1.0.0...v1.0.1) (24-04-03)
### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
- **projects**:
- fix flatRequest error type. fixed #376 &nbsp;-&nbsp; by @honghuangdc in https://github.com/soybeanjs/soybean-admin/issues/376 [<samp>(1ec5e)</samp>](https://github.com/soybeanjs/soybean-admin/commit/1ec5ea0)
- add maxWidth for GlobalTab to fix bg with gap. fixed #350 &nbsp;-&nbsp; by @honghuangdc in https://github.com/soybeanjs/soybean-admin/issues/350 [<samp>(cc539)</samp>](https://github.com/soybeanjs/soybean-admin/commit/cc53997)
### &nbsp;&nbsp;&nbsp;📖 Documentation
- **projects**: update README.md &nbsp;-&nbsp; by @honghuangdc [<samp>(76011)</samp>](https://github.com/soybeanjs/soybean-admin/commit/76011af)
### &nbsp;&nbsp;&nbsp;🏡 Chore
- **projects**:
- update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(4babb)</samp>](https://github.com/soybeanjs/soybean-admin/commit/4babbe1)
- update pnpm version &nbsp;-&nbsp; by @honghuangdc [<samp>(9125c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/9125cc9)
### &nbsp;&nbsp;&nbsp;❤️ Contributors
[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
## [v1.0.0](https://github.com/soybeanjs/soybean-admin/compare/v0.10.4...v1.0.0) (24-03-31) ## [v1.0.0](https://github.com/soybeanjs/soybean-admin/compare/v0.10.4...v1.0.0) (24-03-31)
### &nbsp;&nbsp;&nbsp;🚀 Features ### &nbsp;&nbsp;&nbsp;🚀 Features

View File

@@ -143,17 +143,17 @@ Thanks the following people for their contributions. If you want to contribute t
<p>QQ Group</p> <p>QQ Group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" />
</div> </div>
<!-- <div> <div>
<p>WeChat Group</p> <p>WeChat Group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-0402.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-0402.jpg" style="width:200px" />
</div> --> </div>
<div> <div>
<p>Add the following WeChat to invite to the WeChat group</p> <p>Add the following WeChat to invite to the WeChat group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" />
</div> </div>
<div> <!-- <div>
<p>Add Soybean's WeChat for business consultation, cooperation, project architecture, one-on-one guidance, etc.</p> <p>Add Soybean's WeChat for business consultation, cooperation, project architecture, one-on-one guidance, etc.</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybean.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybean.jpg" style="width:200px" /> -->
</div> </div>
## Star Trend ## Star Trend

View File

@@ -48,7 +48,7 @@
- [预览地址](https://antd.soybeanjs.cn/) - [预览地址](https://antd.soybeanjs.cn/)
- [Github 仓库](https://github.com/soybeanjs/soybean-admin-antd) - [Github 仓库](https://github.com/soybeanjs/soybean-admin-antd)
- [Gitee 仓库](https://gitee.com/honghuangdc/soybean-admin-antd) - [Gitee 仓库](https://gitee.com/honghuangdc/soybean-admin-antd)
-
- **旧版:** - **旧版:**
- [预览地址](https://legacy.soybeanjs.cn/) - [预览地址](https://legacy.soybeanjs.cn/)
- [Github 仓库](https://github.com/soybeanjs/soybean-admin/tree/legacy) - [Github 仓库](https://github.com/soybeanjs/soybean-admin/tree/legacy)

View File

@@ -17,8 +17,7 @@ export default defineConfig(
registeredComponentsOnly: false, registeredComponentsOnly: false,
ignores: ['/^icon-/'] ignores: ['/^icon-/']
} }
], ]
'order-attributify': 'off'
} }
} }
); );

View File

@@ -1,8 +1,8 @@
{ {
"name": "soybean-admin", "name": "soybean-admin",
"type": "module", "type": "module",
"version": "1.0.3", "version": "1.0.0",
"packageManager": "pnpm@8.15.6", "packageManager": "pnpm@8.15.5",
"description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。", "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
"author": { "author": {
"name": "Soybean", "name": "Soybean",
@@ -63,42 +63,42 @@
"pinia": "2.1.7", "pinia": "2.1.7",
"vue": "3.4.21", "vue": "3.4.21",
"vue-draggable-plus": "0.4.0", "vue-draggable-plus": "0.4.0",
"vue-i18n": "9.11.0", "vue-i18n": "9.10.2",
"vue-router": "4.3.0" "vue-router": "4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@elegant-router/vue": "0.3.6", "@elegant-router/vue": "0.3.6",
"@iconify/json": "2.2.198", "@iconify/json": "2.2.196",
"@sa/scripts": "workspace:*", "@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*", "@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.2.5", "@soybeanjs/eslint-config": "1.2.5",
"@tauri-apps/cli": "1.5.11", "@tauri-apps/cli": "1.5.11",
"@types/lodash-es": "4.17.12", "@types/lodash-es": "4.17.12",
"@types/node": "20.12.5", "@types/node": "20.12.2",
"@types/nprogress": "0.2.3", "@types/nprogress": "0.2.3",
"@unocss/eslint-config": "0.59.0", "@unocss/eslint-config": "0.58.8",
"@unocss/preset-icons": "0.59.0", "@unocss/preset-icons": "0.58.8",
"@unocss/preset-uno": "0.59.0", "@unocss/preset-uno": "0.58.8",
"@unocss/transformer-directives": "0.59.0", "@unocss/transformer-directives": "0.58.8",
"@unocss/transformer-variant-group": "0.59.0", "@unocss/transformer-variant-group": "0.58.8",
"@unocss/vite": "0.59.0", "@unocss/vite": "0.58.8",
"@vitejs/plugin-vue": "5.0.4", "@vitejs/plugin-vue": "5.0.4",
"@vitejs/plugin-vue-jsx": "3.1.0", "@vitejs/plugin-vue-jsx": "3.1.0",
"eslint": "8.57.0", "eslint": "8.57.0",
"eslint-plugin-vue": "9.24.0", "eslint-plugin-vue": "9.24.0",
"lint-staged": "15.2.2", "lint-staged": "15.2.2",
"sass": "1.74.1", "sass": "1.72.0",
"simple-git-hooks": "2.11.1", "simple-git-hooks": "2.11.1",
"tsx": "4.7.2", "tsx": "4.7.1",
"typescript": "5.4.4", "typescript": "5.4.3",
"unplugin-icons": "0.18.5", "unplugin-icons": "0.18.5",
"unplugin-vue-components": "0.26.0", "unplugin-vue-components": "0.26.0",
"vite": "5.2.8", "vite": "5.2.7",
"vite-plugin-progress": "0.0.7", "vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1", "vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.0.25", "vite-plugin-vue-devtools": "7.0.25",
"vue-eslint-parser": "9.4.2", "vue-eslint-parser": "9.4.2",
"vue-tsc": "2.0.11" "vue-tsc": "2.0.7"
}, },
"simple-git-hooks": { "simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify", "commit-msg": "pnpm sa git-commit-verify",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/axios", "name": "@sa/axios",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -127,7 +127,6 @@ export function createRequest<ResponseData = any, State = Record<string, unknown
request.cancelRequest = cancelRequest; request.cancelRequest = cancelRequest;
request.cancelAllRequest = cancelAllRequest; request.cancelAllRequest = cancelAllRequest;
request.state = {} as State;
return request; return request;
} }
@@ -146,10 +145,9 @@ export function createFlatRequest<ResponseData = any, State = Record<string, unk
) { ) {
const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData>(axiosConfig, options); const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData>(axiosConfig, options);
const flatRequest: FlatRequestInstance<State, ResponseData> = async function flatRequest< const flatRequest: FlatRequestInstance<State> = async function flatRequest<T = any, R extends ResponseType = 'json'>(
T = any, config: CustomAxiosRequestConfig
R extends ResponseType = 'json' ) {
>(config: CustomAxiosRequestConfig) {
try { try {
const response: AxiosResponse<ResponseData> = await instance(config); const response: AxiosResponse<ResponseData> = await instance(config);
@@ -165,7 +163,7 @@ export function createFlatRequest<ResponseData = any, State = Record<string, unk
} catch (error) { } catch (error) {
return { data: null, error }; return { data: null, error };
} }
} as FlatRequestInstance<State, ResponseData>; } as FlatRequestInstance<State>;
flatRequest.cancelRequest = cancelRequest; flatRequest.cancelRequest = cancelRequest;
flatRequest.cancelAllRequest = cancelAllRequest; flatRequest.cancelAllRequest = cancelAllRequest;

View File

@@ -85,17 +85,15 @@ export type FlatResponseSuccessData<T = any> = {
error: null; error: null;
}; };
export type FlatResponseFailData<ResponseData = any> = { export type FlatResponseFailData<T = any> = {
data: null; data: null;
error: AxiosError<ResponseData>; error: AxiosError<T>;
}; };
export type FlatResponseData<T = any, ResponseData = any> = export type FlatResponseData<T = any> = FlatResponseSuccessData<T> | FlatResponseFailData<T>;
| FlatResponseSuccessData<T>
| FlatResponseFailData<ResponseData>;
export interface FlatRequestInstance<S = Record<string, unknown>, ResponseData = any> extends RequestInstanceCommon<S> { export interface FlatRequestInstance<S = Record<string, unknown>> extends RequestInstanceCommon<S> {
<T = any, R extends ResponseType = 'json'>( <T = any, R extends ResponseType = 'json'>(
config: CustomAxiosRequestConfig<R> config: CustomAxiosRequestConfig<R>
): Promise<FlatResponseData<MappedType<R, T>, ResponseData>>; ): Promise<FlatResponseData<MappedType<R, T>>>;
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/color-palette", "name": "@sa/color-palette",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -3,7 +3,6 @@ import { getColorName } from './name';
import type { ColorPalette, ColorPaletteFamily, ColorPaletteItem, ColorPaletteNumber } from './type'; import type { ColorPalette, ColorPaletteFamily, ColorPaletteItem, ColorPaletteNumber } from './type';
import defaultPalettes from './json/palette.json'; import defaultPalettes from './json/palette.json';
// to do: there is a bug in the code below, when the color is '#1c5cff', the colorPaletteFamily is not similar to the provided color
/** /**
* Get color palette by provided color and color name * Get color palette by provided color and color name
* *

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/hooks", "name": "@sa/hooks",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -16,19 +16,19 @@ export type HookRequestInstanceResponseSuccessData<T = any> = {
error: Ref<null>; error: Ref<null>;
}; };
export type HookRequestInstanceResponseFailData<ResponseData = any> = { export type HookRequestInstanceResponseFailData<T = any> = {
data: Ref<null>; data: Ref<null>;
error: Ref<AxiosError<ResponseData>>; error: Ref<AxiosError<T>>;
}; };
export type HookRequestInstanceResponseData<T = any, ResponseData = any> = { export type HookRequestInstanceResponseData<T = any> = {
loading: Ref<boolean>; loading: Ref<boolean>;
} & (HookRequestInstanceResponseSuccessData<T> | HookRequestInstanceResponseFailData<ResponseData>); } & (HookRequestInstanceResponseSuccessData<T> | HookRequestInstanceResponseFailData<T>);
export interface HookRequestInstance<ResponseData = any> { export interface HookRequestInstance {
<T = any, R extends ResponseType = 'json'>( <T = any, R extends ResponseType = 'json'>(
config: CustomAxiosRequestConfig config: CustomAxiosRequestConfig
): HookRequestInstanceResponseData<MappedType<R, T>, ResponseData>; ): HookRequestInstanceResponseData<MappedType<R, T>>;
cancelRequest: (requestId: string) => void; cancelRequest: (requestId: string) => void;
cancelAllRequest: () => void; cancelAllRequest: () => void;
} }
@@ -45,13 +45,13 @@ export default function createHookRequest<ResponseData = any>(
) { ) {
const request = createFlatRequest<ResponseData>(axiosConfig, options); const request = createFlatRequest<ResponseData>(axiosConfig, options);
const hookRequest: HookRequestInstance<ResponseData> = function hookRequest<T = any, R extends ResponseType = 'json'>( const hookRequest: HookRequestInstance = function hookRequest<T = any, R extends ResponseType = 'json'>(
config: CustomAxiosRequestConfig config: CustomAxiosRequestConfig
) { ) {
const { loading, startLoading, endLoading } = useLoading(); const { loading, startLoading, endLoading } = useLoading();
const data = ref<MappedType<R, T> | null>(null) as Ref<MappedType<R, T>>; const data = ref<MappedType<R, T> | null>(null);
const error = ref<AxiosError<ResponseData> | null>(null) as Ref<AxiosError<ResponseData> | null>; const error = ref<AxiosError<MappedType<R, T>> | null>(null);
startLoading(); startLoading();
@@ -70,7 +70,7 @@ export default function createHookRequest<ResponseData = any>(
data, data,
error error
}; };
} as HookRequestInstance<ResponseData>; } as HookRequestInstance;
hookRequest.cancelRequest = request.cancelRequest; hookRequest.cancelRequest = request.cancelRequest;
hookRequest.cancelAllRequest = request.cancelAllRequest; hookRequest.cancelAllRequest = request.cancelAllRequest;

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/materials", "name": "@sa/materials",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -203,7 +203,7 @@ function handleClickMask() {
<!-- Main Content --> <!-- Main Content -->
<main <main
:id="isContentScroll ? scrollElId : undefined" :id="isContentScroll ? scrollElId : undefined"
class="flex flex-col flex-grow" class="flex flex-grow flex-col"
:class="[commonClass, contentClass, leftGapClass, { 'overflow-y-auto': isContentScroll }]" :class="[commonClass, contentClass, leftGapClass, { 'overflow-y-auto': isContentScroll }]"
> >
<slot></slot> <slot></slot>

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/fetch", "name": "@sa/fetch",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/scripts", "name": "@sa/scripts",
"version": "1.0.3", "version": "1.0.0",
"bin": { "bin": {
"sa": "./bin.ts" "sa": "./bin.ts"
}, },

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/uno-preset", "name": "@sa/uno-preset",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

View File

@@ -1,6 +1,6 @@
{ {
"name": "@sa/utils", "name": "@sa/utils",
"version": "1.0.3", "version": "1.0.0",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },
@@ -13,7 +13,7 @@
"colord": "2.9.3", "colord": "2.9.3",
"crypto-js": "4.2.0", "crypto-js": "4.2.0",
"localforage": "1.10.0", "localforage": "1.10.0",
"nanoid": "5.0.7" "nanoid": "5.0.6"
}, },
"devDependencies": { "devDependencies": {
"@types/crypto-js": "4.2.2" "@types/crypto-js": "4.2.2"

770
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
import { computed, useAttrs } from 'vue'; import { computed, useAttrs } from 'vue';
import { Icon } from '@iconify/vue'; import { Icon } from '@iconify/vue';
defineOptions({ name: 'SvgIcon', inheritAttrs: false }); defineOptions({ name: 'SvgIcon' });
/** /**
* Props * Props

View File

@@ -92,6 +92,7 @@ export function useRouterPush(inSetup = true) {
} }
return { return {
route,
routerPush, routerPush,
routerBack, routerBack,
routerPushByKey, routerPushByKey,

View File

@@ -184,7 +184,7 @@ init();
<template #prefix> <template #prefix>
<SvgIcon :icon="tab.icon" :local-icon="tab.localIcon" class="inline-block align-text-bottom text-16px" /> <SvgIcon :icon="tab.icon" :local-icon="tab.localIcon" class="inline-block align-text-bottom text-16px" />
</template> </template>
<div class="max-w-240px ellipsis-text">{{ tab.label }}</div> <span>{{ tab.label }}</span>
</PageTab> </PageTab>
</div> </div>
</BetterScroll> </BetterScroll>

View File

@@ -1,5 +1,4 @@
import { computed, reactive, ref } from 'vue'; import { computed, reactive, ref } from 'vue';
import { useRoute } from 'vue-router';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { useLoading } from '@sa/hooks'; import { useLoading } from '@sa/hooks';
import { SetupStoreId } from '@/enum'; import { SetupStoreId } from '@/enum';
@@ -11,9 +10,8 @@ import { useRouteStore } from '../route';
import { clearAuthStorage, getToken, getUserInfo } from './shared'; import { clearAuthStorage, getToken, getUserInfo } from './shared';
export const useAuthStore = defineStore(SetupStoreId.Auth, () => { export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const route = useRoute();
const routeStore = useRouteStore(); const routeStore = useRouteStore();
const { toLogin, redirectFromLogin } = useRouterPush(false); const { route, toLogin, redirectFromLogin } = useRouterPush(false);
const { loading: loginLoading, startLoading, endLoading } = useLoading(); const { loading: loginLoading, startLoading, endLoading } = useLoading();
const token = ref(getToken()); const token = ref(getToken());
@@ -38,7 +36,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
authStore.$reset(); authStore.$reset();
if (!route.meta.constant) { if (!route.value.meta.constant) {
await toLogin(); await toLogin();
} }

View File

@@ -2,7 +2,6 @@ import { computed, effectScope, onScopeDispose, ref, toRefs, watch } from 'vue';
import type { Ref } from 'vue'; import type { Ref } from 'vue';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { useEventListener, usePreferredColorScheme } from '@vueuse/core'; import { useEventListener, usePreferredColorScheme } from '@vueuse/core';
import { getColorPalette } from '@sa/color-palette';
import { SetupStoreId } from '@/enum'; import { SetupStoreId } from '@/enum';
import { localStg } from '@/utils/storage'; import { localStg } from '@/utils/storage';
import { addThemeVarsToHtml, createThemeToken, getNaiveTheme, initThemeSettings, toggleCssDarkMode } from './shared'; import { addThemeVarsToHtml, createThemeToken, getNaiveTheme, initThemeSettings, toggleCssDarkMode } from './shared';
@@ -80,15 +79,10 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
* @param color Theme color * @param color Theme color
*/ */
function updateThemeColors(key: App.Theme.ThemeColorKey, color: string) { function updateThemeColors(key: App.Theme.ThemeColorKey, color: string) {
// get a color palette by provided color and color name, and use the suitable color
const colorPalette = getColorPalette(color, key);
const mainColor = colorPalette.main.hexcode;
if (key === 'primary') { if (key === 'primary') {
settings.value.themeColor = mainColor; settings.value.themeColor = color;
} else { } else {
settings.value.otherColor[key] = mainColor; settings.value.otherColor[key] = color;
} }
} }

View File

@@ -150,11 +150,7 @@ export function addThemeVarsToHtml(tokens: App.Theme.BaseToken, darkTokens: App.
} }
`; `;
const styleId = 'theme-vars'; const style = document.createElement('style');
const style = document.querySelector(`#${styleId}`) || document.createElement('style');
style.id = styleId;
style.textContent = css + darkCss; style.textContent = css + darkCss;
@@ -234,9 +230,6 @@ export function getNaiveTheme(colors: App.Theme.ThemeColor) {
}, },
LoadingBar: { LoadingBar: {
colorLoading colorLoading
},
Tag: {
borderRadius: '6px'
} }
}; };

View File

@@ -41,7 +41,7 @@ declare namespace NaiveUI {
type GetTableData<A extends TableApiFn> = A extends TableApiFn<infer T> ? T : never; type GetTableData<A extends TableApiFn> = A extends TableApiFn<infer T> ? T : never;
type NaiveTableConfig<A extends TableApiFn> = Pick< type NaiveTableConfig<A extends TableApiFn> = Pick<
import('@sa/hooks').TableConfig<A, GetTableData<A>, TableColumn<TableDataWithIndex<GetTableData<A>>>>, import('@sa/hooks').TableConfig<A, GetTableData<A>, TableColumn<NaiveUI.TableDataWithIndex<GetTableData<A>>>>,
'apiFn' | 'apiParams' | 'columns' | 'immediate' 'apiFn' | 'apiParams' | 'columns' | 'immediate'
>; >;
} }

View File

@@ -27,8 +27,8 @@ declare namespace UnionKey {
/** /**
* The scroll mode when content overflow * The scroll mode when content overflow
* *
* - wrapper: the wrapper component's root element overflow * - Wrapper the wrapper component's root element overflow
* - content: the content component overflow * - Content the content component overflow
*/ */
type ThemeScrollMode = import('@sa/materials').LayoutScrollMode; type ThemeScrollMode = import('@sa/materials').LayoutScrollMode;

View File

@@ -84,13 +84,11 @@ function createDefaultModel(): Model {
}; };
} }
type RuleKey = Extract<keyof Model, 'menuName' | 'status' | 'routeName' | 'routePath'>; type RuleKey = Extract<keyof Model, 'userName' | 'userStatus'>;
const rules: Record<RuleKey, App.Global.FormRule> = { const rules: Record<RuleKey, App.Global.FormRule> = {
menuName: defaultRequiredRule, userName: defaultRequiredRule,
status: defaultRequiredRule, userStatus: defaultRequiredRule
routeName: defaultRequiredRule,
routePath: defaultRequiredRule
}; };
const disabledMenuType = computed(() => props.operateType === 'edit'); const disabledMenuType = computed(() => props.operateType === 'edit');