1.8.0

Merge pull request #114 from liub1934/main
feat:表格列支持draggable配置是否能拖拽
2026-02-04 21:52:27 +08:00 · 2022-04-01 10:52:30 +08:00 · 2022-04-01 09:44:52 +08:00 · 2022-03-30 18:18:20 +08:00 · 2022-03-28 13:57:43 +08:00 · 2022-03-22 13:31:24 +08:00
82 changed files with 11769 additions and 3447 deletions
--- a/.env.development
+++ b/.env.development
@@ -15,7 +15,7 @@ VITE_DROP_CONSOLE = true

 # 跨域代理，可以配置多个，请注意不要换行
 #VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]]
-# VITE_PROXY=[["/api","https://naive-ui-admin"]]
+#VITE_PROXY=[["/api","https://naive-ui-admin"]]

 # API 接口地址
 VITE_GLOB_API_URL =
--- 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,50 @@
 # CHANGELOG

+## 1.8.0 (2022-04-01)
+
+- ### ✨ Features
+- 新增 `多页签` 支持配置 `affix` 固定属性
+- 新增 `usePage` Hooks
+- 表格列支持 `draggable` 配置拖拽 合并 [#114](https://github.com/jekip/naive-ui-admin/pull/114)
+- 依赖升级
+
+### 🐛 Bug Fixes
+- 修复 `多页签` 关闭全部缺陷
+- 修复 `多页签` 跳转缺陷（记得清空多页签缓存）
+## 1.7.0 (2022-02-14)
+
+### 🐛 Bug Fixes
+- 移除 `登录页面` 滑动验证组件
+- 修复 `BasicUpload` 组件，回显问题
+- 修复 `ts类型` 配置缺陷
+- 修复 `登录页面` message 交互缺陷
+- 修复 `表格编辑` 时间格式化异常 [#92](https://github.com/jekip/naive-ui-admin/issues/92)
+
+- ### ✨ Features
+- 依赖升级
+
+## 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
--- a/README.md
+++ b/README.md
@@ -1,24 +1,56 @@
 ## 简介

-[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
+
+新产品，如果您选的技术栈是 `Antd` 的话，不妨看看
+
+[NaiveAdmin Antd 预览](https://antd.naiveadmin.com)
+
+### Arco vue
+
+新产品，智能设计体系，连接轻盈体验
+
+[NaiveAdmin Arco 预览](https://arco.naiveadmin.com)
+
+### Element Plus
+
+新产品，面向设计师和开发者的组件库
+
+[Element Plus Admin 预览](https://element.naiveadmin.com)
+
+以上版本同时具备 `NaiveAdmin v2` 功能/组件/页面，一如既往、开箱即用，欢迎前往查看。
+
+
 ## 文档

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

 ## 准备

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

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

 - 获取项目代码

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

 [CHANGELOG](./CHANGELOG.md)

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

 ## 如何贡献

@@ -113,11 +142,13 @@ yarn build

 ## 交流

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

- QQ 群 `328347666`
+![abelianGroup](https://user-images.githubusercontent.com/19426584/160335146-c28dd205-4600-4d62-b2c6-6456034ab7b1.jpg)

 ## 赞助
 #### 如果你觉得这个项目帮助到了你，你可以帮作者买一杯果汁表示鼓励 🍹。

 ![donate](https://jekip.github.io/docs/images/sponsor.png)
+
+[Paypal Me](https://www.paypal.com/paypalme/majunping)
--- 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.5",
+  "version": "1.8.0",
  "author": {
    "name": "Ahjung",
    "email": "735878602@qq.com",
@@ -27,73 +27,72 @@
  "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",
-    "date-fns": "^2.23.0",
-    "echarts": "^5.1.2",
-    "element-resize-detector": "^1.2.3",
+    "@vueup/vue-quill": "^1.0.0-beta.8",
+    "@vueuse/core": "^5.3.0",
+    "axios": "^0.21.4",
+    "blueimp-md5": "^2.19.0",
+    "date-fns": "^2.28.0",
+    "echarts": "^5.3.1",
+    "element-resize-detector": "^1.2.4",
    "lodash": "^4.17.21",
    "lodash-es": "^4.17.21",
-    "makeit-captcha": "^1.2.5",
    "mitt": "^2.1.0",
    "mockjs": "^1.1.0",
-    "naive-ui": "^2.16.2",
-    "pinia": "^2.0.0-rc.4",
-    "qs": "^6.10.1",
+    "naive-ui": "^2.27.0",
+    "pinia": "^2.0.13",
+    "qs": "^6.10.3",
    "vfonts": "^0.1.0",
-    "vue": "^3.2.2",
-    "vue-router": "^4.0.11",
-    "vue-types": "^4.0.0",
-    "vuedraggable": "^4.0.3",
-    "vuex": "^4.0.2"
+    "vue": "^3.2.31",
+    "vue-router": "^4.0.14",
+    "vue-types": "^4.1.1",
+    "vuedraggable": "^4.1.0"
  },
  "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.29.1",
-    "@typescript-eslint/parser": "^4.29.1",
-    "@vitejs/plugin-vue": "^1.2.3",
-    "@vitejs/plugin-vue-jsx": "^1.1.5",
-    "@vue/compiler-sfc": "^3.2.2",
+    "@types/lodash": "^4.14.181",
+    "@types/node": "^15.14.9",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue-jsx": "^1.3.9",
+    "@vue/compiler-sfc": "^3.2.31",
    "@vue/eslint-config-typescript": "^7.0.0",
-    "autoprefixer": "^10.3.1",
+    "autoprefixer": "^10.4.4",
    "commitizen": "^4.2.4",
-    "core-js": "^3.14.0",
+    "core-js": "^3.21.1",
    "dotenv": "^10.0.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-config-prettier": "^8.5.0",
+    "eslint-define-config": "1.0.9",
+    "eslint-plugin-jest": "^24.7.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-vue": "^7.20.0",
    "esno": "^0.7.3",
-    "gh-pages": "^3.2.0",
+    "gh-pages": "^3.2.3",
    "husky": "^6.0.0",
-    "jest": "^27.0.6",
-    "less": "^4.1.1",
-    "less-loader": "^9.0.0",
-    "lint-staged": "^11.0.0",
-    "postcss": "^8.3.5",
-    "prettier": "^2.3.1",
-    "pretty-quick": "^3.1.0",
+    "jest": "^27.5.1",
+    "less": "^4.1.2",
+    "less-loader": "^9.1.0",
+    "lint-staged": "^11.2.6",
+    "postcss": "^8.4.12",
+    "prettier": "^2.6.1",
+    "pretty-quick": "^3.1.3",
    "rimraf": "^3.0.2",
    "stylelint": "^13.13.1",
    "stylelint-config-prettier": "^8.0.2",
    "stylelint-config-standard": "^22.0.0",
    "stylelint-order": "^4.1.0",
-    "stylelint-scss": "^3.19.0",
-    "tailwindcss": "^2.2.7",
-    "typescript": "^4.3.5",
-    "vite": "2.4.4",
-    "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"
+    "stylelint-scss": "^3.21.0",
+    "tailwindcss": "^2.2.19",
+    "typescript": "^4.6.3",
+    "unplugin-vue-components": "^0.17.21",
+    "vite": "^2.9.1",
+    "vite-plugin-compression": "^0.3.6",
+    "vite-plugin-html": "^2.1.2",
+    "vite-plugin-mock": "^2.9.6",
+    "vite-plugin-style-import": "^1.4.1",
+    "vue-eslint-parser": "^7.11.0"
  },
  "lint-staged": {
    "*.{vue,js,ts,tsx}": "eslint --fix"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -3,4 +3,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-}
+};
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@

 <script lang="ts" setup>
  import { computed, onMounted, onUnmounted } from 'vue';
-  import { zhCN, dateZhCN, createTheme, inputDark, datePickerDark, darkTheme } from 'naive-ui';
+  import { zhCN, dateZhCN, darkTheme } from 'naive-ui';
  import { LockScreen } from '@/components/Lockscreen';
  import { AppProvider } from '@/components/Application';
  import { useLockscreenStore } from '@/store/modules/lockscreen';
--- 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,9 +1,9 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';

 /**
 * @description: 角色列表
 */
-export function getRoleList(params) {
+export function getRoleList() {
  return http.request({
    url: '/role/list',
    method: 'GET',
--- 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/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
@@ -50,6 +50,11 @@
    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);
  }
@@ -58,6 +63,7 @@
    return {
      ...attrs,
      ...unref(getProps),
+      ...unref(propsRef),
    };
  });

@@ -87,6 +93,7 @@

  function handleSubmit() {
    subLoading.value = true;
+    console.log(subLoading.value);
    emit('on-ok');
  }

@@ -101,7 +108,6 @@
  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
@@ -4,7 +4,6 @@ import { ModalMethods, UseModalReturnType } from '../type';
 import { getDynamicProps } from '@/utils';
 import { tryOnUnmounted } from '@vueuse/core';
 export function useModal(props): UseModalReturnType {
-
  const modalRef = ref<Nullable<ModalMethods>>(null);
  const currentInstance = getCurrentInstance();

--- a/src/components/Modal/src/type/index.ts
+++ b/src/components/Modal/src/type/index.ts
@@ -12,8 +12,8 @@ export interface ModalMethods {
 /**
 * 支持修改，DialogOptions 參數
 */
-export interface ModalProps extends DialogOptions { }
+export type ModalProps = DialogOptions;

 export type RegisterFn = (ModalInstance: ModalMethods) => void;

-export type UseModalReturnType = [RegisterFn, ModalMethods];
+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
@@ -11,7 +11,6 @@
        <CellComponent
          v-bind="getComponentProps"
          :component="getComponent"
-          :style="getWrapperStyle"
          :popoverVisible="getRuleVisible"
          :ruleMessage="ruleMessage"
          :rule="getRule"
@@ -33,7 +32,7 @@
  </div>
 </template>
 <script lang="ts">
-  import type { CSSProperties, PropType } from 'vue';
+  import type { PropType } from 'vue';
  import type { BasicColumn } from '../../types/table';
  import type { EditRecordRow } from './index';

@@ -51,7 +50,8 @@
  import { set, omit } from 'lodash-es';
  import { EventEnum } from '@/components/Table/src/componentMap';

-  import { milliseconds, format } from 'date-fns';
+  import { parseISO, format } from 'date-fns';
+  import { Fn, LabelValueOptions } from '/#/index';

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

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

      const getComponentProps = computed(() => {
@@ -105,16 +105,28 @@

        const isCheckValue = unref(getIsCheckComp);

-        const valueField = isCheckValue ? 'checked' : 'value';
+        let valueField = isCheckValue ? 'checked' : 'value';
        const val = unref(currentValueRef);

        let value = isCheckValue ? (isNumber(val) && isBoolean(val) ? val : !!val) : val;

-        if (isString(value) && component === 'NDatePicker') {
-          value = milliseconds(value as Duration);
-        } else if (isArray(value) && component === 'NDatePicker') {
-          value = value.map((item) => milliseconds(item));
+        //TODO 特殊处理 NDatePicker 可能要根据项目 规范自行调整代码
+        if (component === 'NDatePicker') {
+          if (isString(value)) {
+            if (compProps.valueFormat) {
+              valueField = 'formatted-value';
+            } else {
+              value = parseISO(value as any).getTime();
+            }
+          } else if (isArray(value)) {
+            if (compProps.valueFormat) {
+              valueField = 'formatted-value';
+            } else {
+              value = value.map((item) => parseISO(item).getTime());
+            }
+          }
        }
+
        const onEvent: any = editComponent ? EventEnum[editComponent] : undefined;

        return {
@@ -146,15 +158,6 @@
        return option?.label ?? value;
      });

-      const getWrapperStyle = computed((): CSSProperties => {
-        // if (unref(getIsCheckComp) || unref(getRowEditable)) {
-        //   return {};
-        // }
-        return {
-          width: 'calc(100% - 48px)',
-        };
-      });
-
      const getWrapperClass = computed(() => {
        const { align = 'center' } = props.column;
        return `edit-cell-align-${align}`;
@@ -188,6 +191,7 @@

      async function handleChange(e: any) {
        const component = unref(getComponent);
+        const compProps = props.column?.editComponentProps ?? {};
        if (!e) {
          currentValueRef.value = e;
        } else if (e?.target && Reflect.has(e.target, 'value')) {
@@ -198,10 +202,20 @@
          currentValueRef.value = e;
        }

-        //TODO 根据组件格式化值
-        // if (component === 'NDatePicker') {
-        //   currentValueRef.value = format(currentValueRef.value,'yyyy-MM-dd HH:mm:ss');
-        // }
+        //TODO 特殊处理 NDatePicker 可能要根据项目 规范自行调整代码
+        if (component === 'NDatePicker') {
+          if (isNumber(currentValueRef.value)) {
+            if (compProps.valueFormat) {
+              currentValueRef.value = format(currentValueRef.value, compProps.valueFormat);
+            }
+          } else if (isArray(currentValueRef.value)) {
+            if (compProps.valueFormat) {
+              currentValueRef.value = currentValueRef.value.map((item) => {
+                format(item, compProps.valueFormat);
+              });
+            }
+          }
+        }

        const onChange = props.column?.editComponentProps?.onChange;
        if (onChange && isFunction(onChange)) onChange(...arguments);
@@ -303,104 +317,103 @@
      function initCbs(cbs: 'submitCbs' | 'validCbs' | 'cancelCbs', handle: Fn) {
        if (props.record) {
          /* eslint-disable  */
-      isArray(props.record[cbs])
-         ? props.record[cbs]?.push(handle)
-         : (props.record[cbs] = [handle]);
-     }
-    }
-
-    if (props.record) {
-     initCbs('submitCbs', handleSubmit);
-     initCbs('validCbs', handleSubmiRule);
-     initCbs('cancelCbs', handleCancel);
-
-     if (props.column.key) {
-      if (!props.record.editValueRefs) props.record.editValueRefs = {};
-      props.record.editValueRefs[props.column.key] = currentValueRef;
-     }
-     /* eslint-disable  */
-     props.record.onCancelEdit = () => {
-      isArray(props.record?.cancelCbs) && props.record?.cancelCbs.forEach((fn) => fn());
-     };
-     /* eslint-disable */
-     props.record.onSubmitEdit = async() => {
-      if (isArray(props.record?.submitCbs)) {
-       const validFns = (props.record?.validCbs || []).map((fn) => fn());
-
-       const res = await Promise.all(validFns);
-
-       const pass = res.every((item) => !!item);
-
-       if (!pass) return;
-       const submitFns = props.record?.submitCbs || [];
-       submitFns.forEach((fn) => fn(false, false));
-       table.emit?.('edit-row-end');
-       return true;
+          isArray(props.record[cbs])
+            ? props.record[cbs]?.push(handle)
+            : (props.record[cbs] = [handle]);
+        }
      }
-     };
-    }

-    return {
-     isEdit,
-     handleEdit,
-     currentValueRef,
-     handleSubmit,
-     handleChange,
-     handleCancel,
-     elRef,
-     getComponent,
-     getRule,
-     onClickOutside,
-     ruleMessage,
-     getRuleVisible,
-     getComponentProps,
-     handleOptionsChange,
-     getWrapperStyle,
-     getWrapperClass,
-     getRowEditable,
-     getValues,
-     handleEnter,
-     // getSize,
-    };
-   },
+      if (props.record) {
+        initCbs('submitCbs', handleSubmit);
+        initCbs('validCbs', handleSubmiRule);
+        initCbs('cancelCbs', handleCancel);
+
+        if (props.column.key) {
+          if (!props.record.editValueRefs) props.record.editValueRefs = {};
+          props.record.editValueRefs[props.column.key] = currentValueRef;
+        }
+        /* eslint-disable  */
+        props.record.onCancelEdit = () => {
+          isArray(props.record?.cancelCbs) && props.record?.cancelCbs.forEach((fn) => fn());
+        };
+        /* eslint-disable */
+        props.record.onSubmitEdit = async () => {
+          if (isArray(props.record?.submitCbs)) {
+            const validFns = (props.record?.validCbs || []).map((fn) => fn());
+
+            const res = await Promise.all(validFns);
+
+            const pass = res.every((item) => !!item);
+
+            if (!pass) return;
+            const submitFns = props.record?.submitCbs || [];
+            submitFns.forEach((fn) => fn(false, false));
+            table.emit?.('edit-row-end');
+            return true;
+          }
+        };
+      }
+
+      return {
+        isEdit,
+        handleEdit,
+        currentValueRef,
+        handleSubmit,
+        handleChange,
+        handleCancel,
+        elRef,
+        getComponent,
+        getRule,
+        onClickOutside,
+        ruleMessage,
+        getRuleVisible,
+        getComponentProps,
+        handleOptionsChange,
+        getWrapperClass,
+        getRowEditable,
+        getValues,
+        handleEnter,
+        // getSize,
+      };
+    },
  });
 </script>

 <style lang="less">
-.editable-cell {
- &-content {
-  position: relative;
-  overflow-wrap: break-word;
-  word-break: break-word;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  .editable-cell {
+    &-content {
+      position: relative;
+      overflow-wrap: break-word;
+      word-break: break-word;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;

-  &-comp{
-    flex: 1;
+      &-comp {
+        flex: 1;
+      }
+
+      .edit-icon {
+        font-size: 14px;
+        //position: absolute;
+        //top: 4px;
+        //right: 0;
+        display: none;
+        width: 20px;
+        cursor: pointer;
+      }
+
+      &:hover {
+        .edit-icon {
+          display: inline-block;
+        }
+      }
+    }
+
+    &-action {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
  }
-
-  .edit-icon {
-   font-size: 14px;
-   //position: absolute;
-   //top: 4px;
-   //right: 0;
-   display: none;
-   width: 20px;
-   cursor: pointer;
-  }
-
-  &:hover {
-   .edit-icon {
-    display: inline-block;
-   }
-  }
- }
-
- &-action {
-  display: flex;
-  align-items: center;
-  justify-content: center;
- }
-}
 </style>
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -25,13 +25,26 @@
          </template>
          <div class="table-toolbar-inner">
            <n-checkbox-group v-model:value="checkList" @update:value="onChange">
-              <Draggable v-model="columnsList" animation="300" item-key="key" @end="draggableEnd">
+              <Draggable
+                v-model="columnsList"
+                animation="300"
+                item-key="key"
+                filter=".no-draggable"
+                :move="onMove"
+                @end="draggableEnd"
+              >
                <template #item="{ element }">
                  <div
                    class="table-toolbar-inner-checkbox"
-                    :class="{ 'table-toolbar-inner-checkbox-dark': getDarkTheme === true }"
+                    :class="{
+                      'table-toolbar-inner-checkbox-dark': getDarkTheme === true,
+                      'no-draggable': element.draggable === false,
+                    }"
                  >
-                    <span class="drag-icon">
+                    <span
+                      class="drag-icon"
+                      :class="{ 'drag-icon-hidden': element.draggable === false }"
+                    >
                      <n-icon size="18">
                        <DragOutlined />
                      </n-icon>
@@ -88,7 +101,6 @@
    VerticalRightOutlined,
    VerticalLeftOutlined,
  } from '@vicons/antd';
-  // @ts-ignore
  import Draggable from 'vuedraggable/src/vuedraggable';
  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';

@@ -212,6 +224,11 @@
        }
      }

+      function onMove(e) {
+        if (e.draggedContext.element.draggable === false) return false;
+        return true;
+      }
+
      //固定
      function fixedColumn(item, fixed) {
        if (!state.checkList.includes(item.key)) return;
@@ -233,6 +250,7 @@
        onChange,
        onCheckAll,
        onSelection,
+        onMove,
        resetColumns,
        fixedColumn,
        draggableEnd,
@@ -276,6 +294,10 @@
        display: inline-flex;
        margin-right: 8px;
        cursor: move;
+        &-hidden {
+          visibility: hidden;
+          cursor: default;
+        }
      }

      .fixed-item {
--- 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/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -14,6 +14,8 @@ export interface BasicColumn extends TableBaseColumn {
  auth?: string[];
  // 业务控制是否显示
  ifShow?: boolean | ((column: BasicColumn) => boolean);
+  // 控制是否支持拖拽，默认支持
+  draggable?: boolean;
 }

 export interface TableActionType {
--- 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/components/Upload/src/BasicUpload.vue
+++ b/src/components/Upload/src/BasicUpload.vue
@@ -14,10 +14,10 @@
              <img :src="item" />
            </div>
            <div class="img-box-actions">
-              <n-icon size="18" class="action-icon mx-2" @click="preview(item)">
+              <n-icon size="18" class="mx-2 action-icon" @click="preview(item)">
                <EyeOutlined />
              </n-icon>
-              <n-icon size="18" class="action-icon mx-2" @click="remove(index)">
+              <n-icon size="18" class="mx-2 action-icon" @click="remove(index)">
                <DeleteOutlined />
              </n-icon>
            </div>
@@ -36,7 +36,7 @@
            @before-upload="beforeUpload"
            @finish="finish"
          >
-            <div class="flex justify-center flex-col">
+            <div class="flex flex-col justify-center">
              <n-icon size="18" class="m-auto">
                <PlusOutlined />
              </n-icon>
@@ -68,7 +68,7 @@
 </template>

 <script lang="ts">
-  import { defineComponent, toRefs, reactive, computed } from 'vue';
+  import { defineComponent, toRefs, reactive, computed, watch } from 'vue';
  import { EyeOutlined, DeleteOutlined, PlusOutlined } from '@vicons/antd';
  import { basicProps } from './props';
  import { useMessage, useDialog } from 'naive-ui';
@@ -106,11 +106,14 @@
      });

      //赋值默认图片显示
-      if (props.value.length) {
-        state.imgList = props.value.map((item) => {
-          return getImgUrl(item);
-        });
-      }
+      watch(
+        () => props.value,
+        () => {
+          imgList.value = props.value.map((item) => {
+            return getImgUrl(item);
+          });
+        }
+      );

      //预览
      function preview(url: string) {
--- a/src/hooks/setting/useProjectSetting.ts
+++ b/src/hooks/setting/useProjectSetting.ts
@@ -8,6 +8,8 @@ export function useProjectSetting() {

  const getNavTheme = computed(() => projectStore.navTheme);

+  const getIsMobile = computed(() => projectStore.isMobile);
+
  const getHeaderSetting = computed(() => projectStore.headerSetting);

  const getMultiTabsSetting = computed(() => projectStore.multiTabsSetting);
@@ -27,6 +29,7 @@ export function useProjectSetting() {
  return {
    getNavMode,
    getNavTheme,
+    getIsMobile,
    getHeaderSetting,
    getMultiTabsSetting,
    getMenuSetting,
--- a/src/hooks/web/usePage.ts
+++ b/src/hooks/web/usePage.ts
@@ -0,0 +1,62 @@
+import type { RouteLocationRaw, Router } from 'vue-router';
+
+import { PageEnum } from '@/enums/pageEnum';
+import { RedirectName } from '@/router/constant';
+
+import { useRouter } from 'vue-router';
+import { isString } from '@/utils/is';
+import { unref } from 'vue';
+
+export type RouteLocationRawEx = Omit<RouteLocationRaw, 'path'> & { path: PageEnum };
+
+function handleError(e: Error) {
+  console.error(e);
+}
+
+/**
+ * 页面切换
+ */
+export function useGo(_router?: Router) {
+  let router;
+  if (!_router) {
+    router = useRouter();
+  }
+  const { push, replace } = _router || router;
+  function go(opt: PageEnum | RouteLocationRawEx | string = PageEnum.BASE_HOME, isReplace = false) {
+    if (!opt) {
+      return;
+    }
+    if (isString(opt)) {
+      isReplace ? replace(opt).catch(handleError) : push(opt).catch(handleError);
+    } else {
+      const o = opt as RouteLocationRaw;
+      isReplace ? replace(o).catch(handleError) : push(o).catch(handleError);
+    }
+  }
+  return go;
+}
+
+/**
+ * 重做当前页面
+ */
+export const useRedo = (_router?: Router) => {
+  const { push, currentRoute } = _router || useRouter();
+  const { query, params = {}, name, fullPath } = unref(currentRoute.value);
+  function redo(): Promise<boolean> {
+    return new Promise((resolve) => {
+      if (name === RedirectName) {
+        resolve(false);
+        return;
+      }
+      if (name && Object.keys(params).length > 0) {
+        params['_redirect_type'] = 'name';
+        params['path'] = String(name);
+      } else {
+        params['_redirect_type'] = 'path';
+        params['path'] = fullPath;
+      }
+      push({ name: RedirectName, params, query }).then(() => resolve(true));
+    });
+  }
+  return redo;
+};
--- 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,7 +131,6 @@
            <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">
@@ -361,6 +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/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(
@@ -127,6 +125,7 @@
        } else {
          router.push({ name: key });
        }
+        emit('clickMenuItem' as any, key);
      }

      //展开菜单
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -30,27 +30,22 @@
          </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)"
-                >
-                  <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>
+          <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.meta.affix">
+                  <CloseOutlined />
+                </n-icon>
+              </div>
+            </template>
+          </Draggable>
        </div>
      </div>
      <div class="tabs-close">
@@ -87,7 +82,6 @@
    computed,
    ref,
    toRefs,
-    toRaw,
    unref,
    provide,
    watch,
@@ -113,10 +107,12 @@
    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';
+  import { useGo } from '@/hooks/web/usePage';

  export default defineComponent({
    name: 'TabsView',
@@ -133,8 +129,8 @@
      },
    },
    setup(props) {
-      const { getDarkTheme } = useDesignSetting();
-      const { getNavMode, getHeaderSetting, getMenuSetting, getMultiTabsSetting } =
+      const { getDarkTheme, getAppTheme } = useDesignSetting();
+      const { getNavMode, getHeaderSetting, getMenuSetting, getMultiTabsSetting, getIsMobile } =
        useProjectSetting();
      const settingStore = useProjectSettingStore();

@@ -143,17 +139,24 @@
      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 go = useGo();
+
+      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,
@@ -172,10 +175,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);
      });

      //动态组装样式 菜单缩进
@@ -190,6 +190,13 @@
            : collapsed
            ? `${minMenuWidth}px`
            : `${menuWidth}px`;
+
+        if (getIsMobile.value) {
+          return {
+            left: '0px',
+            width: '100%',
+          };
+        }
        return {
          left: lenNum,
          width: `calc(100% - ${!fixed ? '0px' : lenNum})`,
@@ -198,7 +205,7 @@

      //tags 右侧下拉菜单
      const TabsMenuOptions = computed(() => {
-        const isDisabled = unref(tabsList).length <= 1 ? true : false;
+        const isDisabled = unref(tabsList).length <= 1;
        return [
          {
            label: '刷新当前',
@@ -226,17 +233,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) {
@@ -245,11 +262,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.value.fixed &&
+          getMultiTabsSetting.value.fixed &&
+          scrollTop >= 64
+        );
      }

      window.addEventListener('scroll', onScroll, true);
@@ -281,7 +298,7 @@
          if (whiteList.includes(route.name as string)) return;
          state.activeKey = to;
          tabsViewStore.addTabs(getSimpleRoute(route));
-          updateNavScroll();
+          updateNavScroll(true);
        },
        { immediate: true }
      );
@@ -344,7 +361,6 @@

      // 关闭全部
      const closeAll = () => {
-        localStorage.removeItem('routes');
        tabsViewStore.closeAllTabs();
        router.replace(PageEnum.BASE_HOME);
        updateNavScroll();
@@ -374,64 +390,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;
@@ -452,7 +477,7 @@
        const { fullPath } = e;
        if (fullPath === route.fullPath) return;
        state.activeKey = fullPath;
-        router.push({ path: fullPath });
+        go(e, true);
      }

      //删除tab
@@ -475,11 +500,9 @@
      return {
        ...toRefs(state),
        navWrap,
-        navRef,
        navScroll,
        route,
        tabsList,
-        baseHome: PageEnum.BASE_HOME_REDIRECT,
        goPage,
        closeTabItem,
        closeLeft,
@@ -492,10 +515,12 @@
        closeHandleSelect,
        scrollNext,
        scrollPrev,
-        getNavStyle,
        handleContextMenu,
        onClickOutside,
        getDarkTheme,
+        getAppTheme,
+        getCardColor,
+        getBaseColor,
      };
    },
  });
@@ -552,22 +577,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;
@@ -607,7 +622,7 @@
          }

          .active-item {
-            color: #2d8cf0;
+            color: v-bind(getAppTheme);
          }
        }
      }
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,8 +1,10 @@
 <template>
-  <NLayout class="layout" :position="fixedMenu" has-sider>
-    <NLayoutSider
-      v-if="isMixMenuNoneSub && (navMode === 'vertical' || navMode === 'horizontal-mix')"
-      show-trigger
+  <n-layout class="layout" :position="fixedMenu" has-sider>
+    <n-layout-sider
+      v-if="
+        !isMobile && isMixMenuNoneSub && (navMode === 'vertical' || navMode === 'horizontal-mix')
+      "
+      show-trigger="bar"
      @collapse="collapsed = true"
      :position="fixedMenu"
      @expand="collapsed = false"
@@ -16,14 +18,24 @@
    >
      <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-drawer
+      v-model:show="showSideDrawder"
+      :width="menuWidth"
+      :placement="'left'"
+      class="layout-side-drawer"
+    >
+      <Logo :collapsed="collapsed" />
+      <AsideMenu @clickMenuItem="collapsed = false" />
+    </n-drawer>
+
+    <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,10 +62,10 @@
        <!--        <NLayoutFooter v-if="getShowFooter">-->
        <!--          <PageFooter />-->
        <!--        </NLayoutFooter>-->
-      </NLayoutContent>
+      </n-layout-content>
      <n-back-top :right="100" />
-    </NLayout>
-  </NLayout>
+    </n-layout>
+  </n-layout>
 </template>

 <script lang="ts" setup>
@@ -71,7 +83,7 @@

  const { getDarkTheme } = useDesignSetting();
  const {
-    getShowFooter,
+    // getShowFooter,
    getNavMode,
    getNavTheme,
    getHeaderSetting,
@@ -85,6 +97,13 @@

  const collapsed = ref<boolean>(false);

+  const { mobileWidth, menuWidth } = unref(getMenuSetting);
+
+  const isMobile = computed<boolean>({
+    get: () => settingStore.getIsMobile,
+    set: (val) => settingStore.setIsMobile(val),
+  });
+
  const fixedHeader = computed(() => {
    const { fixed } = unref(getHeaderSetting);
    return fixed ? 'absolute' : 'static';
@@ -127,33 +146,64 @@
    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 showSideDrawder = computed({
+    get: () => isMobile.value && collapsed.value,
+    set: (val) => (collapsed.value = val),
+  });
+
+  //判断是否触发移动端模式
+  const checkMobileMode = () => {
+    if (document.body.clientWidth <= mobileWidth) {
+      isMobile.value = true;
+    } else {
+      isMobile.value = false;
+    }
+    collapsed.value = false;
+  };
+
  const watchWidth = () => {
    const Width = document.body.clientWidth;
    if (Width <= 950) {
      collapsed.value = true;
    } else collapsed.value = false;
-  }
+
+    checkMobileMode();
+  };

  onMounted(() => {
+    checkMobileMode();
    window.addEventListener('resize', watchWidth);
    //挂载在 window 方便与在js中使用
    window['$loading'] = useLoadingBar();
    window['$loading'].finish();
  });
-
 </script>

+<style lang="less">
+  .layout-side-drawer {
+    background-color: rgb(0, 20, 40);
+
+    .layout-sider {
+      min-height: 100vh;
+      box-shadow: 2px 0 8px 0 rgb(29 35 41 / 5%);
+      position: relative;
+      z-index: 13;
+      transition: all 0.2s ease-in-out;
+    }
+  }
+</style>
 <style lang="less" scoped>
  .layout {
    display: flex;
@@ -214,7 +264,7 @@
  }

  .fluid-header {
-    padding-top: 0px;
+    padding-top: 0;
  }

  .main-view-fix {
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,8 +3,6 @@ import { createApp } from 'vue';
 import App from './App.vue';
 import router, { setupRouter } from './router';
 import { setupStore } from '@/store';
-import MakeitCaptcha from 'makeit-captcha';
-import 'makeit-captcha/dist/captcha.min.css';
 import { setupNaive, setupDirectives } from '@/plugins';
 import { AppProvider } from '@/components/Application';

@@ -13,8 +11,6 @@ async function bootstrap() {

  const app = createApp(App);

-  app.use(MakeitCaptcha);
-
  // 注册全局常用的 naive-ui 组件
  setupNaive(app);

--- 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/dashboard.ts
+++ b/src/router/modules/dashboard.ts
@@ -34,6 +34,7 @@ const routes: Array<RouteRecordRaw> = [
        meta: {
          title: '主控台',
          permissions: ['dashboard_console'],
+          affix: true,
        },
        component: () => import('@/views/dashboard/console/console.vue'),
      },
--- a/src/router/modules/frame.ts
+++ b/src/router/modules/frame.ts
@@ -17,6 +17,15 @@ const routes: Array<RouteRecordRaw> = [
      icon: renderIcon(DesktopOutline),
    },
    children: [
+      {
+        path: 'naive-admin',
+        name: 'naive-admin',
+        meta: {
+          title: 'NaiveAdmin',
+          frameSrc: 'https://www.naiveadmin.com',
+        },
+        component: IFrame,
+      },
      {
        path: 'docs',
        name: 'frame-docs',
--- 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/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -3,6 +3,8 @@ const setting = {
  navMode: 'vertical',
  //导航风格 dark 暗色侧边栏 light 白色侧边栏 header-dark 暗色顶栏
  navTheme: 'dark',
+  // 是否处于移动端模式
+  isMobile: false,
  //顶部
  headerSetting: {
    //背景色
@@ -33,6 +35,8 @@ const setting = {
    fixed: true,
    //分割菜单
    mixMenu: false,
+    //触发移动端侧边栏的宽度
+    mobileWidth: 800,
  },
  //面包屑
  crumbsSetting: {
--- 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
@@ -6,6 +6,7 @@ import type { IheaderSetting, ImenuSetting, ImultiTabsSetting, IcrumbsSetting }
 const {
  navMode,
  navTheme,
+  isMobile,
  headerSetting,
  showFooter,
  menuSetting,
@@ -27,6 +28,7 @@ interface ProjectSettingState {
  permissionMode: string; //权限模式
  isPageAnimate: boolean; //是否开启路由动画
  pageAnimateType: string; //路由动画类型
+  isMobile: boolean; // 是否处于移动端模式
 }

 export const useProjectSettingStore = defineStore({
@@ -34,6 +36,7 @@ export const useProjectSettingStore = defineStore({
  state: (): ProjectSettingState => ({
    navMode: navMode,
    navTheme,
+    isMobile,
    headerSetting,
    showFooter,
    menuSetting,
@@ -50,6 +53,9 @@ export const useProjectSettingStore = defineStore({
    getNavTheme(): string {
      return this.navTheme;
    },
+    getIsMobile(): boolean {
+      return this.isMobile;
+    },
    getHeaderSetting(): object {
      return this.headerSetting;
    },
@@ -79,6 +85,9 @@ export const useProjectSettingStore = defineStore({
    setNavTheme(value: string): void {
      this.navTheme = value;
    },
+    setIsMobile(value: boolean): void {
+      this.isMobile = value;
+    },
  },
 });

--- a/src/store/modules/tabsView.ts
+++ b/src/store/modules/tabsView.ts
@@ -7,13 +7,23 @@ const whiteList = ['Redirect', 'login'];

 export type RouteItem = Partial<RouteLocationNormalized> & {
  fullPath: string;
+  path: string;
  name: string;
+  hash: string;
+  meta: object;
+  params: object;
+  query: object;
 };

 export type ITabsViewState = {
  tabsList: RouteItem[]; // 标签页
 };

+//保留固定路由
+function retainAffixRoute(list: any[]) {
+  return list.filter((item) => item?.meta?.affix ?? false);
+}
+
 export const useTabsViewStore = defineStore({
  id: 'app-tabs-view',
  state: (): ITabsViewState => ({
@@ -55,8 +65,8 @@ export const useTabsViewStore = defineStore({
    },
    closeAllTabs() {
      // 关闭全部
-      this.tabsList = [];
-      localStorage.removeItem(TABS_ROUTES);
+      console.log(retainAffixRoute(this.tabsList));
+      this.tabsList = retainAffixRoute(this.tabsList);
    },
  },
 });
--- 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
@@ -1,9 +1,12 @@
-#app, body, html {
+#app,
+body,
+html {
  height: 100%;
 }

 body {
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, "\5FAE\8F6F\96C5\9ED1", Arial, sans-serif;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei,
+    '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif;
  line-height: 1.5;
  color: #515a6e;
  font-size: 14px;
@@ -15,7 +18,7 @@ body {
 //重置样式
 .anticon {
  svg {
-    vertical-align: initial
+    vertical-align: initial;
  }
 }

@@ -25,10 +28,11 @@ a {
  text-decoration: none;
  outline: none;
  cursor: pointer;
-  transition: color .2s ease;
+  transition: color 0.2s ease;
 }

-a:active, a:hover {
+a:active,
+a:hover {
  outline-width: 0;
 }

@@ -40,7 +44,8 @@ a:active {
  color: #2b85e4;
 }

-a:active, a:hover {
+a:active,
+a:hover {
  outline: 0;
  text-decoration: none;
 }
@@ -91,7 +96,7 @@ a:active, a:hover {

 //antd 卡片样式定制
 body .n-card {
-  transition: all .2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }

 body .n-icon {
@@ -110,7 +115,7 @@ body .proCard {
  }
 }

-body .n-modal{
+body .n-modal {
  border-radius: 6px;
 }

--- 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];
--- 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,8 +31,6 @@ const transform: AxiosTransform = {
   * @description: 处理请求数据
   */
  transformRequestData: (res: AxiosResponse<Result>, options: RequestOptions) => {
-    // @ts-ignore
-    const { $message: Message, $dialog: Modal } = window;
    const {
      isShowMessage = true,
      isShowErrorMessage,
@@ -51,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;
@@ -67,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: '确定',
@@ -86,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 请求加上时间戳参数，避免从缓存中拿数据。
@@ -155,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风格
@@ -172,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;
  },
@@ -187,8 +191,8 @@ const transform: AxiosTransform = {
   * @description: 响应错误处理
   */
  responseInterceptorsCatch: (error: any) => {
-    // @ts-ignore
-    const { $message: Message, $dialog: Modal } = window;
+    const $dialog = window['$dialog'];
+    const $message = window['$message'];
    const { response, code, message } = error || {};
    // TODO 此处要根据后端接口返回格式修改
    const msg: string =
@@ -196,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 {
@@ -28,6 +41,8 @@ export interface RequestOptions {
  joinPrefix?: boolean;
  // 接口地址， 不填则使用默认apiUrl
  apiUrl?: string;
+  // 请求拼接路径
+  urlPrefix?: string;
  // 错误消息提示类型
  errorMessageMode?: 'none' | 'modal';
  // 是否添加时间戳
@@ -36,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
@@ -206,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/comp/form/basic.vue
+++ b/src/views/comp/form/basic.vue
@@ -77,10 +77,10 @@
      field: 'makeDate',
      component: 'NDatePicker',
      label: '预约时间',
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
--- a/src/views/comp/form/useForm.vue
+++ b/src/views/comp/form/useForm.vue
@@ -79,10 +79,10 @@
      giProps: {
        //span: 24,
      },
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
--- 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/table/CellColumns.ts
+++ b/src/views/comp/table/CellColumns.ts
@@ -61,6 +61,7 @@ export const columns = [
    editComponentProps: {
      type: 'datetime',
      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss',
    },
    ellipsis: false,
  },
--- a/src/views/comp/table/basic.vue
+++ b/src/views/comp/table/basic.vue
@@ -73,7 +73,7 @@
  }

  const loadDataTable = async (res) => {
-    return await getTableList({...res,...params});
+    return await getTableList({ ...params, ...res });
  };

  function onCheckedRow(rowKeys) {
--- a/src/views/comp/table/editCell.vue
+++ b/src/views/comp/table/editCell.vue
@@ -39,7 +39,7 @@
  }

  const loadDataTable = async (res) => {
-    return await getTableList({ ...res, ...params });
+    return await getTableList({ ...params, ...res });
  };

  function onCheckedRow(rowKeys) {
--- a/src/views/comp/table/editRow.vue
+++ b/src/views/comp/table/editRow.vue
@@ -94,7 +94,7 @@
  }

  const loadDataTable = async (res) => {
-    return await getTableList({ ...res, ...params });
+    return await getTableList({ ...params, ...res });
  };

  function onCheckedRow(rowKeys) {
--- a/src/views/comp/table/rowColumns.ts
+++ b/src/views/comp/table/rowColumns.ts
@@ -64,6 +64,7 @@ export const columns = [
    editComponentProps: {
      type: 'datetime',
      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss',
    },
    ellipsis: false,
  },
--- a/src/views/dashboard/console/console.vue
+++ b/src/views/dashboard/console/console.vue
@@ -23,7 +23,7 @@
                日同比
                <CountTo :startVal="1" suffix="%" :endVal="visits.rise" />
                <n-icon size="12" color="#00ff6f">
-                  <component is="CaretUpOutlined" />
+                  <CaretUpOutlined />
                </n-icon>
              </template>
            </div>
@@ -33,7 +33,7 @@
                周同比
                <CountTo :startVal="1" suffix="%" :endVal="visits.decline" />
                <n-icon size="12" color="#ffde66">
-                  <component is="CaretDownOutlined" />
+                  <CaretDownOutlined />
                </n-icon>
              </template>
            </div>
@@ -115,7 +115,7 @@
                日同比
                <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
                <n-icon size="12" color="#00ff6f">
-                  <component is="CaretUpOutlined" />
+                  <CaretUpOutlined />
                </n-icon>
              </template>
            </div>
@@ -125,7 +125,7 @@
                周同比
                <CountTo :startVal="1" suffix="%" :endVal="orderLarge.rise" />
                <n-icon size="12" color="#ffde66">
-                  <component is="CaretDownOutlined" />
+                  <CaretDownOutlined />
                </n-icon>
              </template>
            </div>
@@ -164,7 +164,7 @@
                月同比
                <CountTo :startVal="1" suffix="%" :endVal="volume.rise" />
                <n-icon size="12" color="#00ff6f">
-                  <component is="CaretUpOutlined" />
+                  <CaretUpOutlined />
                </n-icon>
              </template>
            </div>
@@ -174,7 +174,7 @@
                月同比
                <CountTo :startVal="1" suffix="%" :endVal="volume.decline" />
                <n-icon size="12" color="#ffde66">
-                  <component is="CaretDownOutlined" />
+                  <CaretDownOutlined />
                </n-icon>
              </template>
            </div>
@@ -241,12 +241,10 @@
    SettingOutlined,
  } from '@vicons/antd';

-  const cardHeaderStyle = ref({ 'border-bottom': '1px solid #eee', 'font-size': '16px' });
-
  const loading = ref(true);
-  const visits = ref({});
-  const saleroom = ref({});
-  const orderLarge = ref({});
+  const visits = ref<any>({});
+  const saleroom = ref<any>({});
+  const orderLarge = ref<any>({});
  const volume = ref({});

  // 图标列表
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -43,7 +43,6 @@
    loading.value = true;
    init();
  });
-
 </script>

 <style lang="less" scoped>
--- a/src/views/list/basicList/index.vue
+++ b/src/views/list/basicList/index.vue
@@ -141,10 +141,10 @@
      field: 'makeDate',
      component: 'NDatePicker',
      label: '预约时间',
+      defaultValue: 1183135260000,
      componentProps: {
        type: 'date',
        clearable: true,
-        defaultValue: 1183135260000,
        onUpdateValue: (e: any) => {
          console.log(e);
        },
@@ -296,7 +296,7 @@
  }

  const loadDataTable = async (res) => {
-    return await getTableList({...res, ...formParams, ...params.value});
+    return await getTableList({ ...formParams, ...params.value, ...res });
  };

  function onCheckedRow(rowKeys) {
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -29,7 +29,7 @@
            <n-input
              v-model:value="formInline.password"
              type="password"
-              show-password-toggle
+              showPasswordOn="click"
              placeholder="请输入密码"
            >
              <template #prefix>
@@ -39,11 +39,6 @@
              </template>
            </n-input>
          </n-form-item>
-          <n-form-item path="isCaptcha">
-            <div class="w-full">
-              <mi-captcha width="384" theme-color="#2d8cf0" :logo="logo" @success="onAuthCode" />
-            </div>
-          </n-form-item>
          <n-form-item class="default-color">
            <div class="flex justify-between">
              <div class="flex-initial">
@@ -95,8 +90,8 @@
  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';
+  import { PageEnum } from '@/enums/pageEnum';

  interface FormState {
    username: string;
@@ -107,23 +102,17 @@
  const message = useMessage();
  const loading = ref(false);
  const autoLogin = ref(true);
+  const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;

  const formInline = reactive({
    username: 'admin',
    password: '123456',
-    isCaptcha: false,
+    isCaptcha: true,
  });

  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();
@@ -144,28 +133,26 @@
          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') {
+        try {
+          const { code, message: msg } = await userStore.login(params);
+          message.destroyAll();
+          if (code == ResultEnum.SUCCESS) {
+            const toPath = decodeURIComponent((route.query?.redirect || '/') as string);
+            message.success('登录成功，即将进入系统');
+            if (route.name === LOGIN_NAME) {
              router.replace('/');
-            }
-          });
-        } else {
-          message.info(msg || '登录失败');
+            } else router.replace(toPath);
+          } else {
+            message.info(msg || '登录失败');
+          }
+        } finally {
+          loading.value = false;
        }
      } 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
@@ -37,10 +37,17 @@
  </n-card>
 </template>
 <script lang="ts" setup>
+  import { computed } from 'vue';
+  import { useThemeVars } from 'naive-ui';
  import { useRouter } from 'vue-router';
  import { InfoCircleOutlined } from '@vicons/antd';

  const router = useRouter();
+  const themeVars = useThemeVars();
+
+  const getTableHeaderColor = computed(() => {
+    return themeVars.value.tableHeaderColor;
+  });

  function goHome() {
    router.push('/');
@@ -56,7 +63,7 @@
    &-extra {
      padding: 24px 40px;
      text-align: left;
-      background: #f8f8f9;
+      background: v-bind(getTableHeaderColor);
      border-radius: 4px;
    }
  }
--- a/src/views/result/info.vue
+++ b/src/views/result/info.vue
@@ -41,10 +41,17 @@
  </n-card>
 </template>
 <script lang="ts" setup>
+  import { computed } from 'vue';
+  import { useThemeVars } from 'naive-ui';
  import { useRouter } from 'vue-router';
  import { CheckCircleOutlined } from '@vicons/antd';

  const router = useRouter();
+  const themeVars = useThemeVars();
+
+  const getTableHeaderColor = computed(() => {
+    return themeVars.value.tableHeaderColor;
+  });

  function goHome() {
    router.push('/');
@@ -60,7 +67,7 @@
    &-extra {
      padding: 24px 40px;
      text-align: left;
-      background: #f8f8f9;
+      background: v-bind(getTableHeaderColor);
      border-radius: 4px;
    }
  }
--- a/src/views/result/success.vue
+++ b/src/views/result/success.vue
@@ -23,9 +23,16 @@
  </n-card>
 </template>
 <script lang="ts" setup>
+  import { computed } from 'vue';
  import { useRouter } from 'vue-router';
+  import { useThemeVars } from 'naive-ui';

  const router = useRouter();
+  const themeVars = useThemeVars();
+
+  const getTableHeaderColor = computed(() => {
+    return themeVars.value.tableHeaderColor;
+  });

  function goHome() {
    router.push('/');
@@ -41,7 +48,7 @@
    &-extra {
      padding: 24px 40px;
      text-align: left;
-      background: #f8f8f9;
+      background: v-bind(getTableHeaderColor);
      border-radius: 4px;
    }
  }
--- a/src/views/system/menu/menu.vue
+++ b/src/views/system/menu/menu.vue
@@ -179,7 +179,7 @@
    },
  ]);

-  let formParams = reactive({
+  const formParams = reactive({
    type: 1,
    label: '',
    subtitle: '',
@@ -203,7 +203,7 @@
      const treeItem = getTreeItem(unref(treeData), keys[0]);
      treeItemKey.value = keys;
      treeItemTitle.value = treeItem.label;
-      formParams = Object.assign(formParams, treeItem);
+      Object.assign(formParams, treeItem);
      isEditMenu.value = true;
    } else {
      isEditMenu.value = false;
@@ -213,8 +213,8 @@
  }

  function handleReset() {
-    const treeItem = getTreeItem(unref(treeData), treeItemKey[0]);
-    formParams = Object.assign(formParams, treeItem);
+    const treeItem = getTreeItem(unref(treeData), treeItemKey.value[0]);
+    Object.assign(formParams, treeItem);
  }

  function formSubmit() {
@@ -237,7 +237,8 @@

  onMounted(async () => {
    const treeMenuList = await getMenuList();
-    formParams = treeMenuList.list.map((item) => item.key);
+    const keys = treeMenuList.list.map((item) => item.key);
+    Object.assign(formParams, keys);
    treeData.value = treeMenuList.list;
    loading.value = false;
  });
--- a/src/views/system/role/role.vue
+++ b/src/views/system/role/role.vue
@@ -43,6 +43,7 @@
          :checked-keys="checkedKeys"
          style="max-height: 950px; overflow: hidden"
          @update:checked-keys="checkedTree"
+          @update:expanded-keys="onExpandedKeys"
        />
      </div>
      <template #action>
@@ -135,8 +136,8 @@

  const loadDataTable = async (res: any) => {
    let _params = {
-      ...res,
      ...unref(params),
+      ...res,
    };
    return await getRoleList(_params);
  };
@@ -186,6 +187,10 @@
    checkedKeys.value = [checkedKeys.value, ...keys];
  }

+  function onExpandedKeys(keys) {
+    expandedKeys.value = keys;
+  }
+
  function packHandle() {
    if (expandedKeys.value.length) {
      expandedKeys.value = [];
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,16 +14,28 @@
    "esModuleInterop": true,
    "resolveJsonModule": true,
    "noUnusedLocals": true,
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
    "experimentalDecorators": true,
-    "lib": ["dom", "esnext"],
-    "types": ["vite/client", "jest"],
-    "typeRoots": ["./node_modules/@types/", "./types"],
+    "lib": [
+      "dom",
+      "esnext"
+    ],
+    "types": [
+      "vite/client"
+    ],
+    "typeRoots": [
+      "./node_modules/@types/",
+      "./types"
+    ],
    "noImplicitAny": false,
    "skipLibCheck": true,
    "paths": {
-      "@/*": ["src/*"],
-      "/#/*": ["types/*"]
+      "@/*": [
+        "src/*"
+      ],
+      "/#/*": [
+        "types/*"
+      ]
    }
  },
  "include": [
@@ -36,7 +48,12 @@
    "build/**/*.ts",
    "build/**/*.d.ts",
    "mock/**/*.ts",
+    "components.d.ts",
    "vite.config.ts"
  ],
-  "exclude": ["node_modules", "dist", "**/*.js"]
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/*.js"
+  ]
 }
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -17,6 +17,10 @@ export interface ProjectSettingState {
  permissionMode: string;
 }

+export interface IbodySetting {
+  fixed: boolean;
+}
+
 export interface IheaderSetting {
  bgColor: string;
  fixed: boolean;
@@ -28,6 +32,8 @@ export interface ImenuSetting {
  menuWidth: number;
  fixed: boolean;
  mixMenu: boolean;
+  collapsed: boolean;
+  mobileWidth: number;
 }

 export interface IcrumbsSetting {
--- a/types/utils.d.ts
+++ b/types/utils.d.ts
@@ -0,0 +1,5 @@
+import type { ComputedRef, Ref } from 'vue';
+
+export type DynamicProps<T> = {
+  [P in keyof T]: Ref<T[P]> | T[P] | ComputedRef<T[P]>;
+};
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
xiaoma	9ad5ba18a9	1.8.0	2022-04-01 10:52:30 +08:00
Ah jung	536e16f166	Merge pull request #114 from liub1934/main feat:表格列支持draggable配置是否能拖拽	2022-04-01 09:44:52 +08:00
寻梦	42f2256ea1	feat:表格列支持draggable配置是否能拖拽	2022-03-30 18:18:20 +08:00
Ah jung	bf0d294322	Update README.md	2022-03-28 13:57:43 +08:00
Ah jung	51f5c64755	Update README.md	2022-03-22 13:31:24 +08:00
Ah jung	b49d9e8bd2	Merge pull request #111 from wangdaoo/feat/wangdaoo fix: 优化部分无用代码及升级ui版本 🚀	2022-03-12 18:29:21 +08:00
山人自有妙计	12e62d1179	fix: 优化部分无用代码及升级ui版本 🚀	2022-03-12 18:22:28 +08:00
Ah jung	6558e1597c	Merge pull request #106 from MaybeQHL/main fix: 修复在移动端模式下tags显示的bug update: 移动端模式下侧边菜单item点击隐藏drawer.	2022-03-08 08:42:29 +08:00
Maybe_QHL	7bf1e1265a	fix: 修复在移动端模式下tags显示的bug update: 移动端模式下侧边菜单item点击隐藏drawer.	2022-03-07 17:40:17 +08:00
Ah jung	1213de598e	Merge pull request #105 from MaybeQHL/main 更新侧边导航栏移动端显示为modal显示 > ![微信截图_20220307145012](https://user-images.githubusercontent.com/34638673/156982207-e5185056-cc2a-4fd4-b7d6-53182166b1a4.png) tags 还有点bug需要你去修复一下好，我抽空看看	2022-03-07 14:53:30 +08:00
Maybe_QHL	20c9dbbfe1	忽略代理	2022-03-07 14:31:00 +08:00
Maybe_QHL	6dab2ab35b	更新侧边导航栏移动端显示为modal显示。	2022-03-07 14:21:27 +08:00
xiaoma	a424788c45	CHANGELOG 修改	2022-02-14 15:46:13 +08:00
xiaoma	b31d5c2bd6	1.7.0	2022-02-14 15:42:17 +08:00
xiaoma	b979d9db32	1.7.0	2022-02-14 15:41:46 +08:00
xiaoma	a53c86e41b	1.7.0	2022-02-14 15:12:32 +08:00
Ah jung	b16b5c8992	Merge pull request #97 from liu1013269528/main 修复类型“ComputedRef<{ bgColor: string; fixed: boolean; show: boolean; }…	2022-02-14 10:05:27 +08:00
liu1013269528	58dadbb95a	修复类型“ComputedRef<{ bgColor: string; fixed: boolean; show: boolean; }>”上不存在属性“fixed”。获取计算属性值，需要增加 value 否则返回 undefined	2022-02-14 00:19:05 +08:00
Ah jung	4ebdbc7203	Update README.md	2022-02-13 15:54:29 +08:00
Ah jung	0729e56ed4	Merge pull request #91 from devilmengcry/main 更新naive-ui到2.24.6 show-password-toggle替换成showPasswordOn="click"	2022-01-26 16:06:15 +08:00
李志萌	a50cbfa44d	更新naive-ui到2.24.6 show-password-toggle替换成showPasswordOn="click"	2022-01-26 15:58:19 +08:00
Ah jung	65d6d4d21e	Update README.md	2022-01-26 10:29:45 +08:00
Ah jung	c5bb818f13	Update README.md	2022-01-19 15:32:12 +08:00
Ah jung	9e255da5d7	Update README.md	2022-01-12 11:55:15 +08:00
Ah jung	e2b5086be3	Update README.md	2022-01-12 11:53:33 +08:00
xiaoma	caaca83f78	fix #81	2022-01-07 09:12:41 +08:00
xiaoma	91de971636	降低eslint-define-config版本	2022-01-06 12:54:32 +08:00
xiaoma	5fb005d5ae	依赖还原	2022-01-06 11:26:59 +08:00
xiaoma	b42e0a2fef	还原依赖	2022-01-06 11:26:17 +08:00
xiaoma	097dda5aa1	依赖升级	2022-01-06 10:47:03 +08:00
xiaoma	16714d4bdb	降低eslint版本	2022-01-06 10:36:05 +08:00
xiaoma	a5438b4f50	降低eslint-define-config依赖	2022-01-06 10:29:43 +08:00
xiaoma	4f5bbb0673	降低eslint-define-config依赖	2022-01-06 10:25:46 +08:00
xiaoma	24cbde8b95	降低 eslint-define-config 依赖	2022-01-06 10:23:39 +08:00
xiaoma	7222398cf0	依赖升级	2022-01-06 10:14:24 +08:00
xiaoma	261e27c139	还原yarn.lock	2022-01-06 10:08:03 +08:00
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