修复：项目配置空白，多标签背景色 bug

Merge branch 'main' of github.com:jekip/naive-ui-admin into main
Fix #80 And Depend on the upgrade
2026-02-04 21:52:27 +08:00 · 2022-01-06 09:50:28 +08:00 · 2021-12-30 15:04:31 +08:00 · 2021-12-30 15:04:10 +08:00 · 2021-12-26 10:18:44 +08:00 · 2021-12-24 10:48:49 +08:00
106 changed files with 5493 additions and 5129 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,3 @@
-
 *.sh
 node_modules
 *.md
@@ -13,3 +12,5 @@ dist
 .local
 /bin
 Dockerfile
+components.d.ts
+components.d.ts
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,9 +22,9 @@ module.exports = defineConfig({
    'plugin:@typescript-eslint/recommended',
    'prettier',
    'plugin:prettier/recommended',
-    'plugin:jest/recommended',
  ],
  rules: {
+    'vue/script-setup-uses-vars': 'error',
    '@typescript-eslint/ban-ts-ignore': 'off',
    '@typescript-eslint/explicit-function-return-type': 'off',
    '@typescript-eslint/no-explicit-any': 'off',
@@ -61,7 +61,6 @@ module.exports = defineConfig({
    'vue/singleline-html-element-content-newline': 'off',
    'vue/attribute-hyphenation': 'off',
    'vue/require-default-prop': 'off',
-    'vue/script-setup-uses-vars': 'off',
    'vue/html-self-closing': [
      'error',
      {
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+/components.d.ts
+/components.d.ts
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # CHANGELOG

+## 1.6.1 (2022-01-06)
+
+### 🐛 Bug Fixes
+- 修复 `项目配置` 打开空白
+- 修复 `多标签` 背景和字体色变量丢失
+
+- ### ✨ Features
+- 依赖升级
+
+## 1.6.0 (2021-12-24)
+
+### 🐛 Bug Fixes
+- 修复 `低版本浏览器` 报 globalThis 未定义
+- 修复 `Axios` api地址拼接异常
+- 修复 `createStorage存在prefixKey` 会出bug
+
+- ### ✨ Features
+- 破坏 `Axios` 取消默认导出 `http` 可支持多个请求导出
+- 搜索 `import http from '@/utils/http/axios'` 替换为 `import { http } from '@/utils/http/axios`
+- 新增 `Axios` 多项配置 `urlPrefix`，`joinTime`，`ignoreCancelToken`，`withToken`，`uploadFile方法`
+- 依赖升级
+
+## 1.5.5 (2021-08-14)
+
+### 🐛 Bug Fixes
+- 修复路由只存在一个子路由，图标不显示问题
+- UI样式美化
+
+- ### ✨ Features
+- 支持 Vue 3.2.x 
+- 代码全部按 `script setup` 语法重写（完成80%）  
+- 新增 `回到顶部` 功能  
+- 新增 `拖拽` 示例页面
+- 新增 `富文本` 组件
+- 新增 `路由切换动画` 可在项目设置切换  
+- 依赖升级
+
+# CHANGELOG
+
 ## 1.5.4 (2021-08-10)

 ### 🐛 Bug Fixes
@@ -8,10 +47,12 @@
 - `表格设置列，重复添加action列样式错乱问题` 合并 [#24](https://github.com/jekip/naive-ui-admin/pull/24) 感谢 [@CasbaL](https://github.com/CasbaL)

 - ### ✨ Features
+- 新增 `路由支持（内联外部地址）`配置
+- 新增 `顶部菜单` logo展示
 -（破坏性更新）
 - 优化 `动态路由配置` 取消`constantRouterComponents.ts`，中组件映射配置，更名为 `router-icons.ts`
 - 优化 `admin_info接口结构`，roles 更名为：permissions，roles.roleName，更名为：label
- 优化 多级路由，当没有配置时，`redirect` ，`redirect` 默认为第一个子路由，配置则优先按配置
+- 优化 多级路由，当没有配置`redirect`时，默认为第一个子路由，配置则优先按配置
 - 依赖升级

 # 1.5.3 (2021-08-09)
--- a/README.md
+++ b/README.md
@@ -1,24 +1,51 @@
+## 留步
+少侠留步，早知如此绊人心，何如当初莫相识，右上角免费的 `Star` 点一点，帮我们突破一下 `2k`，谢谢！O(∩_∩)O
+
 ## 简介

-[Naive Ui Admin](https://github.com/jekip/naive-ui-admin) 是一个基于 [Vue3.0](https://github.com/vuejs/vue-next)、[Vite](https://github.com/vitejs/vite)、 [Naive UI](https://www.naiveui.com/)、[TypeScript](https://www.typescriptlang.org/) 的中后台解决方案，它使用了最新的前端技术栈，并提炼了典型的业务模型，页面，包括二次封装组件、动态菜单、权限校验、粒子化权限控制等功能，它可以帮助你快速搭建企业级中后台项目，相信不管是从新技术使用还是其他方面，都能帮助到你。
+[Naive Ui Admin](https://github.com/jekip/naive-ui-admin) 完全免费，且可商用，基于 [Vue3.0](https://github.com/vuejs/vue-next)、[Vite](https://github.com/vitejs/vite)、 [Naive UI](https://www.naiveui.com/)、[TypeScript](https://www.typescriptlang.org/) 的中后台解决方案，它使用了最新的前端技术栈，并提炼了典型的业务模型，页面，包括二次封装组件、动态菜单、权限校验、粒子化权限控制等功能，它可以帮助你快速搭建企业级中后台项目， 相信不管是从新技术使用还是其他方面，都能帮助到你。

 ## 特性
- **最新技术栈**：使用 Vue3/vite2 等前端前沿技术开发
- **TypeScript**: 应用程序级 JavaScript 的语言
- **主题**：可配置的主题
- **Mock 数据** 内置 Mock 数据方案
- **权限** 内置完善的动态路由权限生成方案
- **组件** 二次封装了多个常用的组件
+- 二次封装实用高扩展性组件
+- 响应式、多主题，多配置，快速集成，开箱即用
+- 最新技术栈，使用 `Vue3`、`Typescript`、`Pinia`、`Vite` 等前端前沿技术
+- 强大的鉴权系统，对路由、菜单、功能点等支持`三种鉴权模式`，满足不同的业务鉴权需求
+- 持续更新，实用性页面模板功能和交互，随意搭配组合，让构建页面变得简单化


-## 在线预览
+## 预览
 - [naive-ui-admin](https://naive-ui-admin.vercel.app)

 账号：admin，密码：123456（随意）

+## 提示
+
+如果这个版本的功能和组件，并不能满足您的需求，不妨看看，我们全新 `NaiveAdmin v2` 他或许能让您眼前一亮O(∩_∩)O哈哈~
+
+[NaiveAdmin 官网](https://www.naiveadmin.com)
+
+[NaiveAdmin v2 预览](https://pro.naiveadmin.com)
+
+[NaiveAdmin v2 变更日志](https://www.naiveadmin.com/guide/changelog)
+
+## 新品
+
+### Antd vue
+
+千呼万唤 `Naive Admin Antd` 也迎来了第一个版本，同时具备 `Naive Ui Admin` 优点，如果您选的技术栈是 `Antd` 的话，不妨看看。
+
+[NaiveAdmin Antd 预览](https://antd.naiveadmin.com)
+
+### Arco vue
+
+新产品，新生态，智能设计体系，连接轻盈体验，一如既往、开箱即用，欢迎前往查看。
+
+[NaiveAdmin Arco 预览](https://arco.naiveadmin.com)
+
+
 ## 文档

-[文档地址](https://naive-ui-admin-docs.vercel.app) 
+[v1文档地址](https://naive-ui-admin-docs.vercel.app) 

 ## 准备

@@ -31,7 +58,7 @@
 - [Naive-ui-admin](https://www.naiveui.com/) - ui 基本使用
 - [Mock.js](https://github.com/nuysoft/Mock) - mockjs 基本语法

-## 安装使用
+## 使用

 - 获取项目代码

@@ -64,9 +91,6 @@ yarn build

 [CHANGELOG](./CHANGELOG.md)

-## 感谢
-[@Vben](https://github.com/anncwb/vue-vben-admin) 借鉴 vue-vben-admin 实现的骨架，同时也使用作者开发的 vite 插件，再次感谢作者。
-

 ## 如何贡献

@@ -113,7 +137,11 @@ yarn build

 ## 交流

-`Naive Ui Admin` 是完全开源免费的项目，在帮助开发者更方便地进行中大型管理系统开发，同时也提供 QQ 交流群使用问题欢迎在群内提问。
+`Naive Ui Admin` 在帮助开发者更方便地进行中大型管理系统开发，同时也提供 QQ 交流群使用问题欢迎在群内提问。

 - QQ 群 `328347666`

+## 赞助
+#### 如果你觉得这个项目帮助到了你，你可以帮作者买一杯果汁表示鼓励 🍹。
+
+![donate](https://jekip.github.io/docs/images/sponsor.png)
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -1,4 +1,6 @@
 import type { Plugin } from 'vite';
+import Components from 'unplugin-vue-components/vite';
+import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';

 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
@@ -15,6 +17,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, prodMock)
    vue(),
    // have to
    vueJsx(),
+
+    // 按需引入NaiveUi且自动创建组件声明
+    Components({
+      dts: true,
+      resolvers: [NaiveUiResolver()],
+    }),
  ];

  // vite-plugin-html
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -14,7 +14,7 @@ module.exports = {
        'fixed',
        'resolve',
        'resolves',
-        'resolved'
+        'resolved',
      ],
      issuePrefixes: ['#'],
      noteKeywords: ['BREAKING CHANGE'],
@@ -23,8 +23,8 @@ module.exports = {
      revertCorrespondence: ['header', 'hash'],
      warn() {},
      mergePattern: null,
-      mergeCorrespondence: null
-    }
+      mergeCorrespondence: null,
+    },
  },
  rules: {
    'body-leading-blank': [2, 'always'],
@@ -50,8 +50,8 @@ module.exports = {
        'wip',
        'workflow',
        'types',
-        'release'
-      ]
-    ]
-  }
-}
+        'release',
+      ],
+    ],
+  },
+};
--- a/index.html
+++ b/index.html
@@ -1,26 +1,122 @@
 <!DOCTYPE html>
-<html lang="zh-cmn-Hans">
+<html lang="zh-cmn-Hans" id="htmlRoot" data-theme="light">
 <head>
  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-  <meta name="renderer" content="webkit"/>
+  <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
+  <meta content="webkit" name="renderer"/>
  <meta
-    name="viewport"
    content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+    name="viewport"
  />
-  <link rel="icon" href="/favicon.ico"/>
+  <link href="/favicon.ico" rel="icon"/>
  <title><%= title %></title>
-  <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
 </head>
 <body>
 <div id="appProvider" style="display: none"></div>
 <div id="app">
-  <div class="first-loading-wrp">
-    <div class="loading-wrp">
-        <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
+  <style>
+    .first-loading-wrap {
+      display: flex;
+      width: 100%;
+      height: 100vh;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+    }
+
+    .first-loading-wrap > h1 {
+      font-size: 128px
+    }
+
+    .first-loading-wrap .loading-wrap {
+      padding: 98px;
+      display: flex;
+      justify-content: center;
+      align-items: center
+    }
+
+    .dot {
+      animation: antRotate 1.2s infinite linear;
+      transform: rotate(45deg);
+      position: relative;
+      display: inline-block;
+      font-size: 32px;
+      width: 32px;
+      height: 32px;
+      box-sizing: border-box
+    }
+
+    .dot i {
+      width: 14px;
+      height: 14px;
+      position: absolute;
+      display: block;
+      background-color: #1890ff;
+      border-radius: 100%;
+      transform: scale(.75);
+      transform-origin: 50% 50%;
+      opacity: .3;
+      animation: antSpinMove 1s infinite linear alternate
+    }
+
+    .dot i:nth-child(1) {
+      top: 0;
+      left: 0
+    }
+
+    .dot i:nth-child(2) {
+      top: 0;
+      right: 0;
+      -webkit-animation-delay: .4s;
+      animation-delay: .4s
+    }
+
+    .dot i:nth-child(3) {
+      right: 0;
+      bottom: 0;
+      -webkit-animation-delay: .8s;
+      animation-delay: .8s
+    }
+
+    .dot i:nth-child(4) {
+      bottom: 0;
+      left: 0;
+      -webkit-animation-delay: 1.2s;
+      animation-delay: 1.2s
+    }
+
+    @keyframes antRotate {
+      to {
+        -webkit-transform: rotate(405deg);
+        transform: rotate(405deg)
+      }
+    }
+
+    @-webkit-keyframes antRotate {
+      to {
+        -webkit-transform: rotate(405deg);
+        transform: rotate(405deg)
+      }
+    }
+
+    @keyframes antSpinMove {
+      to {
+        opacity: 1
+      }
+    }
+
+    @-webkit-keyframes antSpinMove {
+      to {
+        opacity: 1
+      }
+    }</style>
+  <div class="first-loading-wrap">
+    <div class="loading-wrap">
+      <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
    </div>
  </div>
 </div>
-<script type="module" src="/src/main.ts"></script>
+<script>var globalThis = window;</script>
+<script src="/src/main.ts" type="module"></script>
 </body>
 </html>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "naive-ui-admin",
-  "version": "1.5.4",
+  "version": "1.6.1",
  "author": {
    "name": "Ahjung",
    "email": "735878602@qq.com",
@@ -27,6 +27,7 @@
  "dependencies": {
    "@vicons/antd": "^0.10.0",
    "@vicons/ionicons5": "^0.10.0",
+    "@vueup/vue-quill": "^1.0.0-beta.7",
    "@vueuse/core": "^5.0.3",
    "axios": "^0.21.1",
    "blueimp-md5": "^2.18.0",
@@ -38,37 +39,36 @@
    "makeit-captcha": "^1.2.5",
    "mitt": "^2.1.0",
    "mockjs": "^1.1.0",
-    "naive-ui": "^2.16.2",
-    "pinia": "^2.0.0-beta.3",
+    "naive-ui": "^2.23.2",
+    "pinia": "^2.0.0-rc.4",
    "qs": "^6.10.1",
    "vfonts": "^0.1.0",
-    "vue": "^3.1.2",
-    "vue-router": "^4.0.10",
-    "vue-types": "^4.0.0",
-    "vuedraggable": "^4.0.3",
-    "vuex": "^4.0.2"
+    "vue": "^3.2.16",
+    "vue-router": "^4.0.11",
+    "vue-types": "^4.1.0",
+    "vuedraggable": "^4.0.3"
  },
  "devDependencies": {
    "@commitlint/cli": "^12.1.4",
    "@commitlint/config-conventional": "^12.1.4",
    "@types/lodash": "^4.14.170",
    "@types/node": "^15.12.2",
-    "@typescript-eslint/eslint-plugin": "^4.26.1",
-    "@typescript-eslint/parser": "^4.26.1",
-    "@vitejs/plugin-vue": "^1.2.3",
-    "@vitejs/plugin-vue-jsx": "^1.1.5",
-    "@vue/compiler-sfc": "3.1.1",
+    "@typescript-eslint/eslint-plugin": "^4.31.2",
+    "@typescript-eslint/parser": "^4.31.2",
+    "@vitejs/plugin-vue": "^1.9.1",
+    "@vitejs/plugin-vue-jsx": "^1.1.8",
+    "@vue/compiler-sfc": "^3.2.16",
    "@vue/eslint-config-typescript": "^7.0.0",
    "autoprefixer": "^10.3.1",
    "commitizen": "^4.2.4",
    "core-js": "^3.14.0",
    "dotenv": "^10.0.0",
-    "eslint": "^7.28.0",
+    "eslint": "^7.32.0",
    "eslint-config-prettier": "^8.3.0",
    "eslint-define-config": "^1.0.9",
    "eslint-plugin-jest": "^24.4.0",
    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.11.1",
+    "eslint-plugin-vue": "^7.18.0",
    "esno": "^0.7.3",
    "gh-pages": "^3.2.0",
    "husky": "^6.0.0",
@@ -86,13 +86,14 @@
    "stylelint-order": "^4.1.0",
    "stylelint-scss": "^3.19.0",
    "tailwindcss": "^2.2.7",
-    "typescript": "^4.3.5",
-    "vite": "2.4.4",
+    "typescript": "^4.4.3",
+    "unplugin-vue-components": "^0.17.2",
+    "vite": "^2.5.10",
    "vite-plugin-compression": "^0.3.1",
    "vite-plugin-html": "^2.0.7",
    "vite-plugin-mock": "^2.9.3",
    "vite-plugin-style-import": "^1.0.1",
-    "vue-eslint-parser": "^7.8.0"
+    "vue-eslint-parser": "^7.11.0"
  },
  "lint-staged": {
    "*.{vue,js,ts,tsx}": "eslint --fix"
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -3,4 +3,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-}
+};
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,8 +16,8 @@
  </transition>
 </template>

-<script lang="ts">
-  import { defineComponent, computed, onMounted, onUnmounted } from 'vue';
+<script lang="ts" setup>
+  import { computed, onMounted, onUnmounted } from 'vue';
  import { zhCN, dateZhCN, createTheme, inputDark, datePickerDark, darkTheme } from 'naive-ui';
  import { LockScreen } from '@/components/Lockscreen';
  import { AppProvider } from '@/components/Application';
@@ -26,86 +26,61 @@
  import { useDesignSettingStore } from '@/store/modules/designSetting';
  import { lighten } from '@/utils/index';

-  export default defineComponent({
-    name: 'App',
-    components: { LockScreen, AppProvider },
-    setup() {
-      const route = useRoute();
-      const useLockscreen = useLockscreenStore();
-      const designStore = useDesignSettingStore();
-      const isLock = computed(() => useLockscreen.isLock);
-      const lockTime = computed(() => useLockscreen.lockTime);
+  const route = useRoute();
+  const useLockscreen = useLockscreenStore();
+  const designStore = useDesignSettingStore();
+  const isLock = computed(() => useLockscreen.isLock);
+  const lockTime = computed(() => useLockscreen.lockTime);

-      /**
-       * @type import('naive-ui').GlobalThemeOverrides
-       */
-      const getThemeOverrides = computed(() => {
-        const appTheme = designStore.appTheme;
-        const lightenStr = lighten(designStore.appTheme, 6);
-        return {
-          common: {
-            primaryColor: appTheme,
-            primaryColorHover: lightenStr,
-            primaryColorPressed: lightenStr,
-          },
-          LoadingBar: {
-            colorLoading: appTheme,
-          },
-        };
-      });
+  /**
+   * @type import('naive-ui').GlobalThemeOverrides
+   */
+  const getThemeOverrides = computed(() => {
+    const appTheme = designStore.appTheme;
+    const lightenStr = lighten(designStore.appTheme, 6);
+    return {
+      common: {
+        primaryColor: appTheme,
+        primaryColorHover: lightenStr,
+        primaryColorPressed: lightenStr,
+      },
+      LoadingBar: {
+        colorLoading: appTheme,
+      },
+    };
+  });

-      const getDarkTheme = computed(() => (designStore.darkTheme ? darkTheme : undefined));
+  const getDarkTheme = computed(() => (designStore.darkTheme ? darkTheme : undefined));

-      let timer;
+  let timer;

-      const timekeeping = () => {
-        clearInterval(timer);
-        if (route.name == 'login' || isLock.value) return;
-        // 设置不锁屏
-        useLockscreen.setLock(false);
-        // 重置锁屏时间
-        useLockscreen.setLockTime();
-        timer = setInterval(() => {
-          // 锁屏倒计时递减
-          useLockscreen.setLockTime(lockTime.value - 1);
-          if (lockTime.value <= 0) {
-            // 设置锁屏
-            useLockscreen.setLock(true);
-            return clearInterval(timer);
-          }
-        }, 1000);
-      };
+  const timekeeping = () => {
+    clearInterval(timer);
+    if (route.name == 'login' || isLock.value) return;
+    // 设置不锁屏
+    useLockscreen.setLock(false);
+    // 重置锁屏时间
+    useLockscreen.setLockTime();
+    timer = setInterval(() => {
+      // 锁屏倒计时递减
+      useLockscreen.setLockTime(lockTime.value - 1);
+      if (lockTime.value <= 0) {
+        // 设置锁屏
+        useLockscreen.setLock(true);
+        return clearInterval(timer);
+      }
+    }, 1000);
+  };

-      onMounted(() => {
-        document.addEventListener('mousedown', timekeeping);
-      });
+  onMounted(() => {
+    document.addEventListener('mousedown', timekeeping);
+  });

-      onUnmounted(() => {
-        document.removeEventListener('mousedown', timekeeping);
-      });
-
-      return {
-        darkTheme: createTheme([inputDark, datePickerDark]),
-        getDarkTheme,
-        zhCN,
-        dateZhCN,
-        isLock,
-        getThemeOverrides,
-      };
-    },
+  onUnmounted(() => {
+    document.removeEventListener('mousedown', timekeeping);
  });
 </script>

 <style lang="less">
-  @import 'styles/common.less';
-
-  .slide-up-enter-active,
-  .slide-up-leave-active {
-    transition: transform 0.35s ease-in;
-  }
-
-  .slide-up-enter-form,
-  .slide-up-leave-to {
-    transform: translateY(-100%);
-  }
+  @import 'styles/index.less';
 </style>
--- a/src/api/dashboard/console.ts
+++ b/src/api/dashboard/console.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 //获取主控台信息
 export function getConsoleInfo() {
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 /**
 * @description: 根据用户id获取用户菜单
--- a/src/api/system/role.ts
+++ b/src/api/system/role.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 /**
 * @description: 角色列表
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 export interface BasicResponseModel<T = any> {
  code: number;
--- a/src/api/table/list.ts
+++ b/src/api/table/list.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 //获取table
 export function getTableList(params) {
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -102,7 +102,7 @@
            type="primary"
            text
            icon-placement="right"
-            v-if="overflow && isInline && getProps.showAdvancedButton"
+            v-if="isInline && getProps.showAdvancedButton"
            @click="unfoldToggle"
          >
            <template #icon>
--- a/src/components/Form/src/hooks/useForm.ts
+++ b/src/components/Form/src/hooks/useForm.ts
@@ -1,5 +1,4 @@
 import type { FormProps, FormActionType, UseFormReturnType } from '../types/form';
-// @ts-ignore
 import type { DynamicProps } from '/#/utils';

 import { ref, onUnmounted, unref, nextTick, watch } from 'vue';
--- a/src/components/Modal/src/basicModal.vue
+++ b/src/components/Modal/src/basicModal.vue
@@ -20,104 +20,94 @@
  </n-modal>
 </template>

-<script lang="ts">
+<script lang="ts" setup>
  import {
-    defineComponent,
    getCurrentInstance,
    ref,
    nextTick,
    unref,
-    toRefs,
-    reactive,
    computed,
+    useAttrs,
+    defineEmits,
+    defineProps,
  } from 'vue';
  import { basicProps } from './props';
  import startDrag from '@/utils/Drag';
  import { deepMerge } from '@/utils';
  import { FormProps } from '@/components/Form';
-  export default defineComponent({
-    name: 'BasicModal',
-    components: {},
-    props: {
-      ...basicProps,
-    },
-    emits: ['on-close', 'on-ok', 'register'],
-    setup(props, { emit, attrs }) {
-      const propsRef = ref<Partial>({});
+  import { ModalProps, ModalMethods } from './type';

-      const state = reactive({
-        isModal: false,
-        subLoading: false,
-      });
+  const attrs = useAttrs();
+  const props = defineProps({ ...basicProps });
+  const emit = defineEmits(['on-close', 'on-ok', 'register']);

-      const getProps = computed((): FormProps => {
-        const modalProps = { ...props, ...unref(propsRef) };
-        return { ...modalProps };
-      });
+  const propsRef = ref(<Partial<ModalProps> | null>null);

-      async function setProps(modalProps: Partial): Promise<void> {
-        propsRef.value = deepMerge(unref(propsRef) || {}, modalProps);
-      }
+  const isModal = ref(false);
+  const subLoading = ref(false);

-      const getBindValue = computed(() => {
-        return {
-          ...attrs,
-          ...unref(getProps),
-        };
-      });
-
-      function setSubLoading(status: boolean) {
-        state.subLoading = status;
-      }
-
-      function openModal() {
-        state.isModal = true;
-        nextTick(() => {
-          const oBox = document.getElementById('basic-modal');
-          const oBar = document.getElementById('basic-modal-bar');
-          startDrag(oBar, oBox);
-        });
-      }
-
-      function closeModal() {
-        state.isModal = false;
-        state.subLoading = false;
-        emit('on-close');
-      }
-
-      function onCloseModal() {
-        state.isModal = false;
-        emit('on-close');
-      }
-
-      function handleSubmit() {
-        state.subLoading = true;
-        emit('on-ok');
-      }
-
-      const modalMethods: ModalMethods = {
-        setProps,
-        openModal,
-        closeModal,
-        setSubLoading,
-      };
-
-      const instance = getCurrentInstance();
-      if (instance) {
-        emit('register', modalMethods);
-      }
-
-      return {
-        ...toRefs(state),
-        getBindValue,
-        openModal,
-        closeModal,
-        onCloseModal,
-        handleSubmit,
-        setProps,
-      };
-    },
+  const getProps = computed((): FormProps => {
+    return { ...props, ...(unref(propsRef) as any) };
  });
+
+  const subBtuText = computed(() => {
+    const { subBtuText } = propsRef.value as any;
+    return subBtuText || props.subBtuText;
+  });
+
+  async function setProps(modalProps: Partial<ModalProps>): Promise<void> {
+    propsRef.value = deepMerge(unref(propsRef) || ({} as any), modalProps);
+  }
+
+  const getBindValue = computed(() => {
+    return {
+      ...attrs,
+      ...unref(getProps),
+      ...unref(propsRef),
+    };
+  });
+
+  function setSubLoading(status: boolean) {
+    subLoading.value = status;
+  }
+
+  function openModal() {
+    isModal.value = true;
+    nextTick(() => {
+      const oBox = document.getElementById('basic-modal');
+      const oBar = document.getElementById('basic-modal-bar');
+      startDrag(oBar, oBox);
+    });
+  }
+
+  function closeModal() {
+    isModal.value = false;
+    subLoading.value = false;
+    emit('on-close');
+  }
+
+  function onCloseModal() {
+    isModal.value = false;
+    emit('on-close');
+  }
+
+  function handleSubmit() {
+    subLoading.value = true;
+    console.log(subLoading.value)
+    emit('on-ok');
+  }
+
+  const modalMethods: ModalMethods = {
+    setProps,
+    openModal,
+    closeModal,
+    setSubLoading,
+  };
+
+  const instance = getCurrentInstance();
+  if (instance) {
+    emit('register', modalMethods);
+  }
 </script>

 <style lang="less">
--- a/src/components/Modal/src/hooks/useModal.ts
+++ b/src/components/Modal/src/hooks/useModal.ts
@@ -1,46 +1,42 @@
-import { ref, onUnmounted, unref, getCurrentInstance, watch } from 'vue';
+import { ref, onUnmounted, unref, getCurrentInstance, watch, nextTick } from 'vue';
 import { isProdMode } from '@/utils/env';
-import { ReturnMethods } from '../type';
+import { ModalMethods, UseModalReturnType } from '../type';
 import { getDynamicProps } from '@/utils';
-export function useModal(props): (((modalMethod: ReturnMethods) => any) | ReturnMethods)[] {
-  const modal = ref<Nullable<ReturnMethods>>(null);
-  const loaded = ref<Nullable<boolean>>(false);
+import { tryOnUnmounted } from '@vueuse/core';
+export function useModal(props): UseModalReturnType {

-  function register(modalMethod: ReturnMethods) {
-    if (!getCurrentInstance()) {
-      throw new Error('useModal() can only be used inside setup() or functional components!');
-    }
-    isProdMode() &&
-      onUnmounted(() => {
-        modal.value = null;
-        loaded.value = false;
-      });
-    if (unref(loaded) && isProdMode() && modalMethod === unref(modal)) return;
-    modal.value = modalMethod;
-
-    watch(
-      () => props,
-      () => {
-        // @ts-ignore
-        const { setProps } = modal.value;
-        props && setProps(getDynamicProps(props));
-      },
-      {
-        immediate: true,
-        deep: true,
-      }
-    );
-  }
+  const modalRef = ref<Nullable<ModalMethods>>(null);
+  const currentInstance = getCurrentInstance();

  const getInstance = () => {
-    const instance = unref(modal);
+    const instance = unref(modalRef.value);
    if (!instance) {
      console.error('useModal instance is undefined!');
    }
    return instance;
  };

-  const methods: ReturnMethods = {
+  const register = (modalInstance: ModalMethods) => {
+    isProdMode() &&
+      tryOnUnmounted(() => {
+        modalRef.value = null;
+      });
+    modalRef.value = modalInstance;
+    currentInstance?.emit('register', modalInstance);
+
+    watch(
+      () => props,
+      () => {
+        props && modalInstance.setProps(getDynamicProps(props));
+      },
+      {
+        immediate: true,
+        deep: true,
+      }
+    );
+  };
+
+  const methods: ModalMethods = {
    setProps: (props): void => {
      getInstance()?.setProps(props);
    },
@@ -54,5 +50,6 @@ export function useModal(props): (((modalMethod: ReturnMethods) => any) | Return
      getInstance()?.setSubLoading(status);
    },
  };
+
  return [register, methods];
 }
--- a/src/components/Modal/src/type/index.ts
+++ b/src/components/Modal/src/type/index.ts
@@ -1,9 +1,19 @@
+import type { DialogOptions } from 'naive-ui/lib/dialog';
 /**
 * @description: 弹窗对外暴露的方法
 */
-export interface ReturnMethods {
+export interface ModalMethods {
  setProps: (props) => void;
  openModal: () => void;
  closeModal: () => void;
  setSubLoading: (status) => void;
 }
+
+/**
+ * 支持修改，DialogOptions 參數
+ */
+export interface ModalProps extends DialogOptions { }
+
+export type RegisterFn = (ModalInstance: ModalMethods) => void;
+
+export type UseModalReturnType = [RegisterFn, ModalMethods];
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -7,7 +7,7 @@
          {{ title }}
          <n-tooltip trigger="hover" v-if="titleTooltip">
            <template #trigger>
-              <n-icon size="18" class="ml-1 cursor-pointer text-gray-400">
+              <n-icon size="18" class="ml-1 text-gray-400 cursor-pointer">
                <QuestionCircleOutlined />
              </n-icon>
            </template>
@@ -156,7 +156,7 @@

      const { getPaginationInfo, setPagination } = usePagination(getProps);

-      const { getDataSourceRef, getRowKey, reload } = useDataSource(
+      const { getDataSourceRef, getDataSource, getRowKey, reload } = useDataSource(
        getProps,
        {
          getPaginationInfo,
@@ -171,7 +171,7 @@
        useColumns(getProps);

      const state = reactive({
-        tableSize: 'medium',
+        tableSize: unref(getProps as any).size || 'medium',
        isColumnSetting: false,
      });

@@ -280,6 +280,7 @@
        ...toRefs(state),
        tableElRef,
        getBindValues,
+        getDataSource,
        densityOptions,
        reload,
        densitySelect,
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -7,23 +7,25 @@
      </n-icon>
    </div>
    <div class="flex editable-cell-content" v-show="isEdit" v-click-outside="onClickOutside">
-      <CellComponent
-        v-bind="getComponentProps"
-        :component="getComponent"
-        :style="getWrapperStyle"
-        :popoverVisible="getRuleVisible"
-        :ruleMessage="ruleMessage"
-        :rule="getRule"
-        :class="getWrapperClass"
-        ref="elRef"
-        @options-change="handleOptionsChange"
-        @pressEnter="handleEnter"
-      />
+      <div class="editable-cell-content-comp">
+        <CellComponent
+          v-bind="getComponentProps"
+          :component="getComponent"
+          :style="getWrapperStyle"
+          :popoverVisible="getRuleVisible"
+          :ruleMessage="ruleMessage"
+          :rule="getRule"
+          :class="getWrapperClass"
+          ref="elRef"
+          @options-change="handleOptionsChange"
+          @pressEnter="handleEnter"
+        />
+      </div>
      <div class="editable-cell-action" v-if="!getRowEditable">
-        <n-icon class="cursor-pointer mx-2">
+        <n-icon class="mx-2 cursor-pointer">
          <CheckOutlined @click="handleSubmit" />
        </n-icon>
-        <n-icon class="cursor-pointer mx-2">
+        <n-icon class="mx-2 cursor-pointer">
          <CloseOutlined @click="handleCancel" />
        </n-icon>
      </div>
@@ -49,7 +51,7 @@
  import { set, omit } from 'lodash-es';
  import { EventEnum } from '@/components/Table/src/componentMap';

-  import { milliseconds } from 'date-fns';
+  import { milliseconds, format } from 'date-fns';

  export default defineComponent({
    name: 'EditableCell',
@@ -92,7 +94,7 @@

      const getIsCheckComp = computed(() => {
        const component = unref(getComponent);
-        return ['NCheckbox', 'NSwitch'].includes(component);
+        return ['NCheckbox', 'NRadio'].includes(component);
      });

      const getComponentProps = computed(() => {
@@ -196,12 +198,9 @@
          currentValueRef.value = e;
        }

-        //TODO 这里组件参数格式，和dayjs格式不一致
+        //TODO 根据组件格式化值
        // if (component === 'NDatePicker') {
-        //   let format = (props.column.editComponentProps?.format)
-        //     .replace(/yyyy/g, 'YYYY')
-        //     .replace(/dd/g, 'DD');
-        //   currentValueRef.value = dayjs(currentValueRef.value).format(format);
+        //   currentValueRef.value = format(currentValueRef.value,'yyyy-MM-dd HH:mm:ss');
        // }

        const onChange = props.column?.editComponentProps?.onChange;
@@ -377,6 +376,10 @@
  white-space: nowrap;
  text-overflow: ellipsis;

+  &-comp{
+    flex: 1;
+  }
+
  .edit-icon {
   font-size: 14px;
   //position: absolute;
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -88,7 +88,6 @@
    VerticalRightOutlined,
    VerticalLeftOutlined,
  } from '@vicons/antd';
-  // @ts-ignore
  import Draggable from 'vuedraggable/src/vuedraggable';
  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';

--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -48,8 +48,7 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
    const columns = cloneDeep(pageColumns);
    return columns
      .filter((column) => {
-        // @ts-ignore
-        return hasPermission(column.auth) && isIfShow(column);
+        return hasPermission(column.auth as string[]) && isIfShow(column);
      })
      .map((column) => {
        //默认 ellipsis 为true
@@ -93,10 +92,10 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
  function handleActionColumn(propsRef: ComputedRef<BasicTableProps>, columns: BasicColumn[]) {
    const { actionColumn } = unref(propsRef);
    if (!actionColumn) return;
-    // @ts-ignore
-    !columns.find((col) => col.key === 'action') && columns.push({
-      ...actionColumn,
-    });
+    !columns.find((col) => col.key === 'action') &&
+      columns.push({
+        ...(actionColumn as any),
+      });
  }

  //设置
--- a/src/components/Table/src/hooks/useDataSource.ts
+++ b/src/components/Table/src/hooks/useDataSource.ts
@@ -9,7 +9,7 @@ export function useDataSource(
  { getPaginationInfo, setPagination, setLoading, tableData },
  emit
 ) {
-  const dataSourceRef = ref([]);
+  const dataSourceRef = ref<Recordable[]>([]);

  watchEffect(() => {
    tableData.value = unref(dataSourceRef);
@@ -47,6 +47,7 @@ export function useDataSource(
    try {
      setLoading(true);
      const { request, pagination }: any = unref(propsRef);
+      if (!request) return;
      //组装分页信息
      const pageField = APISETTING.pageField;
      const sizeField = APISETTING.sizeField;
--- a/src/components/Table/src/hooks/usePagination.ts
+++ b/src/components/Table/src/hooks/usePagination.ts
@@ -3,7 +3,7 @@ import type { BasicTableProps } from '../types/table';
 import { computed, unref, ref, ComputedRef } from 'vue';

 import { isBoolean } from '@/utils/is';
-import { DEFAULTPAGESIZE, PAGESIZES } from '../const';
+import { APISETTING, DEFAULTPAGESIZE, PAGESIZES } from '../const';

 export function usePagination(refProps: ComputedRef<BasicTableProps>) {
  const configRef = ref<PaginationProps>({});
@@ -14,6 +14,7 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
    if (!unref(show) || (isBoolean(pagination) && !pagination)) {
      return false;
    }
+    const { totalField } = APISETTING;
    return {
      pageSize: DEFAULTPAGESIZE,
      pageSizes: PAGESIZES,
@@ -21,6 +22,7 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
      showQuickJumper: true,
      ...(isBoolean(pagination) ? {} : pagination),
      ...unref(configRef),
+      pageCount: unref(configRef)[totalField],
    };
  });

--- a/src/components/Table/src/props.ts
+++ b/src/components/Table/src/props.ts
@@ -16,7 +16,7 @@ export const basicProps = {
    type: String,
    default: 'medium',
  },
-  tableData: {
+  dataSource: {
    type: [Object],
    default: () => [],
  },
@@ -28,7 +28,6 @@ export const basicProps = {
  request: {
    type: Function as PropType<(...arg: any[]) => Promise<any>>,
    default: null,
-    required: true,
  },
  rowKey: {
    type: [String, Function] as PropType<string | ((record) => string)>,
--- a/src/components/Table/src/types/tableAction.ts
+++ b/src/components/Table/src/types/tableAction.ts
@@ -1,7 +1,5 @@
-// @ts-ignore
 import { NButton } from 'naive-ui';
 import { PermissionsEnum } from '@/enums/permissionsEnum';
-// @ts-ignore
 export interface ActionItem extends NButton.props {
  onClick?: Fn;
  label?: string;
--- a/src/hooks/setting/useProjectSetting.ts
+++ b/src/hooks/setting/useProjectSetting.ts
@@ -20,6 +20,10 @@ export function useProjectSetting() {

  const getShowFooter = computed(() => projectStore.showFooter);

+  const getIsPageAnimate = computed(() => projectStore.isPageAnimate);
+
+  const getPageAnimateType = computed(() => projectStore.pageAnimateType);
+
  return {
    getNavMode,
    getNavTheme,
@@ -29,5 +33,7 @@ export function useProjectSetting() {
    getCrumbsSetting,
    getPermissionMode,
    getShowFooter,
+    getIsPageAnimate,
+    getPageAnimateType,
  };
 }
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -30,7 +30,7 @@ export function usePermission() {
  function hasEveryPermission(accesses: string[]): boolean {
    const permissionsList = userStore.getPermissions;
    if (Array.isArray(accesses)) {
-      return accesses.every((access) => !!permissionsList[access]);
+      return permissionsList.every((access: any) => accesses.includes(access.value));
    }
    throw new Error(`[hasEveryPermission]: ${accesses} should be a array !`);
  }
@@ -43,7 +43,7 @@ export function usePermission() {
  function hasSomePermission(accesses: string[]): boolean {
    const permissionsList = userStore.getPermissions;
    if (Array.isArray(accesses)) {
-      return accesses.some((access) => !!permissionsList[access]);
+      return permissionsList.some((access: any) => accesses.includes(access.value));
    }
    throw new Error(`[hasSomePermission]: ${accesses} should be a array !`);
  }
--- a/src/layout/components/Header/ProjectSetting.vue
+++ b/src/layout/components/Header/ProjectSetting.vue
@@ -1,10 +1,10 @@
 <template>
-  <n-drawer v-model:show="isDrawer" :width="width" :placement="placement" :native-scrollbar="false">
-    <n-drawer-content :title="title">
+  <n-drawer v-model:show="isDrawer" :width="width" :placement="placement">
+    <n-drawer-content :title="title" :native-scrollbar="false">
      <div class="drawer">
        <n-divider title-placement="center">主题</n-divider>

-        <div class="drawer-setting-item justify-center dark-switch">
+        <div class="justify-center drawer-setting-item dark-switch">
          <n-tooltip placement="bottom">
            <template #trigger>
              <n-switch v-model:value="designStore.darkTheme" class="dark-theme-switch">
@@ -20,7 +20,7 @@
                </template>
              </n-switch>
            </template>
-            <span>深色主题</span>
+            <span>{{ designStore.darkTheme ? '深' : '浅' }}色主题</span>
          </n-tooltip>
        </div>

@@ -116,9 +116,7 @@
            </n-tooltip>
            <n-badge dot color="#19be6b" v-if="settingStore.navTheme === 'light'" />
          </div>
-        </div>

-        <div class="drawer-setting-item align-items-top">
          <div class="drawer-setting-item-style">
            <n-tooltip placement="top">
              <template #trigger>
@@ -133,14 +131,13 @@
            <n-badge dot color="#19be6b" v-if="settingStore.navTheme === 'header-dark'" />
          </div>
        </div>
-
        <n-divider title-placement="center">界面功能</n-divider>

        <div class="drawer-setting-item">
          <div class="drawer-setting-item-title"> 分割菜单 </div>
          <div class="drawer-setting-item-action">
            <n-switch
-              :disabled="settingStore.navMode === 'horizontal-mix' ? false : true"
+              :disabled="settingStore.navMode !== 'horizontal-mix'"
              v-model:value="settingStore.menuSetting.mixMenu"
            />
          </div>
@@ -206,6 +203,22 @@
        <!--          </div>-->
        <!--        </div>-->

+        <n-divider title-placement="center">动画</n-divider>
+
+        <div class="drawer-setting-item">
+          <div class="drawer-setting-item-title"> 禁用动画 </div>
+          <div class="drawer-setting-item-action">
+            <n-switch v-model:value="settingStore.isPageAnimate" />
+          </div>
+        </div>
+
+        <div class="drawer-setting-item">
+          <div class="drawer-setting-item-title"> 动画类型 </div>
+          <div class="drawer-setting-item-select">
+            <n-select v-model:value="settingStore.pageAnimateType" :options="animateOptions" />
+          </div>
+        </div>
+
        <div class="drawer-setting-item">
          <n-alert type="warning" :showIcon="false">
            <p>{{ alertText }}</p>
@@ -217,12 +230,13 @@
 </template>

 <script lang="ts">
-  import { defineComponent, reactive, toRefs, watch } from 'vue';
+  import { defineComponent, reactive, toRefs, unref, watch, computed } from 'vue';
  import { useProjectSettingStore } from '@/store/modules/projectSetting';
  import { useDesignSettingStore } from '@/store/modules/designSetting';
  import { CheckOutlined } from '@vicons/antd';
  import { Moon, SunnySharp } from '@vicons/ionicons5';
  import { darkTheme } from 'naive-ui';
+  import { animates as animateOptions } from '@/settings/animateSetting';

  export default defineComponent({
    name: 'ProjectSetting',
@@ -257,6 +271,10 @@
        }
      );

+      const directionsOptions = computed(() => {
+        return animateOptions.find((item) => item.value == unref(settingStore.pageAnimateType));
+      });
+
      function openDrawer() {
        state.isDrawer = true;
      }
@@ -291,6 +309,8 @@
        darkTheme,
        openDrawer,
        closeDrawer,
+        animateOptions,
+        directionsOptions,
      };
    },
  });
@@ -325,6 +345,10 @@
        flex: 0 0 auto;
      }

+      &-select {
+        flex: 1;
+      }
+
      .theme-item {
        width: 20px;
        min-width: 20px;
@@ -334,7 +358,7 @@
        border-radius: 2px;
        margin: 0 5px 5px 0;
        text-align: center;
-
+        line-height: 14px;
        .n-icon {
          color: #fff;
        }
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -5,7 +5,7 @@
      class="layout-header-left"
      v-if="navMode === 'horizontal' || (navMode === 'horizontal-mix' && mixMenu)"
    >
-      <div class="logo">
+      <div class="logo" v-if="navMode === 'horizontal'">
        <img src="~@/assets/images/logo.png" alt="" />
        <h2 v-show="!collapsed" class="title">NaiveUiAdmin</h2>
      </div>
--- a/src/layout/components/Logo/index.vue
+++ b/src/layout/components/Logo/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="logo">
-    <img src="~@/assets/images/logo.png" alt="" />
+    <img src="~@/assets/images/logo.png" alt="" :class="{ 'mr-2': !collapsed }" />
    <h2 v-show="!collapsed" class="title">NaiveUiAdmin</h2>
  </div>
 </template>
@@ -29,7 +29,6 @@
    img {
      width: auto;
      height: 32px;
-      margin-right: 10px;
    }

    .title {
--- a/src/layout/components/Main/index.vue
+++ b/src/layout/components/Main/index.vue
@@ -1,7 +1,7 @@
 <template>
  <RouterView>
    <template #default="{ Component, route }">
-      <transition name="zoom-fade" mode="out-in" appear>
+      <transition :name="getTransitionName" mode="out-in" appear>
        <keep-alive v-if="keepAliveComponents" :include="keepAliveComponents">
          <component :is="Component" :key="route.fullPath" />
        </keep-alive>
@@ -12,8 +12,9 @@
 </template>

 <script>
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, unref } from 'vue';
  import { useAsyncRouteStore } from '@/store/modules/asyncRoute';
+  import { useProjectSetting } from '@/hooks/setting/useProjectSetting';

  export default defineComponent({
    name: 'MainView',
@@ -29,11 +30,18 @@
      },
    },
    setup() {
+      const { getIsPageAnimate, getPageAnimateType } = useProjectSetting();
      const asyncRouteStore = useAsyncRouteStore();
      // 需要缓存的路由组件
      const keepAliveComponents = computed(() => asyncRouteStore.keepAliveComponents);
+
+      const getTransitionName = computed(() => {
+        return unref(getIsPageAnimate) ? unref(getPageAnimateType) : '';
+      });
+
      return {
        keepAliveComponents,
+        getTransitionName,
      };
    },
  });
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -88,13 +88,11 @@
      );

      // 监听菜单收缩状态
-      watch(
-        () => props.collapsed,
-        (newVal) => {
-          state.openKeys = newVal ? [] : getOpenKeys;
-          selectedKeys.value = currentRoute.name as string;
-        }
-      );
+      // watch(
+      //   () => props.collapsed,
+      //   (newVal) => {
+      //   }
+      // );

      // 跟随页面路由变化，切换菜单选中状态
      watch(
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -30,27 +30,26 @@
          </n-icon>
        </span>
        <div ref="navScroll" class="tabs-card-scroll">
-          <div ref="navRef" class="tabs-card-nav" :style="getNavStyle">
-            <Draggable :list="tabsList" animation="300" item-key="fullPath" class="flex">
-              <template #item="{ element }">
-                <div
-                  class="tabs-card-scroll-item"
-                  :class="{ 'active-item': activeKey === element.path }"
-                  @click.stop="goPage(element)"
-                  @contextmenu="handleContextMenu($event, element)"
+          <Draggable :list="tabsList" animation="300" item-key="fullPath" class="flex">
+            <template #item="{ element }">
+              <div
+                :id="`tag${element.fullPath.split('/').join('\/')}`"
+                class="tabs-card-scroll-item"
+                :class="{ 'active-item': activeKey === element.path }"
+                @click.stop="goPage(element)"
+                @contextmenu="handleContextMenu($event, element)"
+              >
+                <span>{{ element.meta.title }}</span>
+                <n-icon
+                  size="14"
+                  @click.stop="closeTabItem(element)"
+                  v-if="element.path !== baseHome"
                >
-                  <span>{{ element.meta.title }}</span>
-                  <n-icon
-                    size="14"
-                    @click.stop="closeTabItem(element)"
-                    v-if="element.path != baseHome"
-                  >
-                    <CloseOutlined />
-                  </n-icon>
-                </div>
-              </template>
-            </Draggable>
-          </div>
+                  <CloseOutlined />
+                </n-icon>
+              </div>
+            </template>
+          </Draggable>
        </div>
      </div>
      <div class="tabs-close">
@@ -87,7 +86,6 @@
    computed,
    ref,
    toRefs,
-    toRaw,
    unref,
    provide,
    watch,
@@ -102,8 +100,7 @@
  import { RouteItem } from '@/store/modules/tabsView';
  import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
  import { useMessage } from 'naive-ui';
-  // @ts-ignore
-  import Draggable from 'vuedraggable/src/vuedraggable';
+  import Draggable from 'vuedraggable';
  import { PageEnum } from '@/enums/pageEnum';
  import {
    DownOutlined,
@@ -114,10 +111,11 @@
    LeftOutlined,
    RightOutlined,
  } from '@vicons/antd';
-  import { renderIcon } from '@/utils/index';
+  import { renderIcon } from '@/utils';
  import elementResizeDetectorMaker from 'element-resize-detector';
  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
  import { useProjectSettingStore } from '@/store/modules/projectSetting';
+  import { useThemeVars } from 'naive-ui';

  export default defineComponent({
    name: 'TabsView',
@@ -134,7 +132,7 @@
      },
    },
    setup(props) {
-      const { getDarkTheme } = useDesignSetting();
+      const { getDarkTheme, getAppTheme } = useDesignSetting();
      const { getNavMode, getHeaderSetting, getMenuSetting, getMultiTabsSetting } =
        useProjectSetting();
      const settingStore = useProjectSettingStore();
@@ -144,17 +142,23 @@
      const router = useRouter();
      const tabsViewStore = useTabsViewStore();
      const asyncRouteStore = useAsyncRouteStore();
-      const navRef: any = ref(null);
      const navScroll: any = ref(null);
      const navWrap: any = ref(null);
      const isCurrent = ref(false);

+      const themeVars = useThemeVars();
+
+      const getCardColor = computed(() => {
+        return themeVars.value.cardColor;
+      });
+
+      const getBaseColor = computed(() => {
+        return themeVars.value.textColor1;
+      });
+
      const state = reactive({
        activeKey: route.fullPath,
        scrollable: false,
-        navStyle: {
-          transform: '',
-        },
        dropdownX: 0,
        dropdownY: 0,
        showDropdown: false,
@@ -173,10 +177,7 @@
        const currentRoute = useRoute();
        const navMode = unref(getNavMode);
        if (unref(navMode) != 'horizontal-mix') return true;
-        if (unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot) {
-          return false;
-        }
-        return true;
+        return !(unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot);
      });

      //动态组装样式 菜单缩进
@@ -199,7 +200,7 @@

      //tags 右侧下拉菜单
      const TabsMenuOptions = computed(() => {
-        const isDisabled = unref(tabsList).length <= 1 ? true : false;
+        const isDisabled = unref(tabsList).length <= 1;
        return [
          {
            label: '刷新当前',
@@ -227,17 +228,27 @@
        ];
      });

-      let routes: RouteItem[] = [];
-
+      let cacheRoutes: RouteItem[] = [];
+      const simpleRoute = getSimpleRoute(route);
      try {
        const routesStr = storage.get(TABS_ROUTES) as string | null | undefined;
-        routes = routesStr ? JSON.parse(routesStr) : [getSimpleRoute(route)];
+        cacheRoutes = routesStr ? JSON.parse(routesStr) : [simpleRoute];
      } catch (e) {
-        routes = [getSimpleRoute(route)];
+        cacheRoutes = [simpleRoute];
      }

+      // 将最新的路由信息同步到 localStorage 中
+      const routes = router.getRoutes();
+      cacheRoutes.forEach((cacheRoute) => {
+        const route = routes.find((route) => route.path === cacheRoute.path);
+        if (route) {
+          cacheRoute.meta = route.meta || cacheRoute.meta;
+          cacheRoute.name = (route.name || cacheRoute.name) as string;
+        }
+      });
+
      // 初始化标签页
-      tabsViewStore.initTabs(routes);
+      tabsViewStore.initTabs(cacheRoutes);

      //监听滚动条
      function onScroll(e) {
@@ -246,11 +257,11 @@
          document.documentElement.scrollTop ||
          window.pageYOffset ||
          document.body.scrollTop; // 滚动条偏移量
-        if (!getHeaderSetting.fixed && getMultiTabsSetting.fixed && scrollTop >= 64) {
-          state.isMultiHeaderFixed = true;
-        } else {
-          state.isMultiHeaderFixed = false;
-        }
+        state.isMultiHeaderFixed = !!(
+          !getHeaderSetting.fixed &&
+          getMultiTabsSetting.fixed &&
+          scrollTop >= 64
+        );
      }

      window.addEventListener('scroll', onScroll, true);
@@ -282,7 +293,7 @@
          if (whiteList.includes(route.name as string)) return;
          state.activeKey = to;
          tabsViewStore.addTabs(getSimpleRoute(route));
-          updateNavScroll();
+          updateNavScroll(true);
        },
        { immediate: true }
      );
@@ -375,64 +386,73 @@
        state.showDropdown = false;
      };

-      function getCurrentScrollOffset() {
-        const { navStyle } = state;
-        const transform: any = toRaw(navStyle.transform);
-        return transform ? Number(transform.match(/translateX\(-(\d+(\.\d+)*)px\)/)[1]) : 0;
-      }
-
-      function setOffset(value) {
-        state.navStyle.transform = `translateX(-${value}px)`;
+      /**
+       * @param value 要滚动到的位置
+       * @param amplitude 每次滚动的长度
+       */
+      function scrollTo(value: number, amplitude: number) {
+        const currentScroll = navScroll.value.scrollLeft;
+        const scrollWidth =
+          (amplitude > 0 && currentScroll + amplitude >= value) ||
+          (amplitude < 0 && currentScroll + amplitude <= value)
+            ? value
+            : currentScroll + amplitude;
+        navScroll.value && navScroll.value.scrollTo(scrollWidth, 0);
+        if (scrollWidth === value) return;
+        return window.requestAnimationFrame(() => scrollTo(value, amplitude));
      }

      function scrollPrev() {
        const containerWidth = navScroll.value.offsetWidth;
-        const currentOffset = getCurrentScrollOffset();
-        if (!currentOffset) return;
-        let newOffset = currentOffset > containerWidth ? currentOffset - containerWidth : 0;
-        setOffset(newOffset);
+        const currentScroll = navScroll.value.scrollLeft;
+
+        if (!currentScroll) return;
+        const scrollLeft = currentScroll > containerWidth ? currentScroll - containerWidth : 0;
+        scrollTo(scrollLeft, (scrollLeft - currentScroll) / 20);
      }

      function scrollNext() {
-        const navWidth = navRef.value.scrollWidth;
        const containerWidth = navScroll.value.offsetWidth;
-        const currentOffset = getCurrentScrollOffset();
-        if (navWidth - currentOffset <= containerWidth) return;
+        const navWidth = navScroll.value.scrollWidth;
+        const currentScroll = navScroll.value.scrollLeft;

-        let newOffset =
-          navWidth - currentOffset > containerWidth * 2
-            ? currentOffset + containerWidth
+        if (navWidth - currentScroll <= containerWidth) return;
+        const scrollLeft =
+          navWidth - currentScroll > containerWidth * 2
+            ? currentScroll + containerWidth
            : navWidth - containerWidth;
-
-        setOffset(newOffset);
+        scrollTo(scrollLeft, (scrollLeft - currentScroll) / 20);
      }

-      function updateNavScroll() {
-        if (!navRef.value) return;
-        let navWidth = navRef.value.scrollWidth;
-        let containerWidth = navScroll.value.offsetWidth;
-        const currentOffset = getCurrentScrollOffset();
+      /**
+       * @param autoScroll 是否开启自动滚动功能
+       */
+      async function updateNavScroll(autoScroll?: boolean) {
+        await nextTick();
+        if (!navScroll.value) return;
+        const containerWidth = navScroll.value.offsetWidth;
+        const navWidth = navScroll.value.scrollWidth;
+
        if (containerWidth < navWidth) {
          state.scrollable = true;
-          if (navWidth - currentOffset < containerWidth) {
-            setOffset(navWidth - containerWidth);
+          if (autoScroll) {
+            let tagList = navScroll.value.querySelectorAll('.tabs-card-scroll-item') || [];
+            [...tagList].forEach((tag: HTMLElement) => {
+              // fix SyntaxError
+              if (tag.id === `tag${state.activeKey.split('/').join('\/')}`) {
+                tag.scrollIntoView && tag.scrollIntoView();
+              }
+            });
          }
        } else {
          state.scrollable = false;
-          if (currentOffset > 0) {
-            setOffset(0);
-          }
        }
      }

      function handleResize() {
-        updateNavScroll();
+        updateNavScroll(true);
      }

-      const getNavStyle = computed(() => {
-        return state.navStyle;
-      });
-
      function handleContextMenu(e, item) {
        e.preventDefault();
        isCurrent.value = PageEnum.BASE_HOME_REDIRECT === item.path;
@@ -476,7 +496,6 @@
      return {
        ...toRefs(state),
        navWrap,
-        navRef,
        navScroll,
        route,
        tabsList,
@@ -493,10 +512,12 @@
        closeHandleSelect,
        scrollNext,
        scrollPrev,
-        getNavStyle,
        handleContextMenu,
        onClickOutside,
        getDarkTheme,
+        getAppTheme,
+        getCardColor,
+        getBaseColor,
      };
    },
  });
@@ -553,22 +574,12 @@
        }

        &-scroll {
-          overflow: hidden;
          white-space: nowrap;
-
-          .tabs-card-nav {
-            padding-left: 0;
-            margin: 0;
-            float: left;
-            list-style: none;
-            box-sizing: border-box;
-            position: relative;
-            transition: transform 0.5s ease-in-out;
-          }
+          overflow: hidden;

          &-item {
-            background: var(--color);
-            color: var(--text-color);
+            background: v-bind(getCardColor);
+            color: v-bind(getBaseColor);
            height: 32px;
            padding: 6px 16px 4px;
            border-radius: 3px;
@@ -608,7 +619,7 @@
          }

          .active-item {
-            color: #2d8cf0;
+            color: v-bind(getAppTheme);
          }
        }
      }
@@ -643,11 +654,11 @@
  .tabs-view-default-background {
    background: #f5f7f9;
  }
-  
+
  .tabs-view-dark-background {
    background: #101014;
  }
-  
+
  .tabs-view-fix {
    position: fixed;
    z-index: 5;
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,8 +1,8 @@
 <template>
-  <NLayout class="layout" :position="fixedMenu" has-sider>
-    <NLayoutSider
+  <n-layout class="layout" :position="fixedMenu" has-sider>
+    <n-layout-sider
      v-if="isMixMenuNoneSub && (navMode === 'vertical' || navMode === 'horizontal-mix')"
-      show-trigger
+      show-trigger="bar"
      @collapse="collapsed = true"
      :position="fixedMenu"
      @expand="collapsed = false"
@@ -16,14 +16,14 @@
    >
      <Logo :collapsed="collapsed" />
      <AsideMenu v-model:collapsed="collapsed" v-model:location="getMenuLocation" />
-    </NLayoutSider>
+    </n-layout-sider>

-    <NLayout :inverted="inverted">
-      <NLayoutHeader :inverted="getHeaderInverted" :position="fixedHeader">
+    <n-layout :inverted="inverted">
+      <n-layout-header :inverted="getHeaderInverted" :position="fixedHeader">
        <PageHeader v-model:collapsed="collapsed" :inverted="inverted" />
-      </NLayoutHeader>
+      </n-layout-header>

-      <NLayoutContent
+      <n-layout-content
        class="layout-content"
        :class="{ 'layout-default-background': getDarkTheme === false }"
      >
@@ -50,13 +50,14 @@
        <!--        <NLayoutFooter v-if="getShowFooter">-->
        <!--          <PageFooter />-->
        <!--        </NLayoutFooter>-->
-      </NLayoutContent>
-    </NLayout>
-  </NLayout>
+      </n-layout-content>
+      <n-back-top :right="100" />
+    </n-layout>
+  </n-layout>
 </template>

-<script lang="ts">
-  import { defineComponent, ref, unref, computed, onMounted } from 'vue';
+<script lang="ts" setup>
+  import { ref, unref, computed, onMounted } from 'vue';
  import { Logo } from './components/Logo';
  import { TabsView } from './components/TagsView';
  import { MainView } from './components/Main';
@@ -68,116 +69,87 @@
  import { useRoute } from 'vue-router';
  import { useProjectSettingStore } from '@/store/modules/projectSetting';

-  export default defineComponent({
-    name: 'Layout',
-    components: {
-      TabsView,
-      MainView,
-      PageHeader,
-      AsideMenu,
-      Logo,
-    },
-    setup() {
-      const { getDarkTheme } = useDesignSetting();
-      const {
-        getShowFooter,
-        getNavMode,
-        getNavTheme,
-        getHeaderSetting,
-        getMenuSetting,
-        getMultiTabsSetting,
-      } = useProjectSetting();
+  const { getDarkTheme } = useDesignSetting();
+  const {
+    getShowFooter,
+    getNavMode,
+    getNavTheme,
+    getHeaderSetting,
+    getMenuSetting,
+    getMultiTabsSetting,
+  } = useProjectSetting();

-      const settingStore = useProjectSettingStore();
+  const settingStore = useProjectSettingStore();

-      const navMode = getNavMode;
+  const navMode = getNavMode;

-      const collapsed = ref<boolean>(false);
+  const collapsed = ref<boolean>(false);

-      const fixedHeader = computed(() => {
-        const { fixed } = unref(getHeaderSetting);
-        return fixed ? 'absolute' : 'static';
-      });
+  const fixedHeader = computed(() => {
+    const { fixed } = unref(getHeaderSetting);
+    return fixed ? 'absolute' : 'static';
+  });

-      const isMixMenuNoneSub = computed(() => {
-        const mixMenu = settingStore.menuSetting.mixMenu;
-        const currentRoute = useRoute();
-        if (unref(navMode) != 'horizontal-mix') return true;
-        if (unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot) {
-          return false;
-        }
-        return true;
-      });
+  const isMixMenuNoneSub = computed(() => {
+    const mixMenu = settingStore.menuSetting.mixMenu;
+    const currentRoute = useRoute();
+    if (unref(navMode) != 'horizontal-mix') return true;
+    if (unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot) {
+      return false;
+    }
+    return true;
+  });

-      const fixedMenu = computed(() => {
-        const { fixed } = unref(getHeaderSetting);
-        return fixed ? 'absolute' : 'static';
-      });
+  const fixedMenu = computed(() => {
+    const { fixed } = unref(getHeaderSetting);
+    return fixed ? 'absolute' : 'static';
+  });

-      const isMultiTabs = computed(() => {
-        return unref(getMultiTabsSetting).show;
-      });
+  const isMultiTabs = computed(() => {
+    return unref(getMultiTabsSetting).show;
+  });

-      const fixedMulti = computed(() => {
-        return unref(getMultiTabsSetting).fixed;
-      });
+  const fixedMulti = computed(() => {
+    return unref(getMultiTabsSetting).fixed;
+  });

-      const inverted = computed(() => {
-        return ['dark', 'header-dark'].includes(unref(getNavTheme));
-      });
+  const inverted = computed(() => {
+    return ['dark', 'header-dark'].includes(unref(getNavTheme));
+  });

-      const getHeaderInverted = computed(() => {
-        const navTheme = unref(getNavTheme);
-        return ['light', 'header-dark'].includes(navTheme) ? unref(inverted) : !unref(inverted);
-      });
+  const getHeaderInverted = computed(() => {
+    const navTheme = unref(getNavTheme);
+    return ['light', 'header-dark'].includes(navTheme) ? unref(inverted) : !unref(inverted);
+  });

-      const leftMenuWidth = computed(() => {
-        const { minMenuWidth, menuWidth } = unref(getMenuSetting);
-        return collapsed.value ? minMenuWidth : menuWidth;
-      });
+  const leftMenuWidth = computed(() => {
+    const { minMenuWidth, menuWidth } = unref(getMenuSetting);
+    return collapsed.value ? minMenuWidth : menuWidth;
+  });

-      const getChangeStyle = computed(() => {
-        const { minMenuWidth, menuWidth } = unref(getMenuSetting);
-        return {
-          'padding-left': collapsed.value ? `${minMenuWidth}px` : `${menuWidth}px`,
-        };
-      });
+  const getChangeStyle = computed(() => {
+    const { minMenuWidth, menuWidth } = unref(getMenuSetting);
+    return {
+      'padding-left': collapsed.value ? `${minMenuWidth}px` : `${menuWidth}px`,
+    };
+  });

-      const getMenuLocation = computed(() => {
-        return 'left';
-      });
+  const getMenuLocation = computed(() => {
+    return 'left';
+  });

-      function watchWidth() {
-        const Width = document.body.clientWidth;
-        if (Width <= 950) {
-          collapsed.value = true;
-        } else collapsed.value = false;
-      }
+  const watchWidth = () => {
+    const Width = document.body.clientWidth;
+    if (Width <= 950) {
+      collapsed.value = true;
+    } else collapsed.value = false;
+  };

-      onMounted(() => {
-        window.addEventListener('resize', watchWidth);
-        //挂载在 window 方便与在js中使用
-        window['$loading'] = useLoadingBar();
-        window['$loading'].finish();
-      });
-
-      return {
-        fixedMenu,
-        fixedMulti,
-        fixedHeader,
-        collapsed,
-        inverted,
-        isMultiTabs,
-        leftMenuWidth,
-        getChangeStyle,
-        navMode,
-        getShowFooter,
-        getDarkTheme,
-        getHeaderInverted,
-        getMenuLocation,
-        isMixMenuNoneSub,
-      };
-    },
+  onMounted(() => {
+    window.addEventListener('resize', watchWidth);
+    //挂载在 window 方便与在js中使用
+    window['$loading'] = useLoadingBar();
+    window['$loading'].finish();
  });
 </script>

--- a/src/plugins/naive.ts
+++ b/src/plugins/naive.ts
@@ -65,6 +65,7 @@ import {
  NSpin,
  NTimePicker,
  NBackTop,
+  NSkeleton,
 } from 'naive-ui';

 const naive = create({
@@ -133,6 +134,7 @@ const naive = create({
    NSpin,
    NTimePicker,
    NBackTop,
+    NSkeleton,
  ],
 });

--- a/src/router/generator-routers.ts
+++ b/src/router/generator-routers.ts
@@ -1,7 +1,5 @@
 import { adminMenus } from '@/api/system/menu';
 import { constantRouterIcon } from './router-icons';
-import router from '@/router/index';
-import { constantRouter } from '@/router/index';
 import { RouteRecordRaw } from 'vue-router';
 import { Layout, ParentLayout } from '@/router/constant';
 import type { AppRouteRecordRaw } from '@/router/types';
@@ -61,11 +59,8 @@ export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
      .then((result) => {
        const routeList = routerGenerator(result);
        asyncImportRoute(routeList);
-        const asyncRoutesList = [...routeList, ...constantRouter];
-        asyncRoutesList.forEach((item) => {
-          router.addRoute(item);
-        });
-        resolve(asyncRoutesList);
+
+        resolve(routeList);
      })
      .catch((err) => {
        reject(err);
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -4,7 +4,6 @@ import { RedirectRoute } from '@/router/base';
 import { PageEnum } from '@/enums/pageEnum';
 import { createRouterGuards } from './router-guards';

-// @ts-ignore
 const modules = import.meta.globEager('./modules/**/*.ts');

 const routeModuleList: RouteRecordRaw[] = [];
--- a/src/router/modules/about.ts
+++ b/src/router/modules/about.ts
@@ -12,6 +12,7 @@ const routes: Array<RouteRecordRaw> = [
      sort: 10,
      isRoot: true,
      activeMenu: 'about_index',
+      icon: renderIcon(ProjectOutlined),
    },
    children: [
      {
@@ -19,7 +20,6 @@ const routes: Array<RouteRecordRaw> = [
        name: `about_index`,
        meta: {
          title: '关于',
-          icon: renderIcon(ProjectOutlined),
          extra: renderNew(),
          activeMenu: 'about_index',
        },
--- a/src/router/modules/comp.ts
+++ b/src/router/modules/comp.ts
@@ -1,7 +1,7 @@
 import { RouteRecordRaw } from 'vue-router';
 import { Layout, ParentLayout } from '@/router/constant';
 import { WalletOutlined } from '@vicons/antd';
-import { renderIcon } from '@/utils/index';
+import { renderIcon, renderNew } from '@/utils';

 const routeName = 'comp';

@@ -106,6 +106,24 @@ const routes: Array<RouteRecordRaw> = [
        },
        component: () => import('@/views/comp/modal/index.vue'),
      },
+      {
+        path: 'richtext',
+        name: `richtext`,
+        meta: {
+          title: '富文本',
+          extra: renderNew(),
+        },
+        component: () => import('@/views/comp/richtext/vue-quill.vue'),
+      },
+      {
+        path: 'drag',
+        name: `Drag`,
+        meta: {
+          title: '拖拽',
+          extra: renderNew(),
+        },
+        component: () => import('@/views/comp/drag/index.vue'),
+      },
    ],
  },
 ];
--- a/src/router/modules/list.ts
+++ b/src/router/modules/list.ts
@@ -1,7 +1,7 @@
 import { RouteRecordRaw } from 'vue-router';
 import { Layout } from '@/router/constant';
 import { TableOutlined } from '@vicons/antd';
-import { renderIcon, renderNew } from '@/utils/index';
+import { renderIcon } from '@/utils/index';

 /**
 * @param name 路由名称, 必须设置,且不能重名
@@ -31,7 +31,6 @@ const routes: Array<RouteRecordRaw> = [
        name: 'basic-list',
        meta: {
          title: '基础列表',
-          extra: renderNew(),
        },
        component: () => import('@/views/list/basicList/index.vue'),
      },
--- a/src/router/types.ts
+++ b/src/router/types.ts
@@ -6,7 +6,6 @@ export type Component<T extends any = any> =
  | (() => Promise<typeof import('*.vue')>)
  | (() => Promise<T>);

-// @ts-ignore
 export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
  name: string;
  meta: RouteMeta;
@@ -33,4 +32,24 @@ export interface Meta {
  frameSrc?: string;
  // 外链跳转地址
  externalLink?: string;
+  //隐藏
+  hidden?: boolean;
+}
+
+export interface Menu {
+  title: string;
+  label: string;
+  key: string;
+  meta: RouteMeta;
+  name: string;
+  component?: Component | string;
+  components?: Component;
+  children?: AppRouteRecordRaw[];
+  props?: Recordable;
+  fullPath?: string;
+  icon?: any;
+  path: string;
+  permissions?: string[];
+  redirect?: string;
+  sort?: number;
 }
--- a/src/settings/animateSetting.ts
+++ b/src/settings/animateSetting.ts
@@ -0,0 +1,8 @@
+export const animates = [
+  { value: 'zoom-fade', label: '渐变' },
+  { value: 'zoom-out', label: '闪现' },
+  { value: 'fade-slide', label: '滑动' },
+  { value: 'fade', label: '消退' },
+  { value: 'fade-bottom', label: '底部消退' },
+  { value: 'fade-scale', label: '缩放消退' },
+];
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -43,5 +43,9 @@ const setting = {
  },
  //菜单权限模式 FIXED 前端固定路由  BACK 动态获取
  permissionMode: 'FIXED',
+  //是否开启路由动画
+  isPageAnimate: true,
+  //路由动画类型
+  pageAnimateType: 'zoom-fade',
 };
 export default setting;
--- a/src/store/modules/asyncRoute.ts
+++ b/src/store/modules/asyncRoute.ts
@@ -107,7 +107,7 @@ export const useAsyncRouteStore = defineStore({
      } else {
        try {
          //过滤账户是否拥有某一个权限，并将菜单从加载列表移除
-          accessedRouters = filter([...asyncRoutes, ...constantRouter], routeFilter);
+          accessedRouters = filter(asyncRoutes, routeFilter);
        } catch (error) {
          console.log(error);
        }
--- a/src/store/modules/projectSetting.ts
+++ b/src/store/modules/projectSetting.ts
@@ -12,6 +12,8 @@ const {
  multiTabsSetting,
  crumbsSetting,
  permissionMode,
+  isPageAnimate,
+  pageAnimateType,
 } = projectSetting;

 interface ProjectSettingState {
@@ -23,6 +25,8 @@ interface ProjectSettingState {
  multiTabsSetting: ImultiTabsSetting; //多标签
  crumbsSetting: IcrumbsSetting; //面包屑
  permissionMode: string; //权限模式
+  isPageAnimate: boolean; //是否开启路由动画
+  pageAnimateType: string; //路由动画类型
 }

 export const useProjectSettingStore = defineStore({
@@ -36,6 +40,8 @@ export const useProjectSettingStore = defineStore({
    multiTabsSetting,
    crumbsSetting,
    permissionMode,
+    isPageAnimate,
+    pageAnimateType,
  }),
  getters: {
    getNavMode(): string {
@@ -62,6 +68,12 @@ export const useProjectSettingStore = defineStore({
    getPermissionMode(): string {
      return this.permissionMode;
    },
+    getIsPageAnimate(): boolean {
+      return this.isPageAnimate;
+    },
+    getPageAnimateType(): string {
+      return this.pageAnimateType;
+    },
  },
  actions: {
    setNavTheme(value: string): void {
--- a/src/store/mutation-types.ts
+++ b/src/store/mutation-types.ts
@@ -1,4 +1,4 @@
-export const ACCESS_TOKEN = 'Access-Token'; // 用户token
-export const CURRENT_USER = 'Current-User'; // 当前用户信息
-export const IS_LOCKSCREEN = 'Is-Lockscreen'; // 是否锁屏
-export const TABS_ROUTES = 'Tabs-Routes'; // 标签页
+export const ACCESS_TOKEN = 'ACCESS-TOKEN'; // 用户token
+export const CURRENT_USER = 'CURRENT-USER'; // 当前用户信息
+export const IS_LOCKSCREEN = 'IS-LOCKSCREEN'; // 是否锁屏
+export const TABS_ROUTES = 'TABS-ROUTES'; // 标签页
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -45,7 +45,7 @@ a:active, a:hover {
  text-decoration: none;
 }

-/*滚动条凹槽的颜色，还可以设置边框属性 */
+/* 滚动条凹槽的颜色，还可以设置边框属性 */
 *::-webkit-scrollbar-track-piece {
  background-color: #f8f8f8;
  -webkit-border-radius: 2em;
@@ -53,22 +53,22 @@ a:active, a:hover {
  border-radius: 2em;
 }

-/*滚动条的宽度*/
+/* 滚动条的宽度 */
 *::-webkit-scrollbar {
  width: 9px;
  height: 9px;
 }

-/*滚动条的设置*/
+/* 滚动条的设置 */
 *::-webkit-scrollbar-thumb {
-  background-color: #dddddd;
+  background-color: #ddd;
  background-clip: padding-box;
  -webkit-border-radius: 2em;
  -moz-border-radius: 2em;
  border-radius: 2em;
 }

-/*滚动条鼠标移上去*/
+/* 滚动条鼠标移上去 */
 *::-webkit-scrollbar-thumb:hover {
  background-color: #bbb;
 }
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -0,0 +1,3 @@
+@import 'transition/index.less';
+@import './var.less';
+@import './common.less';
--- a/src/styles/transition/base.less
+++ b/src/styles/transition/base.less
@@ -0,0 +1,18 @@
+.transition-default() {
+  &-enter-active,
+  &-leave-active {
+    transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1) !important;
+  }
+
+  &-move {
+    transition: transform 0.4s;
+  }
+}
+
+.expand-transition {
+  .transition-default();
+}
+
+.expand-x-transition {
+  .transition-default();
+}
--- a/src/styles/transition/fade.less
+++ b/src/styles/transition/fade.less
@@ -0,0 +1,81 @@
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.2s ease-in-out;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+
+/* fade-slide */
+.fade-slide-leave-active,
+.fade-slide-enter-active {
+  transition: all 0.3s;
+}
+
+.fade-slide-enter-from {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.fade-slide-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
+
+// ///////////////////////////////////////////////
+// Fade Bottom
+// ///////////////////////////////////////////////
+
+// Speed: 1x
+.fade-bottom-enter-active,
+.fade-bottom-leave-active {
+  transition: opacity 0.25s, transform 0.3s;
+}
+
+.fade-bottom-enter-from {
+  opacity: 0;
+  transform: translateY(-10%);
+}
+
+.fade-bottom-leave-to {
+  opacity: 0;
+  transform: translateY(10%);
+}
+
+// fade-scale
+.fade-scale-leave-active,
+.fade-scale-enter-active {
+  transition: all 0.28s;
+}
+
+.fade-scale-enter-from {
+  opacity: 0;
+  transform: scale(1.2);
+}
+
+.fade-scale-leave-to {
+  opacity: 0;
+  transform: scale(0.8);
+}
+
+// ///////////////////////////////////////////////
+// Fade Top
+// ///////////////////////////////////////////////
+
+// Speed: 1x
+.fade-top-enter-active,
+.fade-top-leave-active {
+  transition: opacity 0.2s, transform 0.25s;
+}
+
+.fade-top-enter-from {
+  opacity: 0;
+  transform: translateY(8%);
+}
+
+.fade-top-leave-to {
+  opacity: 0;
+  transform: translateY(-8%);
+}
--- a/src/styles/transition/index.less
+++ b/src/styles/transition/index.less
@@ -0,0 +1,10 @@
+@import './base.less';
+@import './fade.less';
+@import './scale.less';
+@import './slide.less';
+@import './scroll.less';
+@import './zoom.less';
+
+.collapse-transition {
+  transition: 0.2s height ease-in-out, 0.2s padding-top ease-in-out, 0.2s padding-bottom ease-in-out;
+}
--- a/src/styles/transition/scale.less
+++ b/src/styles/transition/scale.less
@@ -0,0 +1,21 @@
+.scale-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave,
+  &-leave-to {
+    opacity: 0;
+    transform: scale(0);
+  }
+}
+
+.scale-rotate-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave,
+  &-leave-to {
+    opacity: 0;
+    transform: scale(0) rotate(-45deg);
+  }
+}
--- a/src/styles/transition/scroll.less
+++ b/src/styles/transition/scroll.less
@@ -0,0 +1,67 @@
+.scroll-y-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-from {
+    transform: translateY(-15px);
+  }
+
+  &-leave-to {
+    transform: translateY(15px);
+  }
+}
+
+.scroll-y-reverse-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-from {
+    transform: translateY(15px);
+  }
+
+  &-leave-to {
+    transform: translateY(-15px);
+  }
+}
+
+.scroll-x-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-from {
+    transform: translateX(-15px);
+  }
+
+  &-leave-to {
+    transform: translateX(15px);
+  }
+}
+
+.scroll-x-reverse-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-from {
+    transform: translateX(15px);
+  }
+
+  &-leave-to {
+    transform: translateX(-15px);
+  }
+}
--- a/src/styles/transition/slide.less
+++ b/src/styles/transition/slide.less
@@ -0,0 +1,39 @@
+.slide-y-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateY(-15px);
+  }
+}
+
+.slide-y-reverse-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateY(15px);
+  }
+}
+
+.slide-x-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateX(-15px);
+  }
+}
+
+.slide-x-reverse-transition {
+  .transition-default();
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateX(15px);
+  }
+}
--- a/src/styles/transition/zoom.less
+++ b/src/styles/transition/zoom.less
@@ -0,0 +1,27 @@
+// zoom-out
+.zoom-out-enter-active,
+.zoom-out-leave-active {
+  transition: opacity 0.1 ease-in-out, transform 0.15s ease-out;
+}
+
+.zoom-out-enter-from,
+.zoom-out-leave-to {
+  opacity: 0;
+  transform: scale(0);
+}
+
+// zoom-fade
+.zoom-fade-enter-active,
+.zoom-fade-leave-active {
+  transition: transform 0.2s, opacity 0.3s ease-out;
+}
+
+.zoom-fade-enter-from {
+  opacity: 0;
+  transform: scale(0.92);
+}
+
+.zoom-fade-leave-to {
+  opacity: 0;
+  transform: scale(1.06);
+}
--- a/src/utils/Drag.ts
+++ b/src/utils/Drag.ts
@@ -1,6 +1,5 @@
 //获取相关CSS属性
 const getCss = function (o, key) {
-  // @ts-ignore
  return o.currentStyle
    ? o.currentStyle[key]
    : document.defaultView?.getComputedStyle(o, null)[key];
@@ -14,7 +13,7 @@ const params = {
  flag: false,
 };

-const startDrag = function (bar, target, callback) {
+const startDrag = function (bar, target, callback?) {
  const screenWidth = document.body.clientWidth; // body当前宽度
  const screenHeight = document.documentElement.clientHeight; // 可见区域高度

--- a/src/utils/Storage.ts
+++ b/src/utils/Storage.ts
@@ -48,7 +48,7 @@ export const createStorage = ({ prefixKey = '', storage = localStorage } = {}) =
          if (expire === null || expire >= Date.now()) {
            return value;
          }
-          this.remove(this.getKey(key));
+          this.remove(key);
        } catch (e) {
          return def;
        }
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -5,8 +5,8 @@ import { AxiosCanceler } from './axiosCancel';
 import { isFunction } from '@/utils/is';
 import { cloneDeep } from 'lodash-es';

-import type { RequestOptions, CreateAxiosOptions, Result } from './types';
-// import { ContentTypeEnum } from '/@/enums/httpEnum';
+import type { RequestOptions, CreateAxiosOptions, Result, UploadFileParams } from './types';
+import { ContentTypeEnum } from '@/enums/httpEnum';

 export * from './axiosTransform';

@@ -23,18 +23,6 @@ export class VAxios {
    this.setupInterceptors();
  }

-  /**
-   * @description:  创建axios实例
-   */
-  private createAxios(config: CreateAxiosOptions): void {
-    this.axiosInstance = axios.create(config);
-  }
-
-  private getTransform() {
-    const { transform } = this.options;
-    return transform;
-  }
-
  getAxios(): AxiosInstance {
    return this.axiosInstance;
  }
@@ -59,6 +47,103 @@ export class VAxios {
    Object.assign(this.axiosInstance.defaults.headers, headers);
  }

+  /**
+   * @description:   请求方法
+   */
+  request<T = any>(config: AxiosRequestConfig, options?: RequestOptions): Promise<T> {
+    let conf: AxiosRequestConfig = cloneDeep(config);
+    const transform = this.getTransform();
+
+    const { requestOptions } = this.options;
+
+    const opt: RequestOptions = Object.assign({}, requestOptions, options);
+
+    const { beforeRequestHook, requestCatch, transformRequestData } = transform || {};
+    if (beforeRequestHook && isFunction(beforeRequestHook)) {
+      conf = beforeRequestHook(conf, opt);
+    }
+
+    //这里重新 赋值成最新的配置
+    // @ts-ignore
+    conf.requestOptions = opt;
+
+    return new Promise((resolve, reject) => {
+      this.axiosInstance
+        .request<any, AxiosResponse<Result>>(conf)
+        .then((res: AxiosResponse<Result>) => {
+          // 请求是否被取消
+          const isCancel = axios.isCancel(res);
+          if (transformRequestData && isFunction(transformRequestData) && !isCancel) {
+            try {
+              const ret = transformRequestData(res, opt);
+              resolve(ret);
+            } catch (err) {
+              reject(err || new Error('request error!'));
+            }
+            return;
+          }
+          resolve(res as unknown as Promise<T>);
+        })
+        .catch((e: Error) => {
+          if (requestCatch && isFunction(requestCatch)) {
+            reject(requestCatch(e));
+            return;
+          }
+          reject(e);
+        });
+    });
+  }
+
+  /**
+   * @description:  创建axios实例
+   */
+  private createAxios(config: CreateAxiosOptions): void {
+    this.axiosInstance = axios.create(config);
+  }
+
+  private getTransform() {
+    const { transform } = this.options;
+    return transform;
+  }
+
+  /**
+   * @description:  文件上传
+   */
+  uploadFile<T = any>(config: AxiosRequestConfig, params: UploadFileParams) {
+    const formData = new window.FormData();
+    const customFilename = params.name || 'file';
+
+    if (params.filename) {
+      formData.append(customFilename, params.file, params.filename);
+    } else {
+      formData.append(customFilename, params.file);
+    }
+
+    if (params.data) {
+      Object.keys(params.data).forEach((key) => {
+        const value = params.data![key];
+        if (Array.isArray(value)) {
+          value.forEach((item) => {
+            formData.append(`${key}[]`, item);
+          });
+          return;
+        }
+
+        formData.append(key, params.data![key]);
+      });
+    }
+
+    return this.axiosInstance.request<T>({
+      method: 'POST',
+      data: formData,
+      headers: {
+        'Content-type': ContentTypeEnum.FORM_DATA,
+        ignoreCancelToken: true,
+      },
+      ...config,
+    });
+  }
+
  /**
   * @description: 拦截器配置
   */
@@ -78,10 +163,17 @@ export class VAxios {

    // 请求拦截器配置处理
    this.axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => {
-      const { headers: { ignoreCancelToken } = { ignoreCancelToken: false } } = config;
-      !ignoreCancelToken && axiosCanceler.addPending(config);
+      const {
+        headers: { ignoreCancelToken },
+      } = config;
+      const ignoreCancel =
+        ignoreCancelToken !== undefined
+          ? ignoreCancelToken
+          : this.options.requestOptions?.ignoreCancelToken;
+
+      !ignoreCancel && axiosCanceler.addPending(config);
      if (requestInterceptors && isFunction(requestInterceptors)) {
-        config = requestInterceptors(config);
+        config = requestInterceptors(config, this.options);
      }
      return config;
    }, undefined);
@@ -105,62 +197,4 @@ export class VAxios {
      isFunction(responseInterceptorsCatch) &&
      this.axiosInstance.interceptors.response.use(undefined, responseInterceptorsCatch);
  }
-
-  // /**
-  //  * @description:  文件上传
-  //  */
-  // uploadFiles(config: AxiosRequestConfig, params: File[]) {
-  //   const formData = new FormData();
-
-  //   Object.keys(params).forEach((key) => {
-  //     formData.append(key, params[key as any]);
-  //   });
-
-  //   return this.request({
-  //     ...config,
-  //     method: 'POST',
-  //     data: formData,
-  //     headers: {
-  //       'Content-type': ContentTypeEnum.FORM_DATA,
-  //     },
-  //   });
-  // }
-
-  /**
-   * @description:   请求方法
-   */
-  request<T = any>(config: AxiosRequestConfig, options?: RequestOptions): Promise<T> {
-    let conf: AxiosRequestConfig = cloneDeep(config);
-    const transform = this.getTransform();
-
-    const { requestOptions } = this.options;
-
-    const opt: RequestOptions = Object.assign({}, requestOptions, options);
-
-    const { beforeRequestHook, requestCatch, transformRequestData } = transform || {};
-    if (beforeRequestHook && isFunction(beforeRequestHook)) {
-      conf = beforeRequestHook(conf, opt);
-    }
-    return new Promise((resolve, reject) => {
-      this.axiosInstance
-        .request<any, AxiosResponse<Result>>(conf)
-        .then((res: AxiosResponse<Result>) => {
-          // 请求是否被取消
-          const isCancel = axios.isCancel(res);
-          if (transformRequestData && isFunction(transformRequestData) && !isCancel) {
-            const ret = transformRequestData(res, opt);
-            // ret !== undefined ? resolve(ret) : reject(new Error('request error!'));
-            return resolve(ret);
-          }
-          reject(res as unknown as Promise<T>);
-        })
-        .catch((e: Error) => {
-          if (requestCatch && isFunction(requestCatch)) {
-            reject(requestCatch(e));
-            return;
-          }
-          reject(e);
-        });
-    });
-  }
 }
--- a/src/utils/http/axios/axiosTransform.ts
+++ b/src/utils/http/axios/axiosTransform.ts
@@ -4,6 +4,12 @@
 import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import type { RequestOptions, Result } from './types';

+export interface CreateAxiosOptions extends AxiosRequestConfig {
+  authenticationScheme?: string;
+  transform?: AxiosTransform;
+  requestOptions?: RequestOptions;
+}
+
 export abstract class AxiosTransform {
  /**
   * @description: 请求之前处理配置
@@ -24,7 +30,10 @@ export abstract class AxiosTransform {
  /**
   * @description: 请求之前的拦截器
   */
-  requestInterceptors?: (config: AxiosRequestConfig) => AxiosRequestConfig;
+  requestInterceptors?: (
+    config: AxiosRequestConfig,
+    options: CreateAxiosOptions
+  ) => AxiosRequestConfig;

  /**
   * @description: 请求之后的拦截器
--- a/src/utils/http/axios/checkStatus.ts
+++ b/src/utils/http/axios/checkStatus.ts
@@ -1,46 +1,47 @@
-export function checkStatus(status: number, msg: string, message: any): void {
+export function checkStatus(status: number, msg: string): void {
+  const $message = window['$message'];
  switch (status) {
    case 400:
-      message.error(`${msg}`);
+      $message.error(msg);
      break;
    // 401: 未登录
    // 未登录则跳转登录页面，并携带当前页面的路径
    // 在登录成功后返回当前页面，这一步需要在登录页操作。
    case 401:
-      message.error('用户没有权限（令牌、用户名、密码错误）!');
+      $message.error('用户没有权限（令牌、用户名、密码错误）!');
      break;
    case 403:
-      message.error('用户得到授权，但是访问是被禁止的。!');
+      $message.error('用户得到授权，但是访问是被禁止的。!');
      break;
    // 404请求不存在
    case 404:
-      message.error('网络请求错误,未找到该资源!');
+      $message.error('网络请求错误，未找到该资源!');
      break;
    case 405:
-      message.error('网络请求错误,请求方法未允许!');
+      $message.error('网络请求错误，请求方法未允许!');
      break;
    case 408:
-      message.error('网络请求超时!');
+      $message.error('网络请求超时');
      break;
    case 500:
-      message.error('服务器错误,请联系管理员!');
+      $message.error('服务器错误,请联系管理员!');
      break;
    case 501:
-      message.error('网络未实现!');
+      $message.error('网络未实现');
      break;
    case 502:
-      message.error('网络错误!');
+      $message.error('网络错误');
      break;
    case 503:
-      message.error('服务不可用，服务器暂时过载或维护!');
+      $message.error('服务不可用，服务器暂时过载或维护!');
      break;
    case 504:
-      message.error('网络超时!');
+      $message.error('网络超时');
      break;
    case 505:
-      message.error('http版本不支持该请求!');
+      $message.error('http版本不支持该请求!');
      break;
    default:
-      message.error(msg);
+      $message.error(msg);
  }
 }
--- a/src/utils/http/axios/helper.ts
+++ b/src/utils/http/axios/helper.ts
@@ -36,7 +36,7 @@ export function formatRequestDate(params: Recordable) {
        try {
          params[key] = isString(value) ? value.trim() : value;
        } catch (error) {
-          throw new Error(error);
+          throw new Error(error as any);
        }
      }
    }
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -5,13 +5,15 @@ import axios, { AxiosResponse } from 'axios';
 import { checkStatus } from './checkStatus';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { RequestEnum, ResultEnum, ContentTypeEnum } from '@/enums/httpEnum';
+import { PageEnum } from '@/enums/pageEnum';

 import { useGlobSetting } from '@/hooks/setting';

 import { isString } from '@/utils/is/';
+import { deepMerge, isUrl } from '@/utils';
 import { setObjToUrlParams } from '@/utils/urlUtils';

-import { RequestOptions, Result } from './types';
+import { RequestOptions, Result, CreateAxiosOptions } from './types';

 import { useUserStoreWidthOut } from '@/store/modules/user';

@@ -29,7 +31,6 @@ const transform: AxiosTransform = {
   * @description: 处理请求数据
   */
  transformRequestData: (res: AxiosResponse<Result>, options: RequestOptions) => {
-    const { $message: Message, $dialog: Modal } = window;
    const {
      isShowMessage = true,
      isShowErrorMessage,
@@ -50,15 +51,16 @@ const transform: AxiosTransform = {
      return res.data;
    }

-    const reject = Promise.reject;
-
    const { data } = res;

+    const $dialog = window['$dialog'];
+    const $message = window['$message'];
+
    if (!data) {
      // return '[HTTP] Request has no return value';
-      return reject(data);
+      throw new Error('请求出错，请稍候重试');
    }
-    //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
+    //  这里 code，result，message为 后台统一的字段，需要修改为项目自己的接口返回格式
    const { code, result, message } = data;
    // 请求成功
    const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS;
@@ -66,13 +68,16 @@ const transform: AxiosTransform = {
    if (isShowMessage) {
      if (hasSuccess && (successMessageText || isShowSuccessMessage)) {
        // 是否显示自定义信息提示
-        Message.success(successMessageText || message || '操作成功！');
+        $dialog.success({
+          type: 'success',
+          content: successMessageText || message || '操作成功！',
+        });
      } else if (!hasSuccess && (errorMessageText || isShowErrorMessage)) {
        // 是否显示自定义信息提示
-        Message.error(message || errorMessageText || '操作失败！');
+        $message.error(message || errorMessageText || '操作失败！');
      } else if (!hasSuccess && options.errorMessageMode === 'modal') {
        // errorMessageMode=‘custom-modal’的时候会显示modal错误弹窗，而不是消息提示，用于一些比较重要的错误
-        Modal.info({
+        $dialog.info({
          title: '提示',
          content: message,
          positiveText: '确定',
@@ -85,63 +90,53 @@ const transform: AxiosTransform = {
    if (code === ResultEnum.SUCCESS) {
      return result;
    }
-    // 接口请求错误，统一提示错误信息
-    if (code === ResultEnum.ERROR) {
-      if (message) {
-        Message.error(data.message);
-        Promise.reject(new Error(message));
-      } else {
-        const msg = '操作失败,系统异常!';
-        Message.error(msg);
-        Promise.reject(new Error(msg));
-      }
-      return reject();
+    // 接口请求错误，统一提示错误信息 这里逻辑可以根据项目进行修改
+    let errorMsg = message;
+    switch (code) {
+      // 请求失败
+      case ResultEnum.ERROR:
+        $message.error(errorMsg);
+        break;
+      // 登录超时
+      case ResultEnum.TIMEOUT:
+        const LoginName = PageEnum.BASE_LOGIN_NAME;
+        const LoginPath = PageEnum.BASE_LOGIN;
+        if (router.currentRoute.value?.name === LoginName) return;
+        // 到登录页
+        errorMsg = '登录超时，请重新登录!';
+        $dialog.warning({
+          title: '提示',
+          content: '登录身份已失效，请重新登录!',
+          positiveText: '确定',
+          //negativeText: '取消',
+          closable: false,
+          maskClosable: false,
+          onPositiveClick: () => {
+            storage.clear();
+            window.location.href = LoginPath;
+          },
+          onNegativeClick: () => {},
+        });
+        break;
    }
-
-    // 登录超时
-    if (code === ResultEnum.TIMEOUT) {
-      if (router.currentRoute.value.name == 'login') return;
-      // 到登录页
-      const timeoutMsg = '登录超时,请重新登录!';
-      Modal.warning({
-        title: '提示',
-        content: '登录身份已失效，请重新登录!',
-        positiveText: '确定',
-        negativeText: '取消',
-        onPositiveClick: () => {
-          storage.clear();
-          router.replace({
-            name: 'login',
-            query: {
-              redirect: router.currentRoute.value.fullPath,
-            },
-          });
-        },
-        onNegativeClick: () => {},
-      });
-      return reject(new Error(timeoutMsg));
-    }
-
-    // 这里逻辑可以根据项目进行修改
-    if (!hasSuccess) {
-      return reject(new Error(message));
-    }
-
-    return data;
+    throw new Error(errorMsg);
  },

  // 请求之前处理config
  beforeRequestHook: (config, options) => {
-    const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true } = options;
+    const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true, urlPrefix } = options;

-    if (joinPrefix) {
+    const isUrlStr = isUrl(config.url as string);
+
+    if (!isUrlStr && joinPrefix) {
      config.url = `${urlPrefix}${config.url}`;
    }

-    if (apiUrl && isString(apiUrl)) {
+    if (!isUrlStr && apiUrl && isString(apiUrl)) {
      config.url = `${apiUrl}${config.url}`;
    }
    const params = config.params || {};
+    const data = config.data || false;
    if (config.method?.toUpperCase() === RequestEnum.GET) {
      if (!isString(params)) {
        // 给 get 请求加上时间戳参数，避免从缓存中拿数据。
@@ -154,10 +149,18 @@ const transform: AxiosTransform = {
    } else {
      if (!isString(params)) {
        formatDate && formatRequestDate(params);
-        config.data = params;
-        config.params = undefined;
+        if (Reflect.has(config, 'data') && config.data && Object.keys(config.data).length > 0) {
+          config.data = data;
+          config.params = params;
+        } else {
+          config.data = params;
+          config.params = undefined;
+        }
        if (joinParamsToUrl) {
-          config.url = setObjToUrlParams(config.url as string, config.data);
+          config.url = setObjToUrlParams(
+            config.url as string,
+            Object.assign({}, config.params, config.data)
+          );
        }
      } else {
        // 兼容restful风格
@@ -171,13 +174,15 @@ const transform: AxiosTransform = {
  /**
   * @description: 请求拦截器处理
   */
-  requestInterceptors: (config) => {
+  requestInterceptors: (config, options) => {
    // 请求之前处理config
    const userStore = useUserStoreWidthOut();
    const token = userStore.getToken;
-    if (token) {
+    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
      // jwt token
-      config.headers.token = token;
+      (config as Recordable).headers.Authorization = options.authenticationScheme
+        ? `${options.authenticationScheme} ${token}`
+        : token;
    }
    return config;
  },
@@ -186,7 +191,8 @@ const transform: AxiosTransform = {
   * @description: 响应错误处理
   */
  responseInterceptorsCatch: (error: any) => {
-    const { $message: Message, $dialog: Modal } = window;
+    const $dialog = window['$dialog'];
+    const $message = window['$message'];
    const { response, code, message } = error || {};
    // TODO 此处要根据后端接口返回格式修改
    const msg: string =
@@ -194,57 +200,88 @@ const transform: AxiosTransform = {
    const err: string = error.toString();
    try {
      if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
-        Message.error('接口请求超时,请刷新页面重试!');
+        $message.error('接口请求超时，请刷新页面重试!');
        return;
      }
      if (err && err.includes('Network Error')) {
-        Modal.info({
+        $dialog.info({
          title: '网络异常',
-          content: '请检查您的网络连接是否正常!',
+          content: '请检查您的网络连接是否正常',
          positiveText: '确定',
+          //negativeText: '取消',
+          closable: false,
+          maskClosable: false,
          onPositiveClick: () => {},
+          onNegativeClick: () => {},
        });
-        return;
+        return Promise.reject(error);
      }
    } catch (error) {
-      throw new Error(error);
+      throw new Error(error as any);
    }
    // 请求是否被取消
    const isCancel = axios.isCancel(error);
    if (!isCancel) {
-      checkStatus(error.response && error.response.status, msg, Message);
+      checkStatus(error.response && error.response.status, msg);
    } else {
      console.warn(error, '请求被取消！');
    }
-    return error;
+    //return Promise.reject(error);
+    return Promise.reject(response?.data);
  },
 };

-const Axios = new VAxios({
-  timeout: 10 * 1000,
-  // 接口前缀
-  prefixUrl: urlPrefix,
-  headers: { 'Content-Type': ContentTypeEnum.JSON },
-  // 数据处理方式
-  transform,
-  // 配置项，下面的选项都可以在独立的接口请求中覆盖
-  requestOptions: {
-    // 默认将prefix 添加到url
-    joinPrefix: true,
-    // 是否返回原生响应头 比如：需要获取响应头时使用该属性
-    isReturnNativeResponse: false,
-    // 需要对返回数据进行处理
-    isTransformResponse: true,
-    // post请求的时候添加参数到url
-    joinParamsToUrl: false,
-    // 格式化提交参数时间
-    formatDate: true,
-    // 消息提示类型
-    errorMessageMode: 'none',
-    // 接口地址
-    apiUrl: globSetting.apiUrl as string,
-  },
-  withCredentials: false,
-});
+function createAxios(opt?: Partial<CreateAxiosOptions>) {
+  return new VAxios(
+    deepMerge(
+      {
+        timeout: 10 * 1000,
+        authenticationScheme: '',
+        // 接口前缀
+        prefixUrl: urlPrefix,
+        headers: { 'Content-Type': ContentTypeEnum.JSON },
+        // 数据处理方式
+        transform,
+        // 配置项，下面的选项都可以在独立的接口请求中覆盖
+        requestOptions: {
+          // 默认将prefix 添加到url
+          joinPrefix: true,
+          // 是否返回原生响应头 比如：需要获取响应头时使用该属性
+          isReturnNativeResponse: false,
+          // 需要对返回数据进行处理
+          isTransformResponse: true,
+          // post请求的时候添加参数到url
+          joinParamsToUrl: false,
+          // 格式化提交参数时间
+          formatDate: true,
+          // 消息提示类型
+          errorMessageMode: 'none',
+          // 接口地址
+          apiUrl: globSetting.apiUrl,
+          // 接口拼接地址
+          urlPrefix: urlPrefix,
+          //  是否加入时间戳
+          joinTime: true,
+          // 忽略重复请求
+          ignoreCancelToken: true,
+          // 是否携带token
+          withToken: true,
+        },
+        withCredentials: false,
+      },
+      opt || {}
+    )
+  );
+}

-export default Axios;
+export const http = createAxios();
+
+// 项目，多个不同 api 地址，直接在这里导出多个
+// src/api ts 里面接口，就可以单独使用这个请求，
+// import { httpTwo } from '@/utils/http/axios'
+// export const httpTwo = createAxios({
+//   requestOptions: {
+//     apiUrl: 'http://localhost:9001',
+//     urlPrefix: 'api',
+//   },
+// });
--- a/src/utils/http/axios/types.ts
+++ b/src/utils/http/axios/types.ts
@@ -2,9 +2,22 @@ import { AxiosRequestConfig } from 'axios';
 import { AxiosTransform } from './axiosTransform';

 export interface CreateAxiosOptions extends AxiosRequestConfig {
-  prefixUrl?: string;
  transform?: AxiosTransform;
  requestOptions?: RequestOptions;
+  authenticationScheme?: string;
+}
+
+// 上传文件
+export interface UploadFileParams {
+  // 其他参数
+  data?: Recordable;
+  // 文件参数接口字段名
+  name?: string;
+  // 文件
+  file: File | Blob;
+  // 文件名称
+  filename?: string;
+  [key: string]: any;
 }

 export interface RequestOptions {
@@ -12,8 +25,6 @@ export interface RequestOptions {
  joinParamsToUrl?: boolean;
  // 格式化请求参数时间
  formatDate?: boolean;
-  //  是否处理请求结果
-  isTransformResponse?: boolean;
  // 是否显示提示信息
  isShowMessage?: boolean;
  // 是否解析成JSON
@@ -30,6 +41,8 @@ export interface RequestOptions {
  joinPrefix?: boolean;
  // 接口地址， 不填则使用默认apiUrl
  apiUrl?: string;
+  // 请求拼接路径
+  urlPrefix?: string;
  // 错误消息提示类型
  errorMessageMode?: 'none' | 'modal';
  // 是否添加时间戳
@@ -38,6 +51,10 @@ export interface RequestOptions {
  isTransformResponse?: boolean;
  // 是否返回原生响应头
  isReturnNativeResponse?: boolean;
+  //忽略重复请求
+  ignoreCancelToken?: boolean;
+  // 是否携带token
+  withToken?: boolean;
 }

 export interface Result<T = any> {
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -41,6 +41,7 @@ export function generatorMenu(routerMap: Array<any>) {
      ...info.meta,
      label: info.meta?.title,
      key: info.name,
+      icon: isRoot ? item.meta?.icon : info.meta?.icon,
    };
    // 是否有子菜单，并递归处理
    if (info.children && info.children.length > 0) {
@@ -205,3 +206,10 @@ export function lighten(color: string, amount: number) {
    amount
  )}${addLight(color.substring(4, 6), amount)}`;
 }
+
+/**
+ * 判断是否 url
+ * */
+export function isUrl(url: string) {
+  return /(^http|https:\/\/)/g.test(url);
+}
--- a/src/views/about/index.vue
+++ b/src/views/about/index.vue
@@ -9,7 +9,7 @@
    <n-card
      :bordered="false"
      title="项目信息"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -54,7 +54,7 @@
    <n-card
      :bordered="false"
      title="开发环境依赖"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -68,7 +68,7 @@
    <n-card
      :bordered="false"
      title="生产环境依赖"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -81,40 +81,24 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
-
+<script lang="ts" setup>
  export interface schemaItem {
    field: string;
    label: string;
  }

-  export default defineComponent({
-    setup() {
-      const { pkg, lastBuildTime } = __APP_INFO__;
-      const { dependencies, devDependencies, name, version } = pkg;
+  const { pkg, lastBuildTime } = __APP_INFO__;
+  const { dependencies, devDependencies, name, version } = pkg;

-      const schema: schemaItem[] = [];
-      const devSchema: schemaItem[] = [];
+  const schema: schemaItem[] = [];
+  const devSchema: schemaItem[] = [];

-      Object.keys(dependencies).forEach((key) => {
-        schema.push({ field: key, label: dependencies[key] });
-      });
+  Object.keys(dependencies).forEach((key) => {
+    schema.push({ field: key, label: dependencies[key] });
+  });

-      Object.keys(devDependencies).forEach((key) => {
-        devSchema.push({ field: key, label: devDependencies[key] });
-      });
-
-      return {
-        lastBuildTime,
-        dependencies,
-        devDependencies,
-        name,
-        version,
-        schema,
-        devSchema,
-      };
-    },
+  Object.keys(devDependencies).forEach((key) => {
+    devSchema.push({ field: key, label: devDependencies[key] });
  });
 </script>

--- a/src/views/comp/drag/index.vue
+++ b/src/views/comp/drag/index.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <div class="n-layout-page-header">
+      <n-card :bordered="false" title="拖拽"> 常用于卡片，事项，预约，流程，计划等， </n-card>
+    </div>
+
+    <n-alert title="花式拖拽演示" type="info" class="mt-4">
+      每个卡片，都可以上下拖拽顺序，另外不同卡片，也可以拖拽过去，拖拽过来，都不在话下呢，快试试O(∩_∩)O哈哈~
+    </n-alert>
+
+    <n-grid
+      cols="1 s:2 m:3 l:4 xl:4 2xl:4"
+      class="mt-4 proCard"
+      responsive="screen"
+      :x-gap="12"
+      :y-gap="8"
+    >
+      <n-grid-item>
+        <NCard
+          title="需求池"
+          :segmented="{ content: 'hard', footer: 'hard' }"
+          size="small"
+          :bordered="false"
+        >
+          <template #header-extra>
+            <n-tag type="info">月</n-tag>
+          </template>
+
+          <Draggable
+            class="draggable-ul"
+            animation="300"
+            :list="demandList"
+            group="people"
+            itemKey="name"
+          >
+            <template #item="{ element }">
+              <div class="cursor-move draggable-li">
+                <n-tag type="info">需求</n-tag><span class="ml-2">{{ element.name }}</span>
+              </div>
+            </template>
+          </Draggable>
+        </NCard>
+      </n-grid-item>
+
+      <n-grid-item>
+        <NCard
+          title="开发中"
+          :segmented="{ content: 'hard', footer: 'hard' }"
+          size="small"
+          :bordered="false"
+        >
+          <template #header-extra>
+            <n-tag type="info">月</n-tag>
+          </template>
+
+          <Draggable
+            class="draggable-ul"
+            animation="300"
+            :list="exploitList"
+            group="people"
+            itemKey="name"
+          >
+            <template #item="{ element }">
+              <div class="cursor-move draggable-li">
+                <n-tag type="warning">开发中</n-tag><span class="ml-2">{{ element.name }}</span>
+              </div>
+            </template>
+          </Draggable>
+        </NCard>
+      </n-grid-item>
+
+      <n-grid-item>
+        <NCard
+          title="已完成"
+          :segmented="{ content: 'hard', footer: 'hard' }"
+          size="small"
+          :bordered="false"
+        >
+          <template #header-extra>
+            <n-tag type="info">月</n-tag>
+          </template>
+          <Draggable
+            class="draggable-ul"
+            animation="300"
+            :list="completeList"
+            group="people"
+            itemKey="name"
+          >
+            <template #item="{ element }">
+              <div class="cursor-move draggable-li">
+                <n-tag type="error">已完成</n-tag><span class="ml-2">{{ element.name }}</span>
+              </div>
+            </template>
+          </Draggable>
+        </NCard>
+      </n-grid-item>
+
+      <n-grid-item>
+        <NCard
+          title="已验收"
+          :segmented="{ content: 'hard', footer: 'hard' }"
+          size="small"
+          :bordered="false"
+        >
+          <template #header-extra>
+            <n-tag type="info">月</n-tag>
+          </template>
+          <Draggable
+            class="draggable-ul"
+            animation="300"
+            :list="approvedList"
+            group="people"
+            itemKey="name"
+          >
+            <template #item="{ element }">
+              <div class="cursor-move draggable-li">
+                <n-tag type="success">已验收</n-tag><span class="ml-2">{{ element.name }}</span>
+              </div>
+            </template>
+          </Draggable>
+        </NCard>
+      </n-grid-item>
+    </n-grid>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { reactive } from 'vue';
+  import Draggable from 'vuedraggable';
+
+  const demandList = reactive([
+    { name: '预约表单页面，能填写预约相关信息', id: 1 },
+    { name: '促销活动页面，包含促销广告展示', id: 2 },
+    { name: '商品列表，需要一个到货提醒功能', id: 3 },
+    { name: '商品需要一个评价功能', id: 4 },
+    { name: '商品图片需要提供放大镜', id: 5 },
+    { name: '订单需要提供删除到回收站', id: 6 },
+    { name: '用户头像上传，需要支持裁剪', id: 7 },
+    { name: '据说Vue3.2发布了，setup啥时候支持？', id: 8 },
+  ]);
+
+  const exploitList = reactive([{ name: '商品图片需要提供放大镜', id: 5 }]);
+
+  const completeList = reactive([{ name: '商品图片需要提供放大镜', id: 5 }]);
+
+  const approvedList = reactive([{ name: '商品图片需要提供放大镜', id: 5 }]);
+</script>
+
+<style lang="less" scoped>
+  .draggable-ul {
+    width: 100%;
+    overflow: hidden;
+    margin-top: -16px;
+
+    .draggable-li {
+      width: 100%;
+      padding: 16px 10px;
+      color: #333;
+      border-bottom: 1px solid #efeff5;
+    }
+  }
+</style>
--- a/src/views/comp/form/basic.vue
+++ b/src/views/comp/form/basic.vue
@@ -3,13 +3,15 @@
    <div class="n-layout-page-header">
      <n-card :bordered="false" title="基础表单"> 基础表单，用于向用户收集表单信息 </n-card>
    </div>
-    <n-card :bordered="false" class="proCard mt-4">
+    <n-card :bordered="false" class="mt-4 proCard">
      <div class="BasicForm">
        <BasicForm
          submitButtonText="提交预约"
          layout="horizontal"
          :gridProps="{ cols: 1 }"
          :schemas="schemas"
+          @submit="handleSubmit"
+          @reset="handleReset"
        >
          <template #statusSlot="{ model, field }">
            <n-input v-model:value="model[field]" />
@@ -20,12 +22,11 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
-  import { BasicForm, FormSchema } from '@/components/Form/index';
+<script lang="ts" setup>
+  import { BasicForm } from '@/components/Form/index';
  import { useMessage } from 'naive-ui';

-  const schemas: FormSchema[] = [
+  const schemas = [
    {
      field: 'name',
      component: 'NInput',
@@ -76,10 +77,10 @@
      field: 'makeDate',
      component: 'NDatePicker',
      label: '预约时间',
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
@@ -149,29 +150,16 @@
    },
  ];

-  export default defineComponent({
-    components: { BasicForm },
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
+  const message = useMessage();

-      function handleSubmit(values: Recordable) {
-        console.log(values);
-        message.success(JSON.stringify(values));
-      }
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    message.success(JSON.stringify(values));
+  }

-      function handleReset(values: Recordable) {
-        console.log(values);
-      }
-
-      return {
-        schemas,
-        formRef,
-        handleSubmit,
-        handleReset,
-      };
-    },
-  });
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/comp/form/useForm.vue
+++ b/src/views/comp/form/useForm.vue
@@ -3,7 +3,7 @@
    <div class="n-layout-page-header">
      <n-card :bordered="false" title="基础表单"> useForm 表单，用于向用户收集表单信息 </n-card>
    </div>
-    <n-card :bordered="false" class="proCard mt-4">
+    <n-card :bordered="false" class="mt-4 proCard">
      <div class="BasicForm">
        <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
          <template #statusSlot="{ model, field }">
@@ -15,12 +15,11 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
-  import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
+<script lang="ts" setup>
+  import { BasicForm, useForm } from '@/components/Form/index';
  import { useMessage } from 'naive-ui';

-  const schemas: FormSchema[] = [
+  const schemas = [
    {
      field: 'name',
      component: 'NInput',
@@ -80,10 +79,10 @@
      giProps: {
        //span: 24,
      },
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
@@ -165,43 +164,25 @@
    },
  ];

-  export default defineComponent({
-    components: { BasicForm },
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
+  const message = useMessage();

-      const [register, { setFieldsValue }] = useForm({
-        gridProps: { cols: 1 },
-        collapsedRows: 3,
-        labelWidth: 120,
-        layout: 'horizontal',
-        submitButtonText: '提交预约',
-        schemas,
-      });
-
-      function setName() {
-        setFieldsValue({ name: '小马哥' });
-      }
-
-      function handleSubmit(values: Recordable) {
-        console.log(values);
-        message.success(JSON.stringify(values));
-      }
-
-      function handleReset(values: Recordable) {
-        console.log(values);
-      }
-
-      return {
-        register,
-        formRef,
-        handleSubmit,
-        handleReset,
-        setName,
-      };
-    },
+  const [register, {}] = useForm({
+    gridProps: { cols: 1 },
+    collapsedRows: 3,
+    labelWidth: 120,
+    layout: 'horizontal',
+    submitButtonText: '提交预约',
+    schemas,
  });
+
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    message.success(JSON.stringify(values));
+  }
+
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/comp/modal/index.vue
+++ b/src/views/comp/modal/index.vue
@@ -120,10 +120,10 @@
      giProps: {
        //span: 24,
      },
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
--- a/src/views/comp/richtext/vue-quill.vue
+++ b/src/views/comp/richtext/vue-quill.vue
@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <div class="n-layout-page-header">
+      <n-card :bordered="false" title="富文本">
+        富文本，用于展示图文信息，比如商品详情，文章详情等...
+      </n-card>
+    </div>
+    <n-card :bordered="false" class="mt-4 proCard">
+      <QuillEditor
+        ref="quillEditor"
+        :options="options"
+        v-model:content="myContent"
+        style="height: 350px"
+        @ready="readyQuill"
+        class="quillEditor"
+      />
+      <template #footer>
+        <n-space>
+          <n-button @click="addText">增加文本</n-button>
+          <n-button @click="addImg">增加图片</n-button>
+          <n-button @click="getHtml">获取HTML</n-button>
+        </n-space>
+      </template>
+    </n-card>
+    <n-card :bordered="false" class="mt-4 proCard" title="HTML 内容">
+      <n-input
+        v-model:value="myContentHtml"
+        type="textarea"
+        placeholder="html"
+        :autosize="{
+          minRows: 3,
+          maxRows: 6,
+        }"
+      />
+    </n-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive } from 'vue';
+  import { QuillEditor } from '@vueup/vue-quill';
+  import '@vueup/vue-quill/dist/vue-quill.snow.css';
+  const quillEditor = ref();
+  const myContent = ref(
+    '<h4>Naive Ui Admin 是一个基于 vue3,vite2,TypeScript 的中后台解决方案</h4>'
+  );
+  const myContentHtml = ref(
+    '<h4>Naive Ui Admin 是一个基于 vue3,vite2,TypeScript 的中后台解决方案</h4>'
+  );
+
+  const options = reactive({
+    modules: {
+      toolbar: [
+        ['bold', 'italic', 'underline', 'strike'], // toggled buttons
+        ['blockquote', 'code-block'],
+
+        [{ header: 1 }, { header: 2 }], // custom button values
+        [{ list: 'ordered' }, { list: 'bullet' }],
+        [{ script: 'sub' }, { script: 'super' }], // superscript/subscript
+        [{ indent: '-1' }, { indent: '+1' }], // outdent/indent
+        [{ direction: 'rtl' }], // text direction
+
+        [{ size: ['small', false, 'large', 'huge'] }], // custom dropdown
+        [{ header: [1, 2, 3, 4, 5, 6, false] }],
+
+        [{ color: [] }, { background: [] }], // dropdown with defaults from theme
+        [{ font: [] }],
+        [{ align: [] }],
+        ['clean'],
+        ['image'],
+      ],
+    },
+    theme: 'snow',
+    placeholder: '输入您喜欢的内容吧！',
+  });
+
+  function readyQuill() {
+    console.log('Quill准备好了');
+  }
+
+  function getHtml() {
+    myContentHtml.value = getHtmlVal();
+  }
+
+  function addText() {
+    const html = getHtmlVal() + '新增加的内容';
+    quillEditor.value.setHTML(html);
+  }
+
+  function addImg() {
+    const html =
+      getHtmlVal() +
+      '<img style="width:100px" src="https://www.baidu.com/img/flexible/logo/pc/result.png"/>';
+    quillEditor.value.setHTML(html);
+  }
+
+  function getHtmlVal() {
+    return quillEditor.value.getHTML();
+  }
+</script>
+
+<style lang="less">
+  .ql-toolbar.ql-snow {
+    border-top: none;
+    border-left: none;
+    border-right: none;
+    border-bottom: 1px solid #eee;
+    margin-top: -10px;
+  }
+
+  .ql-container.ql-snow {
+    border: none;
+  }
+</style>
--- a/src/views/comp/table/basic.vue
+++ b/src/views/comp/table/basic.vue
@@ -18,105 +18,90 @@
  </n-card>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, toRefs, ref, h } from 'vue';
+<script lang="ts" setup>
+  import { reactive, ref, h } from 'vue';
  import { BasicTable, TableAction } from '@/components/Table';
  import { getTableList } from '@/api/table/list';
  import { columns } from './basicColumns';
  import { useDialog, useMessage } from 'naive-ui';

-  export default defineComponent({
-    components: { BasicTable },
-    setup() {
-      const message = useMessage();
-      const dialog = useDialog();
-      const actionRef = ref();
-      const state = reactive({
-        params: {
-          pageSize: 5,
-          name: 'xiaoMa',
-        },
-        actionColumn: {
-          width: 150,
-          title: '操作',
-          key: 'action',
-          fixed: 'right',
-          align: 'center',
-          render(record) {
-            return h(TableAction, {
-              style: 'button',
-              actions: createActions(record),
-            });
-          },
-        },
+  const message = useMessage();
+  const dialog = useDialog();
+  const actionRef = ref();
+
+  const params = reactive({
+    pageSize: 5,
+    name: 'xiaoMa',
+  });
+
+  const actionColumn = reactive({
+    width: 150,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    align: 'center',
+    render(record) {
+      return h(TableAction, {
+        style: 'button',
+        actions: createActions(record),
      });
-
-      function createActions(record) {
-        return [
-          {
-            label: '删除',
-            icon: 'ic:outline-delete-outline',
-            onClick: handleDelete.bind(null, record),
-            // 根据业务控制是否显示 isShow 和 auth 是并且关系
-            ifShow: () => {
-              return true;
-            },
-            // 根据权限控制是否显示: 有权限，会显示，支持多个
-            auth: ['basic_list'],
-          },
-          {
-            label: '编辑',
-            onClick: handleEdit.bind(null, record),
-            ifShow: () => {
-              return true;
-            },
-            auth: ['basic_list'],
-          },
-        ];
-      }
-
-      const loadDataTable = async (params) => {
-        const data = await getTableList(params);
-        return data;
-      };
-
-      function onCheckedRow(rowKeys) {
-        console.log(rowKeys);
-      }
-
-      function reloadTable() {
-        actionRef.value.reload();
-      }
-
-      function handleDelete(record) {
-        console.log(record);
-        dialog.info({
-          title: '提示',
-          content: `您想删除${record.name}`,
-          positiveText: '确定',
-          negativeText: '取消',
-          onPositiveClick: () => {
-            message.success('删除成功');
-          },
-          onNegativeClick: () => {},
-        });
-      }
-
-      function handleEdit(record) {
-        console.log(record);
-        message.success('您点击了编辑按钮');
-      }
-
-      return {
-        ...toRefs(state),
-        columns,
-        actionRef,
-        loadDataTable,
-        onCheckedRow,
-        reloadTable,
-      };
    },
  });
+
+  function createActions(record) {
+    return [
+      {
+        label: '删除',
+        icon: 'ic:outline-delete-outline',
+        onClick: handleDelete.bind(null, record),
+        // 根据业务控制是否显示 isShow 和 auth 是并且关系
+        ifShow: () => {
+          return true;
+        },
+        // 根据权限控制是否显示: 有权限，会显示，支持多个
+        auth: ['basic_list'],
+      },
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        ifShow: () => {
+          return true;
+        },
+        auth: ['basic_list'],
+      },
+    ];
+  }
+
+  const loadDataTable = async (res) => {
+    return await getTableList({ ...params, ...res });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    actionRef.value.reload();
+  }
+
+  function handleDelete(record) {
+    console.log(record);
+    dialog.info({
+      title: '提示',
+      content: `您想删除${record.name}`,
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: () => {
+        message.success('删除成功');
+      },
+      onNegativeClick: () => {},
+    });
+  }
+
+  function handleEdit(record) {
+    console.log(record);
+    message.success('您点击了编辑按钮');
+  }
 </script>

 <style lang="less" scoped></style>
--- a/src/views/comp/table/editCell.vue
+++ b/src/views/comp/table/editCell.vue
@@ -19,100 +19,41 @@
  </n-card>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, toRefs, ref, h } from 'vue';
-  import { BasicTable, TableAction } from '@/components/Table';
+<script lang="ts" setup>
+  import { reactive, ref } from 'vue';
+  import { BasicTable } from '@/components/Table';
  import { getTableList } from '@/api/table/list';
  import { columns } from './CellColumns';

-  export default defineComponent({
-    components: { BasicTable },
-    setup() {
-      const actionRef = ref();
-      const currentEditKeyRef = ref('');
-      const state = reactive({
-        params: {
-          pageSize: 5,
-          name: 'xiaoMa',
-        },
-      });
-
-      function handleEdit(record) {
-        currentEditKeyRef.value = record.key;
-        record.onEdit?.(true);
-      }
-
-      function handleCancel(record: EditRecordRow) {
-        currentEditKeyRef.value = '';
-        record.onEdit?.(false, false);
-      }
-
-      function onEditChange({ column, value, record }) {
-        if (column.key === 'id') {
-          record.editValueRefs.name4.value = `${value}`;
-        }
-        console.log(column, value, record);
-      }
-
-      async function handleSave(record: EditRecordRow) {
-        const pass = await record.onEdit?.(false, true);
-        if (pass) {
-          currentEditKeyRef.value = '';
-        }
-      }
-
-      function createActions(record) {
-        if (!record.editable) {
-          return [
-            {
-              label: '编辑',
-              onClick: handleEdit.bind(null, record),
-            },
-          ];
-        } else {
-          return [
-            {
-              label: '保存',
-              onClick: handleSave.bind(null, record),
-            },
-            {
-              label: '取消',
-              onClick: handleCancel.bind(null, record),
-            },
-          ];
-        }
-      }
-
-      const loadDataTable = async (params) => {
-        const data = await getTableList(params);
-        return data;
-      };
-
-      function onCheckedRow(rowKeys) {
-        console.log(rowKeys);
-      }
-
-      function reloadTable() {
-        console.log(actionRef.value);
-        actionRef.value.reload();
-      }
-
-      function editEnd({ record, index, key, value }) {
-        console.log(value);
-      }
-
-      return {
-        ...toRefs(state),
-        columns,
-        actionRef,
-        loadDataTable,
-        onCheckedRow,
-        reloadTable,
-        editEnd,
-        onEditChange,
-      };
-    },
+  const actionRef = ref();
+  const params = reactive({
+    pageSize: 5,
+    name: 'xiaoMa',
  });
+
+  function onEditChange({ column, value, record }) {
+    if (column.key === 'id') {
+      record.editValueRefs.name4.value = `${value}`;
+    }
+    console.log(column, value, record);
+  }
+
+  const loadDataTable = async (res) => {
+    return await getTableList({ ...params, ...res });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    console.log(actionRef.value);
+    actionRef.value.reload();
+  }
+
+  function editEnd({ record, index, key, value }) {
+    console.log(value);
+  }
 </script>

 <style lang="less" scoped></style>
--- a/src/views/comp/table/editRow.vue
+++ b/src/views/comp/table/editRow.vue
@@ -11,7 +11,7 @@
      @edit-end="editEnd"
      @edit-change="onEditChange"
      @update:checked-row-keys="onCheckedRow"
-      :scroll-x="1510"
+      :scroll-x="1590"
    >
      <template #toolbar>
        <n-button type="primary" @click="reloadTable">刷新数据</n-button>
@@ -20,113 +20,95 @@
  </n-card>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, toRefs, ref, h } from 'vue';
+<script lang="ts" setup>
+  import { reactive, ref, h } from 'vue';
  import { BasicTable, TableAction } from '@/components/Table';
  import { getTableList } from '@/api/table/list';
  import { columns } from './rowColumns';

-  export default defineComponent({
-    components: { BasicTable },
-    setup() {
-      const actionRef = ref();
-      const currentEditKeyRef = ref('');
-      const state = reactive({
-        params: {
-          pageSize: 5,
-          name: 'xiaoMa',
-        },
-        actionColumn: {
-          width: 150,
-          title: '操作',
-          key: 'action',
-          fixed: 'right',
-          align: 'center',
-          render(record) {
-            return h(TableAction, {
-              style: 'button',
-              actions: createActions(record),
-            });
-          },
-        },
+  const actionRef = ref();
+  const currentEditKeyRef = ref('');
+  const params = reactive({
+    pageSize: 5,
+    name: 'xiaoMa',
+  });
+
+  const actionColumn = reactive({
+    width: 150,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    align: 'center',
+    render(record) {
+      return h(TableAction, {
+        style: 'button',
+        actions: createActions(record),
      });
-
-      function handleEdit(record) {
-        currentEditKeyRef.value = record.key;
-        record.onEdit?.(true);
-      }
-
-      function handleCancel(record: EditRecordRow) {
-        currentEditKeyRef.value = '';
-        record.onEdit?.(false, false);
-      }
-
-      function onEditChange({ column, value, record }) {
-        if (column.key === 'id') {
-          record.editValueRefs.name4.value = `${value}`;
-        }
-        console.log(column, value, record);
-      }
-
-      async function handleSave(record: EditRecordRow) {
-        const pass = await record.onEdit?.(false, true);
-        if (pass) {
-          currentEditKeyRef.value = '';
-        }
-      }
-
-      function createActions(record) {
-        if (!record.editable) {
-          return [
-            {
-              label: '编辑',
-              onClick: handleEdit.bind(null, record),
-            },
-          ];
-        } else {
-          return [
-            {
-              label: '保存',
-              onClick: handleSave.bind(null, record),
-            },
-            {
-              label: '取消',
-              onClick: handleCancel.bind(null, record),
-            },
-          ];
-        }
-      }
-
-      const loadDataTable = async (params) => {
-        const data = await getTableList(params);
-        return data;
-      };
-
-      function onCheckedRow(rowKeys) {
-        console.log(rowKeys);
-      }
-
-      function reloadTable() {
-        console.log(actionRef.value);
-        actionRef.value.reload();
-      }
-
-      function editEnd({ record, index, key, value }) {
-        console.log(value);
-      }
-
-      return {
-        ...toRefs(state),
-        columns,
-        actionRef,
-        loadDataTable,
-        onCheckedRow,
-        reloadTable,
-        editEnd,
-        onEditChange,
-      };
    },
  });
+
+  function handleEdit(record) {
+    currentEditKeyRef.value = record.key;
+    record.onEdit?.(true);
+  }
+
+  function handleCancel(record) {
+    currentEditKeyRef.value = '';
+    record.onEdit?.(false, false);
+  }
+
+  function onEditChange({ column, value, record }) {
+    if (column.key === 'id') {
+      record.editValueRefs.name4.value = `${value}`;
+    }
+    console.log(column, value, record);
+  }
+
+  async function handleSave(record) {
+    const pass = await record.onEdit?.(false, true);
+    if (pass) {
+      currentEditKeyRef.value = '';
+    }
+  }
+
+  function createActions(record) {
+    if (!record.editable) {
+      return [
+        {
+          label: '编辑',
+          onClick: handleEdit.bind(null, record),
+        },
+      ];
+    } else {
+      return [
+        {
+          label: '保存',
+          onClick: handleSave.bind(null, record),
+        },
+        {
+          label: '取消',
+          onClick: handleCancel.bind(null, record),
+        },
+      ];
+    }
+  }
+
+  const loadDataTable = async (res) => {
+    return await getTableList({ ...params, ...res });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    console.log(actionRef.value);
+    actionRef.value.reload();
+  }
+
+  function editEnd({ record, index, key, value }) {
+    console.log(value);
+  }
 </script>

 <style lang="less" scoped></style>
--- a/src/views/comp/table/rowColumns.ts
+++ b/src/views/comp/table/rowColumns.ts
@@ -59,7 +59,7 @@ export const columns = [
    key: 'beginTime',
    editRow: true,
    edit: true,
-    width: 160,
+    width: 240,
    editComponent: 'NDatePicker',
    editComponentProps: {
      type: 'datetime',
--- a/src/views/comp/upload/index.vue
+++ b/src/views/comp/upload/index.vue
@@ -3,7 +3,7 @@
    <div class="n-layout-page-header">
      <n-card :bordered="false" title="上传图片"> 上传图片，用于向用户收集图片信息 </n-card>
    </div>
-    <n-card :bordered="false" class="proCard mt-4">
+    <n-card :bordered="false" class="mt-4 proCard">
      <n-grid cols="2 s:1 m:3 l:3 xl:3 2xl:3" responsive="screen">
        <n-grid-item offset="0 s:0 m:1 l:1 xl:1 2xl:1">
          <n-form
@@ -47,8 +47,8 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent, ref, unref, reactive, toRefs } from 'vue';
+<script lang="ts" setup>
+  import { ref, unref, reactive } from 'vue';
  import { useMessage } from 'naive-ui';
  import { BasicUpload } from '@/components/Upload';
  import { useGlobSetting } from '@/hooks/setting';
@@ -74,54 +74,38 @@
    },
  };

-  export default defineComponent({
-    components: { BasicUpload },
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
-      const { uploadUrl } = globSetting;
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const { uploadUrl } = globSetting;

-      const state = reactive({
-        formValue: {
-          name: '',
-          mobile: '',
-          //图片列表 通常查看和编辑使用 绝对路径 | 相对路径都可以
-          images: ['https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png'],
-        },
-        uploadHeaders: {
-          platform: 'miniPrograms',
-          timestamp: new Date().getTime(),
-          token: 'Q6fFCuhc1vkKn5JNFWaCLf6gRAc5n0LQHd08dSnG4qo=',
-        },
-      });
-
-      function formSubmit() {
-        formRef.value.validate((errors) => {
-          if (!errors) {
-            message.success('验证成功');
-          } else {
-            message.error('验证失败，请填写完整信息');
-          }
-        });
-      }
-
-      function resetForm() {
-        formRef.value.restoreValidation();
-      }
-
-      function uploadChange(list: string[]) {
-        state.formValue.images = unref(list);
-      }
-
-      return {
-        ...toRefs(state),
-        formRef,
-        uploadUrl,
-        rules,
-        formSubmit,
-        resetForm,
-        uploadChange,
-      };
-    },
+  const formValue = reactive({
+    name: '',
+    mobile: '',
+    //图片列表 通常查看和编辑使用 绝对路径 | 相对路径都可以
+    images: ['https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png'],
  });
+
+  const uploadHeaders = reactive({
+    platform: 'miniPrograms',
+    timestamp: new Date().getTime(),
+    token: 'Q6fFCuhc1vkKn5JNFWaCLf6gRAc5n0LQHd08dSnG4qo=',
+  });
+
+  function formSubmit() {
+    formRef.value.validate((errors) => {
+      if (!errors) {
+        message.success('验证成功');
+      } else {
+        message.error('验证失败，请填写完整信息');
+      }
+    });
+  }
+
+  function resetForm() {
+    formRef.value.restoreValidation();
+  }
+
+  function uploadChange(list: string[]) {
+    formValue.images = unref(list);
+  }
 </script>
--- a/src/views/dashboard/console/console.vue
+++ b/src/views/dashboard/console/console.vue
@@ -13,30 +13,40 @@
            <n-tag type="success">日</n-tag>
          </template>
          <div class="py-1 px-1 flex justify-between">
-            <CountTo :startVal="1" :endVal="visits.dayVisits" class="text-3xl" />
+            <n-skeleton v-if="loading" :width="100" size="medium" />
+            <CountTo v-else :startVal="1" :endVal="visits.dayVisits" class="text-3xl" />
          </div>
          <div class="py-1 px-1 flex justify-between">
            <div class="text-sn">
-              日同比
-              <CountTo :startVal="1" suffix="%" :endVal="visits.rise" />
-              <n-icon size="12" color="#00ff6f">
-                <component is="CaretUpOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                日同比
+                <CountTo :startVal="1" suffix="%" :endVal="visits.rise" />
+                <n-icon size="12" color="#00ff6f">
+                  <CaretUpOutlined />
+                </n-icon>
+              </template>
            </div>
            <div class="text-sn">
-              周同比
-              <CountTo :startVal="1" suffix="%" :endVal="visits.decline" />
-              <n-icon size="12" color="#ffde66">
-                <component is="CaretDownOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                周同比
+                <CountTo :startVal="1" suffix="%" :endVal="visits.decline" />
+                <n-icon size="12" color="#ffde66">
+                  <CaretDownOutlined />
+                </n-icon>
+              </template>
            </div>
          </div>
          <template #footer>
            <div class="flex justify-between">
-              <div class="text-sn"> 总访问量： </div>
-              <div class="text-sn">
-                <CountTo :startVal="1" :endVal="visits.amount" />
-              </div>
+              <n-skeleton v-if="loading" text :repeat="2" />
+              <template v-else>
+                <div class="text-sn"> 总访问量： </div>
+                <div class="text-sn">
+                  <CountTo :startVal="1" :endVal="visits.amount" />
+                </div>
+              </template>
            </div>
          </template>
        </NCard>
@@ -52,7 +62,14 @@
            <n-tag type="info">周</n-tag>
          </template>
          <div class="py-1 px-1 flex justify-between">
-            <CountTo prefix="￥" :startVal="1" :endVal="saleroom.weekSaleroom" class="text-3xl" />
+            <n-skeleton v-if="loading" :width="100" size="medium" />
+            <CountTo
+              v-else
+              prefix="￥"
+              :startVal="1"
+              :endVal="saleroom.weekSaleroom"
+              class="text-3xl"
+            />
          </div>
          <div class="py-2 px-2 flex justify-between">
            <div class="text-sn flex-1">
@@ -66,10 +83,13 @@
          </div>
          <template #footer>
            <div class="flex justify-between">
-              <div class="text-sn"> 总销售额： </div>
-              <div class="text-sn">
-                <CountTo prefix="￥" :startVal="1" :endVal="saleroom.amount" />
-              </div>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                <div class="text-sn"> 总销售额： </div>
+                <div class="text-sn">
+                  <CountTo prefix="￥" :startVal="1" :endVal="saleroom.amount" />
+                </div>
+              </template>
            </div>
          </template>
        </NCard>
@@ -85,30 +105,40 @@
            <n-tag type="warning">周</n-tag>
          </template>
          <div class="py-1 px-1 flex justify-between">
-            <CountTo :startVal="1" :endVal="orderLarge.weekLarge" class="text-3xl" />
+            <n-skeleton v-if="loading" :width="100" size="medium" />
+            <CountTo v-else :startVal="1" :endVal="orderLarge.weekLarge" class="text-3xl" />
          </div>
          <div class="py-1 px-1 flex justify-between">
            <div class="text-sn">
-              日同比
-              <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
-              <n-icon size="12" color="#00ff6f">
-                <component is="CaretUpOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                日同比
+                <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
+                <n-icon size="12" color="#00ff6f">
+                  <CaretUpOutlined />
+                </n-icon>
+              </template>
            </div>
            <div class="text-sn">
-              周同比
-              <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
-              <n-icon size="12" color="#ffde66">
-                <component is="CaretDownOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                周同比
+                <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
+                <n-icon size="12" color="#ffde66">
+                  <CaretDownOutlined />
+                </n-icon>
+              </template>
            </div>
          </div>
          <template #footer>
            <div class="flex justify-between">
-              <div class="text-sn"> 转化率： </div>
-              <div class="text-sn">
-                <CountTo :startVal="1" suffix="%" :endVal="orderLarge.amount" />
-              </div>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                <div class="text-sn"> 转化率： </div>
+                <div class="text-sn">
+                  <CountTo :startVal="1" suffix="%" :endVal="orderLarge.amount" />
+                </div>
+              </template>
            </div>
          </template>
        </NCard>
@@ -124,30 +154,40 @@
            <n-tag type="error">月</n-tag>
          </template>
          <div class="py-1 px-1 flex justify-between">
-            <CountTo prefix="￥" :startVal="1" :endVal="volume.weekLarge" class="text-3xl" />
+            <n-skeleton v-if="loading" :width="100" size="medium" />
+            <CountTo v-else prefix="￥" :startVal="1" :endVal="volume.weekLarge" class="text-3xl" />
          </div>
          <div class="py-1 px-1 flex justify-between">
            <div class="text-sn">
-              月同比
-              <CountTo :startVal="1" suffix="%" :endVal="volume.rise" />
-              <n-icon size="12" color="#00ff6f">
-                <component is="CaretUpOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                月同比
+                <CountTo :startVal="1" suffix="%" :endVal="volume.rise" />
+                <n-icon size="12" color="#00ff6f">
+                  <CaretUpOutlined />
+                </n-icon>
+              </template>
            </div>
            <div class="text-sn">
-              月同比
-              <CountTo :startVal="1" suffix="%" :endVal="volume.decline" />
-              <n-icon size="12" color="#ffde66">
-                <component is="CaretDownOutlined" />
-              </n-icon>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                月同比
+                <CountTo :startVal="1" suffix="%" :endVal="volume.decline" />
+                <n-icon size="12" color="#ffde66">
+                  <CaretDownOutlined />
+                </n-icon>
+              </template>
            </div>
          </div>
          <template #footer>
            <div class="flex justify-between">
-              <div class="text-sn"> 总成交额： </div>
-              <div class="text-sn">
-                <CountTo prefix="￥" :startVal="1" :endVal="volume.amount" />
-              </div>
+              <n-skeleton v-if="loading" :width="100" size="medium" />
+              <template v-else>
+                <div class="text-sn"> 总成交额： </div>
+                <div class="text-sn">
+                  <CountTo prefix="￥" :startVal="1" :endVal="volume.amount" />
+                </div>
+              </template>
            </div>
          </template>
        </NCard>
@@ -160,7 +200,8 @@
        <n-grid-item v-for="(item, index) in iconList" :key="index">
          <NCard content-style="padding-top: 0;" size="small" :bordered="false">
            <template #footer>
-              <div class="cursor-pointer">
+              <n-skeleton v-if="loading" size="medium" />
+              <div class="cursor-pointer" v-else>
                <p class="flex justify-center">
                  <span>
                    <n-icon :size="item.size" class="flex-1" :color="item.color">
@@ -182,113 +223,113 @@
    <VisiTab />
  </div>
 </template>
-<script lang="ts">
-  import { defineComponent, onMounted, reactive, toRefs } from 'vue';
-  import Icons from './components/Icons';
+<script lang="ts" setup>
+  import { ref, onMounted } from 'vue';
+  import { getConsoleInfo } from '@/api/dashboard/console';
  import VisiTab from './components/VisiTab.vue';
  import { CountTo } from '@/components/CountTo/index';
-  import { getConsoleInfo } from '@/api/dashboard/console';
+  import {
+    CaretUpOutlined,
+    CaretDownOutlined,
+    UsergroupAddOutlined,
+    BarChartOutlined,
+    ShoppingCartOutlined,
+    AccountBookOutlined,
+    CreditCardOutlined,
+    MailOutlined,
+    TagsOutlined,
+    SettingOutlined,
+  } from '@vicons/antd';

-  export default defineComponent({
-    components: { ...Icons, VisiTab, CountTo },
-    setup() {
-      const state = reactive({
-        cardHeaderStyle: {
-          'border-bottom': '1px solid #eee',
-          'font-size': '16px',
-        },
-        visits: {},
-        saleroom: {},
-        orderLarge: {},
-        volume: {},
-      });
-      // 图标列表
-      const iconList = [
-        {
-          icon: 'UsergroupAddOutlined',
-          size: '32',
-          title: '用户',
-          color: '#69c0ff',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'BarChartOutlined',
-          size: '32',
-          title: '分析',
-          color: '#69c0ff',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'ShoppingCartOutlined',
-          size: '32',
-          title: '商品',
-          color: '#ff9c6e',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'AccountBookOutlined',
-          size: '32',
-          title: '订单',
-          color: '#b37feb',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'CreditCardOutlined',
-          size: '32',
-          title: '票据',
-          color: '#ffd666',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'MailOutlined',
-          size: '32',
-          title: '消息',
-          color: '#5cdbd3',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'TagsOutlined',
-          size: '32',
-          title: '标签',
-          color: '#ff85c0',
-          eventObject: {
-            click: () => {},
-          },
-        },
-        {
-          icon: 'SettingOutlined',
-          size: '32',
-          title: '配置',
-          color: '#ffc069',
-          eventObject: {
-            click: () => {},
-          },
-        },
-      ];
-      onMounted(async () => {
-        const { visits, saleroom, orderLarge, volume } = await getConsoleInfo();
-        state.visits = visits;
-        state.saleroom = saleroom;
-        state.orderLarge = orderLarge;
-        state.volume = volume;
-      });
-      return {
-        ...toRefs(state),
-        iconList,
-      };
+  const loading = ref(true);
+  const visits = ref<any>({});
+  const saleroom = ref<any>({});
+  const orderLarge = ref<any>({});
+  const volume = ref({});
+
+  // 图标列表
+  const iconList = [
+    {
+      icon: UsergroupAddOutlined,
+      size: '32',
+      title: '用户',
+      color: '#69c0ff',
+      eventObject: {
+        click: () => {},
+      },
    },
+    {
+      icon: BarChartOutlined,
+      size: '32',
+      title: '分析',
+      color: '#69c0ff',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: ShoppingCartOutlined,
+      size: '32',
+      title: '商品',
+      color: '#ff9c6e',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: AccountBookOutlined,
+      size: '32',
+      title: '订单',
+      color: '#b37feb',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: CreditCardOutlined,
+      size: '32',
+      title: '票据',
+      color: '#ffd666',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: MailOutlined,
+      size: '32',
+      title: '消息',
+      color: '#5cdbd3',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: TagsOutlined,
+      size: '32',
+      title: '标签',
+      color: '#ff85c0',
+      eventObject: {
+        click: () => {},
+      },
+    },
+    {
+      icon: SettingOutlined,
+      size: '32',
+      title: '配置',
+      color: '#ffc069',
+      eventObject: {
+        click: () => {},
+      },
+    },
+  ];
+
+  onMounted(async () => {
+    const { visits, saleroom, orderLarge, volume } = await getConsoleInfo();
+    visits.value = visits;
+    saleroom.value = saleroom;
+    orderLarge.value = orderLarge;
+    volume.value = volume;
+    loading.value = false;
  });
 </script>

--- a/src/views/dashboard/monitor/monitor.vue
+++ b/src/views/dashboard/monitor/monitor.vue
@@ -2,15 +2,6 @@
  <div>监控台</div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
-
-  export default defineComponent({
-    components: {},
-    setup() {
-      return {};
-    },
-  });
-</script>
+<script lang="ts" setup></script>

 <style lang="less" scoped></style>
--- a/src/views/dashboard/workplace/workplace.vue
+++ b/src/views/dashboard/workplace/workplace.vue
@@ -298,7 +298,7 @@
  </div>
 </template>

-<script lang="ts">
+<script lang="ts" setup>
  import schoolboy from '@/assets/images/schoolboy.png';
  import {
    GithubOutlined,
@@ -310,30 +310,6 @@
    Html5Outlined,
  } from '@vicons/antd';
  import { LogoVue, LogoAngular, LogoReact, LogoJavascript } from '@vicons/ionicons5';
-
-  import { defineComponent } from 'vue';
-
-  export default defineComponent({
-    name: 'DashboardWorkplace',
-    components: {
-      GithubOutlined,
-      LogoVue,
-      DashboardOutlined,
-      ProfileOutlined,
-      FileProtectOutlined,
-      SettingOutlined,
-      ApartmentOutlined,
-      Html5Outlined,
-      LogoAngular,
-      LogoReact,
-      LogoJavascript,
-    },
-    setup() {
-      return {
-        schoolboy,
-      };
-    },
-  });
 </script>

 <style lang="less" scoped>
--- a/src/views/exception/403.vue
+++ b/src/views/exception/403.vue
@@ -10,20 +10,12 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';
-
-  export default defineComponent({
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+  function goHome() {
+    router.push('/');
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/exception/404.vue
+++ b/src/views/exception/404.vue
@@ -10,20 +10,12 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';
-
-  export default defineComponent({
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+  function goHome() {
+    router.push('/');
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/exception/500.vue
+++ b/src/views/exception/500.vue
@@ -10,20 +10,12 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';
-
-  export default defineComponent({
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+  function goHome() {
+    router.push('/');
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/form/basicForm/index.vue
+++ b/src/views/form/basicForm/index.vue
@@ -81,8 +81,8 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent, ref, reactive, toRefs } from 'vue';
+<script lang="ts" setup>
+  import { ref, unref, reactive } from 'vue';
  import { useMessage } from 'naive-ui';
  import { BasicUpload } from '@/components/Upload';
  import { useGlobSetting } from '@/hooks/setting';
@@ -149,66 +149,46 @@
    },
  };

-  export default defineComponent({
-    components: { BasicUpload },
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
-      const { uploadUrl } = globSetting;
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const { uploadUrl } = globSetting;

-      const defaultValueRef = () => ({
-        name: '',
-        mobile: '',
-        remark: '',
-        sex: 1,
-        matter: null,
-        doctor: null,
-        datetime: [],
-      });
-
-      const state = reactive({
-        formValue: defaultValueRef(),
-        //图片列表 通常查看和编辑使用 绝对路径 | 相对路径都可以
-        uploadList: [
-          'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-        ],
-        uploadHeaders: {
-          platform: 'miniPrograms',
-          timestamp: new Date().getTime(),
-          token: 'Q6fFCuhc1vkKn5JNFWaCLf6gRAc5n0LQHd08dSnG4qo=',
-        },
-      });
-
-      function formSubmit() {
-        formRef.value.validate((errors) => {
-          if (!errors) {
-            message.success('验证成功');
-          } else {
-            message.error('验证失败，请填写完整信息');
-          }
-        });
-      }
-
-      function resetForm() {
-        formRef.value.restoreValidation();
-        state.formValue = Object.assign(state.formValue, defaultValueRef());
-      }
-
-      function uploadChange(list: string[]) {
-        console.log(list);
-      }
-
-      return {
-        ...toRefs(state),
-        formRef,
-        uploadUrl,
-        rules,
-        doctorList,
-        matterList,
-        formSubmit,
-        resetForm,
-        uploadChange,
-      };
-    },
+  const defaultValueRef = () => ({
+    name: '',
+    mobile: '',
+    remark: '',
+    sex: 1,
+    matter: null,
+    doctor: null,
+    datetime: [],
  });
+
+  let formValue = reactive(defaultValueRef());
+  const uploadList = ref([
+    'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
+  ]);
+  const uploadHeaders = reactive({
+    platform: 'miniPrograms',
+    timestamp: new Date().getTime(),
+    token: 'Q6fFCuhc1vkKn5JNFWaCLf6gRAc5n0LQHd08dSnG4qo=',
+  });
+
+  function formSubmit() {
+    formRef.value.validate((errors) => {
+      if (!errors) {
+        message.success('验证成功');
+      } else {
+        message.error('验证失败，请填写完整信息');
+      }
+    });
+  }
+
+  function resetForm() {
+    formRef.value.restoreValidation();
+    formValue = Object.assign(unref(formValue), defaultValueRef());
+  }
+
+  function uploadChange(list: string[]) {
+    console.log(list);
+  }
 </script>
--- a/src/views/form/detail/index.vue
+++ b/src/views/form/detail/index.vue
@@ -8,7 +8,7 @@
    <n-card
      :bordered="false"
      title="基本信息"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -29,7 +29,7 @@
    <n-card
      :bordered="false"
      title="其它信息"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -50,7 +50,7 @@
    <n-card
      :bordered="false"
      title="表格信息"
-      class="proCard mt-4"
+      class="mt-4 proCard"
      size="small"
      :segmented="{ content: 'hard' }"
    >
@@ -119,14 +119,6 @@
  </div>
 </template>

-<script>
-  import { defineComponent } from 'vue';
-
-  export default defineComponent({
-    setup() {
-      return {};
-    },
-  });
-</script>
+<script setup></script>

 <style lang="less" scoped></style>
--- a/src/views/form/stepForm/Step1.vue
+++ b/src/views/form/stepForm/Step1.vue
@@ -47,8 +47,8 @@
  </n-form>
 </template>

-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+  import { ref, defineEmits } from 'vue';
  import { useMessage } from 'naive-ui';

  const myAccountList = [
@@ -73,61 +73,50 @@
    },
  ];

-  export default defineComponent({
-    emits: ['nextStep'],
-    setup(_, { emit }) {
-      const form1Ref: any = ref(null);
-      const message = useMessage();
-      const current = ref(1);
+  const emit = defineEmits(['nextStep']);

-      return {
-        form1Ref,
-        current,
-        formValue: ref({
-          accountType: 1,
-          myAccount: null,
-          account: 'xioama@qq.com',
-          money: '1980',
-          name: 'Ah jung',
-        }),
-        rules: {
-          name: {
-            required: true,
-            message: '请输入收款人姓名',
-            trigger: 'blur',
-          },
-          account: {
-            required: true,
-            message: '请输入收款账户',
-            trigger: 'blur',
-          },
-          money: {
-            required: true,
-            message: '请输入转账金额',
-            trigger: 'blur',
-          },
-          myAccount: {
-            required: true,
-            type: 'number',
-            message: '请选择付款账户',
-            trigger: 'change',
-          },
-        },
-        myAccountList,
-        accountTypeList,
-        formSubmit() {
-          form1Ref.value.validate((errors) => {
-            if (!errors) {
-              emit('nextStep');
-            } else {
-              message.error('验证失败，请填写完整信息');
-            }
-          });
-        },
-        resetForm() {
-          form1Ref.value.restoreValidation();
-        },
-      };
-    },
+  const form1Ref: any = ref(null);
+  const message = useMessage();
+
+  const formValue = ref({
+    accountType: 1,
+    myAccount: null,
+    account: 'xioama@qq.com',
+    money: '1980',
+    name: 'Ah jung',
  });
+
+  const rules = {
+    name: {
+      required: true,
+      message: '请输入收款人姓名',
+      trigger: 'blur',
+    },
+    account: {
+      required: true,
+      message: '请输入收款账户',
+      trigger: 'blur',
+    },
+    money: {
+      required: true,
+      message: '请输入转账金额',
+      trigger: 'blur',
+    },
+    myAccount: {
+      required: true,
+      type: 'number',
+      message: '请选择付款账户',
+      trigger: 'change',
+    },
+  };
+
+  function formSubmit() {
+    form1Ref.value.validate((errors) => {
+      if (!errors) {
+        emit('nextStep');
+      } else {
+        message.error('验证失败，请填写完整信息');
+      }
+    });
+  }
 </script>
--- a/src/views/form/stepForm/Step2.vue
+++ b/src/views/form/stepForm/Step2.vue
@@ -32,50 +32,41 @@
  </n-form>
 </template>

-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+  import { ref, defineEmits } from 'vue';
  import { useMessage } from 'naive-ui';
+  const form2Ref: any = ref(null);
+  const message = useMessage();
+  const loading = ref(false);

-  export default defineComponent({
-    emits: ['prevStep', 'nextStep'],
-    setup(_, { emit }) {
-      const form2Ref: any = ref(null);
-      const message = useMessage();
-      const loading = ref(false);
-
-      function prevStep() {
-        emit('prevStep');
-      }
-
-      function formSubmit() {
-        loading.value = true;
-        form2Ref.value.validate((errors) => {
-          if (!errors) {
-            setTimeout(() => {
-              emit('nextStep');
-            }, 1500);
-          } else {
-            message.error('验证失败，请填写完整信息');
-          }
-        });
-      }
-
-      return {
-        form2Ref,
-        loading,
-        formValue: ref({
-          password: '086611',
-        }),
-        rules: {
-          password: {
-            required: true,
-            message: '请输入支付密码',
-            trigger: 'blur',
-          },
-        },
-        prevStep,
-        formSubmit,
-      };
-    },
+  const formValue = ref({
+    password: '086611',
  });
+
+  const rules = {
+    password: {
+      required: true,
+      message: '请输入支付密码',
+      trigger: 'blur',
+    },
+  };
+
+  const emit = defineEmits(['prevStep', 'nextStep']);
+
+  function prevStep() {
+    emit('prevStep');
+  }
+
+  function formSubmit() {
+    loading.value = true;
+    form2Ref.value.validate((errors) => {
+      if (!errors) {
+        setTimeout(() => {
+          emit('nextStep');
+        }, 1500);
+      } else {
+        message.error('验证失败，请填写完整信息');
+      }
+    });
+  }
 </script>
--- a/src/views/form/stepForm/Step3.vue
+++ b/src/views/form/stepForm/Step3.vue
@@ -31,34 +31,17 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { useRouter } from 'vue-router';
+<script lang="ts" setup>
+  import { defineEmits } from 'vue';

-  export default defineComponent({
-    emits: ['finish', 'prevStep'],
-    setup(_, { emit }) {
-      const router = useRouter();
+  const emit = defineEmits(['finish', 'prevStep']);
+  function prevStep() {
+    emit('prevStep');
+  }

-      function prevStep() {
-        emit('prevStep');
-      }
-
-      function finish() {
-        emit('finish');
-      }
-
-      function toOrderList() {
-        router.push('/form/step-form');
-      }
-
-      return {
-        prevStep,
-        finish,
-        toOrderList,
-      };
-    },
-  });
+  function finish() {
+    emit('finish');
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/form/stepForm/stepForm.vue
+++ b/src/views/form/stepForm/stepForm.vue
@@ -5,7 +5,7 @@
        将一个冗长或用户不熟悉的表单任务分成多个步骤，指导用户完成。
      </n-card>
    </div>
-    <n-card :bordered="false" class="proCard mt-4">
+    <n-card :bordered="false" class="mt-4 proCard">
      <n-space vertical class="steps" justify="center">
        <n-steps :current="currentTab" :status="currentStatus">
          <n-step title="填写转账信息" description="确保填写正确" />
@@ -20,43 +20,30 @@
  </div>
 </template>

-<script>
+<script setup>
  import { defineComponent, ref } from 'vue';
  import step1 from './Step1.vue';
  import step2 from './Step2.vue';
  import step3 from './Step3.vue';

-  export default defineComponent({
-    components: { step1, step2, step3 },
-    setup() {
-      const currentTab = ref(1);
-      const currentStatus = ref('process');
+  const currentTab = ref(1);
+  const currentStatus = ref('process');

-      function nextStep() {
-        if (currentTab.value < 3) {
-          currentTab.value += 1;
-        }
-      }
+  function nextStep() {
+    if (currentTab.value < 3) {
+      currentTab.value += 1;
+    }
+  }

-      function prevStep() {
-        if (currentTab.value > 1) {
-          currentTab.value -= 1;
-        }
-      }
+  function prevStep() {
+    if (currentTab.value > 1) {
+      currentTab.value -= 1;
+    }
+  }

-      function finish() {
-        currentTab.value = 1;
-      }
-
-      return {
-        currentTab,
-        currentStatus,
-        nextStep,
-        prevStep,
-        finish,
-      };
-    },
-  });
+  function finish() {
+    currentTab.value = 1;
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -5,55 +5,45 @@
    </div>
  </n-spin>
 </template>
-<script lang="ts">
-  import { defineComponent, ref, unref, onMounted, nextTick } from 'vue';
+<script lang="ts" setup>
+  import { ref, unref, onMounted, nextTick } from 'vue';
  import { useRoute } from 'vue-router';

-  export default defineComponent({
-    name: 'IFrame',
-    setup() {
-      const currentRoute = useRoute();
-      const loading = ref(false);
-      const frameRef = ref<HTMLFrameElement | null>(null);
-      const frameSrc = ref<string>('');
+  const currentRoute = useRoute();
+  const loading = ref(false);
+  const frameRef = ref<HTMLFrameElement | null>(null);
+  const frameSrc = ref<string>('');

-      if (unref(currentRoute.meta)?.frameSrc) {
-        frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
-      }
+  if (unref(currentRoute.meta)?.frameSrc) {
+    frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
+  }

-      function hideLoading() {
-        loading.value = false;
-      }
+  function hideLoading() {
+    loading.value = false;
+  }

-      function init() {
-        nextTick(() => {
-          const iframe = unref(frameRef);
-          if (!iframe) return;
-          const _frame = iframe as any;
-          if (_frame.attachEvent) {
-            _frame.attachEvent('onload', () => {
-              hideLoading();
-            });
-          } else {
-            iframe.onload = () => {
-              hideLoading();
-            };
-          }
+  function init() {
+    nextTick(() => {
+      const iframe = unref(frameRef);
+      if (!iframe) return;
+      const _frame = iframe as any;
+      if (_frame.attachEvent) {
+        _frame.attachEvent('onload', () => {
+          hideLoading();
        });
+      } else {
+        iframe.onload = () => {
+          hideLoading();
+        };
      }
+    });
+  }

-      onMounted(() => {
-        loading.value = true;
-        init();
-      });
-
-      return {
-        loading,
-        frameRef,
-        frameSrc,
-      };
-    },
+  onMounted(() => {
+    loading.value = true;
+    init();
  });
+
 </script>

 <style lang="less" scoped>
--- a/src/views/list/basicList/index.vue
+++ b/src/views/list/basicList/index.vue
@@ -61,11 +61,11 @@
  </n-card>
 </template>

-<script lang="ts">
-  import { defineComponent, h, reactive, ref, toRefs } from 'vue';
+<script lang="ts" setup>
+  import { h, reactive, ref } from 'vue';
  import { useMessage } from 'naive-ui';
  import { BasicTable, TableAction } from '@/components/Table';
-  import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
+  import { BasicForm, useForm } from '@/components/Form/index';
  import { getTableList } from '@/api/table/list';
  import { columns } from './columns';
  import { PlusOutlined } from '@vicons/antd';
@@ -90,7 +90,7 @@
    },
  };

-  const schemas: FormSchema[] = [
+  const schemas = [
    {
      field: 'name',
      labelMessage: '这是一个提示',
@@ -141,10 +141,10 @@
      field: 'makeDate',
      component: 'NDatePicker',
      label: '预约时间',
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
@@ -214,164 +214,134 @@
    },
  ];

-  export default defineComponent({
-    // eslint-disable-next-line vue/no-unused-components
-    components: { BasicTable, PlusOutlined, TableAction, BasicForm },
-    setup() {
-      const router = useRouter();
-      const formRef: any = ref(null);
-      const message = useMessage();
-      const actionRef = ref();
-      const state = reactive({
-        showModal: false,
-        formBtnLoading: false,
-        formParams: {},
-        params: {
-          pageSize: 5,
-          name: 'xiaoMa',
-        },
-        actionColumn: {
-          width: 220,
-          title: '操作',
-          key: 'action',
-          fixed: 'right',
-          render(record) {
-            return h(TableAction as any, {
-              style: 'button',
-              actions: [
-                {
-                  label: '删除',
-                  icon: 'ic:outline-delete-outline',
-                  onClick: handleDelete.bind(null, record),
-                  // 根据业务控制是否显示 isShow 和 auth 是并且关系
-                  ifShow: () => {
-                    return true;
-                  },
-                  // 根据权限控制是否显示: 有权限，会显示，支持多个
-                  auth: ['basic_list'],
-                },
-                {
-                  label: '编辑',
-                  onClick: handleEdit.bind(null, record),
-                  ifShow: () => {
-                    return true;
-                  },
-                  auth: ['basic_list'],
-                },
-              ],
-              dropDownActions: [
-                {
-                  label: '启用',
-                  key: 'enabled',
-                  // 根据业务控制是否显示: 非enable状态的不显示启用按钮
-                  ifShow: () => {
-                    return true;
-                  },
-                },
-                {
-                  label: '禁用',
-                  key: 'disabled',
-                  ifShow: () => {
-                    return true;
-                  },
-                },
-              ],
-              select: (key) => {
-                message.info(`您点击了，${key} 按钮`);
-              },
-            });
+  const router = useRouter();
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const actionRef = ref();
+
+  const showModal = ref(false);
+  const formBtnLoading = ref(false);
+  const formParams = reactive({
+    name: '',
+    address: '',
+    date: null,
+  });
+
+  const params = ref({
+    pageSize: 5,
+    name: 'xiaoMa',
+  });
+
+  const actionColumn = reactive({
+    width: 220,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '删除',
+            icon: 'ic:outline-delete-outline',
+            onClick: handleDelete.bind(null, record),
+            // 根据业务控制是否显示 isShow 和 auth 是并且关系
+            ifShow: () => {
+              return true;
+            },
+            // 根据权限控制是否显示: 有权限，会显示，支持多个
+            auth: ['basic_list'],
          },
+          {
+            label: '编辑',
+            onClick: handleEdit.bind(null, record),
+            ifShow: () => {
+              return true;
+            },
+            auth: ['basic_list'],
+          },
+        ],
+        dropDownActions: [
+          {
+            label: '启用',
+            key: 'enabled',
+            // 根据业务控制是否显示: 非enable状态的不显示启用按钮
+            ifShow: () => {
+              return true;
+            },
+          },
+          {
+            label: '禁用',
+            key: 'disabled',
+            ifShow: () => {
+              return true;
+            },
+          },
+        ],
+        select: (key) => {
+          message.info(`您点击了，${key} 按钮`);
        },
      });
-
-      const [register, {}] = useForm({
-        gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
-        labelWidth: 80,
-        schemas,
-      });
-
-      function addTable() {
-        state.showModal = true;
-      }
-
-      const loadDataTable = async (res) => {
-        let params = {
-          ...res,
-          ...state.formParams,
-        };
-        return await getTableList(params);
-      };
-
-      function onCheckedRow(rowKeys) {
-        console.log(rowKeys);
-      }
-
-      function reloadTable() {
-        actionRef.value.reload();
-      }
-
-      function confirmForm(e) {
-        e.preventDefault();
-        state.formBtnLoading = true;
-        formRef.value.validate((errors) => {
-          if (!errors) {
-            message.success('新建成功');
-            setTimeout(() => {
-              state.showModal = false;
-              reloadTable();
-            });
-          } else {
-            message.error('请填写完整信息');
-          }
-          state.formBtnLoading = false;
-        });
-      }
-
-      function handleEdit(record: Recordable) {
-        console.log('点击了编辑', record);
-        router.push({ name: 'basic-info', params: { id: record.id } });
-      }
-
-      function handleDelete(record: Recordable) {
-        console.log('点击了删除', record);
-        message.info('点击了删除');
-      }
-
-      function handleOpen(record: Recordable) {
-        console.log('点击了启用', record);
-        message.info('点击了删除');
-      }
-
-      function handleSubmit(values: Recordable) {
-        console.log(values);
-        state.formParams = values;
-        reloadTable();
-      }
-
-      function handleReset(values: Recordable) {
-        console.log(values);
-      }
-
-      return {
-        ...toRefs(state),
-        formRef,
-        columns,
-        rules,
-        actionRef,
-        register,
-        confirmForm,
-        loadDataTable,
-        onCheckedRow,
-        reloadTable,
-        addTable,
-        handleEdit,
-        handleDelete,
-        handleOpen,
-        handleSubmit,
-        handleReset,
-      };
    },
  });
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 80,
+    schemas,
+  });
+
+  function addTable() {
+    showModal.value = true;
+  }
+
+  const loadDataTable = async (res) => {
+    return await getTableList({ ...formParams, ...params.value, ...res });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    actionRef.value.reload();
+  }
+
+  function confirmForm(e) {
+    e.preventDefault();
+    formBtnLoading.value = true;
+    formRef.value.validate((errors) => {
+      if (!errors) {
+        message.success('新建成功');
+        setTimeout(() => {
+          showModal.value = false;
+          reloadTable();
+        });
+      } else {
+        message.error('请填写完整信息');
+      }
+      formBtnLoading.value = false;
+    });
+  }
+
+  function handleEdit(record: Recordable) {
+    console.log('点击了编辑', record);
+    router.push({ name: 'basic-info', params: { id: record.id } });
+  }
+
+  function handleDelete(record: Recordable) {
+    console.log('点击了删除', record);
+    message.info('点击了删除');
+  }
+
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
 </script>

 <style lang="less" scoped></style>
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -50,7 +50,7 @@
                <n-checkbox v-model:checked="autoLogin">自动登录</n-checkbox>
              </div>
              <div class="flex-initial order-last">
-                <a href="javascript:;">忘记密码</a>
+                <a href="javascript:">忘记密码</a>
              </div>
            </div>
          </n-form-item>
@@ -65,21 +65,21 @@
                <span>其它登录方式</span>
              </div>
              <div class="flex-initial mx-2">
-                <a href="javascript:;">
+                <a href="javascript:">
                  <n-icon size="24" color="#2d8cf0">
                    <LogoGithub />
                  </n-icon>
                </a>
              </div>
              <div class="flex-initial mx-2">
-                <a href="javascript:;">
+                <a href="javascript:">
                  <n-icon size="24" color="#2d8cf0">
                    <LogoFacebook />
                  </n-icon>
                </a>
              </div>
              <div class="flex-initial" style="margin-left: auto">
-                <a href="javascript:;">注册账号</a>
+                <a href="javascript:">注册账号</a>
              </div>
            </div>
          </n-form-item>
@@ -89,95 +89,83 @@
  </div>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, toRefs, ref } from 'vue';
-  import { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook } from '@vicons/ionicons5';
+<script lang="ts" setup>
+  import { reactive, ref } from 'vue';
  import { useRoute, useRouter } from 'vue-router';
  import { useUserStore } from '@/store/modules/user';
  import { useMessage } from 'naive-ui';
  import { ResultEnum } from '@/enums/httpEnum';
  import logo from '@/assets/images/logo.png';
+  import { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook } from '@vicons/ionicons5';

  interface FormState {
    username: string;
    password: string;
  }

-  export default defineComponent({
-    components: { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook },
-    setup() {
-      const formRef = ref();
-      const message = useMessage();
-      const state = reactive({
-        loading: false,
-        autoLogin: true,
-        formInline: {
-          username: 'admin',
-          password: '123456',
-          isCaptcha: false,
-        },
-      });
-      const rules = {
-        username: { required: true, message: '请输入用户名', trigger: 'blur' },
-        password: { required: true, message: '请输入密码', trigger: 'blur' },
-        isCaptcha: {
-          required: true,
-          type: 'boolean',
-          trigger: 'change',
-          message: '请点击按钮进行验证码校验',
-          validator: (_, value) => value === true,
-        },
-      };
-      const userStore = useUserStore();
+  const formRef = ref();
+  const message = useMessage();
+  const loading = ref(false);
+  const autoLogin = ref(true);

-      const router = useRouter();
-      const route = useRoute();
-      const handleSubmit = (e) => {
-        e.preventDefault();
-        formRef.value.validate(async (errors) => {
-          if (!errors) {
-            const { username, password } = state.formInline;
-            message.loading('登录中...');
-            state.loading = true;
-
-            const params: FormState = {
-              username,
-              password,
-            };
-
-            const { code, message: msg } = await userStore.login(params);
-
-            if (code == ResultEnum.SUCCESS) {
-              const toPath = decodeURIComponent((route.query?.redirect || '/') as string);
-              message.success('登录成功！');
-              router.replace(toPath).then((_) => {
-                if (route.name == 'login') {
-                  router.replace('/');
-                }
-              });
-            } else {
-              message.info(msg || '登录失败');
-            }
-          } else {
-            message.error('请填写完整信息，并且进行验证码校验');
-          }
-        });
-      };
-
-      function onAuthCode() {
-        state.formInline.isCaptcha = true;
-      }
-
-      return {
-        ...toRefs(state),
-        formRef,
-        rules,
-        logo,
-        handleSubmit,
-        onAuthCode,
-      };
-    },
+  const formInline = reactive({
+    username: 'admin',
+    password: '123456',
+    isCaptcha: false,
  });
+
+  const rules = {
+    username: { required: true, message: '请输入用户名', trigger: 'blur' },
+    password: { required: true, message: '请输入密码', trigger: 'blur' },
+    isCaptcha: {
+      required: true,
+      type: 'boolean',
+      trigger: 'change',
+      message: '请点击按钮进行验证码校验',
+      validator: (_, value) => value === true,
+    },
+  };
+
+  const userStore = useUserStore();
+
+  const router = useRouter();
+  const route = useRoute();
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    formRef.value.validate(async (errors) => {
+      if (!errors) {
+        const { username, password } = formInline;
+        message.loading('登录中...');
+        loading.value = true;
+
+        const params: FormState = {
+          username,
+          password,
+        };
+
+        const { code, message: msg } = await userStore.login(params);
+
+        if (code == ResultEnum.SUCCESS) {
+          const toPath = decodeURIComponent((route.query?.redirect || '/') as string);
+          message.success('登录成功！');
+          router.replace(toPath).then((_) => {
+            if (route.name == 'login') {
+              router.replace('/');
+            }
+          });
+        } else {
+          message.info(msg || '登录失败');
+        }
+      } else {
+        message.error('请填写完整信息，并且进行验证码校验');
+      }
+    });
+  };
+
+  const onAuthCode = () => {
+    formInline.isCaptcha = true;
+  }
 </script>

 <style lang="less" scoped>
--- a/src/views/result/fail.vue
+++ b/src/views/result/fail.vue
@@ -36,22 +36,15 @@
    </div>
  </n-card>
 </template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';
  import { InfoCircleOutlined } from '@vicons/antd';

-  export default defineComponent({
-    components: { InfoCircleOutlined },
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+
+  function goHome() {
+    router.push('/');
+  }
 </script>
 <style lang="less" scoped>
  .result-box {
--- a/src/views/result/info.vue
+++ b/src/views/result/info.vue
@@ -40,22 +40,15 @@
    </div>
  </n-card>
 </template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';
  import { CheckCircleOutlined } from '@vicons/antd';

-  export default defineComponent({
-    components: { CheckCircleOutlined },
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+
+  function goHome() {
+    router.push('/');
+  }
 </script>
 <style lang="less" scoped>
  .result-box {
--- a/src/views/result/success.vue
+++ b/src/views/result/success.vue
@@ -22,20 +22,14 @@
    </div>
  </n-card>
 </template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
+<script lang="ts" setup>
  import { useRouter } from 'vue-router';

-  export default defineComponent({
-    setup() {
-      const router = useRouter();
-      return {
-        goHome() {
-          router.push('/');
-        },
-      };
-    },
-  });
+  const router = useRouter();
+
+  function goHome() {
+    router.push('/');
+  }
 </script>
 <style lang="less" scoped>
  .result-box {
--- a/src/views/setting/account/BasicSetting.vue
+++ b/src/views/setting/account/BasicSetting.vue
@@ -28,8 +28,8 @@
  </n-grid>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, ref, toRefs } from 'vue';
+<script lang="ts" setup>
+  import { reactive, ref } from 'vue';
  import { useMessage } from 'naive-ui';

  const rules = {
@@ -49,37 +49,23 @@
      trigger: 'input',
    },
  };
+  const formRef: any = ref(null);
+  const message = useMessage();

-  export default defineComponent({
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
-
-      const state = reactive({
-        formValue: {
-          name: '',
-          mobile: '',
-          email: '',
-          address: '',
-        },
-      });
-
-      function formSubmit() {
-        formRef.value.validate((errors) => {
-          if (!errors) {
-            message.success('验证成功');
-          } else {
-            message.error('验证失败，请填写完整信息');
-          }
-        });
-      }
-
-      return {
-        formRef,
-        ...toRefs(state),
-        rules,
-        formSubmit,
-      };
-    },
+  const formValue = reactive({
+    name: '',
+    mobile: '',
+    email: '',
+    address: '',
  });
+
+  function formSubmit() {
+    formRef.value.validate((errors) => {
+      if (!errors) {
+        message.success('验证成功');
+      } else {
+        message.error('验证失败，请填写完整信息');
+      }
+    });
+  }
 </script>
--- a/src/views/setting/account/SafetySetting.vue
+++ b/src/views/setting/account/SafetySetting.vue
@@ -49,58 +49,4 @@
  </n-grid>
 </template>

-<script lang="ts">
-  import { defineComponent, reactive, ref, toRefs } from 'vue';
-  import { useMessage } from 'naive-ui';
-
-  const rules = {
-    name: {
-      required: true,
-      message: '请输入昵称',
-      trigger: 'blur',
-    },
-    email: {
-      required: true,
-      message: '请输入邮箱',
-      trigger: 'blur',
-    },
-    mobile: {
-      required: true,
-      message: '请输入联系电话',
-      trigger: 'input',
-    },
-  };
-
-  export default defineComponent({
-    setup() {
-      const formRef: any = ref(null);
-      const message = useMessage();
-
-      const state = reactive({
-        formValue: {
-          name: '',
-          mobile: '',
-          email: '',
-          address: '',
-        },
-      });
-
-      function formSubmit() {
-        formRef.value.validate((errors) => {
-          if (!errors) {
-            message.success('验证成功');
-          } else {
-            message.error('验证失败，请填写完整信息');
-          }
-        });
-      }
-
-      return {
-        formRef,
-        ...toRefs(state),
-        rules,
-        formSubmit,
-      };
-    },
-  });
-</script>
+<script lang="ts" setup></script>
--- a/src/views/setting/account/account.vue
+++ b/src/views/setting/account/account.vue
@@ -24,8 +24,8 @@
    </n-grid>
  </div>
 </template>
-<script lang="ts">
-  import { defineComponent, reactive, toRefs } from 'vue';
+<script lang="ts" setup>
+  import { ref } from 'vue';
  import BasicSetting from './BasicSetting.vue';
  import SafetySetting from './SafetySetting.vue';

@@ -41,26 +41,14 @@
      key: 2,
    },
  ];
-  export default defineComponent({
-    components: { BasicSetting, SafetySetting },
-    setup() {
-      const state = reactive({
-        type: 1,
-        typeTitle: '基本设置',
-      });

-      function switchType(e) {
-        state.type = e.key;
-        state.typeTitle = e.name;
-      }
+  const type = ref(1);
+  const typeTitle = ref('基本设置');

-      return {
-        ...toRefs(state),
-        switchType,
-        typeTabList,
-      };
-    },
-  });
+  function switchType(e) {
+    type.value = e.key;
+    typeTitle.value = e.name;
+  }
 </script>
 <style lang="less" scoped>
  .thing-cell {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaoma	8288f0a84b	修复：项目配置空白，多标签背景色 bug	2022-01-06 09:50:28 +08:00
xiaoma	c0ff8985ea	Merge branch 'main' of github.com:jekip/naive-ui-admin into main	2021-12-30 15:04:31 +08:00
xiaoma	a8400ac475	Fix #80 And Depend on the upgrade	2021-12-30 15:04:10 +08:00
jack	d4b173e3c8	table 支持 dataSource	2021-12-26 10:18:44 +08:00
xiaoma	1ab8b5b221	1.6.0 README.md update	2021-12-24 10:48:49 +08:00
Ah jung	fc5e138ed8	Merge pull request #74 from chenyuxi2002/docs/README docs: README.md 技术站->技术栈	2021-12-06 16:12:09 +08:00
tzcat8	b9b2c6a07e	docs: README.md 技术站->技术栈	2021-12-06 16:01:03 +08:00
Ah jung	3503569dfe	Update README.md	2021-11-26 19:13:24 +08:00
Ah jung	125b7f44e3	Update README.md	2021-11-19 23:42:38 +08:00
Ah jung	3307b927a4	Merge pull request #70 from litao36253/dev_tobealone 获得最新菜单后更新TagsView组件的localStorage缓存	2021-11-18 17:52:29 +08:00
litao	97de86eacb	获得最新菜单后更新TagsView组件的localStorage缓存	2021-11-18 14:35:05 +08:00
Ah jung	cb92f6e87b	Merge pull request #67 from litao36253/dev_tobealone 按需引入NaiveUi并自动创建.d.ts声明，在volar中使用组件可获得代码提示和类型检查	2021-11-14 10:35:16 +08:00
litao	4f81743f90	按需引入NaiveUi并自动创建.d.ts声明，在volar中使用组件可获得代码提示和类型检查	2021-11-14 10:28:54 +08:00
xiaoma	7837c87392	eslintrc 配置更新	2021-11-11 15:34:36 +08:00
xiaoma	17a5d08d94	fix bug README.md update	2021-11-08 09:24:33 +08:00
xiaoma	19e5e5fc4a	fix bug README.md update	2021-11-08 09:21:29 +08:00
xiaoma	822e69deec	README.md update	2021-10-11 13:32:45 +08:00
xiaoma	3bf1e941d4	fix bug	2021-09-29 10:20:48 +08:00
xiaoma	ef4912636e	optimize ts type	2021-09-24 09:08:23 +08:00
xiaoma	7929a74d20	Merge remote-tracking branch 'origin/main' into main	2021-09-23 13:37:39 +08:00
xiaoma	45862d4f9d	Fix bug and README.md update	2021-09-23 13:37:18 +08:00
Ah jung	8e6471060c	Merge pull request #54 from 2462870727/main fix: 增加useModal确认按钮文本	2021-09-22 08:47:45 +08:00
Ah jung	30c0cd5c95	Update basicModal.vue	2021-09-22 08:46:34 +08:00
2462870727@qq.com	259e73c056	fix: useModal	2021-09-19 12:22:49 +08:00
xiaoma	8eaa889399	Fix bug and README.md update	2021-09-18 17:50:21 +08:00
xiaoma	d1635add5f	Fix bug and README.md update	2021-09-18 17:49:04 +08:00
Ah jung	531a31ee5d	Merge pull request #50 from eGluZl/main fix: 修正角色页面的弹窗中的树型组件点击节点不会展开孩子节点的问题。	2021-09-15 18:31:04 +08:00
Ah jung	3b64fc1563	Merge pull request #41 from heng1025/patch-1 Update ProjectSetting.vue	2021-09-15 17:11:39 +08:00
Ah jung	229fc72cda	Merge pull request #34 from Chika99/fix/tagsview fix(tagsview): 多页签适配主题	2021-09-15 17:11:23 +08:00
Ah jung	900954d757	Merge pull request #33 from devlemoe/main feat: TagsView自动滚动功能	2021-09-15 17:11:01 +08:00
Ah jung	fca4dddaf6	Merge pull request #43 from FE-Roading/main fix: constantRouter重复添加和addRoute优化	2021-09-15 17:03:46 +08:00
eGluZl	4add3c3eaa	fix: 修正角色页面的弹窗中的树型组件点击节点不会展开孩子节点的问题。	2021-09-15 16:52:59 +08:00
Ah jung	21e80f8041	Merge pull request #47 from eGluZl/main fix: 修正点击左侧树形组件的某节点时，对应的数据在赋值后页面不响应的问题。	2021-09-14 10:21:50 +08:00
eGluZl	a63c34dbb5	fix: 修正点击左侧树形组件的某节点时，对应的数据在赋值后页面不响应的问题。	2021-09-14 10:15:50 +08:00
xiaoma	e02e96d4e0	标签名修改	2021-09-13 18:46:02 +08:00
xiaoma	70c2b75f17	fix bug	2021-09-10 18:36:43 +08:00
qixm	b186e045bc	fix: constantRouter在useAsyncRouteStore.routers重复添加;BACK权限模式下,router.addRoute添加两次的问题	2021-09-02 15:16:41 +08:00
iron	742749a838	Update ProjectSetting.vue	2021-09-01 16:59:30 +08:00
xiaoma	82dc7d2589	fix 分页字段配置问题	2021-08-28 11:54:42 +08:00
xiaoma	f11af4fc76	fix 分页字段配置问题	2021-08-28 11:52:18 +08:00
xiaoma	85f1dbd5e9	fix 分页字段配置问题	2021-08-28 11:41:36 +08:00
xiaoma	ae001fc7bd	fix 分页字段配置问题	2021-08-28 11:18:33 +08:00
chika	be770016bf	fix(tagsview): 多页签适配主题	2021-08-21 15:19:07 +08:00
devlemoe	1bf722bed0	fix: prev和next按钮不能准确隐藏	2021-08-19 14:19:21 +08:00
devlemoe	8c7dd14004	feat: TagsView自动滚动功能	2021-08-19 11:56:56 +08:00
xiaoma	a0490e3b97	支持 Vue 3.2.x 语法升级为，script setup	2021-08-14 14:53:32 +08:00
xiaoma	905984367c	支持 Vue 3.2.x 语法升级为，script setup	2021-08-14 14:35:42 +08:00
xiaoma	d3f7fa0f9e	CHANGELOG更新	2021-08-10 17:31:50 +08:00