chore(release): release tauri v1.0.2

CHANGELOG.md

@@ -1,43 +1,7 @@
 # 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)
+## [v1.0.2](https://github.com/soybeanjs/soybean-admin/compare/tauri-v1.0.1...v1.0.2) (24-04-08)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
 
@@ -58,7 +22,7 @@
 [![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)
+## [v1.0.1](https://github.com/soybeanjs/soybean-admin/compare/tauri-v1.0.0...v1.0.1) (24-04-03)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
 

README.md

@@ -143,17 +143,17 @@ Thanks the following people for their contributions. If you want to contribute t
   	<p>QQ Group</p>
     <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" />
   </div>
-	<!-- <div>
+	<div>
 		<p>WeChat Group</p>
 		<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-0402.jpg" style="width:200px" />
-	</div> -->
+	</div>
 	<div>
 		<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" />
 	</div>
-  <div>
+  <!-- <div>
     <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>
 
 ## Star Trend

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.0.3",
+  "version": "1.0.2",
   "packageManager": "pnpm@8.15.6",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {

packages/axios/package.json

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

packages/axios/src/index.ts

@@ -127,7 +127,6 @@ export function createRequest<ResponseData = any, State = Record<string, unknown
 
   request.cancelRequest = cancelRequest;
   request.cancelAllRequest = cancelAllRequest;
-  request.state = {} as State;
 
   return request;
 }

packages/color-palette/package.json

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

packages/color-palette/src/index.ts

@@ -3,7 +3,6 @@ import { getColorName } from './name';
 import type { ColorPalette, ColorPaletteFamily, ColorPaletteItem, ColorPaletteNumber } from './type';
 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
  *

packages/hooks/package.json

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

packages/materials/package.json

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

packages/ofetch/package.json

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

packages/scripts/package.json

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

packages/uno-preset/package.json

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

packages/utils/package.json

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

src/components/custom/svg-icon.vue

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

src/hooks/common/router.ts

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

src/store/modules/auth/index.ts

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

src/store/modules/theme/index.ts

@@ -2,7 +2,6 @@ import { computed, effectScope, onScopeDispose, ref, toRefs, watch } from 'vue';
 import type { Ref } from 'vue';
 import { defineStore } from 'pinia';
 import { useEventListener, usePreferredColorScheme } from '@vueuse/core';
-import { getColorPalette } from '@sa/color-palette';
 import { SetupStoreId } from '@/enum';
 import { localStg } from '@/utils/storage';
 import { addThemeVarsToHtml, createThemeToken, getNaiveTheme, initThemeSettings, toggleCssDarkMode } from './shared';
@@ -80,15 +79,10 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
    * @param color Theme color
    */
   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') {
-      settings.value.themeColor = mainColor;
+      settings.value.themeColor = color;
     } else {
-      settings.value.otherColor[key] = mainColor;
+      settings.value.otherColor[key] = color;
     }
   }
 

src/typings/naive-ui.d.ts

@@ -41,7 +41,7 @@ declare namespace NaiveUI {
   type GetTableData<A extends TableApiFn> = A extends TableApiFn<infer T> ? T : never;
 
   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'
   >;
 }

src/typings/union-key.d.ts

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

src/views/manage/menu/modules/menu-operate-drawer.vue

@@ -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> = {
-  menuName: defaultRequiredRule,
-  status: defaultRequiredRule,
-  routeName: defaultRequiredRule,
-  routePath: defaultRequiredRule
+  userName: defaultRequiredRule,
+  userStatus: defaultRequiredRule
 };
 
 const disabledMenuType = computed(() => props.operateType === 'edit');