Merge 2ff0befdd4 into 70c2098d2e

.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = '/'
 
 # Axios 基础路径
 # VITE_AXIOS_BASE_URL = '/api'  # 用于代理
-VITE_AXIOS_BASE_URL = 'https://m1.apifoxmock.com/m1/3776410-3408296-default'  # apifox云端mock
+VITE_AXIOS_BASE_URL = 'https://mock.apipark.cn/m1/3776410-0-default'  # apifox云端mock
 
 # 代理配置-target
 VITE_PROXY_TARGET = 'http://localhost:8085'

.env.production

@@ -4,5 +4,7 @@ VITE_USE_HASH = 'false'
 # 资源公共路径,需要以 /开头和结尾
 VITE_PUBLIC_PATH = '/'
 
-# VITE_AXIOS_BASE_URL = '/api'  # 用于代理
+VITE_AXIOS_BASE_URL = '/api'  # 用于代理
-VITE_AXIOS_BASE_URL = 'https://m1.apifoxmock.com/m1/3776410-3408296-default'  # apifox云端mock
+
+# 代理配置-target
+VITE_PROXY_TARGET = 'http://localhost:8085'

.vscode/extensions.json

@@ -7,6 +7,6 @@
     "esbenp.prettier-vscode",
     "sdras.vue-vscode-snippets",
     "mikestead.dotenv",
-    "tu6ge.naive-ui-intelligence"
+    "simonhe.common-intellisense"
   ]
 }

README.md

@@ -5,17 +5,8 @@
 </p>
 <p align="center">
   <a href="./LICENSE"><img alt="MIT License" src="https://badgen.net/github/license/zclzone/vue-naive-admin"/></a>
-  <a href="https://gitcode.com/zclzone/vue-naive-admin"><img alt="GitCode" src="https://gitcode.com/zclzone/vue-naive-admin/star/badge.svg
-"/></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>
-
-> [!Tip]
-> 我们提供Web（PC+H5+小程序）的技术支持服务及定制开发，不限前后端，详细需求可联系作者，微信: isme-admin，邮箱: zclzone@outlook.com
-
 ## 简介
 
 Vue Naive Admin 是一款极简风格的后台管理模板，包含前后端解决方案，前端使用 Vite + Vue3 + Pinia + Unocss，后端使用 Nestjs + TypeOrm + MySql，简单易用，赏心悦目，历经十几次重构和细节打磨，诚意满满！！
