chore: update deps

* fix(slot): 优化部分slot写法,减少手动判断

* fix(slot): 优化部分slot写法,减少手动判断

* feat(guide): 添加操作指引

.vscode/settings.json

@@ -19,6 +19,5 @@
     "markdown",
     "json",
     "jsonc"
-  ],
+  ]
-  "common-intellisense.ui": ["naiveUi2"]
 }

README.md

@@ -7,6 +7,10 @@
   <a href="./LICENSE"><img alt="MIT License" src="https://badgen.net/github/license/zclzone/vue-naive-admin"/></a>
 </p>
 
+---
+
+<a href="https://hellogithub.com/repository/54f19ba1f9ae4238b3cbd111f3c428b0" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=54f19ba1f9ae4238b3cbd111f3c428b0&claim_uid=jXGayRdJZScqMNr" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
 ## 简介
 
 Vue Naive Admin 是一款极简风格的后台管理模板，包含前后端解决方案，前端使用 Vite + Vue3 + Pinia + Unocss，后端使用 Nestjs + TypeOrm + MySql，简单易用，赏心悦目，历经十几次重构和细节打磨，诚意满满！！

package.json

@@ -13,42 +13,43 @@
   },
   "dependencies": {
     "@arco-design/color": "^0.4.0",
-    "@vueuse/core": "^11.1.0",
+    "@vueuse/core": "^13.1.0",
-    "axios": "^1.7.7",
+    "axios": "^1.8.4",
     "dayjs": "^1.11.13",
-    "echarts": "^5.5.1",
+    "echarts": "^5.6.0",
     "lodash-es": "^4.17.21",
-    "naive-ui": "^2.40.1",
+    "naive-ui": "^2.41.0",
-    "pinia": "^2.2.4",
+    "pinia": "^3.0.2",
-    "pinia-plugin-persistedstate": "^4.1.1",
+    "pinia-plugin-persistedstate": "^4.2.0",
-    "vue": "^3.5.12",
+    "vue": "^3.5.13",
     "vue-echarts": "^7.0.3",
-    "vue-router": "^4.4.5",
+    "vue-router": "^4.5.0",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.8.0",
+    "@antfu/eslint-config": "^4.12.0",
-    "@iconify/json": "^2.2.262",
+    "@iconify/json": "^2.2.331",
-    "@unocss/eslint-config": "^0.63.6",
+    "@unocss/eslint-config": "^66.0.0",
-    "@unocss/eslint-plugin": "^0.63.6",
+    "@unocss/eslint-plugin": "^66.0.0",
-    "@unocss/preset-rem-to-px": "^0.63.6",
+    "@unocss/preset-rem-to-px": "^66.0.0",
-    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitejs/plugin-vue": "^5.2.3",
-    "@vitejs/plugin-vue-jsx": "^4.0.1",
+    "@vitejs/plugin-vue-jsx": "^4.1.2",
-    "eslint": "^9.13.0",
+    "eslint": "^9.25.1",
-    "eslint-plugin-format": "^0.1.2",
+    "eslint-plugin-format": "^1.0.1",
     "esno": "^4.8.0",
-    "fs-extra": "^11.2.0",
+    "fs-extra": "^11.3.0",
-    "glob": "^11.0.0",
+    "glob": "^11.0.2",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.5.1",
-    "rollup-plugin-visualizer": "^5.12.0",
+    "rollup-plugin-visualizer": "^5.14.0",
-    "simple-git-hooks": "^2.11.1",
+    "simple-git-hooks": "^2.13.0",
-    "taze": "^0.17.2",
+    "taze": "^19.0.4",
-    "unocss": "^0.63.6",
+    "unocss": "^66.0.0",
-    "unplugin-auto-import": "^0.18.3",
+    "unplugin-auto-import": "^19.1.2",
-    "unplugin-vue-components": "^0.27.4",
+    "unplugin-vue-components": "^28.5.0",
-    "vite": "^5.4.9",
+    "vite": "^6.3.3",
     "vite-plugin-router-warn": "^1.0.0",
-    "vite-plugin-vue-devtools": "^7.5.2"
+    "vite-plugin-vue-devtools": "^7.7.5",
+    "vue3-intro-step": "^1.0.5"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"

src/components/common/LayoutSetting.vue

@@ -10,7 +10,7 @@
   <div>
     <n-tooltip trigger="hover" placement="left">
       <template #trigger>
-        <div class="f-c-c rounded-4 bg-primary p-8" @click="modalRef.open()">
+        <div id="layout-setting" class="f-c-c rounded-4 bg-primary p-8" @click="modalRef.open()">
           <i class="i-fe:settings cursor-pointer bg-white text-20" />
         </div>
       </template>

src/components/common/ThemeSetting.vue

@@ -1,16 +1,19 @@
 <template>
-  <n-tooltip trigger="hover">
+  <div class="f-c-c">
-    <template #trigger>
+    <n-tooltip trigger="hover" placement="bottom">
-      <n-color-picker
+      <template #trigger>
-        class="mr-16 h-32 w-32"
+        <n-color-picker
-        :value="appStore.primaryColor"
+          id="theme-setting"
-        :swatches="primaryColors"
+          class="h-32 w-32"
-        :on-update:value="(v) => appStore.setPrimaryColor(v)"
+          :value="appStore.primaryColor"
-        :render-label="() => ''"
+          :swatches="primaryColors"
-      />
+          :on-update:value="(v) => appStore.setPrimaryColor(v)"
-    </template>
+          :render-label="() => ''"
-    设置主题色
+        />
-  </n-tooltip>
+      </template>
+      设置主题色
+    </n-tooltip>
+  </div>
 </template>
 
 <script setup>

src/components/common/ToggleTheme.vue

@@ -1,5 +1,6 @@
 <template>
   <i
+    id="toggleTheme"
     class="mr-16 cursor-pointer"
     :class="isDark ? 'i-fe:moon' : 'i-fe:sun'"
     @click="toggleDark"

src/composables/useCrud.js

@@ -6,6 +6,7 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
+import { cloneDeep } from 'lodash-es'
 import { useForm, useModal } from '.'
 
 const ACTIONS = {
@@ -21,7 +22,7 @@ export function useCrud({ name, initForm = {}, doCreate, doDelete, doUpdate, ref
 
   /** 新增 */
   function handleAdd(row = {}, title) {
-    handleOpen({ action: 'add', title, row: { ...initForm, ...row } })
+    handleOpen({ action: 'add', title, row: Object.assign({}, cloneDeep(initForm), cloneDeep(row)) })
   }
 
   /** 修改 */

src/composables/useForm.js

@@ -6,9 +6,11 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
+import { cloneDeep } from 'lodash-es'
+
 export function useForm(initFormData = {}) {
   const formRef = ref(null)
-  const formModel = ref({ ...initFormData })
+  const formModel = ref(cloneDeep(initFormData))
   const rules = {
     required: {
       required: true,

src/directives/index.js

@@ -7,6 +7,7 @@
  **********************************/
 
 import { router } from '@/router'
+import { withDirectives } from 'vue'
 
 const permission = {
   mounted(el, binding) {
@@ -21,3 +22,17 @@ const permission = {
 export function setupDirectives(app) {
   app.directive('permission', permission)
 }
+
+/**
+ * 用于h函数使用自定义权限指令
+ *
+ * @param {*} vnode 虚拟节点
+ * @param {*} code 权限码
+ * @returns 返回一个包含权限指令的vnode
+ *
+ * 使用示例：withPermission(h('button', {class: 'text-red-500'}, '删除'), 'user:delete')
+ *
+ */
+export function withPermission(vnode, code) {
+  return withDirectives(vnode, [[permission, code]])
+}

src/layouts/components/BeginnerGuide.vue

@@ -0,0 +1,120 @@
+<template>
+  <n-tooltip trigger="hover">
+    <template #trigger>
+      <i
+        class="i-fe:beginner mr-16 cursor-pointer text-20"
+        @click="show = true"
+      />
+    </template>
+    操作指引
+  </n-tooltip>
+
+  <Vue3IntroStep
+    ref="myIntroStep"
+    v-model:show="show"
+    :config="config"
+  >
+    <template #prev="{ tipItem, index }">
+      <NButton class="mr-12" type="primary" color="#fff" text-color="#fff" ghost round size="small" @click="prev(tipItem, index)">
+        上一步
+      </NButton>
+    </template>
+    <template #next="{ tipItem }">
+      <NButton class="mr-12" type="primary" color="#fff" text-color="#fff" ghost round size="small" @click="next(tipItem)">
+        下一步
+      </NButton>
+    </template>
+
+    <template #skip>
+      <NButton type="primary" color="#fff" text-color="#fff" ghost round size="small" @click="skip">
+        跳过
+      </NButton>
+    </template>
+
+    <template #done>
+      <NButton type="primary" color="#fff" text-color="#fff" ghost round size="small" @click="done">
+        完成
+      </NButton>
+    </template>
+  </Vue3IntroStep>
+</template>
+
+<script setup>
+import Vue3IntroStep from 'vue3-intro-step'
+
+const myIntroStep = shallowRef(null)
+const show = shallowRef(false)
+const config = {
+  backgroundOpacity: 0.8,
+  titleStyle: {
+    textAlign: 'left',
+    fontSize: '18px',
+  },
+  contentStyle: {
+    textAlign: 'left',
+    fontSize: '14px',
+  },
+  tips: [
+    {
+      el: '#toggleTheme',
+      tipPosition: 'bottom',
+      title: '切换系统主题',
+      content: '一键开启护眼模式',
+    },
+    {
+      el: '#fullscreen',
+      tipPosition: 'bottom',
+      title: '全屏/退出全屏',
+      content: '一键开启全屏',
+    },
+    {
+      el: '#theme-setting',
+      tipPosition: 'bottom',
+      title: '设置主题色',
+      content: '调整为你喜欢的主题色',
+    },
+    {
+      el: '#user-dropdown',
+      tipPosition: 'bottom',
+      title: '个人中心',
+      content: '查看个人资料和退出系统',
+    },
+    {
+      el: '#menu-collapse',
+      tipPosition: 'bottom',
+      title: '展开/收起菜单',
+      content: '一键展开/收起菜单',
+    },
+    {
+      el: '#top-tab',
+      tipPosition: 'bottom',
+      title: '标签栏',
+      content: '鼠标滚轮滑动可调整至最佳视野',
+    },
+    {
+      el: '#layout-setting',
+      tipPosition: 'left',
+      title: '调整系统布局',
+      content: '将系统布局调整为你喜欢的样子',
+    },
+  ],
+}
+
+function skip() {
+  show.value = false
+}
+
+function done() {
+  show.value = false
+}
+
+function next() {
+  // tipItem当前的提示项信息
+  // 调用vue3-intro-step的next方法 手动触发下一步
+  myIntroStep.value.next()
+}
+function prev() {
+  // 调用vue3-intro-step的prev方法 手动触发上一步
+  myIntroStep.value.prev()
+}
+</script>

src/layouts/components/Fullscreen.vue

@@ -1,5 +1,6 @@
 <template>
   <i
+    id="fullscreen"
     class="mr-16 cursor-pointer"
     :class="isFullscreen ? 'i-fe:minimize' : 'i-fe:maximize'"
     @click="toggle"

src/layouts/components/MenuCollapse.vue

@@ -8,6 +8,7 @@
 
 <template>
   <div
+    id="menu-collapse"
     class="f-c-c cursor-pointer rounded-4 p-6 text-22 transition-all-300 auto-bg-hover"
     @click="appStore.switchCollapsed"
   >

src/layouts/components/SideMenu.vue

@@ -54,6 +54,7 @@ function handleMenuSelect(key, item) {
     })
   }
   else {
+    if(!item.path) return
     router.push(item.path)
   }
 }

src/layouts/components/UserAvatar.vue

@@ -8,7 +8,7 @@
 
 <template>
   <n-dropdown :options="options" @select="handleSelect">
-    <div class="flex cursor-pointer items-center">
+    <div id="user-dropdown" class="flex cursor-pointer items-center">
       <n-avatar round :size="36" :src="userStore.avatar" />
       <div v-if="userStore.userInfo" class="ml-12 flex-col flex-shrink-0 items-center">
         <span class="text-14">{{ userStore.nickName ?? userStore.username }}</span>

src/layouts/components/index.js

@@ -1,3 +1,4 @@
+export { default as BeginnerGuide } from './BeginnerGuide.vue'
 export { default as BreadCrumb } from './BreadCrumb.vue'
 export { default as Fullscreen } from './Fullscreen.vue'
 export { default as MenuCollapse } from './MenuCollapse.vue'

src/layouts/components/tab/index.vue

@@ -7,7 +7,7 @@
  --------------------------------->
 
 <template>
-  <div>
+  <div id="top-tab">
     <n-tabs
       :value="tabStore.activeTab"
       :closable="tabStore.tabs.length > 1"

src/layouts/full/header/index.vue

@@ -13,6 +13,8 @@
     <BreadCrumb />
 
     <div class="ml-auto flex flex-shrink-0 items-center px-12 text-18">
+      <BeginnerGuide />
+
       <ToggleTheme />
 
       <Fullscreen />
@@ -35,7 +37,7 @@
 
 <script setup>
 import { ToggleTheme } from '@/components'
-import { BreadCrumb, Fullscreen, MenuCollapse, UserAvatar } from '@/layouts/components'
+import { BeginnerGuide, BreadCrumb, Fullscreen, MenuCollapse, UserAvatar } from '@/layouts/components'
 
 function handleLinkClick(link) {
   window.open(link)

src/layouts/normal/header/index.vue

@@ -15,6 +15,8 @@
     <span class="mx-6 opacity-20">|</span>
 
     <div class="flex flex-shrink-0 items-center px-12 text-18">
+      <BeginnerGuide />
+
       <ToggleTheme />
 
       <Fullscreen />
@@ -37,7 +39,7 @@
 
 <script setup>
 import { ToggleTheme } from '@/components'
-import { AppTab, Fullscreen, MenuCollapse, UserAvatar } from '@/layouts/components'
+import { AppTab, BeginnerGuide, Fullscreen, MenuCollapse, UserAvatar } from '@/layouts/components'
 
 function handleLinkClick(link) {
   window.open(link)

src/store/modules/app.js

@@ -50,7 +50,7 @@ export const useAppStore = defineStore('app', {
     },
   },
   persist: {
-    paths: ['collapsed', 'layout', 'primaryColor', 'naiveThemeOverrides'],
+    pick: ['collapsed', 'layout', 'primaryColor', 'naiveThemeOverrides'],
     storage: sessionStorage,
   },
 })

src/store/modules/tab.js

@@ -88,7 +88,7 @@ export const useTabStore = defineStore('tab', {
     },
   },
   persist: {
-    paths: ['tabs'],
+    pick: ['tabs'],
     storage: sessionStorage,
   },
 })

src/utils/storage/index.js

@@ -11,14 +11,14 @@ import { createStorage } from './storage'
 
 const prefixKey = 'vue-naive-admin_'
 
-export const createLocalStorage = function (option = {}) {
+export function createLocalStorage(option = {}) {
   return createStorage({
     prefixKey: option.prefixKey || '',
     storage: localStorage,
   })
 }
 
-export const createSessionStorage = function (option = {}) {
+export function createSessionStorage(option = {}) {
   return createStorage({
     prefixKey: option.prefixKey || '',
     storage: sessionStorage,

src/views/base/index.vue

@@ -98,7 +98,7 @@
 <script setup>
 import { sleep } from '@/utils'
 
-const handleDelete = function () {
+function handleDelete() {
   $dialog.confirm({
     content: '确认删除？',
     confirm() {

src/views/home/index.vue

@@ -33,7 +33,6 @@
             class="text-14 text-primary text-highlight hover:underline hover:opacity-80"
             href="https://isme.top"
             target="_blank"
-            @click.prevent="message?.info('官网正在火速开发中...')"
           >
             isme.top
           </a>
@@ -284,6 +283,4 @@ const skillOption = {
     },
   ],
 }
-
-const message = $message
 </script>

src/views/pms/role/role-user.vue

@@ -163,31 +163,31 @@ const columns = [
     render(row) {
       return row.roles?.some(item => item.id === +route.params.roleId)
         ? h(
-          NButton,
+            NButton,
-          {
+            {
-            size: 'small',
+              size: 'small',
-            type: 'error',
+              type: 'error',
-            secondary: true,
+              secondary: true,
-            onClick: () => handleBatchRemove([row.id]),
+              onClick: () => handleBatchRemove([row.id]),
-          },
+            },
-          {
+            {
-            default: () => '取消授权',
+              default: () => '取消授权',
-            icon: () => h('i', { class: 'i-material-symbols:delete-outline text-14' }),
+              icon: () => h('i', { class: 'i-material-symbols:delete-outline text-14' }),
-          },
+            },
-        )
+          )
         : h(
-          NButton,
+            NButton,
-          {
+            {
-            size: 'small',
+              size: 'small',
-            type: 'primary',
+              type: 'primary',
-            secondary: true,
+              secondary: true,
-            onClick: () => handleBatchAdd([row.id]),
+              onClick: () => handleBatchAdd([row.id]),
-          },
+            },
-          {
+            {
-            default: () => '授权',
+              default: () => '授权',
-            icon: () => h('i', { class: 'i-line-md:confirm-circle text-14' }),
+              icon: () => h('i', { class: 'i-line-md:confirm-circle text-14' }),
-          },
+            },
-        )
+          )
     },
   },
 ]

src/views/pms/user/index.vue

@@ -77,7 +77,7 @@
             trigger: ['input', 'blur'],
           }"
         >
-          <n-input v-model:value="modalForm.password" />
+          <n-input v-model:value="modalForm.password" type="password" show-password-on="mousedown" />
         </n-form-item>
 
         <n-form-item v-if="['add', 'setRole'].includes(modalAction)" label="角色" path="roleIds">
@@ -112,6 +112,7 @@
 <script setup>
 import { MeCrud, MeModal, MeQueryItem } from '@/components'
 import { useCrud } from '@/composables'
+import { withPermission } from '@/directives'
 import { formatDateTime } from '@/utils'
 import { NAvatar, NButton, NSwitch, NTag } from 'naive-ui'
 import api from './api'
@@ -225,11 +226,23 @@ const columns = [
     hideInExcel: true,
     render(row) {
       return [
+        withPermission(
+          h(NButton, {
+            size: 'small',
+            type: 'primary',
+            secondary: true,
+          }, {
+            default: () => '超管专属',
+            icon: () => h('i', { class: 'i-carbon:user-role text-14' }),
+          }),
+          'SuperAdmin',
+        ),
         h(
           NButton,
           {
             size: 'small',
             type: 'primary',
+            class: 'ml-12px',
             secondary: true,
             onClick: () => handleOpenRolesSet(row),
           },

src/views/profile/index.vue

@@ -73,10 +73,10 @@
         require-mark-placement="left"
       >
         <n-form-item label="原密码" path="oldPassword" :rule="required">
-          <n-input v-model:value="pwdForm.oldPassword" type="password" placeholder="请输入原密码" />
+          <n-input v-model:value="pwdForm.oldPassword" type="password" placeholder="请输入原密码" show-password-on="mousedown" />
         </n-form-item>
         <n-form-item label="新密码" path="newPassword" :rule="required">
-          <n-input v-model:value="pwdForm.newPassword" type="password" placeholder="请输入新密码" />
+          <n-input v-model:value="pwdForm.newPassword" type="password" placeholder="请输入新密码" show-password-on="mousedown" />
         </n-form-item>
       </n-form>
     </MeModal>

uno.config.js

@@ -8,13 +8,13 @@
 
 import { FileSystemIconLoader } from '@iconify/utils/lib/loader/node-loaders'
 import presetRemToPx from '@unocss/preset-rem-to-px'
-import { defineConfig, presetAttributify, presetIcons, presetUno } from 'unocss'
+import { defineConfig, presetAttributify, presetIcons, presetWind3 } from 'unocss'
 import { getIcons } from './build/index.js'
 
 const icons = getIcons()
 export default defineConfig({
   presets: [
-    presetUno(),
+    presetWind3(),
     presetAttributify(),
     presetIcons({
       warn: true,