release: update 5.1.0

* feat: 菜单搜索新增搜索历史和收藏功能

CHANGELOG.en_US.md

@@ -1,8 +1,28 @@
+# 5.1.0 (2024-03-02)
+
+### ✔️ refactor
+
+- Reconstruct the tab page `UI` to make it more convenient to click the close button
+
+### 🎫 Feat
+
+- Added multi-select card example
+- The menu supports all browser behaviors of right-clicking on the `a` tag (opening links in new tabs, new windows, dragging and dropping to open in new tabs, etc.)
+- Added search history and collection functions to menu search
+
+### 🐞 Bug fixes
+
+- Fixed the problem of scroll bars appearing on the login page under `windows` system
+
+### 🍏 Perf
+
+- Standardize the naming rules when registering local icons to better match the icon selector
+
 # 5.0.0 (2024-02-26)
 
 Totally `ESM` version
 
-### ✔️refactor
+### ✔️ refactor
 
 - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10`
 - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs)
@@ -18,7 +38,7 @@ Totally `ESM` version
 - Cleaner and neater pop-up panel on the right side of project configuration
 - Restructure the About page to make it more compact and key information more prominent
 
-### 🎫Feat
+### 🎫 Feat
 
 - Add system management-menu management
 - Improve system management-user management
@@ -59,7 +79,7 @@ Totally `ESM` version
 - Fixed the problem that the right-click tab page panel cannot be closed when clicking on the `iframe` page and the right-click tab page panel is blocked when on the `iframe` page
 - Fixed the problem of missing parameters when clicking on breadcrumbs to jump to the page in routing `query` and `params` modes
 
-### 🍏Perf
+### 🍏 Perf
 
 - Optimize theme color
 - Tabs can be slid left or right according to the sliding force

CHANGELOG.md

@@ -1,8 +1,28 @@
+# 5.1.0 (2024-03-02)
+
+### ✔️ refactor
+
+- Reconstruct the tab page `UI` to make it more convenient to click the close button
+
+### 🎫 Feat
+
+- Added multi-select card example
+- The menu supports all browser behaviors of right-clicking on the `a` tag (opening links in new tabs, new windows, dragging and dropping to open in new tabs, etc.)
+- Added search history and collection functions to menu search
+
+### 🐞 Bug fixes
+
+- Fixed the problem of scroll bars appearing on the login page under `windows` system
+
+### 🍏 Perf
+
+- Standardize the naming rules when registering local icons to better match the icon selector
+
 # 5.0.0 (2024-02-26)
 
 Totally `ESM` version
 
-### ✔️refactor
+### ✔️ refactor
 
 - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10`
 - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs)
@@ -18,7 +38,7 @@ Totally `ESM` version
 - Cleaner and neater pop-up panel on the right side of project configuration
 - Restructure the About page to make it more compact and key information more prominent
 
-### 🎫Feat
+### 🎫 Feat
 
 - Add system management-menu management
 - Improve system management-user management
@@ -59,7 +79,7 @@ Totally `ESM` version
 - Fixed the problem that the right-click tab page panel cannot be closed when clicking on the `iframe` page and the right-click tab page panel is blocked when on the `iframe` page
 - Fixed the problem of missing parameters when clicking on breadcrumbs to jump to the page in routing `query` and `params` modes
 
-### 🍏Perf
+### 🍏 Perf
 
 - Optimize theme color
 - Tabs can be slid left or right according to the sliding force

CHANGELOG.zh_CN.md

@@ -1,3 +1,23 @@
+# 5.1.0 (2024-03-02)
+
+### ✔️ refactor
+
+- 重构标签页`UI`，点击关闭按钮更方便
+
+### 🎫 Feat
+
+- 添加多选卡片示例
+- 菜单支持`a`标签右键的所有浏览器行为（在新标签页中、新窗口中打开链接，拖拽到新标签页打开等）
+- 菜单搜索新增搜索历史和收藏功能
+
+### 🐞 Bug fixes
+
+- 修复`windows`系统下登录页出现滚动条的问题
+
+### 🍏 Perf
+
+- 规范注册本地图标时的命名规则，使其更好地配合图标选择器
+
 # 5.0.0 (2024-02-26)
 
 全面`ESM`版本

build/optimize.ts