@@ -60,7 +51,6 @@ Vue Naive Admin 提供一套后端代码，技术栈使用 Nestjs + TypeOrm + My
 
 - 源码-github: [isme-nest-serve | github](https://github.com/zclzone/isme-nest-serve)
 - 源码-gitee: [isme-nest-serve | gitee](https://gitee.com/isme-admin/isme-nest-serve)
-- 源码-gitcode: [isme-nest-serve | gitcode](https://gitcode.com/zclzone/isme-nest-serve)
 
 ## 文档
 

jsconfig.json

@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "jsx": "preserve",
     "baseUrl": "./",
     "moduleResolution": "node",
     "paths": {
       "@/*": ["src/*"],
       "~/*": ["./*"]
     },
+    "jsx": "preserve",
     "allowJs": true
   },
   "exclude": ["node_modules", "dist"]

package.json

@@ -13,46 +13,46 @@
   },
   "dependencies": {
     "@arco-design/color": "^0.4.0",
-    "@vueuse/core": "^14.1.0",
+    "@vueuse/core": "^12.7.0",
-    "axios": "^1.13.2",
+    "axios": "^1.8.1",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.13",
-    "echarts": "^6.0.0",
+    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.22",
+    "lodash-es": "^4.17.21",
-    "naive-ui": "^2.43.2",
+    "naive-ui": "^2.41.0",
-    "pinia": "^3.0.4",
+    "pinia": "^3.0.1",
-    "pinia-plugin-persistedstate": "^4.7.1",
+    "pinia-plugin-persistedstate": "^4.2.0",
-    "vue": "^3.5.27",
+    "vue": "^3.5.13",
-    "vue-echarts": "^8.0.1",
+    "vue-echarts": "^7.0.3",
-    "vue-router": "^4.6.4",
+    "vue-router": "^4.5.0",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.0.1",
+    "@antfu/eslint-config": "^4.3.0",
-    "@iconify/json": "^2.2.430",
+    "@iconify/json": "^2.2.311",
-    "@unocss/eslint-config": "^66.6.0",
+    "@unocss/eslint-config": "^66.0.0",
-    "@unocss/eslint-plugin": "^66.6.0",
+    "@unocss/eslint-plugin": "^66.0.0",
-    "@unocss/preset-rem-to-px": "^66.6.0",
+    "@unocss/preset-rem-to-px": "^66.0.0",
-    "@vitejs/plugin-vue": "^6.0.3",
+    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitejs/plugin-vue-jsx": "^5.1.3",
+    "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "eslint": "^9.39.2",
+    "eslint": "^9.21.0",
-    "eslint-plugin-format": "^1.3.1",
+    "eslint-plugin-format": "^1.0.1",
     "esno": "^4.8.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.0",
-    "glob": "^13.0.0",
+    "glob": "^11.0.1",
-    "lint-staged": "^16.2.7",
+    "lint-staged": "^15.4.3",
-    "rollup-plugin-visualizer": "^6.0.5",
+    "rollup-plugin-visualizer": "^5.14.0",
-    "simple-git-hooks": "^2.13.1",
+    "simple-git-hooks": "^2.11.1",
-    "taze": "^19.9.2",
+    "taze": "^18.6.0",
-    "unocss": "^66.6.0",
+    "unocss": "^66.0.0",
-    "unplugin-auto-import": "^21.0.0",
+    "unplugin-auto-import": "^19.1.1",
-    "unplugin-vue-components": "^31.0.0",
+    "unplugin-vue-components": "^28.4.1",
-    "vite": "^7.3.1",
+    "vite": "^6.2.0",
-    "vite-plugin-router-warn": "^2.0.0",
+    "vite-plugin-router-warn": "^1.0.0",
-    "vite-plugin-vue-devtools": "^8.0.5",
+    "vite-plugin-vue-devtools": "^7.7.2",
     "vue3-intro-step": "^1.0.5"
   },
   "simple-git-hooks": {
-    "pre-commit": "npx lint-staged"
+    "pre-commit": "pnpm lint-staged"
   },
   "lint-staged": {
     "*": "eslint --fix"

src/App.vue

@@ -29,9 +29,9 @@
 </template>
 
 <script setup>
-import { darkTheme, dateZhCN, zhCN } from 'naive-ui'
 import { LayoutSetting } from '@/components'
 import { useAppStore, useTabStore } from '@/store'
+import { darkTheme, dateZhCN, zhCN } from 'naive-ui'
 import { layoutSettingVisible } from './settings'
 
 const layouts = new Map()

src/components/common/ThemeSetting.vue

@@ -1,10 +1,9 @@
 <template>
-  <div class="f-c-c">
+  <n-tooltip trigger="hover">
-    <n-tooltip trigger="hover" placement="bottom">
     <template #trigger>
       <n-color-picker
         id="theme-setting"
-          class="h-32 w-32"
+        class="mr-16 h-32 w-32"
         :value="appStore.primaryColor"
         :swatches="primaryColors"
         :on-update:value="(v) => appStore.setPrimaryColor(v)"
@@ -13,12 +12,11 @@
     </template>
     设置主题色
   </n-tooltip>
-  </div>
 </template>
 
 <script setup>
-import { getPresetColors } from '@arco-design/color'
 import { useAppStore } from '@/store'
+import { getPresetColors } from '@arco-design/color'
 
 const appStore = useAppStore()
 

src/components/common/ToggleTheme.vue

@@ -8,8 +8,8 @@
 </template>
 
 <script setup>
-import { useDark, useToggle } from '@vueuse/core'
 import { useAppStore } from '@/store'
+import { useDark, useToggle } from '@vueuse/core'
 
 const appStore = useAppStore()
 const isDark = useDark()
@@ -39,7 +39,6 @@ async function toggleDark({ clientX, clientY }) {
       duration: 500,
       easing: 'ease-in',
       pseudoElement: `::view-transition-${isDark.value ? 'old' : 'new'}(root)`,
-      fill: 'both',
     },
   )
 }

src/components/me/crud/index.vue

