From 4c1c7e65998b9b085fedc31444a843947f5afecf Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Wed, 29 May 2024 12:45:00 +0800
Subject: [PATCH 01/14] chore(projects): update vscode launch.json

---
 .vscode/launch.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index f6f291d5..be7c6f6e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,7 +12,7 @@
       "type": "node",
       "request": "launch",
       "name": "TS Debugger",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/tsx",
+      "runtimeExecutable": "tsx",
       "skipFiles": ["<node_internals>/**", "${workspaceFolder}/node_modules/**"],
       "program": "${file}"
     }

From 87b18386f55353606f3e6b155f290ee74aef958c Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Wed, 29 May 2024 12:50:00 +0800
Subject: [PATCH 02/14] docs(projects): update CHANGELOG

---
 CHANGELOG.zh_CN.md | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 4d905f05..6105abb4 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,5 +1,52 @@
 # 更新日志
 
+## [v1.1.2](https://github.com/soybeanjs/soybean-admin/compare/v1.1.1...v1.1.2) (2024-05-24)
+
+### &nbsp;&nbsp;&nbsp;🐞 错误修复
+
+- **项目**:
+  - 修复头部样式 & 修复点击全局标签时按钮高亮。修复了 #446 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/446 [<samp>(64fc0)</samp>](https://github.com/soybeanjs/soybean-admin/commit/64fc099)
+  - 修复多标签页只渲染一次。修复了 #441 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/441 [<samp>(e379d)</samp>](https://github.com/soybeanjs/soybean-admin/commit/e379d6c)
+
+### &nbsp;&nbsp;&nbsp;🛠 优化
+
+- **项目**: 优化代码 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(bc8dc)</samp>](https://github.com/soybeanjs/soybean-admin/commit/bc8dc47)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
+
+## [v1.1.1](https://github.com/soybeanjs/soybean-admin/compare/v1.1.0...v1.1.1) (2024-05-20)
+
+### &nbsp;&nbsp;&nbsp;🚀 功能
+
+- **hooks**: 为 useEcharts 添加 setOptions &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(e4d53)</samp>](https://github.com/soybeanjs/soybean-admin/commit/e4d53aa)
+
+### &nbsp;&nbsp;&nbsp;🐞 修复错误
+
+- **projects**:
+  - 修复 useRouter。修复了 #436 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/436 提交 [<samp>(0774a)</samp>](https://github.com/soybeanjs/soybean-admin/commit/0774a51)
+  - 在动态路由模式下获取路由时添加错误处理。修复了 440 &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(57b4a)</samp>](https://github.com/soybeanjs/soybean-admin/commit/57b4a9d)
+- **styles**:
+  - 修复 useTable 类型 &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(07124)</samp>](https://github.com/soybeanjs/soybean-admin/commit/071241f)
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **projects**:
+  - 更新 CHANGELOG &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(19783)</samp>](https://github.com/soybeanjs/soybean-admin/commit/1978397)
+  - 更新 README.md &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(fa56e)</samp>](https://github.com/soybeanjs/soybean-admin/commit/fa56e9c)
+  - 更新 README.md &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(419ea)</samp>](https://github.com/soybeanjs/soybean-admin/commit/419ea42)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **projects**:
+  - 更新依赖并修复 TS 错误 &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(4ea9c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/4ea9c85)
+  - 更新 eslint-config 并修复代码 &nbsp;-&nbsp; 由 @honghuangdc 提交 [<samp>(68ea9)</samp>](https://github.com/soybeanjs/soybean-admin/commit/68ea974)
+  - 更新 @elegant-router/vue 并为 resolve route 添加错误处理。修复了 #442 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/442 提交 [<samp>(24ff8)</samp>](https://github.com/soybeanjs/soybean-admin/commit/24ff852)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
 
 ## [v1.1.0](https://github.com/honghuangdc/soybean-admin/compare/v1.0.9...v1.1.0) (2024-05-07)
 

From 40d0f8ac1c6ffd5e89e051c5f76cbdd797d97f4e Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Wed, 29 May 2024 12:53:00 +0800
Subject: [PATCH 03/14] optimize(projects): unocss border shortcut

---
 packages/materials/src/libs/page-tab/button-tab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/materials/src/libs/page-tab/button-tab.vue b/packages/materials/src/libs/page-tab/button-tab.vue
index bce4db53..0826e712 100644
--- a/packages/materials/src/libs/page-tab/button-tab.vue
+++ b/packages/materials/src/libs/page-tab/button-tab.vue
@@ -36,7 +36,7 @@ defineSlots<Slots>();
 
 <template>
   <div
-    class=":soy: relative inline-flex cursor-pointer items-center justify-center gap-12px whitespace-nowrap border-1px rounded-4px border-solid px-12px py-4px"
+    class=":soy: relative inline-flex cursor-pointer items-center justify-center gap-12px whitespace-nowrap border-(1px solid) rounded-4px px-12px py-4px"
     :class="[
       style['button-tab'],
       { [style['button-tab_dark']]: darkMode },

From db64b0e2e9a748465f54c99984efb57292361362 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Wed, 29 May 2024 12:59:00 +0800
Subject: [PATCH 04/14] fix(styles): fix FirstLevelMenu style. fixed #450

---
 src/layouts/modules/global-menu/first-level-menu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/modules/global-menu/first-level-menu.vue b/src/layouts/modules/global-menu/first-level-menu.vue
index 290ec6da..fc089f79 100644
--- a/src/layouts/modules/global-menu/first-level-menu.vue
+++ b/src/layouts/modules/global-menu/first-level-menu.vue
@@ -68,7 +68,7 @@ function handleClickMixMenu(menu: App.Global.Menu) {
       <component :is="icon" :class="[isMini ? 'text-icon-small' : 'text-icon-large']" />
       <p
         class="w-full ellipsis-text text-center text-12px transition-height-300"
-        :class="[isMini ? 'h-0 pt-0' : 'h-24px pt-4px']"
+        :class="[isMini ? 'h-0 pt-0' : 'h-20px pt-4px']"
       >
         {{ label }}
       </p>

From 42b121a11773fcf52135f92cd493ddf9ee7f02e6 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Wed, 29 May 2024 13:10:00 +0800
Subject: [PATCH 05/14] fix(styles): fix PinToggler style. fixed #451

---
 src/layouts/modules/global-menu/vertical-mix-menu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/modules/global-menu/vertical-mix-menu.vue b/src/layouts/modules/global-menu/vertical-mix-menu.vue
index a3604bd7..0c0a9582 100644
--- a/src/layouts/modules/global-menu/vertical-mix-menu.vue
+++ b/src/layouts/modules/global-menu/vertical-mix-menu.vue
@@ -55,8 +55,8 @@ function handleResetActiveMenu() {
         :inverted="siderInverted"
         :style="{ width: showDrawer ? themeStore.sider.mixChildMenuWidth + 'px' : '0px' }"
       >
-        <header class="flex-y-center justify-between" :style="{ height: themeStore.header.height + 'px' }">
-          <h2 class="pl-8px text-16px text-primary font-bold">{{ $t('system.title') }}</h2>
+        <header class="flex-y-center justify-between px-12px" :style="{ height: themeStore.header.height + 'px' }">
+          <h2 class="text-16px text-primary font-bold">{{ $t('system.title') }}</h2>
           <PinToggler
             :pin="appStore.mixSiderFixed"
             :class="{ 'text-white:88 !hover:text-white': siderInverted }"

From 086bad474eebfa38c91c7795d280251cc15de1fd Mon Sep 17 00:00:00 2001
From: KC <48410934+orangelckc@users.noreply.github.com>
Date: Fri, 31 May 2024 17:14:47 +0200
Subject: [PATCH 06/14] chore(other): correct spell mistake (#460)

---
 src/store/modules/app/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/app/index.ts b/src/store/modules/app/index.ts
index f5185e99..1b8c4b7d 100644
--- a/src/store/modules/app/index.ts
+++ b/src/store/modules/app/index.ts
@@ -123,7 +123,7 @@ export const useAppStore = defineStore(SetupStoreId.App, () => {
       // update tabs by locale
       tabStore.updateTabsByLocale();
 
-      // sey dayjs locale
+      // set dayjs locale
       setDayjsLocale(locale.value);
     });
   });

From f1850416c81f053aecc3bdf68f6095397fb98241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E8=8F=9C=E7=99=BD=E7=8E=89=E6=B1=A4?=
 <79054161+Azir-11@users.noreply.github.com>
Date: Sat, 1 Jun 2024 13:18:44 +0800
Subject: [PATCH 07/14] chore(other): correct spell mistake (#462)

---
 src/router/guard/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts
index fbeaaa3b..03a5121d 100644
--- a/src/router/guard/route.ts
+++ b/src/router/guard/route.ts
@@ -46,7 +46,7 @@ export function createRouteGuard(router: Router) {
           next({ name: rootRoute });
         }
       },
-      // if is is constant route, then it is allowed to access directly
+      // if it is constant route, then it is allowed to access directly
       {
         condition: !needLogin,
         callback: () => {

From 3ad438984e2e97853c2aec92174190b29c3f20fa Mon Sep 17 00:00:00 2001
From: KC <48410934+orangelckc@users.noreply.github.com>
Date: Sat, 1 Jun 2024 10:53:08 +0200
Subject: [PATCH 08/14] optimize (components): ButtonIcon with smarter class
 merging and tippy (#463)

---
 package.json                          |  1 +
 pnpm-lock.yaml                        | 10 +++++
 src/components/custom/button-icon.vue | 54 ++++++---------------------
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 05c928b4..27480f97 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "naive-ui": "2.38.2",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
+    "tailwind-merge": "^2.3.0",
     "vue": "3.4.27",
     "vue-draggable-plus": "0.4.1",
     "vue-i18n": "9.13.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9406c1d2..75b7a354 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,6 +53,9 @@ importers:
       pinia:
         specifier: 2.1.7
         version: 2.1.7(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5))
+      tailwind-merge:
+        specifier: ^2.3.0
+        version: 2.3.0
       vue:
         specifier: 3.4.27
         version: 3.4.27(typescript@5.4.5)
@@ -4295,6 +4298,9 @@ packages:
     resolution: {integrity: sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
+  tailwind-merge@2.3.0:
+    resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==}
+
   tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
@@ -9361,6 +9367,10 @@ snapshots:
       '@pkgr/core': 0.1.1
       tslib: 2.6.2
 
+  tailwind-merge@2.3.0:
+    dependencies:
+      '@babel/runtime': 7.24.5
+
   tapable@2.2.1: {}
 
   tar@6.2.1:
diff --git a/src/components/custom/button-icon.vue b/src/components/custom/button-icon.vue
index 3cf39e59..153953ae 100644
--- a/src/components/custom/button-icon.vue
+++ b/src/components/custom/button-icon.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { computed } from 'vue';
-import { createReusableTemplate } from '@vueuse/core';
 import type { PopoverPlacement } from 'naive-ui';
+import { twMerge } from 'tailwind-merge';
 
 defineOptions({
   name: 'ButtonIcon',
@@ -21,60 +20,29 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  class: 'h-36px text-icon',
+  class: '',
   icon: '',
   tooltipContent: '',
   tooltipPlacement: 'bottom',
   zIndex: 98
 });
 
-interface ButtonProps {
-  className: string;
-}
-
-const [DefineButton, Button] = createReusableTemplate<ButtonProps>();
-
-const cls = computed(() => {
-  let clsStr = props.class;
-
-  if (!clsStr.includes('h-')) {
-    clsStr += ' h-36px';
-  }
-
-  if (!clsStr.includes('text-')) {
-    clsStr += ' text-icon';
-  }
-
-  return clsStr;
-});
+const DEFAULT_CLASS = 'h-[36px] text-icon';
 </script>
 
 <template>
-  <!-- define component start: Button -->
-  <DefineButton v-slot="{ $slots, className }">
-    <NButton quaternary :class="className">
-      <div class="flex-center gap-8px">
-        <component :is="$slots.default" />
-      </div>
-    </NButton>
-  </DefineButton>
-  <!-- define component end: Button -->
-
-  <NTooltip v-if="tooltipContent" :placement="tooltipPlacement" :z-index="zIndex">
+  <NTooltip :placement="tooltipPlacement" :z-index="zIndex" :disabled="!tooltipContent">
     <template #trigger>
-      <Button :class-name="cls" v-bind="$attrs">
-        <slot>
-          <SvgIcon :icon="icon" />
-        </slot>
-      </Button>
+      <NButton quaternary :class="twMerge(DEFAULT_CLASS, props.class)" v-bind="$attrs">
+        <div class="flex-center gap-8px">
+          <slot>
+            <SvgIcon :icon="icon" />
+          </slot>
+        </div>
+      </NButton>
     </template>
     {{ tooltipContent }}
   </NTooltip>
-  <Button v-else :class-name="cls" v-bind="$attrs">
-    <slot>
-      <SvgIcon :icon="icon" />
-    </slot>
-  </Button>
 </template>
 
 <style scoped></style>

From 2aa85c6f930d26cf2cc09237ec114eae37fba959 Mon Sep 17 00:00:00 2001
From: KC <48410934+orangelckc@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:45:25 +0200
Subject: [PATCH 09/14] optimize(components): accuracy draggable area for
 TableColumnSetting with animation (#465)

---
 src/components/advanced/table-column-setting.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/advanced/table-column-setting.vue b/src/components/advanced/table-column-setting.vue
index 817dc11e..d1e6dca4 100644
--- a/src/components/advanced/table-column-setting.vue
+++ b/src/components/advanced/table-column-setting.vue
@@ -21,10 +21,10 @@ const columns = defineModel<NaiveUI.TableColumnCheck[]>('columns', {
         {{ $t('common.columnSetting') }}
       </NButton>
     </template>
-    <VueDraggable v-model="columns">
+    <VueDraggable v-model="columns" :animation="150" filter=".none_draggable">
       <div v-for="item in columns" :key="item.key" class="h-36px flex-y-center rd-4px hover:(bg-primary bg-opacity-20)">
-        <icon-mdi-drag class="mr-8px cursor-move text-icon" />
-        <NCheckbox v-model:checked="item.checked">
+        <icon-mdi-drag class="mr-8px h-full cursor-move text-icon" />
+        <NCheckbox v-model:checked="item.checked" class="none_draggable flex-1">
           {{ item.title }}
         </NCheckbox>
       </div>

From 8efdb10d86ebb61b7ce2bff5c55df4dbc986bdcc Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Sun, 2 Jun 2024 00:15:46 +0800
Subject: [PATCH 10/14] fix(projects): fix click menu search. fixed #466, close
 #467

---
 src/layouts/modules/global-search/components/search-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/modules/global-search/components/search-modal.vue b/src/layouts/modules/global-search/components/search-modal.vue
index a9ac82cb..d36272cb 100644
--- a/src/layouts/modules/global-search/components/search-modal.vue
+++ b/src/layouts/modules/global-search/components/search-modal.vue
@@ -112,7 +112,7 @@ registerShortcut();
 
     <div class="mt-20px">
       <NEmpty v-if="resultOptions.length === 0" :description="$t('common.noData')" />
-      <SearchResult v-else v-model:path="activePath" :options="resultOptions" @enter.prevent="handleEnter" />
+      <SearchResult v-else v-model:path="activePath" :options="resultOptions" @enter="handleEnter" />
     </div>
     <template #footer>
       <SearchFooter v-if="!isMobile" />

From 5bd96b8dd3861b774698616e0b959156f8b4f033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E8=8F=9C=E7=99=BD=E7=8E=89=E6=B1=A4?=
 <79054161+Azir-11@users.noreply.github.com>
Date: Sun, 2 Jun 2024 00:41:00 +0800
Subject: [PATCH 11/14] fix(components): Fix the issue of search box popping up
 repeatedly due to carriage return (#468)

---
 src/layouts/modules/global-search/components/search-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/modules/global-search/components/search-modal.vue b/src/layouts/modules/global-search/components/search-modal.vue
index d36272cb..39f18a84 100644
--- a/src/layouts/modules/global-search/components/search-modal.vue
+++ b/src/layouts/modules/global-search/components/search-modal.vue
@@ -34,9 +34,9 @@ function search() {
 }
 
 function handleClose() {
-  visible.value = false;
   // handle with setTimeout to prevent user from seeing some operations
   setTimeout(() => {
+    visible.value = false;
     resultOptions.value = [];
     keyword.value = '';
   }, 200);

From 59faf1522969387b5e2e0a1b5d6665432b311606 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Sun, 2 Jun 2024 01:14:48 +0800
Subject: [PATCH 12/14] fix(projects): fix reCacheRoute. fixed #464

---
 src/store/modules/route/index.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index 1acaf69f..d49b756b 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -97,13 +97,19 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   /** Cache routes */
   const cacheRoutes = ref<RouteKey[]>([]);
 
+  /** All cache routes */
+  const allCacheRoutes = shallowRef<RouteKey[]>([]);
+
   /**
    * Get cache routes
    *
    * @param routes Vue routes
    */
   function getCacheRoutes(routes: RouteRecordRaw[]) {
-    cacheRoutes.value = getCacheRouteNames(routes);
+    const alls = getCacheRouteNames(routes);
+
+    cacheRoutes.value = alls;
+    allCacheRoutes.value = [...alls];
   }
 
   /**
@@ -130,12 +136,23 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
     cacheRoutes.value.splice(index, 1);
   }
 
+  /**
+   * Is cached route
+   *
+   * @param routeKey
+   */
+  function isCachedRoute(routeKey: RouteKey) {
+    return allCacheRoutes.value.includes(routeKey);
+  }
+
   /**
    * Re cache routes by route key
    *
    * @param routeKey
    */
   async function reCacheRoutesByKey(routeKey: RouteKey) {
+    if (!isCachedRoute(routeKey)) return;
+
     removeCacheRoutes(routeKey);
 
     await appStore.reloadPage();

From 5a4f844d24d172ced0da5b7a6ce8eaf6ca8ce975 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Sun, 2 Jun 2024 01:21:15 +0800
Subject: [PATCH 13/14] chore(projects): release v1.1.3

---
 CHANGELOG.md                     | 34 ++++++++++++++++++++++++++++++++
 package.json                     |  2 +-
 packages/axios/package.json      |  2 +-
 packages/color/package.json      |  2 +-
 packages/hooks/package.json      |  2 +-
 packages/materials/package.json  |  2 +-
 packages/ofetch/package.json     |  2 +-
 packages/scripts/package.json    |  2 +-
 packages/uno-preset/package.json |  2 +-
 packages/utils/package.json      |  2 +-
 10 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b1a1a36..dd5684dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,40 @@
 # Changelog
 
 
+## [v1.1.3](https://github.com/soybeanjs/soybean-admin/compare/v1.1.2...v1.1.3) (2024-06-02)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
+
+- **components**:
+  - Fix the issue of search box popping up repeatedly due to carriage return &nbsp;-&nbsp; by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/468 [<samp>(5bd96)</samp>](https://github.com/soybeanjs/soybean-admin/commit/5bd96b8)
+- **projects**:
+  - fix click menu search. fixed #466, close #467 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/466 and https://github.com/soybeanjs/soybean-admin/issues/467 [<samp>(8efdb)</samp>](https://github.com/soybeanjs/soybean-admin/commit/8efdb10)
+  - fix reCacheRoute. fixed #464 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/464 [<samp>(59faf)</samp>](https://github.com/soybeanjs/soybean-admin/commit/59faf15)
+- **styles**:
+  - fix FirstLevelMenu style. fixed #450 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/450 [<samp>(db64b)</samp>](https://github.com/soybeanjs/soybean-admin/commit/db64b0e)
+  - fix PinToggler style. fixed #451 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/451 [<samp>(42b12)</samp>](https://github.com/soybeanjs/soybean-admin/commit/42b121a)
+
+### &nbsp;&nbsp;&nbsp;🛠 Optimizations
+
+- **components**: accuracy draggable area for TableColumnSetting with animation &nbsp;-&nbsp; by @orangelckc in https://github.com/soybeanjs/soybean-admin/issues/465 [<samp>(2aa85)</samp>](https://github.com/soybeanjs/soybean-admin/commit/2aa85c6)
+- **projects**: unocss border shortcut &nbsp;-&nbsp; by @soybeanjs [<samp>(40d0f)</samp>](https://github.com/soybeanjs/soybean-admin/commit/40d0f8a)
+
+### &nbsp;&nbsp;&nbsp;📖 Documentation
+
+- **projects**: update CHANGELOG &nbsp;-&nbsp; by @soybeanjs [<samp>(87b18)</samp>](https://github.com/soybeanjs/soybean-admin/commit/87b1838)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **other**:
+  - correct spell mistake &nbsp;-&nbsp; by @orangelckc in https://github.com/soybeanjs/soybean-admin/issues/460 [<samp>(086ba)</samp>](https://github.com/soybeanjs/soybean-admin/commit/086bad4)
+  - correct spell mistake &nbsp;-&nbsp; by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/462 [<samp>(f1850)</samp>](https://github.com/soybeanjs/soybean-admin/commit/f185041)
+- **projects**:
+  - update vscode launch.json &nbsp;-&nbsp; by @soybeanjs [<samp>(4c1c7)</samp>](https://github.com/soybeanjs/soybean-admin/commit/4c1c7e6)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[![orangelckc](https://github.com/orangelckc.png?size=48)](https://github.com/orangelckc)&nbsp;&nbsp;
+
 ## [v1.1.2](https://github.com/soybeanjs/soybean-admin/compare/v1.1.1...v1.1.2) (2024-05-24)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
diff --git a/package.json b/package.json
index 27480f97..de9a9936 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
diff --git a/packages/axios/package.json b/packages/axios/package.json
index 5d9dc191..8f0d448e 100644
--- a/packages/axios/package.json
+++ b/packages/axios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/color/package.json b/packages/color/package.json
index 9ee6c51e..379a6974 100644
--- a/packages/color/package.json
+++ b/packages/color/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 720645b7..63e51678 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/materials/package.json b/packages/materials/package.json
index 7a7aa490..d50c4c02 100644
--- a/packages/materials/package.json
+++ b/packages/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/ofetch/package.json b/packages/ofetch/package.json
index 7a94abe7..37d2cb98 100644
--- a/packages/ofetch/package.json
+++ b/packages/ofetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 2185ec94..35513d28 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "bin": {
     "sa": "./bin.ts"
   },
diff --git a/packages/uno-preset/package.json b/packages/uno-preset/package.json
index 8675a7c0..4ec496c6 100644
--- a/packages/uno-preset/package.json
+++ b/packages/uno-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index f206a689..82bf4421 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "exports": {
     ".": "./src/index.ts"
   },

From 756f84ab1da041688c0e7488b03908798b463d70 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Sun, 2 Jun 2024 01:28:22 +0800
Subject: [PATCH 14/14] docs(projects): update CHANGELOG

---
 CHANGELOG.zh_CN.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 6105abb4..cd3d2da5 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,5 +1,39 @@
 # 更新日志
 
+## [v1.1.3](https://github.com/soybeanjs/soybean-admin/compare/v1.1.2...v1.1.3) (2024-06-02)
+
+### &nbsp;&nbsp;&nbsp;🐞 错误修复
+
+- **组件**:
+  - 修复了由于回车导致搜索框反复弹出的问题 &nbsp;-&nbsp; 由 @Azir-11 在 https://github.com/soybeanjs/soybean-admin/issues/468 中修复 [<samp>(5bd96)</samp>](https://github.com/soybeanjs/soybean-admin/commit/5bd96b8)
+- **项目**:
+  - 修复点击菜单搜索。修复了 #466，关闭 #467 &nbsp;-&nbsp; 由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/466 和 https://github.com/soybeanjs/soybean-admin/issues/467 中修复 [<samp>(8efdb)</samp>](https://github.com/soybeanjs/soybean-admin/commit/8efdb10)
+  - 修复 reCacheRoute。修复了 #464 &nbsp;-&nbsp; 由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/464 中修复 [<samp>(59faf)</samp>](https://github.com/soybeanjs/soybean-admin/commit/59faf15)
+- **样式**:
+  - 修复 FirstLevelMenu 样式。修复了 #450 &nbsp;-&nbsp; 由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/450 中修复 [<samp>(db64b)</samp>](https://github.com/soybeanjs/soybean-admin/commit/db64b0e)
+  - 修复 PinToggler 样式。修复了 #451 &nbsp;-&nbsp; 由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/451 中修复 [<samp>(42b12)</samp>](https://github.com/soybeanjs/soybean-admin/commit/42b121a)
+
+### &nbsp;&nbsp;&nbsp;🛠 优化
+
+- **组件**: 提高 TableColumnSetting 的拖动区域精度，带有动画 &nbsp;-&nbsp; 由 @orangelckc 在 https://github.com/soybeanjs/soybean-admin/issues/465 中优化 [<samp>(2aa85)</samp>](https://github.com/soybeanjs/soybean-admin/commit/2aa85c6)
+- **项目**: unocss 边框快捷方式 &nbsp;-&nbsp; 由 @soybeanjs 优化 [<samp>(40d0f)</samp>](https://github.com/soybeanjs/soybean-admin/commit/40d0f8a)
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **项目**: 更新 CHANGELOG &nbsp;-&nbsp; 由 @soybeanjs 更新 [<samp>(87b18)</samp>](https://github.com/soybeanjs/soybean-admin/commit/87b1838)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **其他**:
+  - 纠正拼写错误 &nbsp;-&nbsp; 由 @orangelckc 在 https://github.com/soybeanjs/soybean-admin/issues/460 中纠正 [<samp>(086ba)</samp>](https://github.com/soybeanjs/soybean-admin/commit/086bad4)
+  - 纠正拼写错误 &nbsp;-&nbsp; 由 @Azir-11 在 https://github.com/soybeanjs/soybean-admin/issues/462 中纠正 [<samp>(f1850)</samp>](https://github.com/soybeanjs/soybean-admin/commit/f185041)
+- **项目**:
+  - 更新 vscode launch.json &nbsp;-&nbsp; 由 @soybeanjs 更新 [<samp>(4c1c7)</samp>](https://github.com/soybeanjs/soybean-admin/commit/4c1c7e6)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[![orangelckc](https://github.com/orangelckc.png?size=48)](https://github.com/orangelckc)&nbsp;&nbsp;
+
 ## [v1.1.2](https://github.com/soybeanjs/soybean-admin/compare/v1.1.1...v1.1.2) (2024-05-24)
 
 ### &nbsp;&nbsp;&nbsp;🐞 错误修复