@@ -37,6 +37,7 @@ const include = [
   "@pureadmin/utils",
   "@wangeditor/editor",
   "responsive-storage",
+  "plus-pro-components",
   "@howdyjs/mouse-menu",
   "@logicflow/extension",
   "vue-virtual-scroller",

locales/en.yaml

@@ -67,6 +67,7 @@ menus:
   hsCollapse: Collapse
   hsProgress: Progress
   hsUpload: File Upload
+  hsCheckCard: CheckCard
   hsmenus: MultiLevel Menu
   hsmenu1: Menu1
   hsmenu1-1: Menu1-1

locales/zh-CN.yaml

@@ -67,6 +67,7 @@ menus:
   hsCollapse: 折叠面板
   hsProgress: 进度条
   hsUpload: 文件上传
+  hsCheckCard: 多选卡片
   hsmenus: 多级菜单
   hsmenu1: 菜单1
   hsmenu1-1: 菜单1-1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -53,9 +53,9 @@
     "@logicflow/core": "^1.2.22",
     "@logicflow/extension": "^1.2.22",
     "@pureadmin/descriptions": "^1.2.0",
-    "@pureadmin/table": "^3.0.2",
+    "@pureadmin/table": "^3.1.0",
     "@pureadmin/utils": "^2.4.4",
-    "@vueuse/core": "^10.8.0",
+    "@vueuse/core": "^10.9.0",
     "@vueuse/motion": "^2.1.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
@@ -67,7 +67,7 @@
     "dayjs": "^1.11.10",
     "echarts": "^5.5.0",
     "el-table-infinite-scroll": "^3.0.3",
-    "element-plus": "^2.5.6",
+    "element-plus": "^2.6.0",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
     "jsbarcode": "^3.11.6",
@@ -78,24 +78,25 @@
     "path": "^0.12.7",
     "pinia": "^2.1.7",
     "pinyin-pro": "^3.19.6",
+    "plus-pro-components": "^0.0.1",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.2",
-    "swiper": "^11.0.6",
+    "swiper": "^11.0.7",
     "typeit": "8.7.1",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.1",
     "version-rocket": "^1.7.1",
-    "vue": "3.4.14",
+    "vue": "^3.4.21",
-    "vue-i18n": "^9.9.1",
+    "vue-i18n": "^9.10.1",
     "vue-json-pretty": "^2.3.0",
     "vue-pdf-embed": "1.2.1",
     "vue-router": "^4.3.0",
     "vue-tippy": "^6.4.1",
     "vue-types": "^5.1.1",
     "vue-virtual-scroller": "2.0.0-beta.8",
-    "vue-waterfall-plugin-next": "^2.3.1",
+    "vue-waterfall-plugin-next": "^2.4.3",
     "vue3-danmaku": "^1.6.0",
     "vuedraggable": "^4.1.0",
     "wavesurfer.js": "^7.7.3",
@@ -116,13 +117,13 @@
     "@types/gradient-string": "^1.1.5",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.11.24",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.11",
+    "@types/qs": "^6.9.12",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@typescript-eslint/parser": "^7.1.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "autoprefixer": "^10.4.17",

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "5.0.0",
+  "Version": "5.1.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
@@ -22,6 +22,7 @@
   "CachingAsyncRoutes": false,
   "TooltipEffect": "light",
   "ResponsiveStorageNameSpace": "responsive-",
+  "MenuSearchHistory": 6,
   "MapConfigure": {
     "amapKey": "97b3248d1553172e81f168cf94ea667e",
     "options": {

src/components/ReCropper/src/index.tsx

@@ -389,7 +389,6 @@ export default defineComponent({
         interactive: true,
         appendTo: "parent",
         // hideOnClick: false,
-        animation: "perspective",
         placement: "bottom-end"
       });
 

src/components/ReIcon/src/offlineIcon.ts

@@ -1,55 +1,54 @@
+// 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
 import { addIcon } from "@iconify/vue/dist/offline";
 
-/**
+// 本地菜单图标，后端在路由的 icon 中返回对应的图标字符串并且前端在此处使用 addIcon 添加即可渲染菜单图标
- * 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
+// @iconify-icons/ep
- */
-
-// 本地菜单图标，后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
-import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
 import Menu from "@iconify-icons/ep/menu";
 import Edit from "@iconify-icons/ep/edit";
-import InformationLine from "@iconify-icons/ri/information-line";
 import SetUp from "@iconify-icons/ep/set-up";
-import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
 import Guide from "@iconify-icons/ep/guide";
-import HomeFilled from "@iconify-icons/ep/home-filled";
-import Card from "@iconify-icons/ri/bank-card-line";
-import ListCheck from "@iconify-icons/ri/list-check";
-import Histogram from "@iconify-icons/ep/histogram";
-import Ppt from "@iconify-icons/ri/file-ppt-2-line";
-import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
-import FlUser from "@iconify-icons/ri/admin-line";
-import Role from "@iconify-icons/ri/admin-fill";
-import Setting from "@iconify-icons/ri/settings-3-line";
-import Dept from "@iconify-icons/ri/git-branch-line";
-import Search from "@iconify-icons/ri/search-line";
-import Lollipop from "@iconify-icons/ep/lollipop";
 import Monitor from "@iconify-icons/ep/monitor";
-import Tag from "@iconify-icons/ri/bookmark-2-line";
+import Lollipop from "@iconify-icons/ep/lollipop";
-import Table from "@iconify-icons/ri/table-line";
+import Histogram from "@iconify-icons/ep/histogram";
-import Info from "@iconify-icons/ri/file-info-line";
+import HomeFilled from "@iconify-icons/ep/home-filled";
-import Artboard from "@iconify-icons/ri/artboard-line";
-addIcon("ubuntuFill", UbuntuFill);
 addIcon("ep:menu", Menu);
-addIcon("edit", Edit);
+addIcon("ep:edit", Edit);
-addIcon("informationLine", InformationLine);
+addIcon("ep:set-up", SetUp);
-addIcon("setUp", SetUp);
+addIcon("ep:guide", Guide);
-addIcon("terminalWindowLine", TerminalWindowLine);
-addIcon("guide", Guide);
-addIcon("homeFilled", HomeFilled);
-addIcon("card", Card);
-addIcon("listCheck", ListCheck);
-addIcon("histogram", Histogram);
-addIcon("ppt", Ppt);
-addIcon("checkboxCircleLine", CheckboxCircleLine);
-addIcon("ri:admin-line", FlUser);
-addIcon("ri:admin-fill", Role);
-addIcon("ri:settings-3-line", Setting);
-addIcon("ri:git-branch-line", Dept);
-addIcon("search", Search);
-addIcon("ep:lollipop", Lollipop);
 addIcon("ep:monitor", Monitor);
+addIcon("ep:lollipop", Lollipop);
+addIcon("ep:histogram", Histogram);
+addIcon("ep:home-filled", HomeFilled);
+// @iconify-icons/ri
+import Tag from "@iconify-icons/ri/bookmark-2-line";
+import Ppt from "@iconify-icons/ri/file-ppt-2-line";
+import Card from "@iconify-icons/ri/bank-card-line";
+import Role from "@iconify-icons/ri/admin-fill";
+import Info from "@iconify-icons/ri/file-info-line";
+import Dept from "@iconify-icons/ri/git-branch-line";
+import Table from "@iconify-icons/ri/table-line";
+import Search from "@iconify-icons/ri/search-line";
+import FlUser from "@iconify-icons/ri/admin-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
+import Artboard from "@iconify-icons/ri/artboard-line";
+import ListCheck from "@iconify-icons/ri/list-check";
+import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
+import InformationLine from "@iconify-icons/ri/information-line";
+import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
+import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
 addIcon("ri:bookmark-2-line", Tag);
-addIcon("table", Table);
+addIcon("ri:file-ppt-2-line", Ppt);
-addIcon("info", Info);
+addIcon("ri:bank-card-line", Card);
-addIcon("artboard", Artboard);
+addIcon("ri:admin-fill", Role);
+addIcon("ri:file-info-line", Info);
+addIcon("ri:git-branch-line", Dept);
+addIcon("ri:table-line", Table);
+addIcon("ri:search-line", Search);
+addIcon("ri:admin-line", FlUser);
+addIcon("ri:settings-3-line", Setting);
+addIcon("ri:artboard-line", Artboard);
+addIcon("ri:list-check", ListCheck);
+addIcon("ri:ubuntu-fill", UbuntuFill);
+addIcon("ri:information-line", InformationLine);
+addIcon("ri:terminal-window-line", TerminalWindowLine);
+addIcon("ri:checkbox-circle-line", CheckboxCircleLine);

src/components/RePureTableBar/src/bar.tsx

@@ -317,7 +317,7 @@ export default defineComponent({
                               />
                               <el-checkbox
                                 key={item}
-                                label={item}
+                                value={item}
                                 onChange={value =>
                                   handleCheckColumnListChange(value, item)
                                 }

src/layout/components/search/components/SearchFooter.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
-import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 import { useNav } from "@/layout/hooks/useNav";
 import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
 import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
+import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 
 const props = withDefaults(defineProps<{ total: number }>(), {
   total: 0

src/layout/components/search/components/SearchHistory.vue

@@ -0,0 +1,198 @@
+<script setup lang="ts">
+import Sortable from "sortablejs";
+import SearchHistoryItem from "./SearchHistoryItem.vue";
+import type { optionsItem, dragItem, Props } from "../types";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
+import { useResizeObserver, isArray, delay } from "@pureadmin/utils";
+import { ref, watch, nextTick, computed, getCurrentInstance } from "vue";
+
+interface Emits {
+  (e: "update:value", val: string): void;
+  (e: "enter"): void;
+  (e: "collect", val: optionsItem): void;
+  (e: "delete", val: optionsItem): void;
+  (e: "drag", val: dragItem): void;
+}
+
+const historyRef = ref();
+const innerHeight = ref();
+/** 判断是否停止鼠标移入事件处理 */
+const stopMouseEvent = ref(false);
+
+const emit = defineEmits<Emits>();
+const instance = getCurrentInstance()!;
+const props = withDefaults(defineProps<Props>(), {});
+
+const itemStyle = computed(() => {
+  return item => {
+    return {
+      background:
+        item?.path === active.value ? useEpThemeStoreHook().epThemeColor : "",
+      color: item.path === active.value ? "#fff" : "",
+      fontSize: item.path === active.value ? "16px" : "14px"
+    };
+  };
+});
+
+const titleStyle = computed(() => {
+  return {
+    color: useEpThemeStoreHook().epThemeColor,
+    fontWeight: 500
+  };
+});
+
+const active = computed({
+  get() {
+    return props.value;
+  },
+  set(val: string) {
+    emit("update:value", val);
+  }
+});
+
+watch(
+  () => props.value,
+  newValue => {
+    if (newValue) {
+      if (stopMouseEvent.value) {
+        delay(100).then(() => (stopMouseEvent.value = false));
+      }
+    }
+  }
+);
+
+const historyList = computed(() => {
+  return props.options.filter(item => item.type === "history");
+});
+
+const collectList = computed(() => {
+  return props.options.filter(item => item.type === "collect");
+});
+
+function handleCollect(item) {
+  emit("collect", item);
+}
+
+function handleDelete(item) {
+  stopMouseEvent.value = true;
+  emit("delete", item);
+}
+
+/** 鼠标移入 */
+async function handleMouse(item) {
+  if (!stopMouseEvent.value) active.value = item.path;
+}
+
+function handleTo() {
+  emit("enter");
+}
+
+function resizeResult() {
+  // el-scrollbar max-height="calc(90vh - 140px)"
+  innerHeight.value = window.innerHeight - window.innerHeight / 10 - 140;
+}
+
+useResizeObserver(historyRef, resizeResult);
+
+function handleScroll(index: number) {
+  const curInstance = instance?.proxy?.$refs[`historyItemRef${index}`];
+  if (!curInstance) return 0;
+  const curRef = isArray(curInstance)
+    ? (curInstance[0] as ElRef)
+    : (curInstance as ElRef);
+  const scrollTop = curRef.offsetTop + 128; // 128 两个history-item（56px+56px=112px）高度加上下margin（8px+8px=16px）
+  return scrollTop > innerHeight.value ? scrollTop - innerHeight.value : 0;
+}
+
+const handleChangeIndex = (evt): void => {
+  emit("drag", { oldIndex: evt.oldIndex, newIndex: evt.newIndex });
+};
+
+let sortableInstance = null;
+
+watch(
+  collectList,
+  val => {
+    if (val.length > 1) {
+      nextTick(() => {
+        const wrapper: HTMLElement =
+          document.querySelector(".collect-container");
+        if (!wrapper || sortableInstance) return;
+        sortableInstance = Sortable.create(wrapper, {
+          animation: 160,
+          onStart: event => {
+            event.item.style.cursor = "move";
+          },
+          onEnd: event => {
+            event.item.style.cursor = "pointer";
+          },
+          onUpdate: handleChangeIndex
+        });
+        resizeResult();
+      });
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+defineExpose({ handleScroll });
+</script>
+
+<template>
+  <div ref="historyRef" class="history">
+    <template v-if="historyList.length">
+      <div :style="titleStyle">搜索历史</div>
+      <div
+        v-for="(item, index) in historyList"
+        :key="item.path"
+        :ref="'historyItemRef' + index"
+        class="history-item dark:bg-[#1d1d1d]"
+        :style="itemStyle(item)"
+        @click="handleTo"
+        @mouseenter="handleMouse(item)"
+      >
+        <SearchHistoryItem
+          :item="item"
+          @delete-item="handleDelete"
+          @collect-item="handleCollect"
+        />
+      </div>
+    </template>
+    <template v-if="collectList.length">
+      <div :style="titleStyle">
+        收藏{{ collectList.length > 1 ? "（可拖拽排序）" : "" }}
+      </div>
+      <div class="collect-container">
+        <div
+          v-for="(item, index) in collectList"
+          :key="item.path"
+          :ref="'historyItemRef' + (index + historyList.length)"
+          class="history-item dark:bg-[#1d1d1d]"
+          :style="itemStyle(item)"
+          @click="handleTo"
+          @mouseenter="handleMouse(item)"
+        >
+          <SearchHistoryItem :item="item" @delete-item="handleDelete" />
+        </div>
+      </div>
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.history {
+  padding-bottom: 12px;
+
+  &-item {
+    display: flex;
+    align-items: center;
+    height: 56px;
+    padding: 14px;
+    margin: 8px auto 10px;
+    cursor: pointer;
+    border: 0.1px solid #ccc;
+    border-radius: 4px;
+    transition: font-size 0.16s;
+  }
+}
+</style>

src/layout/components/search/components/SearchHistoryItem.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import type { optionsItem } from "../types";
+import { transformI18n } from "@/plugins/i18n";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+import Star from "@iconify-icons/ep/star";
+import Close from "@iconify-icons/ep/close";
+
+interface Props {
+  item: optionsItem;
+}
+
+interface Emits {
+  (e: "collectItem", val: optionsItem): void;
+  (e: "deleteItem", val: optionsItem): void;
+}
+
+const emit = defineEmits<Emits>();
+withDefaults(defineProps<Props>(), {});
+
+function handleCollect(item) {
+  emit("collectItem", item);
+}
+
+function handleDelete(item) {
+  emit("deleteItem", item);
+}
+</script>
+
+<template>
+  <component :is="useRenderIcon(item.meta?.icon)" />
+  <span class="history-item-title">
+    {{ transformI18n(item.meta?.title) }}
+  </span>
+  <IconifyIconOffline
+    v-show="item.type === 'history'"
+    :icon="Star"
+    class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
+    @click.stop="handleCollect(item)"
+  />
+  <IconifyIconOffline
+    :icon="Close"
+    class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
+    @click.stop="handleDelete(item)"
+  />
+</template>
+
+<style lang="scss" scoped>
+.history-item-title {
+  display: flex;
+  flex: 1;
+  margin-left: 5px;
+}
+</style>

src/layout/components/search/components/SearchModal.vue

@@ -1,15 +1,18 @@
 <script setup lang="ts">
 import { match } from "pinyin-pro";
 import { useI18n } from "vue-i18n";
+import { getConfig } from "@/config";
 import { useRouter } from "vue-router";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { transformI18n } from "@/plugins/i18n";
-import { ref, computed, shallowRef } from "vue";
+import SearchHistory from "./SearchHistory.vue";
-import { cloneDeep, isAllEmpty } from "@pureadmin/utils";
+import type { optionsItem, dragItem } from "../types";
+import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { usePermissionStoreHook } from "@/store/modules/permission";
+import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
 import Search from "@iconify-icons/ri/search-line";
 
 interface Props {
@@ -24,16 +27,26 @@ interface Emits {
 const { device } = useNav();
 const emit = defineEmits<Emits>();
 const props = withDefaults(defineProps<Props>(), {});
+
 const router = useRouter();
 const { locale } = useI18n();
 
+const HISTORY_TYPE = "history";
+const COLLECT_TYPE = "collect";
+const LOCALEHISTORYKEY = "menu-search-history";
+const LOCALECOLLECTKEY = "menu-search-collect";
+
 const keyword = ref("");
-const scrollbarRef = ref();
 const resultRef = ref();
+const historyRef = ref();
+const scrollbarRef = ref();
 const activePath = ref("");
-const inputRef = ref<HTMLInputElement | null>(null);
+const historyPath = ref("");
 const resultOptions = shallowRef([]);
+const historyOptions = shallowRef([]);
 const handleSearch = useDebounceFn(search, 300);
+const historyNum = getConfig().MenuSearchHistory;
+const inputRef = ref<HTMLInputElement | null>(null);
 
 /** 菜单树形结构 */
 const menusData = computed(() => {
@@ -49,6 +62,36 @@ const show = computed({
   }
 });
 
+watch(
+  () => props.value,
+  newValue => {
+    if (newValue) getHistory();
+  }
+);
+
+const showSearchResult = computed(() => {
+  return keyword.value && resultOptions.value.length > 0;
+});
+
+const showSearchHistory = computed(() => {
+  return !keyword.value && historyOptions.value.length > 0;
+});
+
+const showEmpty = computed(() => {
+  return (
+    (!keyword.value && historyOptions.value.length === 0) ||
+    (keyword.value && resultOptions.value.length === 0)
+  );
+});
+
+function getStorageItem(key) {
+  return storageLocal().getItem<optionsItem[]>(key) || [];
+}
+
+function setStorageItem(key, value) {
+  storageLocal().setItem(key, value);
+}
+
 /** 将菜单树形结构扁平化为一维数组，用于菜单查询 */
 function flatTree(arr) {
   const res = [];
@@ -79,11 +122,8 @@ function search() {
           ))
       : false
   );
-  if (resultOptions.value?.length > 0) {
+  activePath.value =
-    activePath.value = resultOptions.value[0].path;
+    resultOptions.value?.length > 0 ? resultOptions.value[0].path : "";
-  } else {
-    activePath.value = "";
-  }
 }
 
 function handleClose() {
@@ -91,54 +131,143 @@ function handleClose() {
   /** 延时处理防止用户看到某些操作 */
   setTimeout(() => {
     resultOptions.value = [];
+    historyPath.value = "";
     keyword.value = "";
   }, 200);
 }
 
 function scrollTo(index) {
-  const scrollTop = resultRef.value.handleScroll(index);
+  const ref = resultOptions.value.length ? resultRef.value : historyRef.value;
+  const scrollTop = ref.handleScroll(index);
   scrollbarRef.value.setScrollTop(scrollTop);
 }
 
+/** 获取当前选项和路径 */
+function getCurrentOptionsAndPath() {
+  const isResultOptions = resultOptions.value.length > 0;
+  const options = isResultOptions ? resultOptions.value : historyOptions.value;
+  const currentPath = isResultOptions ? activePath.value : historyPath.value;
+  return { options, currentPath, isResultOptions };
+}
+
+/** 更新路径并滚动到指定项 */
+function updatePathAndScroll(newIndex, isResultOptions) {
+  if (isResultOptions) {
+    activePath.value = resultOptions.value[newIndex].path;
+  } else {
+    historyPath.value = historyOptions.value[newIndex].path;
+  }
+  scrollTo(newIndex);
+}
+
 /** key up */
 function handleUp() {
-  const { length } = resultOptions.value;
+  const { options, currentPath, isResultOptions } = getCurrentOptionsAndPath();
-  if (length === 0) return;
+  if (options.length === 0) return;
-  const index = resultOptions.value.findIndex(
+  const index = options.findIndex(item => item.path === currentPath);
-    item => item.path === activePath.value
+  const prevIndex = (index - 1 + options.length) % options.length;
-  );
+  updatePathAndScroll(prevIndex, isResultOptions);
-  if (index === 0) {
-    activePath.value = resultOptions.value[length - 1].path;
-    scrollTo(resultOptions.value.length - 1);
-  } else {
-    activePath.value = resultOptions.value[index - 1].path;
-    scrollTo(index - 1);
-  }
 }
 
 /** key down */
 function handleDown() {
-  const { length } = resultOptions.value;
+  const { options, currentPath, isResultOptions } = getCurrentOptionsAndPath();
-  if (length === 0) return;
+  if (options.length === 0) return;
-  const index = resultOptions.value.findIndex(
+  const index = options.findIndex(item => item.path === currentPath);
-    item => item.path === activePath.value
+  const nextIndex = (index + 1) % options.length;
-  );
+  updatePathAndScroll(nextIndex, isResultOptions);
-  if (index + 1 === length) {
-    activePath.value = resultOptions.value[0].path;
-  } else {
-    activePath.value = resultOptions.value[index + 1].path;
-  }
-  scrollTo(index + 1);
 }
 
 /** key enter */
 function handleEnter() {
-  const { length } = resultOptions.value;
+  const { options, currentPath, isResultOptions } = getCurrentOptionsAndPath();
-  if (length === 0 || activePath.value === "") return;
+  if (options.length === 0 || currentPath === "") return;
-  router.push(activePath.value);
+  const index = options.findIndex(item => item.path === currentPath);
+  if (index === -1) return;
+  if (isResultOptions) {
+    saveHistory();
+  } else {
+    updateHistory();
+  }
+  router.push(options[index].path);
   handleClose();
 }
 
+/** 删除历史记录 */
+function handleDelete(item) {
+  const key = item.type === HISTORY_TYPE ? LOCALEHISTORYKEY : LOCALECOLLECTKEY;
+  let list = getStorageItem(key);
+  list = list.filter(listItem => listItem.path !== item.path);
+  setStorageItem(key, list);
+  getHistory();
+}
+
+/** 收藏历史记录 */
+function handleCollect(item) {
+  let searchHistoryList = getStorageItem(LOCALEHISTORYKEY);
+  let searchCollectList = getStorageItem(LOCALECOLLECTKEY);
+  searchHistoryList = searchHistoryList.filter(
+    historyItem => historyItem.path !== item.path
+  );
+  setStorageItem(LOCALEHISTORYKEY, searchHistoryList);
+  if (!searchCollectList.some(collectItem => collectItem.path === item.path)) {
+    searchCollectList.unshift({ ...item, type: COLLECT_TYPE });
+    setStorageItem(LOCALECOLLECTKEY, searchCollectList);
+  }
+  getHistory();
+}
+
+/** 存储搜索记录 */
+function saveHistory() {
+  const { path, meta } = resultOptions.value.find(
+    item => item.path === activePath.value
+  );
+  const searchHistoryList = getStorageItem(LOCALEHISTORYKEY);
+  const searchCollectList = getStorageItem(LOCALECOLLECTKEY);
+  const isCollected = searchCollectList.some(item => item.path === path);
+  const existingIndex = searchHistoryList.findIndex(item => item.path === path);
+  if (!isCollected) {
+    if (existingIndex !== -1) searchHistoryList.splice(existingIndex, 1);
+    if (searchHistoryList.length >= historyNum) searchHistoryList.pop();
+    searchHistoryList.unshift({ path, meta, type: HISTORY_TYPE });
+    storageLocal().setItem(LOCALEHISTORYKEY, searchHistoryList);
+  }
+}
+
+/** 更新存储的搜索记录 */
+function updateHistory() {
+  let searchHistoryList = getStorageItem(LOCALEHISTORYKEY);
+  const historyIndex = searchHistoryList.findIndex(
+    item => item.path === historyPath.value
+  );
+  if (historyIndex !== -1) {
+    const [historyItem] = searchHistoryList.splice(historyIndex, 1);
+    searchHistoryList.unshift(historyItem);
+    setStorageItem(LOCALEHISTORYKEY, searchHistoryList);
+  }
+}
+
+/** 获取本地历史记录 */
+function getHistory() {
+  const searchHistoryList = getStorageItem(LOCALEHISTORYKEY);
+  const searchCollectList = getStorageItem(LOCALECOLLECTKEY);
+  historyOptions.value = [...searchHistoryList, ...searchCollectList];
+  historyPath.value = historyOptions.value[0]?.path;
+}
+
+/** 拖拽改变收藏顺序 */
+function handleDrag(item: dragItem) {
+  const searchCollectList = getStorageItem(LOCALECOLLECTKEY);
+  const [reorderedItem] = searchCollectList.splice(item.oldIndex, 1);
+  searchCollectList.splice(item.newIndex, 0, reorderedItem);
+  storageLocal().setItem(LOCALECOLLECTKEY, searchCollectList);
+  historyOptions.value = [
+    ...getStorageItem(LOCALEHISTORYKEY),
+    ...getStorageItem(LOCALECOLLECTKEY)
+  ];
+  historyPath.value = reorderedItem.path;
+}
+
 onKeyStroke("Enter", handleEnter);
 onKeyStroke("ArrowUp", handleUp);
 onKeyStroke("ArrowDown", handleDown);
@@ -174,14 +303,21 @@ onKeyStroke("ArrowDown", handleDown);
         />
       </template>
     </el-input>
-    <div class="search-result-container">
+    <div class="search-content">
       <el-scrollbar ref="scrollbarRef" max-height="calc(90vh - 140px)">
-        <el-empty
+        <el-empty v-if="showEmpty" description="暂无搜索结果" />
-          v-if="resultOptions.length === 0"
+        <SearchHistory
-          description="暂无搜索结果"
+          v-if="showSearchHistory"
+          ref="historyRef"
+          v-model:value="historyPath"
+          :options="historyOptions"
+          @click="handleEnter"
+          @delete="handleDelete"
+          @collect="handleCollect"
+          @drag="handleDrag"
         />
         <SearchResult
-          v-else
+          v-if="showSearchResult"
           ref="resultRef"
           v-model:value="activePath"
           :options="resultOptions"
@@ -196,7 +332,7 @@ onKeyStroke("ArrowDown", handleDown);
 </template>
 
 <style lang="scss" scoped>
-.search-result-container {
+.search-content {
   margin-top: 12px;
 }
 </style>

src/layout/components/search/components/SearchResult.vue

@@ -1,24 +1,11 @@
 <script setup lang="ts">
+import type { Props } from "../types";
 import { transformI18n } from "@/plugins/i18n";
 import { useResizeObserver } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, computed, getCurrentInstance, onMounted } from "vue";
 import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
-import Bookmark2Line from "@iconify-icons/ri/bookmark-2-line";
-
-interface optionsItem {
-  path: string;
-  meta?: {
-    icon?: string;
-    title?: string;
-  };
-}
-
-interface Props {
-  value: string;
-  options: Array<optionsItem>;
-}
 
 interface Emits {
   (e: "update:value", val: string): void;
@@ -27,9 +14,9 @@ interface Emits {
 
 const resultRef = ref();
 const innerHeight = ref();
-const props = withDefaults(defineProps<Props>(), {});
 const emit = defineEmits<Emits>();
 const instance = getCurrentInstance()!;
+const props = withDefaults(defineProps<Props>(), {});
 
 const itemStyle = computed(() => {
   return item => {
@@ -93,7 +80,7 @@ defineExpose({ handleScroll });
       @click="handleTo"
       @mouseenter="handleMouse(item)"
     >
-      <component :is="useRenderIcon(item.meta?.icon ?? Bookmark2Line)" />
+      <component :is="useRenderIcon(item.meta?.icon)" />
       <span class="result-item-title">
         {{ transformI18n(item.meta?.title) }}
       </span>

src/layout/components/search/index.vue

@@ -14,7 +14,7 @@ function handleSearch() {
       class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
       @click="handleSearch"
     >
-      <IconifyIconOffline icon="search" />
+      <IconifyIconOffline icon="ri:search-line" />
     </div>
     <SearchModal v-model:value="show" />
   </div>

src/layout/components/search/types.ts

@@ -0,0 +1,20 @@
+interface optionsItem {
+  path: string;
+  type: "history" | "collect";
+  meta: {
+    icon?: string;
+    title?: string;
+  };
+}
+
+interface dragItem {
+  oldIndex: number;
+  newIndex: number;
+}
+
+interface Props {
+  value: string;
+  options: Array<optionsItem>;
+}
+
+export type { optionsItem, dragItem, Props };

src/layout/components/sidebar/linkItem.vue

@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { isUrl } from "@pureadmin/utils";
+import { menuType } from "@/layout/types";
+
+defineOptions({
+  name: "LinkItem"
+});
+
+const props = defineProps<{
+  to: menuType;
+}>();
+
+const isExternalLink = computed(() => isUrl(props.to.name));
+const getLinkProps = (item: menuType) => {
+  if (isExternalLink.value) {
+    return {
+      href: item.name,
+      target: "_blank",
+      rel: "noopener"
+    };
+  }
+  return {
+    to: item
+  };
+};
+</script>
+
+<template>
+  <component
+    :is="isExternalLink ? 'a' : 'router-link'"
+    v-bind="getLinkProps(to)"
+  >
+    <slot />
+  </component>
+</template>

src/layout/components/sidebar/logo.vue

@@ -48,6 +48,7 @@ const { title, getLogo } = useNav();
     flex-wrap: nowrap;
     align-items: center;
     height: 100%;
+    padding-left: 10px;
 
     img {
       display: inline-block;

src/layout/components/sidebar/sidebarItem.vue

@@ -1,19 +1,28 @@
 <script setup lang="ts">
 import path from "path";
 import { getConfig } from "@/config";
+import LinkItem from "./linkItem.vue";
 import { menuType } from "../../types";
 import extraIcon from "./extraIcon.vue";
 import { ReText } from "@/components/ReText";
 import { useNav } from "@/layout/hooks/useNav";
 import { transformI18n } from "@/plugins/i18n";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { type CSSProperties, type PropType, computed, ref, toRaw } from "vue";
+import {
+  type PropType,
+  type CSSProperties,
+  ref,
+  toRaw,
+  computed,
+  useAttrs
+} from "vue";
 
 import ArrowUp from "@iconify-icons/ep/arrow-up-bold";
 import EpArrowDown from "@iconify-icons/ep/arrow-down-bold";
 import ArrowLeft from "@iconify-icons/ep/arrow-left-bold";
 import ArrowRight from "@iconify-icons/ep/arrow-right-bold";
 
+const attrs = useAttrs();
 const { layout, isCollapse, tooltipEffect, getDivStyle } = useNav();
 
 const props = defineProps({
@@ -32,6 +41,7 @@ const props = defineProps({
 
 const getNoDropdownStyle = computed((): CSSProperties => {
   return {
+    width: "100%",
     display: "flex",
     alignItems: "center"
   };
@@ -96,61 +106,66 @@ function resolvePath(routePath) {
 </script>
 
 <template>
-  <el-menu-item
+  <link-item
     v-if="
       hasOneShowingChild(props.item.children, props.item) &&
       (!onlyOneChild.children || onlyOneChild.noShowingChildren)
     "
-    :index="resolvePath(onlyOneChild.path)"
+    :to="item"
-    :class="{ 'submenu-title-noDropdown': !isNest }"
-    :style="getNoDropdownStyle"
   >
-    <div
+    <el-menu-item
-      v-if="toRaw(props.item.meta.icon)"
+      :index="resolvePath(onlyOneChild.path)"
-      class="sub-menu-icon"
+      :class="{ 'submenu-title-noDropdown': !isNest }"
-      :style="getSubMenuIconStyle"
+      :style="getNoDropdownStyle"
+      v-bind="attrs"
     >
-      <component
+      <div
-        :is="
+        v-if="toRaw(props.item.meta.icon)"
-          useRenderIcon(
+        class="sub-menu-icon"
-            toRaw(onlyOneChild.meta.icon) ||
+        :style="getSubMenuIconStyle"
-              (props.item.meta && toRaw(props.item.meta.icon))
+      >
-          )
+        <component
-        "
+          :is="
-      />
+            useRenderIcon(
-    </div>
+              toRaw(onlyOneChild.meta.icon) ||
-    <el-text
+                (props.item.meta && toRaw(props.item.meta.icon))
-      v-if="
+            )
-        (!props.item?.meta.icon &&
+          "
-          isCollapse &&
+        />
-          layout === 'vertical' &&
-          props.item?.pathList?.length === 1) ||
-        (!onlyOneChild.meta.icon &&
-          isCollapse &&
-          layout === 'mix' &&
-          props.item?.pathList?.length === 2)
-      "
-      truncated
-      class="!px-4 !text-inherit"
-    >
-      {{ transformI18n(onlyOneChild.meta.title) }}
-    </el-text>
-
-    <template #title>
-      <div :style="getDivStyle">
-        <ReText
-          :tippyProps="{
-            offset: [0, -10],
-            theme: tooltipEffect
-          }"
-          class="!text-inherit"
-        >
-          {{ transformI18n(onlyOneChild.meta.title) }}
-        </ReText>
-        <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
       </div>
-    </template>
+      <el-text
-  </el-menu-item>
+        v-if="
+          (!props.item?.meta.icon &&
+            isCollapse &&
+            layout === 'vertical' &&
+            props.item?.pathList?.length === 1) ||
+          (!onlyOneChild.meta.icon &&
+            isCollapse &&
+            layout === 'mix' &&
+            props.item?.pathList?.length === 2)
+        "
+        truncated
+        class="!px-4 !text-inherit"
+      >
+        {{ transformI18n(onlyOneChild.meta.title) }}
+      </el-text>
+
+      <template #title>
+        <div :style="getDivStyle">
+          <ReText
+            :tippyProps="{
+              offset: [0, -10],
+              theme: tooltipEffect
+            }"
+            class="!text-inherit"
+          >
+            {{ transformI18n(onlyOneChild.meta.title) }}
+          </ReText>
+          <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
+        </div>
+      </template>
+    </el-menu-item>
+  </link-item>
   <el-sub-menu
     v-else
     ref="subMenu"

src/layout/components/tag/index.scss

@@ -18,26 +18,6 @@
   }
 }
 
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes close {
-  from {
-    transform: translate(-50%, -50%);
-  }
-
-  to {
-    transform: translate(0, -50%);
-  }
-}
-
 .tags-view {
   position: relative;
   display: flex;
@@ -51,41 +31,35 @@
   .scroll-item {
     position: relative;
     display: inline-block;
-    height: 28px;
+    height: 34px;
-    padding: 0 6px;
+    padding-left: 6px;
-    margin-right: 4px;
+    line-height: 34px;
-    line-height: 28px;
     cursor: pointer;
-    border-radius: 3px 3px 0 0;
-    box-shadow: 0 0 1px #888;
     transition: all 0.4s;
 
+    &:not(:first-child) {
+      padding-right: 24px;
+    }
+
     .el-icon-close {
       position: absolute;
       top: 50%;
-      font-size: 10px;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 18px;
+      height: 18px;
       color: var(--el-color-primary);
       cursor: pointer;
-      transition: font-size 0.2s;
+      border-radius: 4px;
-      transform: translate(-50%, -50%);
+      transition:
+        background-color 0.12s,
+        color 0.12s;
+      transform: translate(0, -50%);
 
       &:hover {
-        font-size: 13px;
+        color: rgb(0 0 0 / 88%) !important;
-        color: #fff;
+        background-color: rgb(0 0 0 / 6%);
-        background: #b4bccc;
-        border-radius: 50%;
-      }
-    }
-
-    &.is-closable:not(:first-child) {
-      &:hover {
-        padding-right: 18px;
-
-        &:not(.is-active) {
-          .el-icon-close {
-            animation: close 200ms ease-in forwards;
-          }
-        }
       }
     }
   }
@@ -99,7 +73,6 @@
   .scroll-container {
     position: relative;
     flex: 1;
-    padding: 5px 0;
     overflow: hidden;
     white-space: nowrap;
 
@@ -114,7 +87,7 @@
         transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 
         &:nth-child(1) {
-          margin-left: 5px;
+          padding: 0 12px;
         }
       }
     }
@@ -194,14 +167,7 @@
 .scroll-item.is-active {
   position: relative;
   color: #fff;
-
+  box-shadow: 0 0 0.7px #888;
-  &:not(:first-child) {
-    padding-right: 18px;
-  }
-
-  .el-icon-close {
-    transform: translate(0, -50%);
-  }
 
   .tag-title {
     color: var(--el-color-primary) !important;
@@ -212,16 +178,16 @@
 .arrow-right,
 .arrow-down {
   position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 40px;
-  height: 38px;
+  height: 34px;
   color: var(--el-text-color-primary);
 
   svg {
-    position: absolute;
-    left: 50%;
     width: 20px;
     height: 20px;
-    transform: translate(-50%, 50%);
   }
 }
 

src/layout/components/tag/index.vue

@@ -21,9 +21,9 @@ import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
 import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
 import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
 import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
-import CloseBold from "@iconify-icons/ep/close-bold";
 
 const {
+  Close,
   route,
   router,
   visible,
@@ -156,7 +156,8 @@ const handleWheel = (event: WheelEvent): void => {
 };
 
 const smoothScroll = (offset: number): void => {
-  const scrollAmount = 20; // 每帧滚动的距离
+  // 每帧滚动的距离
+  const scrollAmount = 20;
   let remaining = Math.abs(offset);
 
   const scrollStep = () => {
@@ -586,7 +587,7 @@ onBeforeUnmount(() => {
             class="el-icon-close"
             @click.stop="deleteMenu(item)"
           >
-            <IconifyIconOffline :icon="CloseBold" />
+            <IconifyIconOffline :icon="Close" />
           </span>
           <span
             v-if="showModel !== 'card'"

src/layout/hooks/useTag.ts

@@ -216,6 +216,7 @@ export function useTags() {
   });
 
   return {
+    Close,
     route,
     router,
     visible,

src/layout/types.ts

@@ -8,7 +8,7 @@ export const routerArrays: Array<RouteConfigs> =
           path: "/welcome",
           meta: {
             title: "menus.hshome",
-            icon: "homeFilled"
+            icon: "ep:home-filled"
           }
         }
       ]
@@ -62,6 +62,7 @@ export interface setType {
 
 export type menuType = {
   id?: number;
+  name?: string;
   path?: string;
   noShowingChildren?: boolean;
   children?: menuType[];

src/router/modules/able.ts

@@ -5,7 +5,7 @@ export default {
   path: "/able",
   redirect: "/able/watermark",
   meta: {
-    icon: "ubuntuFill",
+    icon: "ri:ubuntu-fill",
     title: $t("menus.hsAble"),
     rank: able
   },

src/router/modules/about.ts

@@ -5,7 +5,7 @@ export default {
   path: "/about",
   redirect: "/about/index",
   meta: {
-    icon: "info",
+    icon: "ri:file-info-line",
     title: $t("menus.hsAbout"),
     rank: about
   },

src/router/modules/board.ts

@@ -6,7 +6,7 @@ export default {
   path: "/board",
   redirect: "/board/index",
   meta: {
-    icon: "artboard",
+    icon: "ri:artboard-line",
     title: $t("menus.hsboard"),
     rank: board
   },
@@ -17,8 +17,7 @@ export default {
       component: IFrame,
       meta: {
         title: $t("menus.hsboard"),
-        frameSrc: "https://songlh.top/paint-board/",
+        frameSrc: "https://songlh.top/paint-board/"
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     }
   ]

src/router/modules/components.ts

@@ -31,7 +31,15 @@ export default {
       name: "PureUpload",
       component: () => import("@/views/components/upload/index.vue"),
       meta: {
-        title: $t("menus.hsUpload"),
+        title: $t("menus.hsUpload")
+      }
+    },
+    {
+      path: "/components/check-card",
+      name: "CheckCard",
+      component: () => import("@/views/components/check-card.vue"),
+      meta: {
+        title: $t("menus.hsCheckCard"),
         extraIcon: "IF-pure-iconfont-new svg"
       }
     },

src/router/modules/editor.ts

@@ -5,7 +5,7 @@ export default {
   path: "/editor",
   redirect: "/editor/index",
   meta: {
-    icon: "edit",
+    icon: "ep:edit",
     title: $t("menus.hseditor"),
     rank: editor
   },

src/router/modules/error.ts

@@ -5,7 +5,7 @@ export default {
   path: "/error",
   redirect: "/error/403",
   meta: {
-    icon: "informationLine",
+    icon: "ri:information-line",
     // showLink: false,
     title: $t("menus.hsabnormal"),
     rank: error

src/router/modules/flowchart.ts

@@ -5,7 +5,7 @@ export default {
   path: "/flow-chart",
   redirect: "/flow-chart/index",
   meta: {
-    icon: "setUp",
+    icon: "ep:set-up",
     title: $t("menus.hsflowChart"),
     rank: flowchart
   },

src/router/modules/formdesign.ts

@@ -6,7 +6,7 @@ export default {
   path: "/form-design",
   redirect: "/form-design/index",
   meta: {
-    icon: "terminalWindowLine",
+    icon: "ri:terminal-window-line",
     title: $t("menus.hsFormDesign"),
     rank: formdesign
   },

src/router/modules/guide.ts

@@ -5,7 +5,7 @@ export default {
   path: "/guide",
   redirect: "/guide/index",
   meta: {
-    icon: "guide",
+    icon: "ep:guide",
     title: $t("menus.hsguide"),
     rank: guide
   },

src/router/modules/home.ts

@@ -9,7 +9,7 @@ export default {
   component: Layout,
   redirect: "/welcome",
   meta: {
-    icon: "homeFilled",
+    icon: "ep:home-filled",
     title: $t("menus.hshome"),
     rank: home
   },

src/router/modules/list.ts

@@ -5,7 +5,7 @@ export default {
   path: "/list",
   redirect: "/list/card",
   meta: {
-    icon: "listCheck",
+    icon: "ri:list-check",
     title: $t("menus.hsList"),
     rank: list
   },
@@ -15,7 +15,7 @@ export default {
       name: "ListCard",
       component: () => import("@/views/list/card/index.vue"),
       meta: {
-        icon: "card",
+        icon: "ri:bank-card-line",
         title: $t("menus.hsListCard"),
         showParent: true
       }

src/router/modules/nested.ts

@@ -6,7 +6,7 @@ export default {
   redirect: "/nested/menu1/menu1-1",
   meta: {
     title: $t("menus.hsmenus"),
-    icon: "histogram",
+    icon: "ep:histogram",
     rank: nested
   },
   children: [

src/router/modules/ppt.ts

@@ -5,7 +5,7 @@ export default {
   path: "/ppt",
   redirect: "/ppt/index",
   meta: {
-    icon: "ppt",
+    icon: "ri:file-ppt-2-line",
     title: "PPT",
     rank: ppt
   },

src/router/modules/result.ts

@@ -5,7 +5,7 @@ export default {
   path: "/result",
   redirect: "/result/success",
   meta: {
-    icon: "checkboxCircleLine",
+    icon: "ri:checkbox-circle-line",
     title: $t("menus.hsResult"),
     rank: result
   },

src/router/modules/table.ts

@@ -5,7 +5,7 @@ export default {
   path: "/pure-table",
   redirect: "/pure-table/index",
   meta: {
-    icon: "table",
+    icon: "ri:table-line",
     title: "pure-admin-table",
     rank: table
   },

src/style/dark.scss

@@ -45,6 +45,15 @@ html.dark {
     .arrow-right {
       border-left: 1px solid $border-style;
     }
+
+    .scroll-item {
+      .el-icon-close {
+        &:hover {
+          color: rgb(255 255 255 / 85%) !important;
+          background-color: rgb(255 255 255 / 12%);
+        }
+      }
+    }
   }
 
   /* 项目配置面板 */

src/style/element-plus.scss

@@ -102,7 +102,6 @@
 
 /* 克隆并自定义 ElMessage 样式，不会影响 ElMessage 原本样式，在 src/utils/message.ts 中调用自定义样式 ElMessage 方法即可，整体暗色风格在 src/style/dark.scss 文件进行了适配 */
 .pure-message {
-  padding: 10px 13px !important;
   background: #fff !important;
   border-width: 0 !important;
   box-shadow:
@@ -110,22 +109,13 @@
     0 6px 16px #00000014,
     0 9px 28px 8px #0000000d !important;
 
-  &.el-message.is-closable .el-message__content {
-    padding-right: 17px !important;
-  }
-
   & .el-message__content {
     color: #000000d9 !important;
     pointer-events: all !important;
     background-image: initial !important;
   }
 
-  & .el-message__icon {
-    margin-right: 8px !important;
-  }
-
   & .el-message__closeBtn {
-    right: 9px !important;
     border-radius: 4px;
     outline: none;
     transition:

src/style/login.css

@@ -10,6 +10,7 @@
 .login-container {
   width: 100vw;
   height: 100vh;
+  max-width: 100%;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   grid-gap: 18rem;

src/style/sidebar.scss

@@ -14,6 +14,11 @@
     }
   }
 
+  /* 修复 windows 下双滚动条问题 https://github.com/pure-admin/vue-pure-admin/pull/936#issuecomment-1968125992 */
+  .el-popper.pure-scrollbar {
+    overflow: hidden;
+  }
+
   /* popper menu 超出内容区可滚动 */
   .pure-scrollbar {
     max-height: calc(100vh - calc(50px * 2.5));
@@ -130,11 +135,9 @@
     }
 
     a {
-      display: inline-block;
       display: flex;
       flex-wrap: wrap;
       width: 100%;
-      padding-left: 10px;
     }
 
     .el-menu {
@@ -331,9 +334,18 @@
       margin-top: 0;
     }
 
+    /* 无子菜单时激活 border-bottom */
+    a > .is-active.submenu-title-noDropdown {
+      border-bottom: 2px solid var(--el-menu-active-color);
+    }
+
     .el-menu--popup {
       background-color: $subMenuBg !important;
 
+      a > .is-active.submenu-title-noDropdown {
+        border-bottom: none;
+      }
+
       .el-menu-item {
         color: $menuText;
         background-color: $subMenuBg;
@@ -348,12 +360,6 @@
       }
     }
 
-    /* 无子菜单时激活 border-bottom */
-    .router-link-exact-active > .submenu-title-noDropdown {
-      height: 60px;
-      border-bottom: 2px solid var(--el-menu-active-color);
-    }
-
     /* 子菜单中还有子菜单 */
     .el-menu .el-sub-menu__title {
       min-width: $sideBarWidth !important;

src/utils/localforage/index.ts

@@ -85,6 +85,22 @@ class StorageProxy implements ProxyStorage {
         });
     });
   }
+
+  /**
+   * @description 获取数据仓库中所有的key
+   */
+  public async keys() {
+    return new Promise<string[]>((resolve, reject) => {
+      this.storage
+        .keys()
+        .then(keys => {
+          resolve(keys);
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
 }
 
 /**

src/views/components/check-button.vue

@@ -94,10 +94,10 @@ watch(size, val =>
         <el-space wrap :size="40">
           <span style="font-size: 16px; font-weight: 800"> 可选按钮 </span>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
-            <el-radio label="disabled">禁用</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
           </el-radio-group>
         </el-space>
       </div>
@@ -108,9 +108,9 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-radio-button label="wait">等待中</el-radio-button>
+      <el-radio-button value="wait">等待中</el-radio-button>
-      <el-radio-button label="progress">进行中</el-radio-button>
+      <el-radio-button value="progress">进行中</el-radio-button>
-      <el-radio-button label="complete">已完成</el-radio-button>
+      <el-radio-button value="complete">已完成</el-radio-button>
     </el-radio-group>
     <el-divider />
 
@@ -120,9 +120,9 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-radio label="wait" border>等待中</el-radio>
+      <el-radio value="wait" border>等待中</el-radio>
-      <el-radio label="progress" border>进行中</el-radio>
+      <el-radio value="progress" border>进行中</el-radio>
-      <el-radio label="complete" border>已完成</el-radio>
+      <el-radio value="complete" border>已完成</el-radio>
     </el-radio-group>
     <el-divider />
 
@@ -132,19 +132,19 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-radio-button label="wait">
+      <el-radio-button value="wait">
         <span class="flex">
           <IconifyIconOnline icon="ri:progress-8-fill" class="mr-1" />
           等待中
         </span>
       </el-radio-button>
-      <el-radio-button label="progress">
+      <el-radio-button value="progress">
         <span class="flex">
           <IconifyIconOnline icon="ri:progress-6-line" class="mr-1" />
           进行中
         </span>
       </el-radio-button>
-      <el-radio-button label="complete">
+      <el-radio-button value="complete">
         <span class="flex">
           <IconifyIconOnline icon="ri:progress-8-line" class="mr-1" />
           已完成
@@ -159,9 +159,9 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-checkbox-button label="apple">苹果</el-checkbox-button>
+      <el-checkbox-button value="apple">苹果</el-checkbox-button>
-      <el-checkbox-button label="tomato">西红柿</el-checkbox-button>
+      <el-checkbox-button value="tomato">西红柿</el-checkbox-button>
-      <el-checkbox-button label="banana">香蕉</el-checkbox-button>
+      <el-checkbox-button value="banana">香蕉</el-checkbox-button>
     </el-checkbox-group>
     <el-divider />
 
@@ -171,9 +171,9 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-checkbox label="cucumber" border>黄瓜</el-checkbox>
+      <el-checkbox value="cucumber" border>黄瓜</el-checkbox>
-      <el-checkbox label="onion" border>洋葱</el-checkbox>
+      <el-checkbox value="onion" border>洋葱</el-checkbox>
-      <el-checkbox label="blueberry" border>蓝莓</el-checkbox>
+      <el-checkbox value="blueberry" border>蓝莓</el-checkbox>
     </el-checkbox-group>
     <el-divider />
 
@@ -184,13 +184,13 @@ watch(size, val =>
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     >
-      <el-checkbox-button label="tomato">
+      <el-checkbox-button value="tomato">
         <span class="flex">
           <IconifyIconOnline icon="streamline-emojis:tomato" class="mr-1" />
           番茄
         </span>
       </el-checkbox-button>
-      <el-checkbox-button label="watermelon">
+      <el-checkbox-button value="watermelon">
         <span class="flex">
           <IconifyIconOnline
             icon="streamline-emojis:watermelon-1"
@@ -199,7 +199,7 @@ watch(size, val =>
           西瓜
         </span>
       </el-checkbox-button>
-      <el-checkbox-button label="strawberry">
+      <el-checkbox-button value="strawberry">
         <span class="flex">
           <IconifyIconOnline
             icon="streamline-emojis:strawberry-1"

src/views/components/check-card.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { ref, watch } from "vue";
+// https://plus-pro-components.com/components/check-card-group.html
+import { PlusCheckCardGroup } from "plus-pro-components";
+import "plus-pro-components/es/components/check-card-group/style/css";
+
+defineOptions({
+  name: "CheckCard"
+});
+
+const size = ref("default");
+const dynamicSize = ref();
+const list = ref("0");
+const list1 = ref([]);
+
+const options = [
+  {
+    title: "标题一",
+    value: "0",
+    description: "坚持梦想，成就不凡的自己",
+    avatar:
+      "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+  },
+  {
+    title: "标题二",
+    value: "1",
+    description: "每一次努力，都是成长的契机",
+    avatar:
+      "https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg"
+  }
+];
+
+watch(size, val =>
+  val === "disabled"
+    ? (dynamicSize.value = "default")
+    : (dynamicSize.value = size.value)
+);
+</script>
+
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <div class="card-header">
+        <el-space wrap :size="40">
+          <el-link
+            v-tippy="{
+              content: '点击查看详细文档'
+            }"
+            href="https://plus-pro-components.com/components/check-card-group.html"
+            target="_blank"
+            style="font-size: 16px; font-weight: 800"
+          >
+            多选卡片组
+          </el-link>
+          <el-radio-group v-model="size" size="small">
+            <el-radio value="large">大尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
+          </el-radio-group>
+        </el-space>
+      </div>
+    </template>
+
+    <p class="mb-2 mt-4">单选</p>
+    <PlusCheckCardGroup
+      v-model="list"
+      :options="options"
+      :size="dynamicSize"
+      :disabled="size === 'disabled'"
+    />
+
+    <p class="mb-2 mt-4">多选</p>
+    <PlusCheckCardGroup
+      v-model="list1"
+      :options="options"
+      :size="dynamicSize"
+      :disabled="size === 'disabled'"
+      multiple
+    />
+  </el-card>
+</template>

src/views/components/collapse.vue

@@ -45,8 +45,8 @@ const handleChange = (val: string[]) => {
 
     <p class="mb-2">基础用法</p>
     <el-radio-group v-model="radio" class="mb-3">
-      <el-radio label="">可同时展开多个面板</el-radio>
+      <el-radio value="">可同时展开多个面板</el-radio>
-      <el-radio label="accordion">每次只能展开一个面板</el-radio>
+      <el-radio value="accordion">每次只能展开一个面板</el-radio>
     </el-radio-group>
     <el-button size="small" text bg class="ml-8 mb-1" @click="onClick">
       外部触发打开、关闭

src/views/components/color-picker.vue

@@ -57,10 +57,10 @@ function onClick() {
             颜色选择器
           </el-link>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
-            <el-radio label="disabled">禁用</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
           </el-radio-group>
         </el-space>
       </div>

src/views/components/date-picker.vue

@@ -144,10 +144,10 @@ watch(size, val =>
             日期选择器
           </el-link>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
-            <el-radio label="disabled">禁用</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
           </el-radio-group>
         </el-space>
       </div>
@@ -245,9 +245,9 @@ watch(size, val =>
       :disabled="size === 'disabled'"
       @change="value7 = ''"
     >
-      <el-radio label="">Date</el-radio>
+      <el-radio value="">Date</el-radio>
-      <el-radio label="YYYY-MM-DD">年月日</el-radio>
+      <el-radio value="YYYY-MM-DD">年月日</el-radio>
-      <el-radio label="x">时间戳</el-radio>
+      <el-radio value="x">时间戳</el-radio>
     </el-radio-group>
     <br />
     <el-space wrap>

src/views/components/datetime-picker.vue

@@ -170,10 +170,10 @@ watch(size, val =>
             日期时间选择器
           </el-link>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
-            <el-radio label="disabled">禁用</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
           </el-radio-group>
         </el-space>
       </div>
@@ -197,9 +197,9 @@ watch(size, val =>
       :disabled="size === 'disabled'"
       @change="value1 = ''"
     >
-      <el-radio label="">Date</el-radio>
+      <el-radio value="">Date</el-radio>
-      <el-radio label="YYYY-MM-DD HH:mm:ss">年月日 时分秒</el-radio>
+      <el-radio value="YYYY-MM-DD HH:mm:ss">年月日 时分秒</el-radio>
-      <el-radio label="x">时间戳</el-radio>
+      <el-radio value="x">时间戳</el-radio>
     </el-radio-group>
     <br />
     <el-space wrap>

src/views/components/el-button.vue

@@ -68,10 +68,10 @@ watch(size, val =>
             Button 按钮
           </el-link>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
-            <el-radio label="disabled">禁用</el-radio>
+            <el-radio value="disabled">禁用</el-radio>
           </el-radio-group>
         </el-space>
       </div>
@@ -79,13 +79,13 @@ watch(size, val =>
 
     <p class="mb-2">基础按钮</p>
     <el-radio-group v-model="baseRadio" class="mb-3">
-      <el-radio label="default" />
+      <el-radio label="default" value="default" />
-      <el-radio label="plain" />
+      <el-radio label="plain" value="plain" />
-      <el-radio label="round" />
+      <el-radio label="round" value="round" />
-      <el-radio label="circle" />
+      <el-radio label="circle" value="circle" />
-      <el-radio label="link" />
+      <el-radio label="link" value="link" />
-      <el-radio label="text" />
+      <el-radio label="text" value="text" />
-      <el-radio label="text-bg" />
+      <el-radio label="text-bg" value="text-bg" />
     </el-radio-group>
     <br />
     <el-space wrap>

src/views/components/segmented.vue

@@ -86,7 +86,7 @@ const optionsIcon: Array<OptionsType> = [
   },
   {
     label: "周三",
-    icon: "terminalWindowLine"
+    icon: "ri:terminal-window-line"
   },
   {
     label: "周四"
@@ -103,7 +103,7 @@ const optionsOnlyIcon: Array<OptionsType> = [
     icon: HomeFilled
   },
   {
-    icon: "terminalWindowLine"
+    icon: "ri:terminal-window-line"
   },
   {
     icon: "streamline-emojis:cow-face"
@@ -131,7 +131,7 @@ const optionsLabel: Array<OptionsType> = [
   {
     label: () => (
       <div>
-        {h(useRenderIcon("terminalWindowLine"), {
+        {h(useRenderIcon("ri:terminal-window-line"), {
           class: "m-auto mt-1 w-[18px] h-[18px]"
         })}
         <p>周二</p>

src/views/components/tag.vue

@@ -79,9 +79,9 @@ const handleInputConfirm = () => {
             Tag 标签
           </el-link>
           <el-radio-group v-model="size" size="small">
-            <el-radio label="large">大尺寸</el-radio>
+            <el-radio value="large">大尺寸</el-radio>
-            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio value="default">默认尺寸</el-radio>
-            <el-radio label="small">小尺寸</el-radio>
+            <el-radio value="small">小尺寸</el-radio>
           </el-radio-group>
         </el-space>
       </div>
@@ -89,9 +89,9 @@ const handleInputConfirm = () => {
 
     <p class="mb-2">基础按钮</p>
     <el-radio-group v-model="baseTag" class="mb-3">
-      <el-radio label="dark" />
+      <el-radio label="dark" value="dark" />
-      <el-radio label="light" />
+      <el-radio label="light" value="light" />
-      <el-radio label="plain" />
+      <el-radio label="plain" value="plain" />
     </el-radio-group>
     <br />
     <el-space class="mb-3">

src/views/components/time-picker.vue

@@ -69,10 +69,10 @@ const endTime = ref("");
               时间选择器
             </el-link>
             <el-radio-group v-model="size" size="small">
-              <el-radio label="large">大尺寸</el-radio>
+              <el-radio value="large">大尺寸</el-radio>
-              <el-radio label="default">默认尺寸</el-radio>
+              <el-radio value="default">默认尺寸</el-radio>
-              <el-radio label="small">小尺寸</el-radio>
+              <el-radio value="small">小尺寸</el-radio>
-              <el-radio label="disabled">禁用</el-radio>
+              <el-radio value="disabled">禁用</el-radio>
             </el-radio-group>
           </el-space>
         </div>

src/views/list/card/components/DialogForm.vue

@@ -102,8 +102,8 @@ const rules = {
       </el-form-item>
       <el-form-item label="产品状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio label="0">已停用</el-radio>
+          <el-radio value="0">已停用</el-radio>
-          <el-radio label="1">已启用</el-radio>
+          <el-radio value="1">已启用</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="产品描述" prop="description">

src/views/list/card/index.vue

@@ -110,7 +110,7 @@ const handleManageProduct = product => {
           <el-icon class="el-input__icon">
             <IconifyIconOffline
               v-show="searchValue.length === 0"
-              icon="search"
+              icon="ri:search-line"
             />
           </el-icon>
         </template>

src/views/pure-table/base/layout.vue

@@ -25,8 +25,8 @@ const columns: TableColumnList = [
 <template>
   <div>
     <el-radio-group v-model="tableLayout">
-      <el-radio-button label="fixed" />
+      <el-radio-button label="fixed" value="fixed" />
-      <el-radio-button label="auto" />
+      <el-radio-button label="auto" value="auto" />
     </el-radio-group>
 
     <pure-table

src/views/pure-table/high/page/index.vue

@@ -23,36 +23,36 @@ const {
     <el-space class="float-right mb-4">
       <p class="text-sm">多选：</p>
       <el-radio-group v-model="select" size="small">
-        <el-radio-button label="yes">是</el-radio-button>
+        <el-radio-button value="yes">是</el-radio-button>
-        <el-radio-button label="no">否</el-radio-button>
+        <el-radio-button value="no">否</el-radio-button>
       </el-radio-group>
       <el-divider direction="vertical" />
       <p class="text-sm">动态列：</p>
       <el-radio-group v-model="hideVal" size="small">
-        <el-radio-button label="nohide">不隐藏</el-radio-button>
+        <el-radio-button value="nohide">不隐藏</el-radio-button>
-        <el-radio-button label="hideDate">隐藏日期</el-radio-button>
+        <el-radio-button value="hideDate">隐藏日期</el-radio-button>
-        <el-radio-button label="hideName">隐藏姓名</el-radio-button>
+        <el-radio-button value="hideName">隐藏姓名</el-radio-button>
-        <el-radio-button label="hideAddress">隐藏地址</el-radio-button>
+        <el-radio-button value="hideAddress">隐藏地址</el-radio-button>
       </el-radio-group>
       <el-divider direction="vertical" />
       <p class="text-sm">表格大小：</p>
       <el-radio-group v-model="tableSize" size="small">
-        <el-radio-button label="large">large</el-radio-button>
+        <el-radio-button value="large">large</el-radio-button>
-        <el-radio-button label="default">default</el-radio-button>
+        <el-radio-button value="default">default</el-radio-button>
-        <el-radio-button label="small">small</el-radio-button>
+        <el-radio-button value="small">small</el-radio-button>
       </el-radio-group>
       <el-divider direction="vertical" />
       <p class="text-sm">分页大小：</p>
       <el-radio-group v-model="paginationSmall" size="small" @change="onChange">
-        <el-radio-button :label="false">no small</el-radio-button>
+        <el-radio-button :value="false">no small</el-radio-button>
-        <el-radio-button :label="true">small</el-radio-button>
+        <el-radio-button :value="true">small</el-radio-button>
       </el-radio-group>
       <el-divider direction="vertical" />
       <p class="text-sm">分页的对齐方式：</p>
       <el-radio-group v-model="paginationAlign" size="small">
-        <el-radio-button label="right">right</el-radio-button>
+        <el-radio-button value="right">right</el-radio-button>
-        <el-radio-button label="center">center</el-radio-button>
+        <el-radio-button value="center">center</el-radio-button>
-        <el-radio-button label="left">left</el-radio-button>
+        <el-radio-button value="left">left</el-radio-button>
       </el-radio-group>
     </el-space>
 

src/views/pure-table/high/table-select/index.vue

@@ -9,8 +9,8 @@ const model = ref("radio");
 <template>
   <el-space>
     <el-radio-group v-model="model">
-      <el-radio-button label="radio">单选</el-radio-button>
+      <el-radio-button value="radio">单选</el-radio-button>
-      <el-radio-button label="multiple">多选</el-radio-button>
+      <el-radio-button value="multiple">多选</el-radio-button>
     </el-radio-group>
     <el-divider direction="vertical" />
     <component

src/views/pure-table/high/table-select/multiple/index.vue

@@ -91,7 +91,7 @@ const {
           @selection-change="handleSelectionChange"
         />
         <el-button
-          class="absolute bottom-[17px]"
+          class="absolute bottom-[25px] left-[20px]"
           type="primary"
           size="small"
           text

src/views/system/dept/index.vue

@@ -58,7 +58,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/menu/index.vue

@@ -48,7 +48,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/role/index.vue

@@ -74,7 +74,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/user/index.vue

@@ -95,7 +95,7 @@ const {
         <el-form-item>
           <el-button
             type="primary"
-            :icon="useRenderIcon('search')"
+            :icon="useRenderIcon('ri:search-line')"
             :loading="loading"
             @click="onSearch"
           >

src/views/system/user/tree.vue

@@ -110,7 +110,7 @@ defineExpose({ onTreeReset });
           <el-icon class="el-input__icon">
             <IconifyIconOffline
               v-show="searchValue.length === 0"
-              icon="search"
+              icon="ri:search-line"
             />
           </el-icon>
         </template>

src/views/welcome/components/table/index.vue

@@ -36,7 +36,7 @@ const { loading, columns, dataList, pagination, Empty, onCurrentChange } =
         circle
         size="small"
         :title="`查看序号为${row.id}的详情`"
-        :icon="useRenderIcon('search')"
+        :icon="useRenderIcon('ri:search-line')"
       />
     </template>
   </pure-table>

types/global.d.ts

@@ -96,6 +96,7 @@ declare global {
     CachingAsyncRoutes?: boolean;
     TooltipEffect?: Effect;
     ResponsiveStorageNameSpace?: string;
+    MenuSearchHistory?: number;
     MapConfigure?: {
       amapKey?: string;
       options: {
@@ -131,6 +132,7 @@ declare global {
     overallStyle?: string;
     showLogo?: boolean;
     showModel?: string;
+    menuSearchHistory?: number;
     mapConfigure?: {
       amapKey?: string;
       options: {