@@ -7,7 +7,6 @@
  --------------------------------->
 
 <template>
-  <div class="h-full flex flex-col overflow-hidden">
   <AppCard v-if="$slots.default" bordered bg="#fafafc dark:black" class="mb-30 min-h-60 rounded-4">
     <form class="flex justify-between p-16" @submit.prevent="handleSearch()">
       <n-scrollbar x-scrollable>
@@ -47,12 +46,9 @@
     :data="tableData"
     :row-key="(row) => row[rowKey]"
     :pagination="isPagination ? pagination : false"
-      flex-height
-      class="flex-1"
     @update:checked-row-keys="onChecked"
     @update:page="onPageChange"
   />
-  </div>
 </template>
 
 <script setup>

src/directives/index.js

@@ -6,10 +6,9 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
-import { withDirectives } from 'vue'
 import { router } from '@/router'
 
-const permission = {
+export const permission = {
   mounted(el, binding) {
     const currentRoute = unref(router.currentRoute)
     const btns = currentRoute.meta?.btns?.map(item => item.code) || []
@@ -22,17 +21,3 @@ 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/MenuCollapse.vue

@@ -9,7 +9,7 @@
 <template>
   <div
     id="menu-collapse"
-    class="f-c-c cursor-pointer rounded-4 auto-bg-hover p-6 text-22 transition-all-300"
+    class="f-c-c cursor-pointer rounded-4 p-6 text-22 transition-all-300 auto-bg-hover"
     @click="appStore.switchCollapsed"
   >
     <i :class="appStore.collapsed ? 'i-line-md-menu-unfold-left' : 'i-line-md-menu-fold-left'" />

src/layouts/components/SideMenu.vue

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

src/router/guards/permission-guard.js

@@ -43,6 +43,12 @@ export function createPermissionGuard(router) {
       return { ...to, replace: true }
     }
 
+    router.addRoute({
+      name: 'catchAll',
+      path: '/:catchAll(.*)',
+      redirect: '/404',
+    })
+
     const routes = router.getRoutes()
     if (routes.find(route => route.name === to.name))
       return true

src/store/helper.js

@@ -1,4 +1,3 @@
-import { cloneDeep } from 'lodash-es'
 import api from '@/api'
 import { basePermissions } from '@/settings'
 
@@ -27,5 +26,5 @@ export async function getPermissions() {
   catch (error) {
     console.error(error)
   }
-  return cloneDeep(basePermissions).concat(asyncPermissions)
+  return basePermissions.concat(asyncPermissions)
 }

src/store/modules/app.js

@@ -6,10 +6,10 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
+import { defaultLayout, defaultPrimaryColor, naiveThemeOverrides } from '@/settings'
 import { generate, getRgbStr } from '@arco-design/color'
 import { useDark } from '@vueuse/core'
 import { defineStore } from 'pinia'
-import { defaultLayout, defaultPrimaryColor, naiveThemeOverrides } from '@/settings'
 
 export const useAppStore = defineStore('app', {
   state: () => ({

src/store/modules/auth.js

@@ -6,8 +6,8 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
-import { defineStore } from 'pinia'
 import { usePermissionStore, useRouterStore, useTabStore, useUserStore } from '@/store'
+import { defineStore } from 'pinia'
 
 export const useAuthStore = defineStore('auth', {
   state: () => ({

src/store/modules/permission.js

@@ -6,9 +6,9 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
+import { isExternal } from '@/utils'
 import { hyphenate } from '@vueuse/core'
 import { defineStore } from 'pinia'
-import { isExternal } from '@/utils'
 
 export const usePermissionStore = defineStore('permission', {
   state: () => ({
@@ -29,6 +29,8 @@ export const usePermissionStore = defineStore('permission', {
       const route = this.generateRoute(item, item.show ? null : parent?.key)
       if (item.enable && route.path && !route.path.startsWith('http'))
         this.accessRoutes.push(route)
+      if (!item.show)
+        return null
       const menuItem = {
         label: route.meta.title,
         key: route.name,
@@ -46,8 +48,6 @@ export const usePermissionStore = defineStore('permission', {
         if (!menuItem.children.length)
           delete menuItem.children
       }
-      if (!item.show)
-        return null
       return menuItem
     },
     generateRoute(item, parentKey) {

src/store/modules/router.js

@@ -16,6 +16,8 @@ export const useRouterStore = defineStore('router', () => {
     accessRoutes.forEach((item) => {
       router.hasRoute(item.name) && router.removeRoute(item.name)
     })
+
+    router.removeRoute('catchAll')
   }
 
   return {

src/styles/reset.css

@@ -34,8 +34,8 @@ html,
   -webkit-text-size-adjust: 100%; /* 2 */
   -moz-tab-size: 4; /* 3 */
   tab-size: 4; /* 3 */
-  font-family:
+  font-family: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-    ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; /* 4 */
+    'Noto Color Emoji'; /* 4 */
   font-feature-settings: normal; /* 5 */
   font-variation-settings: normal; /* 6 */
   -webkit-tap-highlight-color: transparent; /* 7 */
@@ -114,8 +114,7 @@ code,
 kbd,
 samp,
 pre {
-  font-family:
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace; /* 1 */
-    ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace; /* 1 */
   font-feature-settings: normal; /* 2 */
   font-variation-settings: normal; /* 3 */
   font-size: 1em; /* 4 */

src/utils/http/helpers.js

@@ -10,15 +10,16 @@
 import { useAuthStore } from '@/store'
 
 let isConfirming = false
-
+export function resolveResError(code, message, needTip = true) {
-function handleAuthExpired(content, needTip) {
+  switch (code) {
+    case 401:
       if (isConfirming || !needTip)
         return
       isConfirming = true
       $dialog.confirm({
         title: '提示',
         type: 'info',
-    content,
+        content: '登录已过期，是否重新登录？',
         confirm() {
           useAuthStore().logout()
           window.$message?.success('已退出登录')
@@ -29,15 +30,25 @@ function handleAuthExpired(content, needTip) {
         },
       })
       return false
-}
-
-export function resolveResError(code, message, needTip = true) {
-  switch (code) {
-    case 401:
-      return handleAuthExpired('登录已过期，是否重新登录？', needTip)
     case 11007:
     case 11008:
-      return handleAuthExpired(`${message}，是否重新登录？`, needTip)
+      if (isConfirming || !needTip)
+        return
+      isConfirming = true
+      $dialog.confirm({
+        title: '提示',
+        type: 'info',
+        content: `${message}，是否重新登录？`,
+        confirm() {
+          useAuthStore().logout()
+          window.$message?.success('已退出登录')
+          isConfirming = false
+        },
+        cancel() {
+          isConfirming = false
+        },
+      })
+      return false
     case 403:
       message = '请求被拒绝'
       break

src/utils/index.js

@@ -11,4 +11,5 @@ export * from './common'
 export * from './http'
 export * from './is'
 export * from './naiveTools'
+export * from './permissionH'
 export * from './storage'

src/utils/naiveTools.js

@@ -7,9 +7,9 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
-import * as NaiveUI from 'naive-ui'
 import { useAppStore } from '@/store'
 import { isNullOrUndef } from '@/utils'
+import * as NaiveUI from 'naive-ui'
 
 export function setupMessage(NMessage) {
   class Message {

src/utils/permissionH.js

@@ -0,0 +1,14 @@
+import { permission } from '@/directives'
+/**
+ * @description: 按钮权限渲染
+ */
+import { h, withDirectives } from 'vue'
+
+export function PH(el, props, slots, butCode) {
+  return withDirectives(
+    h(el, props, slots),
+    [
+      [permission, butCode],
+    ],
+  )
+}

src/views/base/unocss-icon.vue

@@ -26,7 +26,7 @@
       <li
         v-for="item in icons"
         :key="item"
-        class="w-160 f-c-c flex-col cursor-pointer card-border rounded-12 auto-bg px-12 py-24"
+        class="w-160 f-c-c flex-col cursor-pointer rounded-12 px-12 py-24 card-border auto-bg"
         @click="copy(`&lt;i class=&quot;${item}&quot; /&gt;`)"
       >
         <i :class="`${item}?mask`" class="text-28 text-gray-600 hover:bg-primary" />

src/views/base/unocss.vue

@@ -22,7 +22,7 @@
     </p>
 
     <div mt-20 w-350 f-c-c flex-col>
-      <div flex flex-wrap justify-around card-border rounded-10 p-10>
+      <div flex flex-wrap justify-around rounded-10 p-10 card-border>
         <div m-20 h-50 w-50 f-c-c rounded-5 p-10 border="1 solid">
           <span h-6 w-6 rounded-3 bg-black dark:bg-white />
         </div>

src/views/demo/upload/index.vue

@@ -62,7 +62,11 @@ defineOptions({ name: 'ImgUpload' })
 
 const { copy, copied } = useClipboard()
 
-const imgList = reactive([])
+const imgList = reactive([
+  { url: 'https://img.isme.top/isme/67208863145ef.jpg' },
+  { url: 'https://img.isme.top/isme/67208ab2a9de0.jpg' },
+  { url: 'https://img.isme.top/isme/67208ab4c6596.jpg' },
+])
 
 watch(copied, (val) => {
   if (val)

src/views/home/index.vue

@@ -30,9 +30,10 @@
       <n-card class="ml-12 w-70%" title="✨ 欢迎使用 Vue Naive Admin 2.0">
         <template #header-extra>
           <a
-            class="text-highlight text-14 text-primary hover:underline hover:opacity-80"
+            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>
@@ -68,7 +69,7 @@
     <div class="mt-12 flex">
       <n-card class="w-50%" title="💯 特性" segmented>
         <template #header-extra>
-          <span class="text-highlight opacity-90">👏 历经十几次重构和细节打磨</span>
+          <span class="opacity-90 text-highlight">👏 历经十几次重构和细节打磨</span>
         </template>
 
         <ul class="opacity-90">
@@ -159,13 +160,13 @@
 </template>
 
 <script setup>
+import { useUserStore } from '@/store'
 import { BarChart, LineChart, PieChart } from 'echarts/charts'
 import { GridComponent, LegendComponent, TooltipComponent } from 'echarts/components'
 import * as echarts from 'echarts/core'
 import { UniversalTransition } from 'echarts/features'
 import { CanvasRenderer } from 'echarts/renderers'
 import VChart from 'vue-echarts'
-import { useUserStore } from '@/store'
 
 const userStore = useUserStore()
 
@@ -250,7 +251,7 @@ const skillOption = {
   },
   series: [
     {
-      bottom: '12%',
+      top: '12%',
       type: 'pie',
       radius: ['35%', '90%'],
       avoidLabelOverlap: true,
@@ -283,4 +284,6 @@ const skillOption = {
     },
   ],
 }
+
+const message = $message
 </script>

src/views/login/index.vue

@@ -9,7 +9,7 @@
 <template>
   <div class="wh-full flex-col bg-[url(@/assets/images/login_bg.webp)] bg-cover">
     <div
-      class="m-auto max-w-700 min-w-345 f-c-c rounded-8 auto-bg bg-opacity-20 bg-cover p-12 card-shadow"
+      class="m-auto max-w-700 min-w-345 f-c-c rounded-8 bg-opacity-20 bg-cover p-12 card-shadow auto-bg"
     >
       <div class="hidden w-380 px-20 py-35 md:block">
         <img src="@/assets/images/login_banner.webp" class="w-full" alt="login_banner">
@@ -101,9 +101,9 @@
 </template>
 
 <script setup>
-import { useStorage } from '@vueuse/core'
 import { useAuthStore } from '@/store'
 import { lStorage, throttle } from '@/utils'
+import { useStorage } from '@vueuse/core'
 import api from './api'
 
 const authStore = useAuthStore()

src/views/pms/resource/api.js

@@ -6,8 +6,8 @@
  * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  **********************************/
 
-import axios from 'axios'
 import { request } from '@/utils'
+import axios from 'axios'
 
 export default {
   getMenuTree: () => request.get('/permission/menu/tree'),

src/views/pms/resource/components/ResAddOrEdit.vue

@@ -159,10 +159,10 @@
 </template>
 
 <script setup>
-import icons from 'isme:icons'
-import pagePathes from 'isme:page-pathes'
 import { MeModal } from '@/components'
 import { useForm, useModal } from '@/composables'
+import icons from 'isme:icons'
+import pagePathes from 'isme:page-pathes'
 import api from '../api'
 import QuestionLabel from './QuestionLabel.vue'
 

src/views/pms/resource/index.vue

@@ -92,8 +92,8 @@
 </template>
 
 <script setup>
-import { NButton, NSwitch } from 'naive-ui'
 import { MeCrud } from '@/components'
+import { NButton, NSwitch } from 'naive-ui'
 import api from './api'
 import MenuTree from './components/MenuTree.vue'
 import ResAddOrEdit from './components/ResAddOrEdit.vue'

src/views/pms/role/index.vue

@@ -75,7 +75,7 @@
             :checked-keys="modalForm.permissionIds"
             :on-update:checked-keys="(keys) => (modalForm.permissionIds = keys)"
 
-            checkable check-on-click default-expand-all
+            default-expand-all checkable check-on-click
             class="cus-scroll max-h-200 w-full"
           />
         </n-form-item>
@@ -95,9 +95,9 @@
 </template>
 
 <script setup>
-import { NButton, NSwitch } from 'naive-ui'
 import { MeCrud, MeModal, MeQueryItem } from '@/components'
 import { useCrud } from '@/composables'
+import { NButton, NSwitch } from 'naive-ui'
 import api from './api'
 
 defineOptions({ name: 'RoleMgt' })

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

@@ -67,10 +67,10 @@
 </template>
 
 <script setup>
-import { NAvatar, NButton, NSwitch, NTag } from 'naive-ui'
-import { h } from 'vue'
 import { MeCrud, MeQueryItem } from '@/components'
 import { formatDateTime } from '@/utils'
+import { NAvatar, NButton, NSwitch, NTag } from 'naive-ui'
+import { h } from 'vue'
 import api from './api'
 
 defineOptions({ name: 'RoleUser' })

src/views/pms/user/index.vue

@@ -77,7 +77,7 @@
             trigger: ['input', 'blur'],
           }"
         >
-          <n-input v-model:value="modalForm.password" type="password" show-password-on="mousedown" />
+          <n-input v-model:value="modalForm.password" />
         </n-form-item>
 
         <n-form-item v-if="['add', 'setRole'].includes(modalAction)" label="角色" path="roleIds">
@@ -110,11 +110,10 @@
 </template>
 
 <script setup>
-import { NAvatar, NButton, NSwitch, NTag } from 'naive-ui'
 import { MeCrud, MeModal, MeQueryItem } from '@/components'
 import { useCrud } from '@/composables'
-import { withPermission } from '@/directives'
+import { formatDateTime, PH } from '@/utils'
-import { formatDateTime } from '@/utils'
+import { NAvatar, NButton, NSwitch, NTag } from 'naive-ui'
 import api from './api'
 
 defineOptions({ name: 'UserMgt' })
@@ -220,22 +219,25 @@ const columns = [
   {
     title: '操作',
     key: 'actions',
-    width: 420,
+    width: 380,
     align: 'right',
     fixed: 'right',
     hideInExcel: true,
     render(row) {
       return [
-        withPermission(
+        PH(
-          h(NButton, {
+          NButton,
+          {
             size: 'small',
             type: 'primary',
             secondary: true,
-          }, {
+            onClick: () => handleOpenRolesSet(row),
+          },
+          {
             default: () => '超管专属',
             icon: () => h('i', { class: 'i-carbon:user-role text-14' }),
-          }),
+          },
-          'SuperAdmin',
+          'superAdmin',
         ),
         h(
           NButton,

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="请输入原密码" show-password-on="mousedown" />
+          <n-input v-model:value="pwdForm.oldPassword" type="password" placeholder="请输入原密码" />
         </n-form-item>
         <n-form-item label="新密码" path="newPassword" :rule="required">
-          <n-input v-model:value="pwdForm.newPassword" type="password" placeholder="请输入新密码" show-password-on="mousedown" />
+          <n-input v-model:value="pwdForm.newPassword" type="password" placeholder="请输入新密码" />
         </n-form-item>
       </n-form>
     </MeModal>

vite.config.js

@@ -69,9 +69,6 @@ export default defineConfig(({ mode }) => {
         },
       },
     },
-    optimizeDeps: {
-      include: ['vue3-intro-step'],
-    },
     build: {
       chunkSizeWarningLimit: 1024, // chunk 大小警告的限制（单位kb）
     },