日常版本更新

fix(table): 修复表格分页计算问题

.editorconfig

@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset=utf-8
+end_of_line=LF
+insert_final_newline=true
+indent_style=space
+indent_size=2
+max_line_length = 100
+
+[*.{yml,yaml,json}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.env.development

@@ -13,14 +13,18 @@ VITE_BASE_URL = /
 # 是否删除console
 VITE_DROP_CONSOLE = true
 
+# 跨域代理，可以配置多个，请注意不要换行
+#VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]]
+# VITE_PROXY=[["/api","https://naive-ui-admin"]]
+
 # API 接口地址
-VITE_APP_API_URL = /
+VITE_GLOB_API_URL =
 
 # 图片上传地址
-VITE_GLOB_UPLOAD_URL= /
+VITE_GLOB_UPLOAD_URL=
 
 # 图片前缀地址
-VITE_GLOB_IMG_URL= /
+VITE_GLOB_IMG_URL=
 
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX = /api

.env.production

@@ -11,13 +11,21 @@ VITE_BASE_URL = /
 VITE_DROP_CONSOLE = true
 
 # API
-VITE_APP_API_URL = /
+VITE_GLOB_API_URL =
 
 # 图片上传地址
-VITE_GLOB_UPLOAD_URL= /
+VITE_GLOB_UPLOAD_URL=
 
 # 图片前缀地址
-VITE_GLOB_IMG_URL= /
+VITE_GLOB_IMG_URL=
 
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX = /api
+
+# 是否启用gzip压缩或brotli压缩
+# 可选: gzip | brotli | none
+# 如果你需要多种形式，你可以用','来分隔
+VITE_BUILD_COMPRESS = 'none'
+
+# 使用压缩时是否删除原始文件，默认为false
+VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false

.eslintrc.js

@@ -1,9 +1,11 @@
-module.exports = {
+// @ts-check
+const { defineConfig } = require('eslint-define-config');
+module.exports = defineConfig({
   root: true,
   env: {
     browser: true,
     node: true,
-    es6: true
+    es6: true,
   },
   parser: 'vue-eslint-parser',
   parserOptions: {
@@ -12,21 +14,46 @@ module.exports = {
     sourceType: 'module',
     jsxPragma: 'React',
     ecmaFeatures: {
-      jsx: true
+      jsx: true,
-    }
+    },
   },
   extends: [
     'plugin:vue/vue3-recommended',
     'plugin:@typescript-eslint/recommended',
     'prettier',
-    'plugin:prettier/recommended'
+    'plugin:prettier/recommended',
+    'plugin:jest/recommended',
   ],
   rules: {
-    'vue/no-unused-components': 'off',
+    '@typescript-eslint/ban-ts-ignore': 'off',
-    'vue/no-unused-vars': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
-    'vue/no-v-for-template-key-on-child': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
     'vue/custom-event-name-casing': 'off',
-    // 'vue/attributes-order': 'off',
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      },
+    ],
+    'no-unused-vars': [
+      'error',
+      {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      },
+    ],
+    'space-before-function-paren': 'off',
+
+    'vue/attributes-order': 'off',
     'vue/one-component-per-file': 'off',
     'vue/html-closing-bracket-newline': 'off',
     'vue/max-attributes-per-line': 'off',
@@ -34,34 +61,18 @@ module.exports = {
     'vue/singleline-html-element-content-newline': 'off',
     'vue/attribute-hyphenation': 'off',
     'vue/require-default-prop': 'off',
-
+    'vue/script-setup-uses-vars': 'off',
-    'space-before-function-paren': 'off',
-
-    '@typescript-eslint/camelcase': 'off',
-    '@typescript-eslint/ban-ts-ignore': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    'no-use-before-define': 'off',
-    '@typescript-eslint/no-use-before-define': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/ban-types': 'off',
-    '@typescript-eslint/no-non-null-assertion': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'vue/html-self-closing': [
       'error',
       {
         html: {
           void: 'always',
           normal: 'never',
-          component: 'always'
+          component: 'always',
         },
         svg: 'always',
-        math: 'always'
+        math: 'always',
-      }
+      },
-    ]
+    ],
-  }
+  },
-}
+});

CHANGELOG.md

@@ -1,4 +1,62 @@
-# 1.3 (2021-07-19)
+# 1.5.2 (2021-08-06)
+### 🐛 Bug Fixes
+- 修复已知bug
+
+- ### ✨ Features
+- 新增 `混合菜单模式`
+- 新增 `根路由`
+- 新增 `关于` 根路由示例页面
+- 文档同步更新，组件和示例
+
+
+
+# 1.5.1 (2021-08-05)
+### 🐛 Bug Fixes
+- 修复windows系统获取项目换行符问题
+- 修复表格分页计算问题 [@Chika99](https://github.com/Chika99)
+- 修复锁屏样式自适应问题 [@Chika99](https://github.com/Chika99)
+- 依赖 dayjs 移除，用date-fns，和UI框架底层保持一致
+- 修复已知bug 
+
+- ### ✨ Features
+- 新增 `baseForm` 组件，和`基础`，`useForm`使用方式
+- 新增 `baseModal`，组件，和 `useForm`使用方式  
+- 新增`子菜单` new Tag标签
+- 菜单支持 `根路由`配置
+
+
+
+
+# 1.5.0 (2021-07-30)
+### 🐛 Bug Fixes
+- 修复表格列配置，拖拽时最后的操作列重复增加
+- 多标签页交互优化
+
+- ### ✨ Features
+- `项目文档`已上线
+- `Application`组件加载机制优化，解决路由守卫，Axios中可使用，Dialog，Message 等之类组件
+- `BasicTable` 组件新增`高度自适应`，`单元格编辑`，`整行编辑` 特性
+- `nprogress` 移除，用 `Loading Bar`代替
+- 打包支持`gzip`，`brotli` 压缩
+- 新增代理`VITE_PROXY`配置
+- 路由菜单，支持多级菜单
+- 依赖升级
+- 本次更新，有破坏性更新，涉及文件重命名，增删调整
+
+
+# 1.4.0 (2021-07-21)
+### 🐛 Bug Fixes
+- vite降至2.3.6
+- 多标签页交互优化
+
+- ### ✨ Features
+- 新增 `TableAction` 组件
+- 新增 `菜单权限管理` 示例
+- 新增 `角色权限管理` 示例
+- 持续更新更多实用组件及示例，感谢Star
+
+
+# 1.3.0 (2021-07-19)
 ### 🐛 Bug Fixes
 - 修复多标签页左右切换按钮自适应展示
 - 修复登录页面出现多标签页
@@ -11,7 +69,7 @@
 - 持续更新更多实用组件及示例，感谢Star
 
 
-# 1.2 (2021-07-16)
+# 1.2.0 (2021-07-16)
 ### 🐛 Bug Fixes
 - 修复面包屑显示登录页面
 - 菜单支持只展开当前父级菜单
@@ -25,7 +83,7 @@
 - 持续更新更多实用示例，同时也演示`Naive UI`使用方法
 
 
-# 1.1 (2021-07-15)
+# 1.1.0 (2021-07-15)
 - ### ✨ Features
 - 新增 `基础表单` 示例页面
 - 新增 `分步表单` 示例页面
@@ -33,7 +91,7 @@
 - 持续更新更多实用示例，同时也演示`Naive UI`使用方法
 
 
-# 1.0 (2021-07-12)
+# 1.0.0 (2021-07-12)
 ### 🐛 Bug Fixes
 - 修复页面切换面包屑未及时更新
 

README.md

@@ -1,6 +1,6 @@
 ## 简介
 
-Naive Ui Admin 是一个免费开源的中后台模版，使用了最新的`vue3`,`vite2`,`TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。
+[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 等前端前沿技术开发
@@ -10,32 +10,15 @@ Naive Ui Admin 是一个免费开源的中后台模版，使用了最新的`vue3
 - **权限** 内置完善的动态路由权限生成方案
 - **组件** 二次封装了多个常用的组件
 
-### 页面功能
-#### 系统看板
-- [x] 主控台
-- [ ] 监控页
-- [x] 工作台
-- [x] 表单页面
-- [x] 列表页面
-- [x] 异常页面
-- [x] 结果页面
-- [x] 设置页面
-
-### 页面组件
-#### ProTable
-- [x] 基础表格
-- [x] 上传图片
-- [x] 滑块验证码  
-- 持续开发中...
 
 ## 在线预览
 - [naive-ui-admin](https://jekip.github.io)
 
-账号：admin，密码：123456
+账号：admin，密码：123456（随意）
 
 ## 文档
 
-[文档地址](https://github.com/jekip/naive-ui-admin) - 待完善
+[文档地址](https://jekip.github.io/docs/) 
 
 ## 准备
 
@@ -82,7 +65,7 @@ yarn build
 [CHANGELOG](./CHANGELOG.md)
 
 ## 感谢
-[@Vben](https://github.com/anncwb/vue-vben-admin) 借鉴 vue-vben-admin 实现的骨架，同时也使用作者开发的 vite 插件，非常感谢作者。
+[@Vben](https://github.com/anncwb/vue-vben-admin) 借鉴 vue-vben-admin 实现的骨架，同时也使用作者开发的 vite 插件，再次感谢作者。
 
 
 ## 如何贡献

build/utils.ts

@@ -31,8 +31,7 @@ export function wrapperEnv(envConf: Recordable): ViteEnv {
     if (envName === 'VITE_PROXY') {
       try {
         realName = JSON.parse(realName);
-      } catch (error) {
+      } catch (error) {}
-      }
     }
     ret[envName] = realName;
     process.env[envName] = realName;
@@ -51,8 +50,7 @@ export function getEnvConfig(match = 'VITE_GLOB_', confFiles = ['.env', '.env.pr
     try {
       const env = dotenv.parse(fs.readFileSync(path.resolve(process.cwd(), item)));
       envConfig = { ...envConfig, ...env };
-    } catch (error) {
+    } catch (error) {}
-    }
   });
 
   Object.keys(envConfig).forEach((key) => {

build/vite/plugin/compress.ts

@@ -0,0 +1,35 @@
+/**
+ * Used to package and output gzip. Note that this does not work properly in Vite, the specific reason is still being investigated
+ * https://github.com/anncwb/vite-plugin-compression
+ */
+import type { Plugin } from 'vite';
+
+import compressPlugin from 'vite-plugin-compression';
+
+export function configCompressPlugin(
+  compress: 'gzip' | 'brotli' | 'none',
+  deleteOriginFile = false
+): Plugin | Plugin[] {
+  const compressList = compress.split(',');
+
+  const plugins: Plugin[] = [];
+
+  if (compressList.includes('gzip')) {
+    plugins.push(
+      compressPlugin({
+        ext: '.gz',
+        deleteOriginFile,
+      })
+    );
+  }
+  if (compressList.includes('brotli')) {
+    plugins.push(
+      compressPlugin({
+        ext: '.br',
+        algorithm: 'brotliCompress',
+        deleteOriginFile,
+      })
+    );
+  }
+  return plugins;
+}

build/vite/plugin/index.ts

@@ -5,9 +5,10 @@ import vueJsx from '@vitejs/plugin-vue-jsx';
 
 import { configHtmlPlugin } from './html';
 import { configMockPlugin } from './mock';
+import { configCompressPlugin } from './compress';
 
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, prodMock) {
-  const { VITE_USE_MOCK } = viteEnv;
+  const { VITE_USE_MOCK, VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv;
 
   const vitePlugins: (Plugin | Plugin[])[] = [
     // have to
@@ -22,5 +23,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, prodMock)
   // vite-plugin-mock
   VITE_USE_MOCK && vitePlugins.push(configMockPlugin(isBuild, prodMock));
 
+  if (isBuild) {
+    // rollup-plugin-gzip
+    vitePlugins.push(
+      configCompressPlugin(VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE)
+    );
+  }
+
   return vitePlugins;
 }

build/vite/proxy.ts

@@ -0,0 +1,34 @@
+/**
+ * Used to parse the .env.development proxy configuration
+ */
+import type { ProxyOptions } from 'vite';
+
+type ProxyItem = [string, string];
+
+type ProxyList = ProxyItem[];
+
+type ProxyTargetList = Record<string, ProxyOptions & { rewrite: (path: string) => string }>;
+
+const httpsRE = /^https:\/\//;
+
+/**
+ * Generate proxy
+ * @param list
+ */
+export function createProxy(list: ProxyList = []) {
+  const ret: ProxyTargetList = {};
+  for (const [prefix, target] of list) {
+    const isHttps = httpsRE.test(target);
+
+    // https://github.com/http-party/node-http-proxy#options
+    ret[prefix] = {
+      target: target,
+      changeOrigin: true,
+      ws: true,
+      rewrite: (path) => path.replace(new RegExp(`^${prefix}`), ''),
+      // https is require secure=false
+      ...(isHttps ? { secure: false } : {}),
+    };
+  }
+  return ret;
+}

index.html

@@ -13,6 +13,7 @@
   <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">

mock/_util.ts

@@ -1,4 +1,4 @@
-import Mock from 'mockjs'
+import Mock from 'mockjs';
 
 export function resultSuccess(result, { message = 'ok' } = {}) {
   return Mock.mock({
@@ -51,9 +51,9 @@ export function pagination<T = any>(pageNo: number, pageSize: number, array: T[]
  * @param {Function} callback 回调函数
  */
 export function doCustomTimes(times: number, callback: any) {
-  let i = -1
+  let i = -1;
   while (++i < times) {
-    callback(i)
+    callback(i);
   }
 }
 

mock/dashboard/console.ts

@@ -1,5 +1,5 @@
-import { Random } from 'mockjs'
+import { Random } from 'mockjs';
-import { resultSuccess } from '../_util'
+import { resultSuccess } from '../_util';
 
 const consoleInfo = {
   //访问量
@@ -13,7 +13,7 @@ const consoleInfo = {
   saleroom: {
     weekSaleroom: Random.float(10000, 99999, 2, 2),
     amount: Random.float(99999, 999999, 2, 2),
-    degree:Random.float(10,99)
+    degree: Random.float(10, 99),
   },
   //订单量
   orderLarge: {
@@ -27,10 +27,9 @@ const consoleInfo = {
     weekLarge: Random.float(10000, 99999, 2, 2),
     rise: Random.float(10, 99),
     decline: Random.float(10, 99),
-    amount:Random.float(99999,999999,2,2)
+    amount: Random.float(99999, 999999, 2, 2),
   },
-}
+};
-
 
 export default [
   //主控台 卡片数据
@@ -41,7 +40,5 @@ export default [
     response: () => {
       return resultSuccess(consoleInfo);
     },
-  }
+  },
-]
+];
-
-

mock/system/menu.ts

@@ -0,0 +1,89 @@
+import { resultSuccess } from '../_util';
+
+const menuList = () => {
+  const result: any[] = [
+    {
+      label: 'Dashboard',
+      key: 'dashboard',
+      type: 1,
+      subtitle: 'dashboard',
+      openType: 1,
+      auth: 'dashboard',
+      path: '/dashboard',
+      children: [
+        {
+          label: '主控台',
+          key: 'console',
+          type: 1,
+          subtitle: 'console',
+          openType: 1,
+          auth: 'console',
+          path: '/dashboard/console',
+        },
+        {
+          label: '工作台',
+          key: 'workplace',
+          type: 1,
+          subtitle: 'workplace',
+          openType: 1,
+          auth: 'workplace',
+          path: '/dashboard/workplace',
+        },
+      ],
+    },
+    {
+      label: '表单管理',
+      key: 'form',
+      type: 1,
+      subtitle: 'form',
+      openType: 1,
+      auth: 'form',
+      path: '/form',
+      children: [
+        {
+          label: '基础表单',
+          key: 'basic-form',
+          type: 1,
+          subtitle: 'basic-form',
+          openType: 1,
+          auth: 'basic-form',
+          path: '/form/basic-form',
+        },
+        {
+          label: '分步表单',
+          key: 'step-form',
+          type: 1,
+          subtitle: 'step-form',
+          openType: 1,
+          auth: 'step-form',
+          path: '/form/step-form',
+        },
+        {
+          label: '表单详情',
+          key: 'detail',
+          type: 1,
+          subtitle: 'detail',
+          openType: 1,
+          auth: 'detail',
+          path: '/form/detail',
+        },
+      ],
+    },
+  ];
+
+  return result;
+};
+
+export default [
+  {
+    url: '/api/menu/list',
+    timeout: 1000,
+    method: 'get',
+    response: () => {
+      const list = menuList();
+      return resultSuccess({
+        list,
+      });
+    },
+  },
+];

mock/system/role.ts

@@ -0,0 +1,45 @@
+import { resultSuccess, doCustomTimes } from '../_util';
+
+function getMenuKeys() {
+  const keys = ['dashboard', 'console', 'workplace', 'basic-form', 'step-form', 'detail'];
+  const newKeys = [];
+  doCustomTimes(parseInt(Math.random() * 6), () => {
+    const key = keys[Math.floor(Math.random() * keys.length)];
+    newKeys.push(key);
+  });
+  return Array.from(new Set(newKeys));
+}
+
+const roleList = (pageSize) => {
+  const result: any[] = [];
+  doCustomTimes(pageSize, () => {
+    result.push({
+      id: '@integer(10,100)',
+      name: '@cname()',
+      explain: '@cname()',
+      isDefault: '@boolean()',
+      menu_keys: getMenuKeys(),
+      create_date: `@date('yyyy-MM-dd hh:mm:ss')`,
+      'status|1': ['normal', 'enable', 'disable'],
+    });
+  });
+  return result;
+};
+
+export default [
+  {
+    url: '/api/role/list',
+    timeout: 1000,
+    method: 'get',
+    response: ({ query }) => {
+      const { page = 1, pageSize = 10 } = query;
+      const list = roleList(Number(pageSize));
+      return resultSuccess({
+        page: Number(page),
+        pageSize: Number(pageSize),
+        pageCount: 60,
+        list,
+      });
+    },
+  },
+];

mock/table/list.ts

@@ -1,11 +1,11 @@
-import { Random } from 'mockjs'
+import { Random } from 'mockjs';
-import { resultSuccess, doCustomTimes, resultPageSuccess } from '../_util'
+import { resultSuccess, doCustomTimes } from '../_util';
 
-const tableList = ((pageSize) => {
+const tableList = (pageSize) => {
-  const result:any[] = []
+  const result: any[] = [];
   doCustomTimes(pageSize, () => {
     result.push({
-      id: '@integer(10,100)',
+      id: '@integer(10,999999)',
       beginTime: '@datetime',
       endTime: '@datetime',
       address: '@city()',
@@ -14,12 +14,11 @@ const tableList = ((pageSize) => {
       date: `@date('yyyy-MM-dd')`,
       time: `@time('HH:mm')`,
       'no|100000-10000000': 100000,
-      'status|1': ['normal', 'enable', 'disable'],
+      'status|1': [true, false],
     });
-  })
-  return result
   });
-
+  return result;
+};
 
 export default [
   //表格数据列表
@@ -29,16 +28,13 @@ export default [
     method: 'get',
     response: ({ query }) => {
       const { page = 1, pageSize = 10 } = query;
-      const list = tableList(Number(pageSize))
+      const list = tableList(Number(pageSize));
       return resultSuccess({
         page: Number(page),
         pageSize: Number(pageSize),
         pageCount: 60,
-        list
+        list,
-      }
+      });
-      );
     },
-  }
+  },
-]
+];
-
-

mock/user/menus.ts

@@ -1,5 +1,4 @@
-import { MockMethod } from 'vite-plugin-mock'
+import { resultSuccess } from '../_util';
-import { resultSuccess, getRequestToken } from '../_util'
 
 const menusList = [
   {
@@ -18,7 +17,7 @@ const menusList = [
         component: 'DashboardConsole',
         meta: {
           title: '主控台',
-                }
+        },
       },
       {
         path: 'monitor',
@@ -26,7 +25,7 @@ const menusList = [
         component: 'DashboardMonitor',
         meta: {
           title: '监控页',
-                }
+        },
       },
       {
         path: 'workplace',
@@ -35,11 +34,11 @@ const menusList = [
         meta: {
           hidden: true,
           title: '工作台',
-                }
+        },
       },
     ],
-    }
+  },
-]
+];
 
 export default [
   {
@@ -49,5 +48,5 @@ export default [
     response: () => {
       return resultSuccess(menusList);
     },
-    }
+  },
-]
+];

mock/user/user.ts

@@ -1,9 +1,9 @@
-import Mock from 'mockjs'
+import Mock from 'mockjs';
-import { resultSuccess, getRequestToken } from '../_util'
+import { resultSuccess } from '../_util';
 
-const Random = Mock.Random
+const Random = Mock.Random;
 
-const token = Random.string('upper', 32, 32)
+const token = Random.string('upper', 32, 32);
 
 const adminInfo = {
   userId: '1',
@@ -25,9 +25,17 @@ const adminInfo = {
     {
       roleName: '工作台',
       value: 'dashboard_workplace',
-    }
+    },
+    {
+      roleName: '基础列表',
+      value: 'basic_list',
+    },
+    {
+      roleName: '基础列表删除',
+      value: 'basic_list_delete',
+    },
   ],
-}
+};
 
 export default [
   {
@@ -48,4 +56,4 @@ export default [
       return resultSuccess(adminInfo);
     },
   },
-]
+];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui-admin",
-  "version": "1.2",
+  "version": "1.5.2",
   "author": {
     "name": "Ahjung",
     "email": "735878602@qq.com",
@@ -8,8 +8,12 @@
   },
   "private": true,
   "scripts": {
+    "bootstrap": "yarn install",
+    "serve": "npm run dev",
     "dev": "vite",
     "build": "vite build && esno ./build/script/postBuild.ts",
+    "build:no-cache": "yarn clean:cache && npm run build",
+    "report": "cross-env REPORT=true npm run build",
     "preview": "vite preview",
     "build typecheck": "vuedx-typecheck . && vite build",
     "deploy": "gh-pages -d dist",
@@ -26,7 +30,7 @@
     "@vueuse/core": "^5.0.3",
     "axios": "^0.21.1",
     "blueimp-md5": "^2.18.0",
-    "dayjs": "^1.10.5",
+    "date-fns": "^2.23.0",
     "echarts": "^5.1.2",
     "element-resize-detector": "^1.2.3",
     "lodash": "^4.17.21",
@@ -34,8 +38,7 @@
     "makeit-captcha": "^1.2.5",
     "mitt": "^2.1.0",
     "mockjs": "^1.1.0",
-    "naive-ui": "^2.15.5",
+    "naive-ui": "^2.16.0",
-    "nprogress": "^1.0.0-1",
     "pinia": "^2.0.0-beta.3",
     "qs": "^6.10.1",
     "vfonts": "^0.1.0",
@@ -62,27 +65,32 @@
     "dotenv": "^10.0.0",
     "eslint": "^7.28.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",
     "esno": "^0.7.3",
     "gh-pages": "^3.2.0",
     "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",
+    "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.4",
+    "tailwindcss": "^2.2.7",
-    "typescript": "^4.3.2",
+    "typescript": "^4.3.5",
-    "vite": "^2.4.2",
+    "vite": "2.3.6",
+    "vite-plugin-compression": "^0.3.1",
     "vite-plugin-html": "^2.0.7",
-    "vite-plugin-mock": "^2.9.1",
+    "vite-plugin-mock": "^2.9.3",
     "vite-plugin-style-import": "^1.0.1",
     "vue-eslint-parser": "^7.8.0"
   },

prettier.config.js

@@ -15,6 +15,6 @@ module.exports = {
   requirePragma: false,
   proseWrap: 'never',
   htmlWhitespaceSensitivity: 'strict',
-  endOfLine: 'lf',
+  endOfLine: 'auto',
   rangeStart: 0,
 };

src/App.vue

@@ -11,70 +11,78 @@
     </AppProvider>
   </NConfigProvider>
 
-  <transition v-if="isLock && $route.name != 'login'" name="slide-up">
+  <transition v-if="isLock && $route.name !== 'login'" name="slide-up">
     <LockScreen />
   </transition>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, onMounted, onUnmounted } from 'vue'
+  import { defineComponent, computed, onMounted, onUnmounted } from 'vue';
-import { zhCN, dateZhCN, createTheme, inputDark, datePickerDark, darkTheme } from 'naive-ui'
+  import { zhCN, dateZhCN, createTheme, inputDark, datePickerDark, darkTheme } from 'naive-ui';
-import { LockScreen } from '@/components/Lockscreen'
+  import { LockScreen } from '@/components/Lockscreen';
-import { AppProvider } from '@/components/Application'
+  import { AppProvider } from '@/components/Application';
-import { useLockscreenStore } from '@/store/modules/lockscreen'
+  import { useLockscreenStore } from '@/store/modules/lockscreen';
-import { useRoute } from 'vue-router'
+  import { useRoute } from 'vue-router';
-import { useDesignSettingStore } from '@/store/modules/designSetting'
+  import { useDesignSettingStore } from '@/store/modules/designSetting';
+  import { lighten } from '@/utils/index';
 
   export default defineComponent({
     name: 'App',
     components: { LockScreen, AppProvider },
     setup() {
-    const route = useRoute()
+      const route = useRoute();
-    const useLockscreen = useLockscreenStore()
+      const useLockscreen = useLockscreenStore();
-    const designStore = useDesignSettingStore()
+      const designStore = useDesignSettingStore();
-    const isLock = computed(() => useLockscreen.isLock)
+      const isLock = computed(() => useLockscreen.isLock);
-    const lockTime = computed(() => useLockscreen.lockTime)
+      const lockTime = computed(() => useLockscreen.lockTime);
+
       /**
        * @type import('naive-ui').GlobalThemeOverrides
        */
       const getThemeOverrides = computed(() => {
+        const appTheme = designStore.appTheme;
+        const lightenStr = lighten(designStore.appTheme, 6);
         return {
           common: {
-          primaryColor: designStore.appTheme,
+            primaryColor: appTheme,
-          primaryColorHover: '#57a3f3'
+            primaryColorHover: lightenStr,
-        }
+            primaryColorPressed: lightenStr,
-      }
+          },
-    })
+          LoadingBar: {
+            colorLoading: appTheme,
+          },
+        };
+      });
 
-    const getDarkTheme = computed(() => (designStore.darkTheme ? darkTheme : undefined))
+      const getDarkTheme = computed(() => (designStore.darkTheme ? darkTheme : undefined));
 
-    let timer
+      let timer;
 
       const timekeeping = () => {
-      clearInterval(timer)
+        clearInterval(timer);
-      if (route.name == 'login' || isLock.value) return
+        if (route.name == 'login' || isLock.value) return;
         // 设置不锁屏
-      useLockscreen.setLock(false)
+        useLockscreen.setLock(false);
         // 重置锁屏时间
-      useLockscreen.setLockTime()
+        useLockscreen.setLockTime();
         timer = setInterval(() => {
           // 锁屏倒计时递减
-        useLockscreen.setLockTime(lockTime.value - 1)
+          useLockscreen.setLockTime(lockTime.value - 1);
           if (lockTime.value <= 0) {
             // 设置锁屏
-          useLockscreen.setLock(true)
+            useLockscreen.setLock(true);
-          return clearInterval(timer)
+            return clearInterval(timer);
-        }
-      }, 1000)
           }
+        }, 1000);
+      };
 
       onMounted(() => {
-      document.addEventListener('mousedown', timekeeping)
+        document.addEventListener('mousedown', timekeeping);
-    })
+      });
 
       onUnmounted(() => {
-      document.removeEventListener('mousedown', timekeeping)
+        document.removeEventListener('mousedown', timekeeping);
-    })
+      });
 
       return {
         darkTheme: createTheme([inputDark, datePickerDark]),
@@ -82,16 +90,14 @@ export default defineComponent({
         zhCN,
         dateZhCN,
         isLock,
-      getThemeOverrides
+        getThemeOverrides,
-    }
+      };
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less">
-@import 'styles/global.less';
   @import 'styles/common.less';
-@import 'styles/override.less';
 
   .slide-up-enter-active,
   .slide-up-leave-active {

src/api/dashboard/console.ts

@@ -1,11 +1,9 @@
-import http from '@/utils/http/axios'
+import http from '@/utils/http/axios';
 
 //获取主控台信息
 export function getConsoleInfo() {
-    return http.request(
+  return http.request({
-        {
     url: '/dashboard/console',
-            method: 'get'
+    method: 'get',
-        }
+  });
-    )
 }

src/api/system/menu.ts

@@ -1,33 +1,23 @@
-import http from '@/utils/http/axios'
+import http from '@/utils/http/axios';
-import {
-    GetByUserIdParams,
-    GetMenuListByUserIdResult,
-    GetAuthCodeByUserIdResult
-} from './model/menuModel'
-
-enum Api {
-    adminMenus = '/menus',
-    GetBtnCodeListByUserId = '/getBtnCodeListByUserId'
-}
 
 /**
  * @description: 根据用户id获取用户菜单
  */
 export function adminMenus() {
-    return http.request<GetMenuListByUserIdResult>({
+  return http.request({
-        url: Api.adminMenus,
+    url: '/menus',
-        method: 'GET'
+    method: 'GET',
-    })
+  });
 }
 
 /**
- * 根据用户Id获取权限编码
+ * 获取tree菜单列表
  * @param params
  */
-export function getBtnCodeListByUserId(params: GetByUserIdParams) {
+export function getMenuList(params?) {
-    return http.request<GetAuthCodeByUserIdResult>({
+  return http.request({
-        url: Api.GetBtnCodeListByUserId,
+    url: '/menu/list',
     method: 'GET',
-        params
+    params,
-    })
+  });
 }

src/api/system/role.ts

@@ -0,0 +1,11 @@
+import http from '@/utils/http/axios';
+
+/**
+ * @description: 角色列表
+ */
+export function getRoleList() {
+  return http.request({
+    url: '/role/list',
+    method: 'GET',
+  });
+}

src/api/system/user.ts

@@ -1,27 +1,25 @@
-import http from '@/utils/http/axios'
+import http from '@/utils/http/axios';
 
 export interface BasicResponseModel<T = any> {
-    code: number
+  code: number;
-    message: string
+  message: string;
-    result: T
+  result: T;
 }
 
 export interface BasicPageParams {
-    pageNumber: number
+  pageNumber: number;
-    pageSize: number
+  pageSize: number;
-    total: number
+  total: number;
 }
 
 /**
  * @description: 获取用户信息
  */
 export function getUserInfo() {
-    return http.request(
+  return http.request({
-        {
     url: '/admin_info',
-            method: 'get'
+    method: 'get',
-        }
+  });
-    )
 }
 
 /**
@@ -32,12 +30,12 @@ export function login(params) {
     {
       url: '/login',
       method: 'POST',
-            params
+      params,
     },
     {
-            isTransformRequestResult: false
+      isTransformResponse: false,
     }
-    )
+  );
 }
 
 /**
@@ -48,12 +46,12 @@ export function changePassword(params, uid) {
     {
       url: `/user/u${uid}/changepw`,
       method: 'POST',
-            params
+      params,
     },
     {
-            isTransformRequestResult: false
+      isTransformResponse: false,
     }
-    )
+  );
 }
 
 /**
@@ -63,6 +61,6 @@ export function logout(params) {
   return http.request({
     url: '/login/logout',
     method: 'POST',
-        params
+    params,
-    })
+  });
 }

src/api/table/list.ts

@@ -1,12 +1,10 @@
-import http from '@/utils/http/axios'
+import http from '@/utils/http/axios';
 
 //获取table
 export function getTableList(params) {
-    return http.request(
+  return http.request({
-        {
     url: '/table/list',
     method: 'get',
-            params
+    params,
-        }
+  });
-    )
 }

src/assets/images/nav-horizontal-mix.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="52px" height="45px" viewBox="0 0 52 45" enable-background="new 0 0 52 45" xml:space="preserve">  <image id="image0" width="52" height="45" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAAtCAMAAADWf7iKAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAAdVBMVEX///8AAABkbnc9RVY7
+QE9fY3GIiJZjbHk9QFOCi5QAAAA9QlZfZHMAAAA4QFEAAADt7/Lf5OTt7/KChoYAAADu8PTf3+Nw
+c3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyNUkyOEn////w8vWhURXFAAAAI3RS
+TlMAAE/2/uZJUP45AvfkBP4F9LrwPwP0vUkOAREsNjk0JwYHCLrjEiIAAAABYktHRACIBR1IAAAA
+CXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH5QgGAhE5kB5L+gAAAIZJREFUSMft1rsSgjAQhWEW
+FTUYIopKlPui7/+IZqFhbMxmhm7//qvPiaKgAOIN+rbdJQCE9qO3cR2OhFTKMYgn5ZDmGcy0Q4aJ
+0AhaoPdPnz8JEiRIkKCV0DkE5YQ0D12uBQ01B93uj9LSJdDPV1V71rRlMf0Iq7p+8Kw3aj4fAJYR
+TCigL0lMJ5P4y7LRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTA4LTA2VDAyOjE3OjU2KzAwOjAw
+Kbo8/wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0wOC0wNlQwMjoxNzo1NiswMDowMFjnhEMAAAAA
+SUVORK5CYII=" />
+</svg>

src/components/Application/Application.vue

@@ -1,4 +1,5 @@
 <template>
+  <n-loading-bar-provider>
     <n-dialog-provider>
       <DialogContent />
       <n-notification-provider>
@@ -8,18 +9,32 @@
         </n-message-provider>
       </n-notification-provider>
     </n-dialog-provider>
+  </n-loading-bar-provider>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+  import { defineComponent } from 'vue';
-import { MessageContent } from '@/components/MessageContent'
+  import {
-import { DialogContent } from '@/components/DialogContent'
+    NDialogProvider,
+    NNotificationProvider,
+    NMessageProvider,
+    NLoadingBarProvider,
+  } from 'naive-ui';
+  import { MessageContent } from '@/components/MessageContent';
+  import { DialogContent } from '@/components/DialogContent';
 
   export default defineComponent({
     name: 'Application',
-  components: { MessageContent, DialogContent },
+    components: {
+      NDialogProvider,
+      NNotificationProvider,
+      NMessageProvider,
+      NLoadingBarProvider,
+      MessageContent,
+      DialogContent,
+    },
     setup() {
-    return {}
+      return {};
-  }
+    },
-})
+  });
 </script>

src/components/Application/index.ts

@@ -1,3 +1,3 @@
-import AppProvider from './Application.vue'
+import AppProvider from './Application.vue';
 
-export { AppProvider }
+export { AppProvider };

src/components/DialogContent/index.ts

@@ -1,3 +1,3 @@
-import DialogContent from './index.vue'
+import DialogContent from './index.vue';
 
-export { DialogContent }
+export { DialogContent };

src/components/DialogContent/index.vue

@@ -1,12 +1,12 @@
 <template></template>
 <script lang="ts">
-import { useDialog } from 'naive-ui'
+  import { useDialog } from 'naive-ui';
 
   export default {
     name: 'DialogContent',
     setup() {
       //挂载在 window 方便与在js中使用
-    window.$dialog = useDialog()
+      window['$dialog'] = useDialog();
-  }
+    },
-}
+  };
 </script>

src/components/Form/index.ts

@@ -0,0 +1,4 @@
+export { default as BasicForm } from './src/BasicForm.vue';
+export { useForm } from './src/hooks/useForm';
+export * from './src/types/form';
+export * from './src/types/index';

src/components/Form/src/BasicForm.vue

@@ -0,0 +1,322 @@
+<template>
+  <n-form v-bind="getBindValue" :model="formModel" ref="formElRef">
+    <n-grid v-bind="getGrid">
+      <n-gi v-bind="schema.giProps" v-for="schema in getSchema" :key="schema.field">
+        <n-form-item :label="schema.label" :path="schema.field">
+          <!--标签名右侧温馨提示-->
+          <template #label v-if="schema.labelMessage">
+            {{ schema.label }}
+            <n-tooltip trigger="hover" :style="schema.labelMessageStyle">
+              <template #trigger>
+                <n-icon size="18" class="cursor-pointer text-gray-400">
+                  <QuestionCircleOutlined />
+                </n-icon>
+              </template>
+              {{ schema.labelMessage }}
+            </n-tooltip>
+          </template>
+
+          <!--判断插槽-->
+          <template v-if="schema.slot">
+            <slot
+              :name="schema.slot"
+              :model="formModel"
+              :field="schema.field"
+              :value="formModel[schema.field]"
+            ></slot>
+          </template>
+
+          <!--NCheckbox-->
+          <template v-else-if="schema.component === 'NCheckbox'">
+            <n-checkbox-group v-model:value="formModel[schema.field]">
+              <n-space>
+                <n-checkbox
+                  v-for="item in schema.componentProps.options"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                />
+              </n-space>
+            </n-checkbox-group>
+          </template>
+
+          <!--NRadioGroup-->
+          <template v-else-if="schema.component === 'NRadioGroup'">
+            <n-radio-group v-model:value="formModel[schema.field]">
+              <n-space>
+                <n-radio
+                  v-for="item in schema.componentProps.options"
+                  :key="item.value"
+                  :value="item.value"
+                >
+                  {{ item.label }}
+                </n-radio>
+              </n-space>
+            </n-radio-group>
+          </template>
+          <!--动态渲染表单组件-->
+          <component
+            v-else
+            v-bind="getComponentProps(schema)"
+            :is="schema.component"
+            v-model:value="formModel[schema.field]"
+            :class="{ isFull: schema.isFull != false && getProps.isFull }"
+          />
+          <!--组件后面的内容-->
+          <template v-if="schema.suffix">
+            <slot
+              :name="schema.suffix"
+              :model="formModel"
+              :field="schema.field"
+              :value="formModel[schema.field]"
+            ></slot>
+          </template>
+        </n-form-item>
+      </n-gi>
+      <!--提交 重置 展开 收起 按钮-->
+      <n-gi
+        :span="isInline ? '' : 24"
+        :suffix="isInline ? true : false"
+        #="{ overflow }"
+        v-if="getProps.showActionButtonGroup"
+      >
+        <n-space
+          align="center"
+          :justify="isInline ? 'end' : 'start'"
+          :style="{ 'margin-left': `${isInline ? 12 : getProps.labelWidth}px` }"
+        >
+          <n-button
+            v-if="getProps.showSubmitButton"
+            v-bind="getSubmitBtnOptions"
+            @click="handleSubmit"
+            :loading="loadingSub"
+            >{{ getProps.submitButtonText }}</n-button
+          >
+          <n-button
+            v-if="getProps.showResetButton"
+            v-bind="getResetBtnOptions"
+            @click="resetFields"
+            >{{ getProps.resetButtonText }}</n-button
+          >
+          <n-button
+            type="primary"
+            text
+            icon-placement="right"
+            v-if="
+              isInline &&
+              getSchema.length > (getProps.gridProps?.cols || 0) &&
+              getProps.showAdvancedButton
+            "
+            @click="unfoldToggle"
+          >
+            <template #icon>
+              <n-icon size="14" class="unfold-icon" v-if="overflow">
+                <DownOutlined />
+              </n-icon>
+              <n-icon size="14" class="unfold-icon" v-else>
+                <UpOutlined />
+              </n-icon>
+            </template>
+            {{ overflow ? '展开' : '收起' }}
+          </n-button>
+        </n-space>
+      </n-gi>
+    </n-grid>
+  </n-form>
+</template>
+
+<script lang="ts">
+  import { defineComponent, reactive, ref, computed, unref, onMounted, watch } from 'vue';
+  import { createPlaceholderMessage } from './helper';
+  import { useFormEvents } from './hooks/useFormEvents';
+  import { useFormValues } from './hooks/useFormValues';
+
+  import { basicProps } from './props';
+  import { DownOutlined, UpOutlined, QuestionCircleOutlined } from '@vicons/antd';
+
+  import type { Ref } from 'vue';
+  import type { GridProps } from 'naive-ui/lib/grid';
+  import type { FormSchema, FormProps, FormActionType } from './types/form';
+
+  import { isArray } from '@/utils/is/index';
+  import { deepMerge } from '@/utils';
+
+  export default defineComponent({
+    name: 'BasicUpload',
+    components: { DownOutlined, UpOutlined, QuestionCircleOutlined },
+    props: {
+      ...basicProps,
+    },
+    emits: ['reset', 'submit', 'register'],
+    setup(props, { emit, attrs }) {
+      const defaultFormModel = ref<Recordable>({});
+      const formModel = reactive<Recordable>({});
+      const propsRef = ref<Partial<FormProps>>({});
+      const schemaRef = ref<Nullable<FormSchema[]>>(null);
+      const formElRef = ref<Nullable<FormActionType>>(null);
+      const gridCollapsed = ref(true);
+      const loadingSub = ref(false);
+      const isUpdateDefaultRef = ref(false);
+
+      const getSubmitBtnOptions = computed(() => {
+        return Object.assign(
+          {
+            size: props.size,
+            type: 'primary',
+          },
+          props.submitButtonOptions
+        );
+      });
+
+      const getResetBtnOptions = computed(() => {
+        return Object.assign(
+          {
+            size: props.size,
+            type: 'default',
+          },
+          props.resetButtonOptions
+        );
+      });
+
+      function getComponentProps(schema) {
+        const compProps = schema.componentProps ?? {};
+        const component = schema.component;
+        return {
+          clearable: true,
+          placeholder: createPlaceholderMessage(unref(component)),
+          ...compProps,
+        };
+      }
+
+      const getProps = computed((): FormProps => {
+        const formProps = { ...props, ...unref(propsRef) } as FormProps;
+        const rulesObj: any = {
+          rules: {},
+        };
+        const schemas: any = formProps.schemas || [];
+        schemas.forEach((item) => {
+          if (item.rules && isArray(item.rules)) {
+            rulesObj.rules[item.field] = item.rules;
+          }
+        });
+        return { ...formProps, ...unref(rulesObj) };
+      });
+
+      const isInline = computed(() => {
+        const { layout } = unref(getProps);
+        return layout === 'inline';
+      });
+
+      const getGrid = computed((): GridProps => {
+        const { gridProps } = unref(getProps);
+        return {
+          ...gridProps,
+          collapsed: isInline.value ? gridCollapsed.value : false,
+        };
+      });
+
+      const getBindValue = computed(
+        () => ({ ...attrs, ...props, ...unref(getProps) } as Recordable)
+      );
+
+      const getSchema = computed((): FormSchema[] => {
+        const schemas: FormSchema[] = unref(schemaRef) || (unref(getProps).schemas as any);
+        for (const schema of schemas) {
+          const { defaultValue } = schema;
+          // handle date type
+          // dateItemType.includes(component as string)
+          if (defaultValue) {
+            schema.defaultValue = defaultValue;
+          }
+        }
+        return schemas as FormSchema[];
+      });
+
+      const { handleFormValues, initDefault } = useFormValues({
+        getProps,
+        defaultFormModel,
+        getSchema,
+        formModel,
+      });
+
+      const { handleSubmit, validate, resetFields, getFieldsValue, clearValidate, setFieldsValue } =
+        useFormEvents({
+          emit,
+          getProps,
+          formModel,
+          getSchema,
+          formElRef: formElRef as Ref<FormActionType>,
+          defaultFormModel,
+          loadingSub,
+          handleFormValues,
+        });
+
+      function unfoldToggle() {
+        gridCollapsed.value = !gridCollapsed.value;
+      }
+
+      async function setProps(formProps: Partial<FormProps>): Promise<void> {
+        propsRef.value = deepMerge(unref(propsRef) || {}, formProps);
+      }
+
+      const formActionType: Partial<FormActionType> = {
+        getFieldsValue,
+        setFieldsValue,
+        resetFields,
+        validate,
+        clearValidate,
+        setProps,
+        submit: handleSubmit,
+      };
+
+      watch(
+        () => getSchema.value,
+        (schema) => {
+          if (unref(isUpdateDefaultRef)) {
+            return;
+          }
+          if (schema?.length) {
+            initDefault();
+            isUpdateDefaultRef.value = true;
+          }
+        }
+      );
+
+      onMounted(() => {
+        initDefault();
+        emit('register', formActionType);
+      });
+
+      return {
+        formElRef,
+        formModel,
+        getGrid,
+        getProps,
+        getBindValue,
+        getSchema,
+        getSubmitBtnOptions,
+        getResetBtnOptions,
+        handleSubmit,
+        resetFields,
+        loadingSub,
+        isInline,
+        getComponentProps,
+        unfoldToggle,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .isFull {
+    width: 100%;
+    justify-content: flex-start;
+  }
+
+  .unfold-icon {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    margin-left: -3px;
+  }
+</style>

src/components/Form/src/helper.ts

@@ -0,0 +1,42 @@
+import { ComponentType } from '/types/index';
+
+/**
+ * @description: 生成placeholder
+ */
+export function createPlaceholderMessage(component: ComponentType) {
+  if (component === 'NInput') return '请输入';
+  if (
+    ['NPicker', 'NSelect', 'NCheckbox', 'NRadio', 'NSwitch', 'NDatePicker', 'NTimePicker'].includes(
+      component
+    )
+  )
+    return '请选择';
+  return '';
+}
+
+const DATE_TYPE = ['DatePicker', 'MonthPicker', 'WeekPicker', 'TimePicker'];
+
+function genType() {
+  return [...DATE_TYPE, 'RangePicker'];
+}
+
+/**
+ * 时间字段
+ */
+export const dateItemType = genType();
+
+export function defaultType(component) {
+  if (component === 'NInput') return '';
+  if (component === 'NInputNumber') return null;
+  return [
+    'NPicker',
+    'NSelect',
+    'NCheckbox',
+    'NRadio',
+    'NSwitch',
+    'NDatePicker',
+    'NTimePicker',
+  ].includes(component)
+    ? ''
+    : undefined;
+}

src/components/Form/src/hooks/useForm.ts

@@ -0,0 +1,87 @@
+import type { FormProps, FormActionType, UseFormReturnType } from '../types/form';
+// @ts-ignore
+import type { DynamicProps } from '/#/utils';
+
+import { ref, onUnmounted, unref, nextTick, watch } from 'vue';
+import { isProdMode } from '@/utils/env';
+import { getDynamicProps } from '@/utils';
+
+type Props = Partial<DynamicProps<FormProps>>;
+
+export function useForm(props?: Props): UseFormReturnType {
+  const formRef = ref<Nullable<FormActionType>>(null);
+  const loadedRef = ref<Nullable<boolean>>(false);
+
+  async function getForm() {
+    const form = unref(formRef);
+    if (!form) {
+      console.error(
+        'The form instance has not been obtained, please make sure that the form has been rendered when performing the form operation!'
+      );
+    }
+    await nextTick();
+    return form as FormActionType;
+  }
+
+  function register(instance: FormActionType) {
+    isProdMode() &&
+      onUnmounted(() => {
+        formRef.value = null;
+        loadedRef.value = null;
+      });
+    if (unref(loadedRef) && isProdMode() && instance === unref(formRef)) return;
+
+    formRef.value = instance;
+    loadedRef.value = true;
+
+    watch(
+      () => props,
+      () => {
+        props && instance.setProps(getDynamicProps(props));
+      },
+      {
+        immediate: true,
+        deep: true,
+      }
+    );
+  }
+
+  const methods: FormActionType = {
+    setProps: async (formProps: Partial<FormProps>) => {
+      const form = await getForm();
+      await form.setProps(formProps);
+    },
+
+    resetFields: async () => {
+      getForm().then(async (form) => {
+        await form.resetFields();
+      });
+    },
+
+    clearValidate: async (name?: string | string[]) => {
+      const form = await getForm();
+      await form.clearValidate(name);
+    },
+
+    getFieldsValue: <T>() => {
+      return unref(formRef)?.getFieldsValue() as T;
+    },
+
+    setFieldsValue: async <T>(values: T) => {
+      const form = await getForm();
+      await form.setFieldsValue<T>(values);
+    },
+
+    submit: async (): Promise<any> => {
+      const form = await getForm();
+      return form.submit();
+    },
+
+    validate: async (nameList?: any[]): Promise<Recordable> => {
+      const form = await getForm();
+      return form.validate(nameList);
+    },
+  };
+
+  return [register, methods];
+}

src/components/Form/src/hooks/useFormContext.ts

@@ -0,0 +1,11 @@
+import { provide, inject } from 'vue';
+
+const key = Symbol('formElRef');
+
+export function createFormContext(instance) {
+  provide(key, instance);
+}
+
+export function useFormContext() {
+  return inject(key);
+}

src/components/Form/src/hooks/useFormEvents.ts

@@ -0,0 +1,107 @@
+import type { ComputedRef, Ref } from 'vue';
+import type { FormProps, FormSchema, FormActionType } from '../types/form';
+import { unref, toRaw } from 'vue';
+import { isFunction } from '@/utils/is';
+
+declare type EmitType = (event: string, ...args: any[]) => void;
+
+interface UseFormActionContext {
+  emit: EmitType;
+  getProps: ComputedRef<FormProps>;
+  getSchema: ComputedRef<FormSchema[]>;
+  formModel: Recordable;
+  formElRef: Ref<FormActionType>;
+  defaultFormModel: Recordable;
+  loadingSub: Ref<boolean>;
+  handleFormValues: Function;
+}
+
+export function useFormEvents({
+  emit,
+  getProps,
+  formModel,
+  getSchema,
+  formElRef,
+  defaultFormModel,
+  loadingSub,
+  handleFormValues,
+}: UseFormActionContext) {
+  // 验证
+  async function validate() {
+    return unref(formElRef)?.validate();
+  }
+
+  // 提交
+  async function handleSubmit(e?: Event): Promise<void> {
+    e && e.preventDefault();
+    loadingSub.value = true;
+    const { submitFunc } = unref(getProps);
+    if (submitFunc && isFunction(submitFunc)) {
+      await submitFunc();
+      return;
+    }
+    const formEl = unref(formElRef);
+    if (!formEl) return;
+    try {
+      await validate();
+      loadingSub.value = false;
+      emit('submit', formModel);
+      return true;
+    } catch (error) {
+      loadingSub.value = false;
+      return false;
+    }
+  }
+
+  //清空校验
+  async function clearValidate() {
+    // @ts-ignore
+    await unref(formElRef)?.restoreValidation();
+  }
+
+  //重置
+  async function resetFields(): Promise<void> {
+    const { resetFunc, submitOnReset } = unref(getProps);
+    resetFunc && isFunction(resetFunc) && (await resetFunc());
+
+    const formEl = unref(formElRef);
+    if (!formEl) return;
+    Object.keys(formModel).forEach((key) => {
+      formModel[key] = unref(defaultFormModel)[key] || null;
+    });
+    await clearValidate();
+    const fromValues = handleFormValues(toRaw(unref(formModel)));
+    emit('reset', fromValues);
+    submitOnReset && (await handleSubmit());
+  }
+
+  //获取表单值
+  function getFieldsValue(): Recordable {
+    const formEl = unref(formElRef);
+    if (!formEl) return {};
+    return handleFormValues(toRaw(unref(formModel)));
+  }
+
+  //设置表单字段值
+  async function setFieldsValue(values: Recordable): Promise<void> {
+    const fields = unref(getSchema)
+      .map((item) => item.field)
+      .filter(Boolean);
+
+    Object.keys(values).forEach((key) => {
+      const value = values[key];
+      if (fields.includes(key)) {
+        formModel[key] = value;
+      }
+    });
+  }
+
+  return {
+    handleSubmit,
+    validate,
+    resetFields,
+    getFieldsValue,
+    clearValidate,
+    setFieldsValue,
+  };
+}

src/components/Form/src/hooks/useFormValues.ts

@@ -0,0 +1,54 @@
+import { isArray, isFunction, isObject, isString, isNullOrUnDef } from '@/utils/is';
+import { unref } from 'vue';
+import type { Ref, ComputedRef } from 'vue';
+import type { FormSchema } from '../types/form';
+import { set } from 'lodash-es';
+
+interface UseFormValuesContext {
+  defaultFormModel: Ref<any>;
+  getSchema: ComputedRef<FormSchema[]>;
+  formModel: Recordable;
+}
+export function useFormValues({ defaultFormModel, getSchema, formModel }: UseFormValuesContext) {
+  // 加工 form values
+  function handleFormValues(values: Recordable) {
+    if (!isObject(values)) {
+      return {};
+    }
+    const res: Recordable = {};
+    for (const item of Object.entries(values)) {
+      let [, value] = item;
+      const [key] = item;
+      if (
+        !key ||
+        (isArray(value) && value.length === 0) ||
+        isFunction(value) ||
+        isNullOrUnDef(value)
+      ) {
+        continue;
+      }
+      // 删除空格
+      if (isString(value)) {
+        value = value.trim();
+      }
+      set(res, key, value);
+    }
+    return res;
+  }
+
+  //初始化默认值
+  function initDefault() {
+    const schemas = unref(getSchema);
+    const obj: Recordable = {};
+    schemas.forEach((item) => {
+      const { defaultValue } = item;
+      if (!isNullOrUnDef(defaultValue)) {
+        obj[item.field] = defaultValue;
+        formModel[item.field] = defaultValue;
+      }
+    });
+    defaultFormModel.value = obj;
+  }
+
+  return { handleFormValues, initDefault };
+}

src/components/Form/src/props.ts

@@ -0,0 +1,82 @@
+import type { CSSProperties, PropType } from 'vue';
+import { FormSchema } from './types/form';
+import type { GridProps, GridItemProps } from 'naive-ui/lib/grid';
+import type { ButtonProps } from 'naive-ui/lib/button';
+import { propTypes } from '@/utils/propTypes';
+export const basicProps = {
+  // 标签宽度  固定宽度
+  labelWidth: {
+    type: [Number, String] as PropType<number | string>,
+    default: 80,
+  },
+  // 表单配置规则
+  schemas: {
+    type: [Array] as PropType<FormSchema[]>,
+    default: () => [],
+  },
+  //布局方式
+  layout: {
+    type: String,
+    default: 'inline',
+  },
+  //是否展示为行内表单
+  inline: {
+    type: Boolean,
+    default: false,
+  },
+  //大小
+  size: {
+    type: String,
+    default: 'medium',
+  },
+  //标签位置
+  labelPlacement: {
+    type: String,
+    default: 'left',
+  },
+  //组件是否width 100%
+  isFull: {
+    type: Boolean,
+    default: true,
+  },
+  //是否显示操作按钮（查询/重置）
+  showActionButtonGroup: propTypes.bool.def(true),
+  // 显示重置按钮
+  showResetButton: propTypes.bool.def(true),
+  //重置按钮配置
+  resetButtonOptions: Object as PropType<Partial<ButtonProps>>,
+  // 显示确认按钮
+  showSubmitButton: propTypes.bool.def(true),
+  // 确认按钮配置
+  submitButtonOptions: Object as PropType<Partial<ButtonProps>>,
+  //展开收起按钮
+  showAdvancedButton: propTypes.bool.def(true),
+  // 确认按钮文字
+  submitButtonText: {
+    type: String,
+    default: '查询',
+  },
+  //重置按钮文字
+  resetButtonText: {
+    type: String,
+    default: '重置',
+  },
+  //grid 配置
+  gridProps: Object as PropType<GridProps>,
+  //gi配置
+  giProps: Object as PropType<GridItemProps>,
+  //grid 样式
+  baseGridStyle: {
+    type: Object as PropType<CSSProperties>,
+  },
+  //是否折叠
+  collapsed: {
+    type: Boolean,
+    default: false,
+  },
+  //默认展示的行数
+  collapsedRows: {
+    type: Number,
+    default: 1,
+  },
+};

src/components/Form/src/types/form.ts

@@ -0,0 +1,58 @@
+import { ComponentType } from './index';
+import type { CSSProperties } from 'vue';
+import type { GridProps, GridItemProps } from 'naive-ui/lib/grid';
+import type { ButtonProps } from 'naive-ui/lib/button';
+
+export interface FormSchema {
+  field: string;
+  label: string;
+  labelMessage?: string;
+  labelMessageStyle?: object | string;
+  defaultValue?: any;
+  component?: ComponentType;
+  componentProps?: object;
+  slot?: string;
+  rules?: object | object[];
+  giProps?: GridItemProps;
+  isFull?: boolean;
+  suffix?: string;
+}
+
+export interface FormProps {
+  model?: Recordable;
+  labelWidth?: number | string;
+  schemas?: FormSchema[];
+  inline: boolean;
+  layout?: string;
+  size: string;
+  labelPlacement: string;
+  isFull: boolean;
+  showActionButtonGroup?: boolean;
+  showResetButton?: boolean;
+  resetButtonOptions?: Partial<ButtonProps>;
+  showSubmitButton?: boolean;
+  showAdvancedButton?: boolean;
+  submitButtonOptions?: Partial<ButtonProps>;
+  submitButtonText?: string;
+  resetButtonText?: string;
+  gridProps?: GridProps;
+  giProps?: GridItemProps;
+  resetFunc?: () => Promise<void>;
+  submitFunc?: () => Promise<void>;
+  submitOnReset?: boolean;
+  baseGridStyle?: CSSProperties;
+}
+
+export interface FormActionType {
+  submit: () => Promise<any>;
+  setProps: (formProps: Partial<FormProps>) => Promise<void>;
+  setFieldsValue: <T>(values: T) => Promise<void>;
+  clearValidate: (name?: string | string[]) => Promise<void>;
+  getFieldsValue: () => Recordable;
+  resetFields: () => Promise<void>;
+  validate: (nameList?: any[]) => Promise<any>;
+}
+
+export type RegisterFn = (formInstance: FormActionType) => void;
+
+export type UseFormReturnType = [RegisterFn, FormActionType];

src/components/Form/src/types/index.ts

@@ -0,0 +1,28 @@
+export type ComponentType =
+  | 'NInput'
+  | 'NInputGroup'
+  | 'NInputPassword'
+  | 'NInputSearch'
+  | 'NInputTextArea'
+  | 'NInputNumber'
+  | 'NInputCountDown'
+  | 'NSelect'
+  | 'NTreeSelect'
+  | 'NRadioButtonGroup'
+  | 'NRadioGroup'
+  | 'NCheckbox'
+  | 'NCheckboxGroup'
+  | 'NAutoComplete'
+  | 'NCascader'
+  | 'NDatePicker'
+  | 'NMonthPicker'
+  | 'NRangePicker'
+  | 'NWeekPicker'
+  | 'NTimePicker'
+  | 'NSwitch'
+  | 'NStrengthMeter'
+  | 'NUpload'
+  | 'NIconPicker'
+  | 'NRender'
+  | 'NSlider'
+  | 'NRate';

src/components/LoadingContent/index.ts

@@ -0,0 +1,3 @@
+import LoadingContent from './index.vue';
+
+export { LoadingContent };

src/components/LoadingContent/index.vue

@@ -0,0 +1,12 @@
+<template></template>
+<script lang="ts">
+  import { useLoadingBar } from 'naive-ui';
+
+  export default {
+    name: 'LoadingContent',
+    setup() {
+      //挂载在 window 方便与在js中使用
+      window['$loading'] = useLoadingBar();
+    },
+  };
+</script>

src/components/Lockscreen/Lockscreen.vue

@@ -7,7 +7,6 @@
     @contextmenu.prevent
   >
     <template v-if="!showLogin">
-
       <div class="lock-box">
         <div class="lock">
           <span class="lock-icon" title="解锁屏幕" @click="onLockLogin(true)">
@@ -16,14 +15,14 @@
             </n-icon>
           </span>
         </div>
-
       </div>
       <!--充电-->
       <recharge
         :battery="battery"
         :battery-status="batteryStatus"
         :calc-discharging-time="calcDischargingTime"
-      ></recharge>
+        :calc-charging-time="calcChargingTime"
+      />
 
       <div class="local-time">
         <div class="time">{{ hour }}:{{ minute }}</div>
@@ -50,9 +49,10 @@
           type="password"
           autofocus
           v-model:value="loginParams.password"
-            placeholder="请输入登录密码">
+          placeholder="请输入登录密码"
+        >
           <template #suffix>
-            <n-icon @click="onLogin" style="cursor: pointer;">
+            <n-icon @click="onLogin" style="cursor: pointer">
               <LoadingOutlined v-if="loginLoading" />
               <arrow-right-outlined v-else />
             </n-icon>
@@ -68,58 +68,56 @@
           <div><a @click="goLogin">重新登录</a></div>
           <div><a @click="onLogin">进入系统</a></div>
         </div>
-
       </div>
     </template>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, reactive, toRefs, computed } from 'vue'
+  import { defineComponent, reactive, toRefs } from 'vue';
-import { ResultEnum } from '@/enums/httpEnum'
+  import { ResultEnum } from '@/enums/httpEnum';
-import recharge from './Recharge.vue'
+  import recharge from './Recharge.vue';
   import {
     LockOutlined,
     LoadingOutlined,
-  UnlockOutlined,
     UserOutlined,
     ApiOutlined,
     ArrowRightOutlined,
     WifiOutlined,
-} from '@vicons/antd'
+  } from '@vicons/antd';
 
-import { useRouter, useRoute } from 'vue-router'
+  import { useRouter, useRoute } from 'vue-router';
-import { useOnline } from '@/hooks/useOnline'
+  import { useOnline } from '@/hooks/useOnline';
-import { useTime } from '@/hooks/useTime'
+  import { useTime } from '@/hooks/useTime';
-import { useBattery } from '@/hooks/useBattery'
+  import { useBattery } from '@/hooks/useBattery';
-import { useLockscreenStore } from '@/store/modules/lockscreen'
+  import { useLockscreenStore } from '@/store/modules/lockscreen';
-import { useUserStore } from '@/store/modules/user'
+  import { useUserStore } from '@/store/modules/user';
 
   export default defineComponent({
     name: 'Lockscreen',
     components: {
       LockOutlined,
       LoadingOutlined,
-    UnlockOutlined,
       UserOutlined,
       ArrowRightOutlined,
       ApiOutlined,
       WifiOutlined,
       recharge,
     },
-  setup(props, { emit }) {
+    setup() {
-    const useLockscreen = useLockscreenStore()
+      const useLockscreen = useLockscreenStore();
       const userStore = useUserStore();
 
       // 获取时间
-    const { month, day, hour, minute, second, week } = useTime()
+      const { month, day, hour, minute, second, week } = useTime();
-    const { online } = useOnline()
+      const { online } = useOnline();
 
-    const router = useRouter()
+      const router = useRouter();
-    const route = useRoute()
+      const route = useRoute();
 
-    const { battery, batteryStatus, calcDischargingTime } = useBattery()
+      const { battery, batteryStatus, calcDischargingTime, calcChargingTime } = useBattery();
-    const { username } = userStore.getUserInfo || {}
+      const userInfo: object = userStore.getUserInfo || {};
+      const username = userInfo['username'] || '';
       const state = reactive({
         showLogin: false,
         loginLoading: false, // 正在登录
@@ -127,45 +125,45 @@ export default defineComponent({
         errorMsg: '密码错误',
         loginParams: {
           username: username || '',
-        password: ''
+          password: '',
-      }
+        },
-    })
+      });
 
       // 解锁登录
-    const onLockLogin = (value: boolean) => (state.showLogin = value)
+      const onLockLogin = (value: boolean) => (state.showLogin = value);
 
       // 登录
       const onLogin = async () => {
         if (!state.loginParams.password.trim()) {
-        return
+          return;
         }
         const params = {
           isLock: true,
-        ...state.loginParams
+          ...state.loginParams,
-      }
+        };
-      state.loginLoading = true
+        state.loginLoading = true;
-      const { code, result, message } = await userStore.login(params)
+        const { code, message } = await userStore.login(params);
         if (code === ResultEnum.SUCCESS) {
-        onLockLogin(false)
+          onLockLogin(false);
-        useLockscreen.setLock(false)
+          useLockscreen.setLock(false);
         } else {
-        state.errorMsg = message
+          state.errorMsg = message;
-        state.isLoginError = true
+          state.isLoginError = true;
-      }
-      state.loginLoading = false
         }
+        state.loginLoading = false;
+      };
 
       //重新登录
       const goLogin = () => {
-      onLockLogin(false)
+        onLockLogin(false);
-      useLockscreen.setLock(false)
+        useLockscreen.setLock(false);
         router.replace({
           path: '/login',
           query: {
-          redirect: route.fullPath
+            redirect: route.fullPath,
-        }
+          },
-      })
+        });
-    }
+      };
 
       return {
         ...toRefs(state),
@@ -179,12 +177,13 @@ export default defineComponent({
         battery,
         batteryStatus,
         calcDischargingTime,
+        calcChargingTime,
         onLockLogin,
         onLogin,
-      goLogin
+        goLogin,
-    }
+      };
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less" scoped>

src/components/Lockscreen/Recharge.vue

@@ -13,14 +13,14 @@
         剩余可使用时间：{{ calcDischargingTime }}
       </div>
       <span v-show="Number.isFinite(battery.chargingTime) && battery.chargingTime != 0">
-        距离电池充满需要：{{ calcDischargingTime }}
+        距离电池充满需要：{{ calcChargingTime }}
       </span>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+  import { defineComponent } from 'vue';
 
   export default defineComponent({
     name: 'HuaweiCharge',
@@ -29,20 +29,24 @@ export default defineComponent({
       battery: {
         // 电池对象
         type: Object,
-      default: () => ({})
+        default: () => ({}),
       },
       calcDischargingTime: {
         // 电池剩余时间可用时间
         type: String,
-      default: ''
+        default: '',
+      },
+      calcChargingTime: {
+        type: String,
+        default: '',
       },
       batteryStatus: {
         // 电池状态
         type: String,
-      validator: (val: string) => ['充电中', '已充满', '已断开电源'].includes(val)
+        validator: (val: string) => ['充电中', '已充满', '已断开电源'].includes(val),
-    }
+      },
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less" scoped>
@@ -51,12 +55,12 @@ export default defineComponent({
     bottom: 20vh;
     left: 50vw;
     width: 300px;
-  height: 400px;
+    height: 500px;
     transform: translateX(-50%);
 
     .number {
       position: absolute;
-    top: 27%;
+      top: 20%;
       z-index: 10;
       width: 300px;
       font-size: 32px;
@@ -147,7 +151,6 @@ each(range(15), {
   }
 });
 
-
   @keyframes rotate {
     50% {
       border-radius: 45% / 42% 38% 58% 49%;

src/components/Lockscreen/index.ts

@@ -1,3 +1,3 @@
-import LockScreen from './Lockscreen.vue'
+import LockScreen from './Lockscreen.vue';
 
-export { LockScreen }
+export { LockScreen };

src/components/MessageContent/index.ts

@@ -1,3 +1,3 @@
-import MessageContent from './index.vue'
+import MessageContent from './index.vue';
 
-export { MessageContent }
+export { MessageContent };

src/components/MessageContent/index.vue

@@ -1,12 +1,12 @@
 <template></template>
 <script lang="ts">
-import { useMessage } from 'naive-ui'
+  import { useMessage } from 'naive-ui';
 
   export default {
     name: 'MessageContent',
     setup() {
       //挂载在 window 方便与在js中使用
-    window.$message = useMessage()
+      window['$message'] = useMessage();
-  }
+    },
-}
+  };
 </script>

src/components/Modal/index.ts

@@ -0,0 +1,3 @@
+export { default as basicModal } from './src/basicModal.vue';
+export { useModal } from './src/hooks/useModal';
+export * from './src/type';

src/components/Modal/src/basicModal.vue

@@ -0,0 +1,127 @@
+<template>
+  <n-modal id="basic-modal" v-bind="getBindValue" v-model:show="isModal" @close="onCloseModal">
+    <template #header>
+      <div class="w-full cursor-move" id="basic-modal-bar">{{ getBindValue.title }}</div>
+    </template>
+    <template #default>
+      <slot name="default"></slot>
+    </template>
+    <template #action v-if="!$slots.action">
+      <n-space>
+        <n-button @click="closeModal">取消</n-button>
+        <n-button type="primary" :loading="subLoading" @click="handleSubmit">{{
+          subBtuText
+        }}</n-button>
+      </n-space>
+    </template>
+    <template v-else #action>
+      <slot name="action"></slot>
+    </template>
+  </n-modal>
+</template>
+
+<script lang="ts">
+  import {
+    defineComponent,
+    getCurrentInstance,
+    ref,
+    nextTick,
+    unref,
+    toRefs,
+    reactive,
+    computed,
+  } from 'vue';
+  import { basicProps } from './props';
+  import startDrag from '@/utils/Drag';
+  import { deepMerge } from '@/utils';
+  import { FormProps } from '@/components/Form';
+  export default defineComponent({
+    name: 'BasicModal',
+    components: {},
+    props: {
+      ...basicProps,
+    },
+    emits: ['on-close', 'on-ok', 'register'],
+    setup(props, { emit, attrs }) {
+      const propsRef = ref<Partial>({});
+
+      const state = reactive({
+        isModal: false,
+        subLoading: false,
+      });
+
+      const getProps = computed((): FormProps => {
+        const modalProps = { ...props, ...unref(propsRef) };
+        return { ...modalProps };
+      });
+
+      async function setProps(modalProps: Partial): Promise<void> {
+        propsRef.value = deepMerge(unref(propsRef) || {}, modalProps);
+      }
+
+      const getBindValue = computed(() => {
+        return {
+          ...attrs,
+          ...unref(getProps),
+        };
+      });
+
+      function setSubLoading(status: boolean) {
+        state.subLoading = status;
+      }
+
+      function openModal() {
+        state.isModal = true;
+        nextTick(() => {
+          const oBox = document.getElementById('basic-modal');
+          const oBar = document.getElementById('basic-modal-bar');
+          startDrag(oBar, oBox);
+        });
+      }
+
+      function closeModal() {
+        state.isModal = false;
+        state.subLoading = false;
+        emit('on-close');
+      }
+
+      function onCloseModal() {
+        state.isModal = false;
+        emit('on-close');
+      }
+
+      function handleSubmit() {
+        state.subLoading = true;
+        emit('on-ok');
+      }
+
+      const modalMethods: ModalMethods = {
+        setProps,
+        openModal,
+        closeModal,
+        setSubLoading,
+      };
+
+      const instance = getCurrentInstance();
+      if (instance) {
+        emit('register', modalMethods);
+      }
+
+      return {
+        ...toRefs(state),
+        getBindValue,
+        openModal,
+        closeModal,
+        onCloseModal,
+        handleSubmit,
+        setProps,
+      };
+    },
+  });
+</script>
+
+<style lang="less">
+  .cursor-move {
+    cursor: move;
+  }
+</style>

src/components/Modal/src/hooks/useModal.ts

@@ -0,0 +1,58 @@
+import { ref, onUnmounted, unref, getCurrentInstance, watch } from 'vue';
+import { isProdMode } from '@/utils/env';
+import { ReturnMethods } from '../type';
+import { getDynamicProps } from '@/utils';
+export function useModal(props): (((modalMethod: ReturnMethods) => any) | ReturnMethods)[] {
+  const modal = ref<Nullable<ReturnMethods>>(null);
+  const loaded = ref<Nullable<boolean>>(false);
+
+  function register(modalMethod: ReturnMethods) {
+    if (!getCurrentInstance()) {
+      throw new Error('useModal() can only be used inside setup() or functional components!');
+    }
+    isProdMode() &&
+      onUnmounted(() => {
+        modal.value = null;
+        loaded.value = false;
+      });
+    if (unref(loaded) && isProdMode() && modalMethod === unref(modal)) return;
+    modal.value = modalMethod;
+
+    watch(
+      () => props,
+      () => {
+        // @ts-ignore
+        const { setProps } = modal.value;
+        props && setProps(getDynamicProps(props));
+      },
+      {
+        immediate: true,
+        deep: true,
+      }
+    );
+  }
+
+  const getInstance = () => {
+    const instance = unref(modal);
+    if (!instance) {
+      console.error('useModal instance is undefined!');
+    }
+    return instance;
+  };
+
+  const methods: ReturnMethods = {
+    setProps: (props): void => {
+      getInstance()?.setProps(props);
+    },
+    openModal: () => {
+      getInstance()?.openModal();
+    },
+    closeModal: () => {
+      getInstance()?.closeModal();
+    },
+    setSubLoading: (status) => {
+      getInstance()?.setSubLoading(status);
+    },
+  };
+  return [register, methods];
+}

src/components/Modal/src/props.ts

@@ -0,0 +1,30 @@
+import { NModal } from 'naive-ui';
+
+export const basicProps = {
+  ...NModal.props,
+  // 确认按钮文字
+  subBtuText: {
+    type: String,
+    default: '确认',
+  },
+  showIcon: {
+    type: Boolean,
+    default: false,
+  },
+  width: {
+    type: Number,
+    default: 446,
+  },
+  title: {
+    type: String,
+    default: '',
+  },
+  maskClosable: {
+    type: Boolean,
+    default: false,
+  },
+  preset: {
+    type: String,
+    default: 'dialog',
+  },
+};

src/components/Modal/src/type/index.ts

@@ -0,0 +1,9 @@
+/**
+ * @description: 弹窗对外暴露的方法
+ */
+export interface ReturnMethods {
+  setProps: (props) => void;
+  openModal: () => void;
+  closeModal: () => void;
+  setSubLoading: (status) => void;
+}

src/components/Table/README.md

@@ -1,91 +0,0 @@
-BasicTable 重封装组件说明
-====
-
-封装说明
-----
-
-> 基础的使用方式与 API 与 [官方版(data-table)](https://www.naiveui.com/zh-CN/os-theme/components/data-table#tree) 本一致，在其基础上，封装了加载数据的方法。
->
-> 你无需在你是用表格的页面进行分页逻辑处理，仅需向 BasicTable 组件传递绑定 `:api="Promise"` 对象即可
->
-> 例子1
-----
-（基础使用）
-
-```vue
-
-<template>
-    <BasicTable
-      title="表格列表"
-      :columns="columns"
-      :api="loadDataTable"
-      :row-key="row => row.id"
-      @update:checked-row-keys="onCheckedRow"
-    >
-      <template #toolbar>
-        <n-button type="primary">添加会员</n-button>
-      </template>
-    </BasicTable>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { BasicTable } from '@/components/Table'
-import { getTableList } from '@/api/table/list'
-const columns = [
-    {
-      title: 'id',
-      key: 'id'
-    },
-    {
-      title: '名称',
-      key: 'name'
-    },
-    {
-      title: '地址',
-      key: 'address'
-    },
-    {
-      title: '日期',
-      key: 'date'
-    },
-]
-export default defineComponent({
-  components: { BasicTable },
-  setup() {
-      const loadDataTable = async (params) => {
-        const data = await getTableList(params);
-        return data
-      }
-    return {
-      columns,
-      loadDataTable
-    }
-  }
-})
-</script>
-```
-
-API
-----
-BasicTable 在 NaiveUi 的 data-table 上进行了一层封装，支持了一些预设，并且封装了一些行为。这里只列出与 data-table 不同的 api。
-
-> request：Promise 参考上面例子写法
-> ref：可绑定ref 调用组件内部方法（data-table本身的方法和参数）
-
-Methods
-----
-> reload：actionRef.value.reload()
-
-> 其余方法，请打印查看
-
-Slots
-----
-> 名称：tableTitle | 表格顶部左侧区域                          
-> 名称：toolbar | 表格顶部右侧区域
-
-
-更新时间
-----
-
-该文档最后更新于： 2021-07-12 PM 10:13

src/components/Table/index.ts

@@ -1 +1,4 @@
 export { default as BasicTable } from './src/Table.vue';
+export { default as TableAction } from './src/components/TableAction.vue';
+export * from './src/types/table';
+export * from './src/types/tableAction';

src/components/Table/src/Table.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="table-toolbar">
-
     <!--顶部左侧区域-->
     <div class="flex items-center table-toolbar-left">
       <template v-if="title">
@@ -20,7 +19,6 @@
     </div>
 
     <div class="flex items-center table-toolbar-right">
-
       <!--顶部右侧区域-->
       <slot name="toolbar"></slot>
 
@@ -40,7 +38,12 @@
       <n-tooltip trigger="hover">
         <template #trigger>
           <div class="table-toolbar-right-icon">
-            <n-dropdown @select="densitySelect" trigger="click" :options="densityOptions" v-model:value="tableSize">
+            <n-dropdown
+              @select="densitySelect"
+              trigger="click"
+              :options="densityOptions"
+              v-model:value="tableSize"
+            >
               <n-icon size="18">
                 <ColumnHeightOutlined />
               </n-icon>
@@ -51,13 +54,12 @@
       </n-tooltip>
 
       <!--表格设置单独抽离成组件-->
-      <ColumnSetting></ColumnSetting>
+      <ColumnSetting />
-
     </div>
-
   </div>
   <div class="s-table">
     <n-data-table
+      ref="tableElRef"
       v-bind="getBindValues"
       :pagination="pagination"
       @update:page="updatePage"
@@ -71,57 +73,77 @@
 </template>
 
 <script lang="ts">
-import { NDataTable } from 'naive-ui'
+  import {
-import { ref, defineComponent, reactive, unref, onMounted, toRaw, onBeforeMount, computed, toRefs, watch } from "vue"
+    ref,
-import { ReloadOutlined, ColumnHeightOutlined, SettingOutlined, DragOutlined, QuestionCircleOutlined } from '@vicons/antd'
+    defineComponent,
+    reactive,
+    unref,
+    toRaw,
+    computed,
+    toRefs,
+    onMounted,
+    nextTick,
+  } from 'vue';
+  import { ReloadOutlined, ColumnHeightOutlined, QuestionCircleOutlined } from '@vicons/antd';
   import { createTableContext } from './hooks/useTableContext';
 
-import ColumnSetting from './components/settings/ColumnSetting.vue'
+  import ColumnSetting from './components/settings/ColumnSetting.vue';
 
   import { useLoading } from './hooks/useLoading';
   import { useColumns } from './hooks/useColumns';
   import { useDataSource } from './hooks/useDataSource';
   import { usePagination } from './hooks/usePagination';
 
-import { basicProps } from './props'
+  import { basicProps } from './props';
 
-import { BasicTableProps } from './types/table'
+  import { BasicTableProps } from './types/table';
 
+  import { getViewportOffset } from '@/utils/domUtils';
+  import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn';
+  import { isBoolean } from '@/utils/is';
 
   const densityOptions = [
     {
-    type: "menu",
+      type: 'menu',
       label: '紧凑',
       key: 'small',
     },
     {
-    type: "menu",
+      type: 'menu',
       label: '默认',
-    key: "medium"
+      key: 'medium',
     },
     {
-    type: "menu",
+      type: 'menu',
       label: '宽松',
-    key: 'large'
+      key: 'large',
-  }
+    },
-]
+  ];
 
   export default defineComponent({
     components: {
-    ReloadOutlined, ColumnHeightOutlined, SettingOutlined, DragOutlined, ColumnSetting, QuestionCircleOutlined
+      ReloadOutlined,
+      ColumnHeightOutlined,
+      ColumnSetting,
+      QuestionCircleOutlined,
     },
     props: {
-    ...NDataTable.props, // 这里继承原 UI 组件的 props
+      ...basicProps,
-    ...basicProps
     },
     emits: [
       'fetch-success',
       'fetch-error',
-    'update:checked-row-keys'
+      'update:checked-row-keys',
+      'edit-end',
+      'edit-cancel',
+      'edit-row-end',
+      'edit-change',
     ],
     setup(props, { emit }) {
-
+      const deviceHeight = ref(150);
+      const tableElRef = ref<ComponentRef>(null);
       const wrapRef = ref<Nullable<HTMLDivElement>>(null);
+      let paginationEl: HTMLElement | null;
 
       const tableData = ref<Recordable[]>([]);
       const innerPropsRef = ref<Partial<BasicTableProps>>();
@@ -132,92 +154,76 @@ export default defineComponent({
 
       const { getLoading, setLoading } = useLoading(getProps);
 
-    const {
+      const { getPaginationInfo, setPagination } = usePagination(getProps);
-      getPaginationInfo,
-      getPagination,
-      setPagination,
-      setShowPagination,
-      getShowPagination,
-    } = usePagination(getProps)
 
-    const { getDataSourceRef, getRowKey, getDataSource, setDataSource, reload } = useDataSource(
+      const { getDataSourceRef, getRowKey, reload } = useDataSource(
-        getProps, {
+        getProps,
+        {
           getPaginationInfo,
           setPagination,
           tableData,
-          setLoading
+          setLoading,
-        }, emit
+        },
-    )
+        emit
+      );
 
-    const {
+      const { getPageColumns, setColumns, getColumns, getCacheColumns, setCacheColumnsField } =
-      getPageColumns,
+        useColumns(getProps);
-      setColumns,
-      getColumns,
-      getCacheColumns,
-      setCacheColumnsField,
-      getColumnsRef
-    } = useColumns(getProps)
 
       const state = reactive({
         tableSize: 'medium',
-      isColumnSetting: false
+        isColumnSetting: false,
-    })
+      });
 
       //页码切换
       function updatePage(page) {
-      setPagination({ page: page, });
+        setPagination({ page: page });
-      reload()
+        reload();
       }
 
       //分页数量切换
       function updatePageSize(size) {
-      setPagination({ page: 1, pageSize: size, });
+        setPagination({ page: 1, pageSize: size });
-      reload()
+        reload();
       }
 
       //密度切换
       function densitySelect(e) {
-      state.tableSize = e
+        state.tableSize = e;
       }
 
       //选中行
       function updateCheckedRowKeys(rowKeys) {
-      emit('update:checked-row-keys', rowKeys)
+        emit('update:checked-row-keys', rowKeys);
-    }
-
-    //重置 Columns
-    const resetColumns = () => {
-      columns.map(item => {
-        item.isShow = true
-      })
       }
 
       //获取表格大小
-    const getTableSize = computed(() => state.tableSize)
+      const getTableSize = computed(() => state.tableSize);
 
       //组装表格信息
       const getBindValues = computed(() => {
         const tableData = unref(getDataSourceRef);
-      let propsData = {
+        const maxHeight = tableData.length ? `${unref(deviceHeight)}px` : 'auto';
+        return {
           ...unref(getProps),
           loading: unref(getLoading),
           columns: toRaw(unref(getPageColumns)),
           rowKey: unref(getRowKey),
           data: tableData,
           size: unref(getTableSize),
-        remote: true
+          remote: true,
-      }
+          'max-height': maxHeight,
-      return propsData
+        };
-    })
+      });
 
       //获取分页信息
-    const pagination = computed(() => toRaw(unref(getPaginationInfo)))
+      const pagination = computed(() => toRaw(unref(getPaginationInfo)));
 
       function setProps(props: Partial<BasicTableProps>) {
         innerPropsRef.value = { ...unref(innerPropsRef), ...props };
       }
 
-    const tableAction: TableActionType = {
+      const tableAction = {
         reload,
         setColumns,
         setLoading,
@@ -228,14 +234,54 @@ export default defineComponent({
         setCacheColumnsField,
         emit,
         getSize: () => {
-        return unref(getBindValues).size as SizeType;
+          return unref(getBindValues).size;
         },
       };
 
+      const getCanResize = computed(() => {
+        const { canResize } = unref(getProps);
+        return canResize;
+      });
+
+      async function computeTableHeight() {
+        const table = unref(tableElRef);
+        if (!table) return;
+        if (!unref(getCanResize)) return;
+        const tableEl: any = table?.$el;
+        const headEl = tableEl.querySelector('.n-data-table-thead ');
+        const { bottomIncludeBody } = getViewportOffset(headEl);
+        const headerH = 64;
+        let paginationH = 2;
+        let marginH = 24;
+        if (!isBoolean(pagination)) {
+          paginationEl = tableEl.querySelector('.n-data-table__pagination') as HTMLElement;
+          if (paginationEl) {
+            const offsetHeight = paginationEl.offsetHeight;
+            paginationH += offsetHeight || 0;
+          } else {
+            paginationH += 28;
+          }
+        }
+        let height =
+          bottomIncludeBody - (headerH + paginationH + marginH + (props.resizeHeightOffset || 0));
+        const maxHeight = props.maxHeight;
+        height = maxHeight && maxHeight < height ? maxHeight : height;
+        deviceHeight.value = height;
+      }
+
+      useWindowSizeFn(computeTableHeight, 280);
+
+      onMounted(() => {
+        nextTick(() => {
+          computeTableHeight();
+        });
+      });
+
       createTableContext({ ...tableAction, wrapRef, getBindValues });
 
       return {
         ...toRefs(state),
+        tableElRef,
         getBindValues,
         densityOptions,
         reload,
@@ -244,14 +290,12 @@ export default defineComponent({
         updatePageSize,
         updateCheckedRowKeys,
         pagination,
-      resetColumns,
+        tableAction,
-      tableAction
+      };
-    }
+    },
-  }
+  });
-})
-
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
   .table-toolbar {
     display: flex;
     justify-content: space-between;

src/components/Table/src/componentMap.ts

@@ -0,0 +1,41 @@
+import type { Component } from 'vue';
+import {
+  NInput,
+  NSelect,
+  NCheckbox,
+  NInputNumber,
+  NSwitch,
+  NDatePicker,
+  NTimePicker,
+} from 'naive-ui';
+import type { ComponentType } from './types/componentType';
+
+export enum EventEnum {
+  NInput = 'on-input',
+  NInputNumber = 'on-input',
+  NSelect = 'on-update:value',
+  NSwitch = 'on-update:value',
+  NCheckbox = 'on-update:value',
+  NDatePicker = 'on-update:value',
+  NTimePicker = 'on-update:value',
+}
+
+const componentMap = new Map<ComponentType, Component>();
+
+componentMap.set('NInput', NInput);
+componentMap.set('NInputNumber', NInputNumber);
+componentMap.set('NSelect', NSelect);
+componentMap.set('NSwitch', NSwitch);
+componentMap.set('NCheckbox', NCheckbox);
+componentMap.set('NDatePicker', NDatePicker);
+componentMap.set('NTimePicker', NTimePicker);
+
+export function add(compName: ComponentType, component: Component) {
+  componentMap.set(compName, component);
+}
+
+export function del(compName: ComponentType) {
+  componentMap.delete(compName);
+}
+
+export { componentMap };

src/components/Table/src/components/TableAction.vue

@@ -0,0 +1,136 @@
+<template>
+  <div class="tableAction">
+    <div class="flex items-center justify-center">
+      <template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
+        <n-button v-bind="action" class="mx-2">{{ action.label }}</n-button>
+      </template>
+      <n-dropdown
+        v-if="dropDownActions && getDropdownList.length"
+        trigger="hover"
+        :options="getDropdownList"
+        @select="select"
+      >
+        <slot name="more"></slot>
+        <n-button v-bind="getMoreProps" class="mx-2" v-if="!$slots.more" icon-placement="right">
+          <div class="flex items-center">
+            <span>更多</span>
+            <n-icon size="14" class="ml-1">
+              <DownOutlined />
+            </n-icon>
+          </div>
+          <!--          <template #icon>-->
+          <!--            -->
+          <!--          </template>-->
+        </n-button>
+      </n-dropdown>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent, PropType, computed, toRaw } from 'vue';
+  import { ActionItem } from '@/components/Table';
+  import { usePermission } from '@/hooks/web/usePermission';
+  import { isBoolean, isFunction } from '@/utils/is';
+  import { DownOutlined } from '@vicons/antd';
+
+  export default defineComponent({
+    name: 'TableAction',
+    components: { DownOutlined },
+    props: {
+      actions: {
+        type: Array as PropType<ActionItem[]>,
+        default: null,
+        required: true,
+      },
+      dropDownActions: {
+        type: Array as PropType<ActionItem[]>,
+        default: null,
+      },
+      style: {
+        type: String as PropType<String>,
+        default: 'button',
+      },
+      select: {
+        type: Function as PropType<Function>,
+        default: () => {},
+      },
+    },
+    setup(props) {
+      const { hasPermission } = usePermission();
+
+      const actionType =
+        props.style === 'button' ? 'default' : props.style === 'text' ? 'primary' : 'default';
+      const actionText =
+        props.style === 'button' ? undefined : props.style === 'text' ? true : undefined;
+
+      const getMoreProps = computed(() => {
+        return {
+          text: actionText,
+          type: actionType,
+          size: 'small',
+        };
+      });
+
+      const getDropdownList = computed(() => {
+        return (toRaw(props.dropDownActions) || [])
+          .filter((action) => {
+            return hasPermission(action.auth) && isIfShow(action);
+          })
+          .map((action) => {
+            const { popConfirm } = action;
+            return {
+              size: 'small',
+              text: actionText,
+              type: actionType,
+              ...action,
+              ...popConfirm,
+              onConfirm: popConfirm?.confirm,
+              onCancel: popConfirm?.cancel,
+            };
+          });
+      });
+
+      function isIfShow(action: ActionItem): boolean {
+        const ifShow = action.ifShow;
+
+        let isIfShow = true;
+
+        if (isBoolean(ifShow)) {
+          isIfShow = ifShow;
+        }
+        if (isFunction(ifShow)) {
+          isIfShow = ifShow(action);
+        }
+        return isIfShow;
+      }
+
+      const getActions = computed(() => {
+        return (toRaw(props.actions) || [])
+          .filter((action) => {
+            return hasPermission(action.auth) && isIfShow(action);
+          })
+          .map((action) => {
+            const { popConfirm } = action;
+            //需要展示什么风格，自己修改一下参数
+            return {
+              size: 'small',
+              text: actionText,
+              type: actionType,
+              ...action,
+              ...(popConfirm || {}),
+              onConfirm: popConfirm?.confirm,
+              onCancel: popConfirm?.cancel,
+              enable: !!popConfirm,
+            };
+          });
+      });
+
+      return {
+        getActions,
+        getDropdownList,
+        getMoreProps,
+      };
+    },
+  });
+</script>

src/components/Table/src/components/editable/CellComponent.ts

@@ -0,0 +1,47 @@
+import type { FunctionalComponent, defineComponent } from 'vue';
+import type { ComponentType } from '../../types/componentType';
+import { componentMap } from '@/components/Table/src/componentMap';
+
+import { h } from 'vue';
+
+import { NPopover } from 'naive-ui';
+
+export interface ComponentProps {
+  component: ComponentType;
+  rule: boolean;
+  popoverVisible: boolean;
+  ruleMessage: string;
+}
+
+export const CellComponent: FunctionalComponent = (
+  { component = 'NInput', rule = true, ruleMessage, popoverVisible }: ComponentProps,
+  { attrs }
+) => {
+  const Comp = componentMap.get(component) as typeof defineComponent;
+
+  const DefaultComp = h(Comp, attrs);
+  if (!rule) {
+    return DefaultComp;
+  }
+  return h(
+    NPopover,
+    { 'display-directive': 'show', show: !!popoverVisible, manual: 'manual' },
+    {
+      trigger: () => DefaultComp,
+      default: () =>
+        h(
+          'span',
+          {
+            style: {
+              color: 'red',
+              width: '90px',
+              display: 'inline-block',
+            },
+          },
+          {
+            default: () => ruleMessage,
+          }
+        ),
+    }
+  );
+};

src/components/Table/src/components/editable/EditableCell.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="editable-cell">
+    <div v-show="!isEdit" class="editable-cell-content" @click="handleEdit">
+      {{ getValues }}
+      <n-icon class="edit-icon" v-if="!column.editRow">
+        <FormOutlined />
+      </n-icon>
+    </div>
+    <div class="flex editable-cell-content" v-show="isEdit" v-click-outside="onClickOutside">
+      <CellComponent
+        v-bind="getComponentProps"
+        :component="getComponent"
+        :style="getWrapperStyle"
+        :popoverVisible="getRuleVisible"
+        :ruleMessage="ruleMessage"
+        :rule="getRule"
+        :class="getWrapperClass"
+        ref="elRef"
+        @options-change="handleOptionsChange"
+        @pressEnter="handleEnter"
+      />
+      <div class="editable-cell-action" v-if="!getRowEditable">
+        <n-icon class="cursor-pointer mx-2">
+          <CheckOutlined @click="handleSubmit" />
+        </n-icon>
+        <n-icon class="cursor-pointer mx-2">
+          <CloseOutlined @click="handleCancel" />
+        </n-icon>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+  import type { CSSProperties, PropType } from 'vue';
+  import type { BasicColumn } from '../../types/table';
+  import type { EditRecordRow } from './index';
+
+  import { defineComponent, ref, unref, nextTick, computed, watchEffect, toRaw } from 'vue';
+  import { FormOutlined, CloseOutlined, CheckOutlined } from '@vicons/antd';
+  import { CellComponent } from './CellComponent';
+
+  import { useTableContext } from '../../hooks/useTableContext';
+
+  import clickOutside from '@/directives/clickOutside';
+
+  import { propTypes } from '@/utils/propTypes';
+  import { isString, isBoolean, isFunction, isNumber, isArray } from '@/utils/is';
+  import { createPlaceholderMessage } from './helper';
+  import { set, omit } from 'lodash-es';
+  import { EventEnum } from '@/components/Table/src/componentMap';
+
+  import { milliseconds } from 'date-fns';
+
+  export default defineComponent({
+    name: 'EditableCell',
+    components: { FormOutlined, CloseOutlined, CheckOutlined, CellComponent },
+    directives: {
+      clickOutside,
+    },
+    props: {
+      value: {
+        type: [String, Number, Boolean, Object] as PropType<string | number | boolean | Recordable>,
+        default: '',
+      },
+      record: {
+        type: Object as PropType<EditRecordRow>,
+      },
+      column: {
+        type: Object as PropType<BasicColumn>,
+        default: () => ({}),
+      },
+      index: propTypes.number,
+    },
+    setup(props) {
+      const table = useTableContext();
+      const isEdit = ref(false);
+      const elRef = ref();
+      const ruleVisible = ref(false);
+      const ruleMessage = ref('');
+      const optionsRef = ref<LabelValueOptions>([]);
+      const currentValueRef = ref<any>(props.value);
+      const defaultValueRef = ref<any>(props.value);
+
+      // const { prefixCls } = useDesign('editable-cell');
+
+      const getComponent = computed(() => props.column?.editComponent || 'NInput');
+      const getRule = computed(() => props.column?.editRule);
+
+      const getRuleVisible = computed(() => {
+        return unref(ruleMessage) && unref(ruleVisible);
+      });
+
+      const getIsCheckComp = computed(() => {
+        const component = unref(getComponent);
+        return ['NCheckbox', 'NSwitch'].includes(component);
+      });
+
+      const getComponentProps = computed(() => {
+        const compProps = props.column?.editComponentProps ?? {};
+        const editComponent = props.column?.editComponent ?? null;
+        const component = unref(getComponent);
+        const apiSelectProps: Recordable = {};
+
+        const isCheckValue = unref(getIsCheckComp);
+
+        const 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));
+        }
+        const onEvent: any = editComponent ? EventEnum[editComponent] : undefined;
+
+        return {
+          placeholder: createPlaceholderMessage(unref(getComponent)),
+          ...apiSelectProps,
+          ...omit(compProps, 'onChange'),
+          [onEvent]: handleChange,
+          [valueField]: value,
+        };
+      });
+
+      const getValues = computed(() => {
+        const { editComponentProps, editValueMap } = props.column;
+
+        const value = unref(currentValueRef);
+
+        if (editValueMap && isFunction(editValueMap)) {
+          return editValueMap(value);
+        }
+
+        const component = unref(getComponent);
+        if (!component.includes('NSelect')) {
+          return value;
+        }
+
+        const options: LabelValueOptions = editComponentProps?.options ?? (unref(optionsRef) || []);
+        const option = options.find((item) => `${item.value}` === `${value}`);
+
+        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}`;
+      });
+
+      const getRowEditable = computed(() => {
+        const { editable } = props.record || {};
+        return !!editable;
+      });
+
+      watchEffect(() => {
+        defaultValueRef.value = props.value;
+      });
+
+      watchEffect(() => {
+        const { editable } = props.column;
+        if (isBoolean(editable) || isBoolean(unref(getRowEditable))) {
+          isEdit.value = !!editable || unref(getRowEditable);
+        }
+      });
+
+      function handleEdit() {
+        if (unref(getRowEditable) || unref(props.column?.editRow)) return;
+        ruleMessage.value = '';
+        isEdit.value = true;
+        nextTick(() => {
+          const el = unref(elRef);
+          el?.focus?.();
+        });
+      }
+
+      async function handleChange(e: any) {
+        const component = unref(getComponent);
+        if (!e) {
+          currentValueRef.value = e;
+        } else if (e?.target && Reflect.has(e.target, 'value')) {
+          currentValueRef.value = (e as ChangeEvent).target.value;
+        } else if (component === 'NCheckbox') {
+          currentValueRef.value = (e as ChangeEvent).target.checked;
+        } else if (isString(e) || isBoolean(e) || isNumber(e)) {
+          currentValueRef.value = e;
+        }
+
+        //TODO 这里组件参数格式，和dayjs格式不一致
+        // if (component === 'NDatePicker') {
+        //   let format = (props.column.editComponentProps?.format)
+        //     .replace(/yyyy/g, 'YYYY')
+        //     .replace(/dd/g, 'DD');
+        //   currentValueRef.value = dayjs(currentValueRef.value).format(format);
+        // }
+
+        const onChange = props.column?.editComponentProps?.onChange;
+        if (onChange && isFunction(onChange)) onChange(...arguments);
+
+        table.emit?.('edit-change', {
+          column: props.column,
+          value: unref(currentValueRef),
+          record: toRaw(props.record),
+        });
+        await handleSubmiRule();
+      }
+
+      async function handleSubmiRule() {
+        const { column, record } = props;
+        const { editRule } = column;
+        const currentValue = unref(currentValueRef);
+
+        if (editRule) {
+          if (isBoolean(editRule) && !currentValue && !isNumber(currentValue)) {
+            ruleVisible.value = true;
+            const component = unref(getComponent);
+            ruleMessage.value = createPlaceholderMessage(component);
+            return false;
+          }
+          if (isFunction(editRule)) {
+            const res = await editRule(currentValue, record as Recordable);
+            if (!!res) {
+              ruleMessage.value = res;
+              ruleVisible.value = true;
+              return false;
+            } else {
+              ruleMessage.value = '';
+              return true;
+            }
+          }
+        }
+        ruleMessage.value = '';
+        return true;
+      }
+
+      async function handleSubmit(needEmit = true, valid = true) {
+        if (valid) {
+          const isPass = await handleSubmiRule();
+          if (!isPass) return false;
+        }
+
+        const { column, index, record } = props;
+        if (!record) return false;
+        const { key } = column;
+        const value = unref(currentValueRef);
+        if (!key) return;
+
+        const dataKey = key as string;
+
+        set(record, dataKey, value);
+        //const record = await table.updateTableData(index, dataKey, value);
+        needEmit && table.emit?.('edit-end', { record, index, key, value });
+        isEdit.value = false;
+      }
+
+      async function handleEnter() {
+        if (props.column?.editRow) {
+          return;
+        }
+        await handleSubmit();
+      }
+
+      function handleCancel() {
+        isEdit.value = false;
+        currentValueRef.value = defaultValueRef.value;
+        const { column, index, record } = props;
+        const { key } = column;
+        ruleVisible.value = true;
+        ruleMessage.value = '';
+        table.emit?.('edit-cancel', {
+          record,
+          index,
+          key: key,
+          value: unref(currentValueRef),
+        });
+      }
+
+      function onClickOutside() {
+        if (props.column?.editable || unref(getRowEditable)) {
+          return;
+        }
+        const component = unref(getComponent);
+
+        if (component.includes('NInput')) {
+          handleCancel();
+        }
+      }
+
+      // only ApiSelect
+      function handleOptionsChange(options: LabelValueOptions) {
+        optionsRef.value = options;
+      }
+
+      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;
+      }
+     };
+    }
+
+    return {
+     isEdit,
+     handleEdit,
+     currentValueRef,
+     handleSubmit,
+     handleChange,
+     handleCancel,
+     elRef,
+     getComponent,
+     getRule,
+     onClickOutside,
+     ruleMessage,
+     getRuleVisible,
+     getComponentProps,
+     handleOptionsChange,
+     getWrapperStyle,
+     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;
+
+  .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>

src/components/Table/src/components/editable/helper.ts

@@ -0,0 +1,15 @@
+import { ComponentType } from '../../types/componentType';
+
+/**
+ * @description: 生成placeholder
+ */
+export function createPlaceholderMessage(component: ComponentType) {
+  if (component === 'NInput') return '请输入';
+  if (
+    ['NPicker', 'NSelect', 'NCheckbox', 'NRadio', 'NSwitch', 'NDatePicker', 'NTimePicker'].includes(
+      component
+    )
+  )
+    return '请选择';
+  return '';
+}

src/components/Table/src/components/editable/index.ts

@@ -0,0 +1,49 @@
+import type { BasicColumn } from '@/components/Table/src/types/table';
+import { h, Ref } from 'vue';
+
+import EditableCell from './EditableCell.vue';
+
+export function renderEditCell(column: BasicColumn) {
+  return (record, index) => {
+    const _key = column.key;
+    const value = record[_key];
+    record.onEdit = async (edit: boolean, submit = false) => {
+      if (!submit) {
+        record.editable = edit;
+      }
+
+      if (!edit && submit) {
+        const res = await record.onSubmitEdit?.();
+        if (res) {
+          record.editable = false;
+          return true;
+        }
+        return false;
+      }
+      // cancel
+      if (!edit && !submit) {
+        record.onCancelEdit?.();
+      }
+      return true;
+    };
+    return h(EditableCell, {
+      value,
+      record,
+      column,
+      index,
+    });
+  };
+}
+
+export type EditRecordRow<T = Recordable> = Partial<
+  {
+    onEdit: (editable: boolean, submit?: boolean) => Promise<boolean>;
+    editable: boolean;
+    onCancel: Fn;
+    onSubmit: Fn;
+    submitCbs: Fn[];
+    cancelCbs: Fn[];
+    validCbs: Fn[];
+    editValueRefs: Recordable<Ref>;
+  } & T
+>;

src/components/Table/src/components/settings/ColumnSetting.vue

@@ -11,18 +11,26 @@
           <template #header>
             <div class="table-toolbar-inner-popover-title">
               <n-space>
-                <n-checkbox v-model:checked="checkAll" @update:checked="onCheckAll">列展示</n-checkbox>
+                <n-checkbox v-model:checked="checkAll" @update:checked="onCheckAll"
-                <n-checkbox v-model:checked="selection" @update:checked="onSelection">勾选列</n-checkbox>
+                  >列展示</n-checkbox
-                <n-button text type="info" size="small" class="mt-1" @click="resetColumns">重置</n-button>
+                >
+                <n-checkbox v-model:checked="selection" @update:checked="onSelection"
+                  >勾选列</n-checkbox
+                >
+                <n-button text type="info" size="small" class="mt-1" @click="resetColumns"
+                  >重置</n-button
+                >
               </n-space>
             </div>
           </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">
-                <template #item="{element, index}">
+                <template #item="{ element }">
-                  <div class="table-toolbar-inner-checkbox"
+                  <div
-                       :class="{'table-toolbar-inner-checkbox-dark':getDarkTheme === true}">
+                    class="table-toolbar-inner-checkbox"
+                    :class="{ 'table-toolbar-inner-checkbox-dark': getDarkTheme === true }"
+                  >
                     <span class="drag-icon">
                       <n-icon size="18">
                         <DragOutlined />
@@ -32,8 +40,12 @@
                     <div class="fixed-item">
                       <n-tooltip trigger="hover" placement="bottom">
                         <template #trigger>
-                          <n-icon size="18" :color="element.fixed === 'left' ? '#2080f0':undefined"
+                          <n-icon
-                                  class="cursor-pointer" @click="fixedColumn(element,'left')">
+                            size="18"
+                            :color="element.fixed === 'left' ? '#2080f0' : undefined"
+                            class="cursor-pointer"
+                            @click="fixedColumn(element, 'left')"
+                          >
                             <VerticalRightOutlined />
                           </n-icon>
                         </template>
@@ -42,8 +54,12 @@
                       <n-divider vertical />
                       <n-tooltip trigger="hover" placement="bottom">
                         <template #trigger>
-                          <n-icon size="18" :color="element.fixed === 'right' ? '#2080f0':undefined"
+                          <n-icon
-                                  class="cursor-pointer" @click="fixedColumn(element,'right')">
+                            size="18"
+                            :color="element.fixed === 'right' ? '#2080f0' : undefined"
+                            class="cursor-pointer"
+                            @click="fixedColumn(element, 'right')"
+                          >
                             <VerticalLeftOutlined />
                           </n-icon>
                         </template>
@@ -63,11 +79,18 @@
 </template>
 
 <script lang="ts">
-import { ref, defineComponent, reactive, unref, toRaw, computed, toRefs, watchEffect } from "vue"
+  import { ref, defineComponent, reactive, unref, toRaw, computed, toRefs, watchEffect } from 'vue';
   import { useTableContext } from '../../hooks/useTableContext';
-import { ReloadOutlined, ColumnHeightOutlined, SettingOutlined, DragOutlined, VerticalRightOutlined, VerticalLeftOutlined } from '@vicons/antd'
+  import { cloneDeep } from 'lodash-es';
-import Draggable from 'vuedraggable/src/vuedraggable'
+  import {
-import { useDesignSetting } from "@/hooks/setting/useDesignSetting";
+    SettingOutlined,
+    DragOutlined,
+    VerticalRightOutlined,
+    VerticalLeftOutlined,
+  } from '@vicons/antd';
+  // @ts-ignore
+  import Draggable from 'vuedraggable/src/vuedraggable';
+  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
 
   interface Options {
     title: string;
@@ -78,12 +101,15 @@ interface Options {
   export default defineComponent({
     name: 'ColumnSetting',
     components: {
-    ReloadOutlined, ColumnHeightOutlined, SettingOutlined, DragOutlined, Draggable,
+      SettingOutlined,
-    VerticalRightOutlined, VerticalLeftOutlined
+      DragOutlined,
+      Draggable,
+      VerticalRightOutlined,
+      VerticalLeftOutlined,
     },
-  setup(props, { emit }) {
+    setup() {
-    const { getDarkTheme } = useDesignSetting()
+      const { getDarkTheme } = useDesignSetting();
-    const table = useTableContext();
+      const table: any = useTableContext();
       const columnsList = ref<Options[]>([]);
       const cacheColumnsList = ref<Options[]>([]);
 
@@ -91,12 +117,12 @@ export default defineComponent({
         selection: false,
         checkAll: true,
         checkList: [],
-      defaultCheckList: []
+        defaultCheckList: [],
-    })
+      });
 
       const getSelection = computed(() => {
-      return state.selection
+        return state.selection;
-    })
+      });
 
       watchEffect(() => {
         const columns = table.getColumns();
@@ -107,96 +133,96 @@ export default defineComponent({
 
       //初始化
       function init() {
-      const columns = getColumns();
+        const columns: any[] = getColumns();
-      const checkList = columns.map(item => item.key)
+        const checkList: any = columns.map((item) => item.key);
-      state.checkList = checkList
+        state.checkList = checkList;
-      state.defaultCheckList = checkList
+        state.defaultCheckList = checkList;
-      columnsList.value = columns
+        const newColumns = columns.filter((item) => item.key != 'action' && item.title != '操作');
-      cacheColumnsList.value = columns
+        if (!columnsList.value.length) {
+          columnsList.value = cloneDeep(newColumns);
+          cacheColumnsList.value = cloneDeep(newColumns);
+        }
       }
 
       //切换
       function onChange(checkList) {
         if (state.selection) {
-        checkList.unshift('selection')
+          checkList.unshift('selection');
         }
-      setColumns(checkList)
+        setColumns(checkList);
       }
 
       //设置
       function setColumns(columns) {
-      table.setColumns(columns)
+        table.setColumns(columns);
       }
 
       //获取
       function getColumns() {
-      let newRet = []
+        let newRet: any[] = [];
-      table.getColumns().forEach(item => {
+        table.getColumns().forEach((item) => {
-        newRet.push({ ...item })
+          newRet.push({ ...item });
-      })
+        });
-      return newRet
+        return newRet;
       }
 
       //重置
       function resetColumns() {
-      state.checkList = [...state.defaultCheckList]
+        state.checkList = [...state.defaultCheckList];
         state.checkAll = true;
-      let cacheColumnsKeys: any[] = table.getCacheColumns()
+        let cacheColumnsKeys: any[] = table.getCacheColumns();
-      let newColumns = cacheColumnsKeys.map(item => {
+        let newColumns = cacheColumnsKeys.map((item) => {
           return {
             ...item,
-          fixed: undefined
+            fixed: undefined,
-        }
+          };
-      })
+        });
         setColumns(newColumns);
-      columnsList.value = newColumns
+        columnsList.value = newColumns;
       }
 
       //全选
       function onCheckAll(e) {
-      let checkList = table.getCacheColumns(true)
+        let checkList = table.getCacheColumns(true);
         if (e) {
           setColumns(checkList);
-        state.checkList = checkList
+          state.checkList = checkList;
         } else {
           setColumns([]);
-        state.checkList = []
+          state.checkList = [];
         }
       }
 
       //拖拽排序
       function draggableEnd() {
-      const newColumns = toRaw(unref(columnsList))
+        const newColumns = toRaw(unref(columnsList));
-      columnsList.value = newColumns
+        columnsList.value = newColumns;
         setColumns(newColumns);
       }
 
       //勾选列
       function onSelection(e) {
-      let checkList = table.getCacheColumns()
+        let checkList = table.getCacheColumns();
         if (e) {
-        checkList.unshift({ type: 'selection', key: 'selection' })
+          checkList.unshift({ type: 'selection', key: 'selection' });
           setColumns(checkList);
         } else {
-        checkList.splice(0, 1)
+          checkList.splice(0, 1);
           setColumns(checkList);
         }
       }
 
       //固定
       function fixedColumn(item, fixed) {
-      console.log('item：', item)
         if (!state.checkList.includes(item.key)) return;
         let columns = getColumns();
-      const isFixed = item.fixed === fixed ? undefined : fixed
+        const isFixed = item.fixed === fixed ? undefined : fixed;
-      let index = columns.findIndex(res => res.key === item.key)
+        let index = columns.findIndex((res) => res.key === item.key);
-      console.log('index：', index)
         if (index !== -1) {
           columns[index].fixed = isFixed;
         }
-      table.setCacheColumnsField(item.key, { fixed: isFixed })
+        table.setCacheColumnsField(item.key, { fixed: isFixed });
-      columnsList.value[index].fixed = isFixed
+        columnsList.value[index].fixed = isFixed;
-      console.log('columnsList：', columnsList.value)
         setColumns(columns);
       }
 
@@ -210,10 +236,10 @@ export default defineComponent({
         resetColumns,
         fixedColumn,
         draggableEnd,
-      getSelection
+        getSelection,
-    }
+      };
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less">
@@ -270,7 +296,7 @@ export default defineComponent({
 
     &-checkbox-dark {
       &:hover {
-      background: hsla(0, 0%, 100%, .08);
+        background: hsla(0, 0%, 100%, 0.08);
       }
     }
   }

src/components/Table/src/const.ts

@@ -1,6 +1,6 @@
-import componentSetting from '@/settings/componentSetting'
+import componentSetting from '@/settings/componentSetting';
 
-const { table } = componentSetting
+const { table } = componentSetting;
 
 const { apiSetting, defaultPageSize, pageSizes } = table;
 
@@ -9,7 +9,3 @@ export const DEFAULTPAGESIZE = defaultPageSize;
 export const APISETTING = apiSetting;
 
 export const PAGESIZES = pageSizes;
-
-
-
-

src/components/Table/src/hooks/useColumns.ts

@@ -1,7 +1,12 @@
-import { ref, Ref, ComputedRef, unref, computed, watch, toRaw } from 'vue';
+import { ref, Ref, ComputedRef, unref, computed, watch, toRaw, h } from 'vue';
 import type { BasicColumn, BasicTableProps } from '../types/table';
 import { isEqual, cloneDeep } from 'lodash-es';
-import { isArray, isString } from '@/utils/is';
+import { isArray, isString, isBoolean, isFunction } from '@/utils/is';
+import { usePermission } from '@/hooks/web/usePermission';
+import { ActionItem } from '@/components/Table';
+import { renderEditCell } from '../components/editable';
+import { NTooltip, NIcon } from 'naive-ui';
+import { FormOutlined } from '@vicons/antd';
 
 export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
   const columnsRef = ref(unref(propsRef).columns) as unknown as Ref<BasicColumn[]>;
@@ -9,14 +14,71 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
 
   const getColumnsRef = computed(() => {
     const columns = cloneDeep(unref(columnsRef));
+
+    handleActionColumn(propsRef, columns);
+    if (!columns) return [];
     return columns;
-    })
+  });
+
+  const { hasPermission } = usePermission();
+
+  function isIfShow(action: ActionItem): boolean {
+    const ifShow = action.ifShow;
+
+    let isIfShow = true;
+
+    if (isBoolean(ifShow)) {
+      isIfShow = ifShow;
+    }
+    if (isFunction(ifShow)) {
+      isIfShow = ifShow(action);
+    }
+    return isIfShow;
+  }
+
+  const renderTooltip = (trigger, content) => {
+    return h(NTooltip, null, {
+      trigger: () => trigger,
+      default: () => content,
+    });
+  };
 
   const getPageColumns = computed(() => {
     const pageColumns = unref(getColumnsRef);
     const columns = cloneDeep(pageColumns);
     return columns
+      .filter((column) => {
+        // @ts-ignore
+        return hasPermission(column.auth) && isIfShow(column);
       })
+      .map((column) => {
+        const { edit } = column;
+        if (edit) {
+          column.render = renderEditCell(column);
+          if (edit) {
+            const title: any = column.title;
+            column.title = () => {
+              return renderTooltip(
+                h('span', {}, [
+                  h('span', { style: { 'margin-right': '5px' } }, title),
+                  h(
+                    NIcon,
+                    {
+                      size: 14,
+                    },
+                    {
+                      default: () => h(FormOutlined),
+                    }
+                  ),
+                ]),
+                '该列可编辑'
+              );
+            };
+          }
+        }
+        return column;
+      });
+  });
 
   watch(
     () => unref(propsRef).columns,
@@ -26,6 +88,14 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
     }
   );
 
+  function handleActionColumn(propsRef: ComputedRef<BasicTableProps>, columns: BasicColumn[]) {
+    const { actionColumn } = unref(propsRef);
+    if (!actionColumn) return;
+    // @ts-ignore
+    columns.push({
+      ...actionColumn,
+    });
+  }
 
   //设置
   function setColumns(columnList: string[]) {
@@ -41,43 +111,41 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
     if (!isString(columns[0])) {
       columnsRef.value = columns;
     } else {
-            const newColumns: any[] = []
+      const newColumns: any[] = [];
-            cacheColumns.forEach(item => {
+      cacheColumns.forEach((item) => {
         if (columnList.includes(item.key)) {
-                    newColumns.push({ ...item })
+          newColumns.push({ ...item });
         }
-            })
+      });
       if (!isEqual(cacheKeys, columns)) {
         newColumns.sort((prev, next) => {
-                    return (
+          return cacheKeys.indexOf(prev.key) - cacheKeys.indexOf(next.key);
-                        cacheKeys.indexOf(prev.key) - cacheKeys.indexOf(next.key)
-                    );
         });
       }
-            columnsRef.value = newColumns
+      columnsRef.value = newColumns;
     }
   }
 
   //获取
   function getColumns() {
-        let columns = toRaw(unref(getColumnsRef));
+    const columns = toRaw(unref(getColumnsRef));
-        return columns.map(item => {
+    return columns.map((item) => {
-            return { ...item, title: item.title, key: item.key, fixed: item.fixed || undefined }
+      return { ...item, title: item.title, key: item.key, fixed: item.fixed || undefined };
-        })
+    });
   }
 
   //获取原始
   function getCacheColumns(isKey?: boolean): any[] {
-        return isKey ? cacheColumns.map(item => item.key) : cacheColumns;
+    return isKey ? cacheColumns.map((item) => item.key) : cacheColumns;
   }
 
   //更新原始数据单个字段
-    function setCacheColumnsField(dataIndex: string | undefined, value: Partial<BasicColumn>) {
+  function setCacheColumnsField(key: string | undefined, value: Partial<BasicColumn>) {
-        if (!dataIndex || !value) {
+    if (!key || !value) {
       return;
     }
     cacheColumns.forEach((item) => {
-            if (item.key === dataIndex) {
+      if (item.key === key) {
         Object.assign(item, value);
         return;
       }
@@ -90,6 +158,6 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
     setCacheColumnsField,
     setColumns,
     getColumns,
-        getPageColumns
+    getPageColumns,
   };
 }

src/components/Table/src/hooks/useDataSource.ts

@@ -6,12 +6,7 @@ import { APISETTING } from '../const';
 
 export function useDataSource(
   propsRef: ComputedRef<BasicTableProps>,
-    {
+  { getPaginationInfo, setPagination, setLoading, tableData },
-        getPaginationInfo,
-        setPagination,
-        setLoading,
-        tableData
-    },
   emit
 ) {
   const dataSourceRef = ref([]);
@@ -33,8 +28,10 @@ export function useDataSource(
 
   const getRowKey = computed(() => {
     const { rowKey }: any = unref(propsRef);
-        return rowKey ? rowKey : () => {
+    return rowKey
-            return 'key'
+      ? rowKey
+      : () => {
+          return 'key';
         };
   });
 
@@ -50,12 +47,11 @@ export function useDataSource(
     try {
       setLoading(true);
       const { request, pagination }: any = unref(propsRef);
-
       //组装分页信息
-            const pageField = APISETTING.pageField
+      const pageField = APISETTING.pageField;
-            const sizeField = APISETTING.sizeField
+      const sizeField = APISETTING.sizeField;
-            const totalField = APISETTING.totalField
+      const totalField = APISETTING.totalField;
-            const listField = APISETTING.listField
+      const listField = APISETTING.listField;
 
       let pageParams = {};
       const { page = 1, pageSize = 10 } = unref(getPaginationInfo) as PaginationProps;
@@ -67,25 +63,24 @@ export function useDataSource(
         pageParams[sizeField] = pageSize;
       }
 
-            let params = {
+      const params = {
         ...pageParams,
-            }
+      };
       const res = await request(params);
 
-            const resultTotal = res[totalField] || 0
+      const resultTotal = res[totalField] || 0;
-            const currentPage = res[pageField]
+      const currentPage = res[pageField];
 
       // 如果数据异常，需获取正确的页码再次执行
       if (resultTotal) {
-                const currentTotalPage = Math.ceil(resultTotal / pageSize);
+        if (page > resultTotal) {
-                if (page > currentTotalPage) {
           setPagination({
-                        [pageField]: currentTotalPage,
+            [pageField]: resultTotal,
           });
           fetch(opt);
         }
       }
-            let resultInfo = res[listField] ? res[listField] : []
+      const resultInfo = res[listField] ? res[listField] : [];
       dataSourceRef.value = resultInfo;
       setPagination({
         [pageField]: currentPage,
@@ -98,10 +93,10 @@ export function useDataSource(
       }
       emit('fetch-success', {
         items: unref(resultInfo),
-                resultTotal
+        resultTotal,
       });
     } catch (error) {
-            console.error(error)
+      console.error(error);
       emit('fetch-error', error);
       dataSourceRef.value = [];
       // setPagination({
@@ -115,7 +110,7 @@ export function useDataSource(
   onMounted(() => {
     setTimeout(() => {
       fetch();
-        }, 16)
+    }, 16);
   });
 
   function setTableData(values) {
@@ -136,6 +131,6 @@ export function useDataSource(
     getDataSourceRef,
     getDataSource,
     setTableData,
-        reload
+    reload,
-    }
+  };
 }

src/components/Table/src/props.ts

@@ -1,7 +1,9 @@
-import type { PropType } from 'vue'
+import type { PropType } from 'vue';
-import { BasicColumn } from './types/table'
+import { propTypes } from '@/utils/propTypes';
-
+import { BasicColumn } from './types/table';
+import { NDataTable } from 'naive-ui';
 export const basicProps = {
+  ...NDataTable.props, // 这里继承原 UI 组件的 props
   title: {
     type: String,
     default: null,
@@ -16,8 +18,7 @@ export const basicProps = {
   },
   tableData: {
     type: [Object],
-        default: () => {
+    default: () => [],
-        },
   },
   columns: {
     type: [Array] as PropType<BasicColumn[]>,
@@ -27,7 +28,7 @@ export const basicProps = {
   request: {
     type: Function as PropType<(...arg: any[]) => Promise<any>>,
     default: null,
-        required: true
+    required: true,
   },
   rowKey: {
     type: [String, Function] as PropType<string | ((record) => string)>,
@@ -35,11 +36,17 @@ export const basicProps = {
   },
   pagination: {
     type: [Object, Boolean],
-        default: () => {
+    default: () => {},
-        }
   },
+  //废弃
   showPagination: {
     type: [String, Boolean],
-        default: 'auto'
+    default: 'auto',
-    }
+  },
-}
+  actionColumn: {
+    type: Object as PropType<BasicColumn>,
+    default: null,
+  },
+  canResize: propTypes.bool.def(true),
+  resizeHeightOffset: propTypes.number.def(0),
+};

src/components/Table/src/types/componentType.ts

@@ -0,0 +1,8 @@
+export type ComponentType =
+  | 'NInput'
+  | 'NInputNumber'
+  | 'NSelect'
+  | 'NCheckbox'
+  | 'NSwitch'
+  | 'NDatePicker'
+  | 'NTimePicker';

src/components/Table/src/types/pagination.ts

@@ -1,11 +1,8 @@
-import Pagination from 'naive-ui/lib/pagination';
-import { VNodeChild } from 'vue';
-
 export interface PaginationProps {
   page?: number;
-    pageCount?: number,
+  pageCount?: number;
-    pageSize?: number,
+  pageSize?: number;
-    pageSizes?: number[],
+  pageSizes?: number[];
-    showSizePicker?: boolean,
+  showSizePicker?: boolean;
-    showQuickJumper?: boolean,
+  showQuickJumper?: boolean;
 }

src/components/Table/src/types/table.ts

@@ -1,22 +1,35 @@
-import type {
+import type { TableBaseColumn } from 'naive-ui/lib/data-table/src/interface';
-    TableBaseColumn,
+import { ComponentType } from './componentType';
-} from 'naive-ui/lib/data-table/src/interface';
-
 export interface BasicColumn extends TableBaseColumn {
-
+  //编辑表格
+  edit?: boolean;
+  editRow?: boolean;
+  editable?: boolean;
+  editComponent?: ComponentType;
+  editComponentProps?: Recordable;
+  editRule?: boolean | ((text: string, record: Recordable) => Promise<string>);
+  editValueMap?: (value: any) => string;
+  onEditRow?: () => void;
+  // 权限编码控制是否显示
+  auth?: string[];
+  // 业务控制是否显示
+  ifShow?: boolean | ((column: BasicColumn) => boolean);
 }
 
 export interface TableActionType {
   reload: (opt) => Promise<void>;
   emit?: any;
-    getColumns: (opt) => BasicColumn[];
+  getColumns: (opt?) => BasicColumn[];
   setColumns: (columns: BasicColumn[] | string[]) => void;
 }
 
-export interface BasicTableProps<T = any> {
+export interface BasicTableProps {
-    title?: string,
+  title?: string;
-    dataSource: Function,
+  dataSource: Function;
-    columns: any[],
+  columns: any[];
-    pagination: object,
+  pagination: object;
-    showPagination: boolean
+  showPagination: boolean;
+  actionColumn: any[];
+  canResize: boolean;
+  resizeHeightOffset: number;
 }

src/components/Table/src/types/tableAction.ts

@@ -0,0 +1,26 @@
+// @ts-ignore
+import { NButton } from 'naive-ui';
+import { RoleEnum } from '@/enums/roleEnum';
+// @ts-ignore
+export interface ActionItem extends NButton.props {
+  onClick?: Fn;
+  label?: string;
+  color?: 'success' | 'error' | 'warning';
+  icon?: string;
+  popConfirm?: PopConfirm;
+  disabled?: boolean;
+  divider?: boolean;
+  // 权限编码控制是否显示
+  auth?: RoleEnum | RoleEnum[] | string | string[];
+  // 业务控制是否显示
+  ifShow?: boolean | ((action: ActionItem) => boolean);
+}
+
+export interface PopConfirm {
+  title: string;
+  okText?: string;
+  cancelText?: string;
+  confirm: Fn;
+  cancel?: Fn;
+  icon?: string;
+}

src/components/Upload/src/BasicUpload.vue

@@ -2,9 +2,13 @@
   <div class="w-full">
     <div class="upload">
       <div class="upload-card">
-
         <!--图片列表-->
-        <div class="upload-card-item" :style="getCSSProperties" v-for="(item,index) in imgList">
+        <div
+          class="upload-card-item"
+          :style="getCSSProperties"
+          v-for="(item, index) in imgList"
+          :key="`img_${index}`"
+        >
           <div class="upload-card-item-info">
             <div class="img-box">
               <img :src="item" />
@@ -21,8 +25,11 @@
         </div>
 
         <!--上传图片-->
-        <div class="upload-card-item upload-card-item-select-picture" :style="getCSSProperties"
+        <div
-             v-if="imgList.length < maxNumber">
+          class="upload-card-item upload-card-item-select-picture"
+          :style="getCSSProperties"
+          v-if="imgList.length < maxNumber"
+        >
           <n-upload
             v-bind="$props"
             :file-list-style="{ display: 'none' }"
@@ -37,7 +44,6 @@
             </div>
           </n-upload>
         </div>
-
       </div>
     </div>
 
@@ -47,7 +53,6 @@
         {{ helpText }}
       </n-alert>
     </n-space>
-
   </div>
 
   <!--预览图片-->
@@ -63,58 +68,54 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, toRefs, reactive, computed } from "vue";
+  import { defineComponent, toRefs, reactive, computed } from 'vue';
-import { EyeOutlined, DeleteOutlined, PlusOutlined } from "@vicons/antd";
+  import { EyeOutlined, DeleteOutlined, PlusOutlined } from '@vicons/antd';
-import { NUpload } from 'naive-ui'
+  import { basicProps } from './props';
-import { basicProps } from "./props";
+  import { useMessage, useDialog } from 'naive-ui';
-import { useMessage, useDialog } from 'naive-ui'
+  import { ResultEnum } from '@/enums/httpEnum';
-import { ResultEnum } from '@/enums/httpEnum'
+  import componentSetting from '@/settings/componentSetting';
-import componentSetting from '@/settings/componentSetting'
+  import { useGlobSetting } from '@/hooks/setting';
-import { useGlobSetting } from '@/hooks/setting'
+  import { isString } from '@/utils/is';
-import { isString } from '@/utils/is'
 
-const globSetting = useGlobSetting()
+  const globSetting = useGlobSetting();
 
   export default defineComponent({
     name: 'BasicUpload',
 
     components: { EyeOutlined, DeleteOutlined, PlusOutlined },
     props: {
-    ...NUpload.props, // 这里继承原 UI 组件的 props
+      ...basicProps,
-    ...basicProps
     },
     emits: ['uploadChange', 'delete'],
     setup(props, { emit }) {
-    const { value, width, height } = props
-
       const getCSSProperties = computed(() => {
         return {
-        width: `${ width }px`,
+          width: `${props.width}px`,
-        height: `${ height }px`,
+          height: `${props.height}px`,
-      }
+        };
-    })
+      });
 
-    const message = useMessage()
+      const message = useMessage();
-    const dialog = useDialog()
+      const dialog = useDialog();
 
       const state = reactive({
         showModal: false,
         previewUrl: '',
         originalImgList: [],
-      imgList: []
+        imgList: [],
-    })
+      });
 
       //赋值默认图片显示
-    if (value.length) {
+      if (props.value.length) {
-      state.imgList = value.map(item => {
+        state.imgList = props.value.map((item) => {
-        return getImgUrl(item)
+          return getImgUrl(item);
-      })
+        });
       }
 
       //预览
       function preview(url: string) {
-      state.showModal = true
+        state.showModal = true;
-      state.previewUrl = url
+        state.previewUrl = url;
       }
 
       //删除
@@ -125,32 +126,29 @@ export default defineComponent({
           positiveText: '确定',
           negativeText: '取消',
           onPositiveClick: () => {
-          state.imgList.splice(index, 1)
+            state.imgList.splice(index, 1);
-          state.originalImgList.splice(index, 1)
+            state.originalImgList.splice(index, 1);
-          emit('uploadChange', state.originalImgList)
+            emit('uploadChange', state.originalImgList);
-          emit('delete', state.originalImgList)
+            emit('delete', state.originalImgList);
           },
-        onNegativeClick: () => {
+          onNegativeClick: () => {},
-
+        });
-        }
-      })
       }
 
       //组装完整图片地址
-    function getImgUrl(url: string) {
+      function getImgUrl(url: string): string {
-      const { imgUrl } = globSetting
+        const { imgUrl } = globSetting;
-      return (/(^http|https:\/\/)/g).test(url) ? url : `${ imgUrl }${ url }`
+        return /(^http|https:\/\/)/g.test(url) ? url : `${imgUrl}${url}`;
       }
 
-
       function checkFileType(fileType: string) {
-      return componentSetting.upload.fileType.includes(fileType)
+        return componentSetting.upload.fileType.includes(fileType);
       }
 
       //上传之前
-    function beforeUpload({ file, fileList }) {
+      function beforeUpload({ file }) {
         const fileInfo = file.file;
-      const { maxSize, accept, maxNumber } = props;
+        const { maxSize, accept } = props;
         const acceptRef = (isString(accept) && accept.split(',')) || [];
 
         // 设置最大值，则判断
@@ -160,29 +158,29 @@ export default defineComponent({
         }
 
         // 设置类型,则判断
-      const fileType = componentSetting.upload.fileType
+        const fileType = componentSetting.upload.fileType;
         if (acceptRef.length > 0 && !checkFileType(fileInfo.type)) {
           message.error(`只能上传文件类型为${fileType.join(',')}`);
           return false;
         }
 
-      return true
+        return true;
       }
 
       //上传结束
       function finish({ event: Event }) {
         const res = eval('(' + Event.target.response + ')');
-      const infoField = componentSetting.upload.apiSetting.infoField
+        const infoField = componentSetting.upload.apiSetting.infoField;
-      const { code } = res
+        const { code } = res;
-      const message = (res.msg || res.message) || '上传失败'
+        const message = res.msg || res.message || '上传失败';
-      const result = res[infoField]
+        const result = res[infoField];
         //成功
         if (code === ResultEnum.SUCCESS) {
-        let imgUrl: string = getImgUrl(result.photo)
+          let imgUrl = getImgUrl(result.photo);
-        state.imgList.push(imgUrl)
+          state.imgList.push(imgUrl);
-        state.originalImgList.push(result.photo)
+          state.originalImgList.push(result.photo);
-        emit('uploadChange', state.originalImgList)
+          emit('uploadChange', state.originalImgList);
-      } else message.error(message)
+        } else message.error(message);
       }
 
       return {
@@ -191,14 +189,13 @@ export default defineComponent({
         preview,
         remove,
         beforeUpload,
-      getCSSProperties
+        getCSSProperties,
-    }
+      };
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less">
-
   .upload {
     width: 100%;
     overflow: hidden;
@@ -223,9 +220,12 @@ export default defineComponent({
 
         &:hover {
           background: 0 0;
+          .upload-card-item-info::before {
+            opacity: 1;
+          }
 
           &-info::before {
-          opacity: 1
+            opacity: 1;
           }
         }
 
@@ -246,9 +246,9 @@ export default defineComponent({
             z-index: 1;
             width: 100%;
             height: 100%;
-          background-color: rgba(0, 0, 0, .5);
+            background-color: rgba(0, 0, 0, 0.5);
             opacity: 0;
-          transition: all .3s;
+            transition: all 0.3s;
             content: ' ';
           }
 
@@ -267,7 +267,7 @@ export default defineComponent({
             white-space: nowrap;
             transform: translate(-50%, -50%);
             opacity: 0;
-          transition: all .3s;
+            transition: all 0.3s;
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -277,16 +277,15 @@ export default defineComponent({
             }
 
             .action-icon {
-            color: rgba(255, 255, 255, .85);
+              color: rgba(255, 255, 255, 0.85);
 
               &:hover {
                 cursor: pointer;
-              color: #fff
+                color: #fff;
               }
             }
           }
         }
-
       }
 
       &-item-select-picture {
@@ -300,14 +299,6 @@ export default defineComponent({
           color: #666;
         }
       }
-
-    &-item:hover {
-      background: 0 0;
-
-      .upload-card-item-info::before {
-        opacity: 1
-      }
-    }
     }
   }
 </style>

src/components/Upload/src/props.ts

@@ -1,5 +1,5 @@
-import type { PropType } from 'vue'
+import type { PropType } from 'vue';
-import { NUpload } from 'naive-ui'
+import { NUpload } from 'naive-ui';
 
 export const basicProps = {
   ...NUpload.props,
@@ -13,22 +13,22 @@ export const basicProps = {
   },
   maxSize: {
     type: Number as PropType<number>,
-        default: 2
+    default: 2,
   },
   maxNumber: {
     type: Number as PropType<number>,
-        default: Infinity
+    default: Infinity,
   },
   value: {
     type: Array as PropType<string[]>,
-        default: () => []
+    default: () => [],
   },
   width: {
     type: Number as PropType<number>,
-        default: 104
+    default: 104,
   },
   height: {
     type: Number as PropType<number>,
-        default: 104 //建议不小于这个尺寸 太小页面可能显示有异常
+    default: 104, //建议不小于这个尺寸 太小页面可能显示有异常
   },
-}
+};

src/components/Upload/src/type/index.ts

@@ -1,7 +1,7 @@
-export interface BasicProps<T = any> {
+export interface BasicProps {
-    title?: string,
+  title?: string;
-    dataSource: Function,
+  dataSource: Function;
-    columns: any[],
+  columns: any[];
-    pagination: object,
+  pagination: object;
-    showPagination: boolean
+  showPagination: boolean;
 }

src/directives/clickOutside.ts

@@ -0,0 +1,86 @@
+import { on } from '@/utils/domUtils';
+import { isServer } from '@/utils/is';
+import type { ComponentPublicInstance, DirectiveBinding, ObjectDirective } from 'vue';
+
+type DocumentHandler = <T extends MouseEvent>(mouseup: T, mousedown: T) => void;
+
+type FlushList = Map<
+  HTMLElement,
+  {
+    documentHandler: DocumentHandler;
+    bindingFn: (...args: unknown[]) => unknown;
+  }
+>;
+
+const nodeList: FlushList = new Map();
+
+let startClick: MouseEvent;
+
+if (!isServer) {
+  on(document, 'mousedown', (e: MouseEvent) => (startClick = e));
+  on(document, 'mouseup', (e: MouseEvent) => {
+    for (const { documentHandler } of nodeList.values()) {
+      documentHandler(e, startClick);
+    }
+  });
+}
+
+function createDocumentHandler(el: HTMLElement, binding: DirectiveBinding): DocumentHandler {
+  let excludes: HTMLElement[] = [];
+  if (Array.isArray(binding.arg)) {
+    excludes = binding.arg;
+  } else {
+    // due to current implementation on binding type is wrong the type casting is necessary here
+    excludes.push(binding.arg as unknown as HTMLElement);
+  }
+  return function (mouseup, mousedown) {
+    const popperRef = (
+      binding.instance as ComponentPublicInstance<{
+        popperRef: Nullable<HTMLElement>;
+      }>
+    ).popperRef;
+    const mouseUpTarget = mouseup.target as Node;
+    const mouseDownTarget = mousedown.target as Node;
+    const isBound = !binding || !binding.instance;
+    const isTargetExists = !mouseUpTarget || !mouseDownTarget;
+    const isContainedByEl = el.contains(mouseUpTarget) || el.contains(mouseDownTarget);
+    const isSelf = el === mouseUpTarget;
+
+    const isTargetExcluded =
+      (excludes.length && excludes.some((item) => item?.contains(mouseUpTarget))) ||
+      (excludes.length && excludes.includes(mouseDownTarget as HTMLElement));
+    const isContainedByPopper =
+      popperRef && (popperRef.contains(mouseUpTarget) || popperRef.contains(mouseDownTarget));
+    if (
+      isBound ||
+      isTargetExists ||
+      isContainedByEl ||
+      isSelf ||
+      isTargetExcluded ||
+      isContainedByPopper
+    ) {
+      return;
+    }
+    binding.value();
+  };
+}
+
+const ClickOutside: ObjectDirective = {
+  beforeMount(el, binding) {
+    nodeList.set(el, {
+      documentHandler: createDocumentHandler(el, binding),
+      bindingFn: binding.value,
+    });
+  },
+  updated(el, binding) {
+    nodeList.set(el, {
+      documentHandler: createDocumentHandler(el, binding),
+      bindingFn: binding.value,
+    });
+  },
+  unmounted(el) {
+    nodeList.delete(el);
+  },
+};
+
+export default ClickOutside;

src/directives/permission.ts

@@ -1,19 +1,19 @@
-import { ObjectDirective } from 'vue'
+import { ObjectDirective } from 'vue';
-import { usePermission } from "@/hooks/web/usePermission";
+import { usePermission } from '@/hooks/web/usePermission';
 
 export const permission: ObjectDirective = {
-    mounted(el: HTMLButtonElement, binding, vnode) {
+  mounted(el: HTMLButtonElement, binding) {
-        if (binding.value == undefined) return
+    if (binding.value == undefined) return;
-        const { action, effect } = binding.value
+    const { action, effect } = binding.value;
-        const { hasPermission } = usePermission()
+    const { hasPermission } = usePermission();
     if (!hasPermission(action)) {
       if (effect == 'disabled') {
-                el.disabled = true
+        el.disabled = true;
-                el.style["disabled"] = 'disabled'
+        el.style['disabled'] = 'disabled';
-                el.classList.add("n-button--disabled")
+        el.classList.add('n-button--disabled');
       } else {
-                el.remove()
+        el.remove();
-            }
-        }
       }
     }
+  },
+};

src/enums/cacheEnum.ts

@@ -1,20 +1,20 @@
 // token key
-export const TOKEN_KEY = 'TOKEN'
+export const TOKEN_KEY = 'TOKEN';
 
 // user info key
-export const USER_INFO_KEY = 'USER__INFO__'
+export const USER_INFO_KEY = 'USER__INFO__';
 
 // role info key
-export const ROLES_KEY = 'ROLES__KEY__'
+export const ROLES_KEY = 'ROLES__KEY__';
 
 // project config key
-export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__'
+export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__';
 
 // lock info
-export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__'
+export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__';
 
 // base global local key
-export const BASE_LOCAL_CACHE_KEY = 'LOCAL__CACHE__KEY__'
+export const BASE_LOCAL_CACHE_KEY = 'LOCAL__CACHE__KEY__';
 
 // base global session key
-export const BASE_SESSION_CACHE_KEY = 'SESSION__CACHE__KEY__'
+export const BASE_SESSION_CACHE_KEY = 'SESSION__CACHE__KEY__';

src/enums/httpEnum.ts

@@ -5,7 +5,7 @@ export enum ResultEnum {
   SUCCESS = 200,
   ERROR = -1,
   TIMEOUT = 10042,
-    TYPE = 'success'
+  TYPE = 'success',
 }
 
 /**
@@ -16,7 +16,7 @@ export enum RequestEnum {
   POST = 'POST',
   PATCH = 'PATCH',
   PUT = 'PUT',
-    DELETE = 'DELETE'
+  DELETE = 'DELETE',
 }
 
 /**
@@ -30,5 +30,5 @@ export enum ContentTypeEnum {
   // form-data 一般配合qs
   FORM_URLENCODED = 'application/x-www-form-urlencoded;charset=UTF-8',
   // form-data  上传
-    FORM_DATA = 'multipart/form-data;charset=UTF-8'
+  FORM_DATA = 'multipart/form-data;charset=UTF-8',
 }

src/enums/pageEnum.ts

@@ -7,6 +7,8 @@ export enum PageEnum {
   REDIRECT_NAME = 'Redirect',
   // 首页
   BASE_HOME = '/dashboard',
+  //首页跳转默认路由
+  BASE_HOME_REDIRECT = '/dashboard/console',
   // 错误
   ERROR_PAGE_NAME = 'ErrorPage',
 }

src/enums/roleEnum.ts

@@ -3,5 +3,5 @@ export enum RoleEnum {
   ADMIN = 'admin',
 
   // 普通用户
-    NORMAL = 'normal'
+  NORMAL = 'normal',
 }

src/hooks/event/useWindowSizeFn.ts

@@ -0,0 +1,36 @@
+import { tryOnMounted, tryOnUnmounted } from '@vueuse/core';
+import { useDebounceFn } from '@vueuse/core';
+
+interface WindowSizeOptions {
+  once?: boolean;
+  immediate?: boolean;
+  listenerOptions?: AddEventListenerOptions | boolean;
+}
+
+export function useWindowSizeFn<T>(fn: Fn<T>, wait = 150, options?: WindowSizeOptions) {
+  let handler = () => {
+    fn();
+  };
+  const handleSize = useDebounceFn(handler, wait);
+  handler = handleSize;
+
+  const start = () => {
+    if (options && options.immediate) {
+      handler();
+    }
+    window.addEventListener('resize', handler);
+  };
+
+  const stop = () => {
+    window.removeEventListener('resize', handler);
+  };
+
+  tryOnMounted(() => {
+    start();
+  });
+
+  tryOnUnmounted(() => {
+    stop();
+  });
+  return [start, stop];
+}

src/hooks/index.ts

@@ -1,3 +1,3 @@
-import { useAsync } from './use-async'
+import { useAsync } from './use-async';
 
-export { useAsync }
+export { useAsync };

src/hooks/setting/index.ts

@@ -11,7 +11,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_PROD_MOCK,
-        VITE_GLOB_IMG_URL
+    VITE_GLOB_IMG_URL,
   } = getAppEnvConfig();
 
   if (!/[a-zA-Z\_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -28,8 +28,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     urlPrefix: VITE_GLOB_API_URL_PREFIX,
     uploadUrl: VITE_GLOB_UPLOAD_URL,
     prodMock: VITE_GLOB_PROD_MOCK,
-        imgUrl: VITE_GLOB_IMG_URL
+    imgUrl: VITE_GLOB_IMG_URL,
-
   };
   return glob as Readonly<GlobConfig>;
 };

src/hooks/setting/useDesignSetting.ts

@@ -13,7 +13,6 @@ export function useDesignSetting() {
   return {
     getDarkTheme,
     getAppTheme,
-        getAppThemeList
+    getAppThemeList,
-    }
+  };
-
 }

src/hooks/setting/useProjectSetting.ts

@@ -2,7 +2,6 @@ import { computed } from 'vue';
 import { useProjectSettingStore } from '@/store/modules/projectSetting';
 
 export function useProjectSetting() {
-
   const projectStore = useProjectSettingStore();
 
   const getNavMode = computed(() => projectStore.navMode);
@@ -29,6 +28,6 @@ export function useProjectSetting() {
     getMenuSetting,
     getCrumbsSetting,
     getPermissionMode,
-        getShowFooter
+    getShowFooter,
-    }
+  };
 }

src/hooks/use-async.ts

@@ -1,15 +1,15 @@
-import { Ref, isReactive, isRef } from 'vue'
+import { isReactive, isRef } from 'vue';
 
 function setLoading(loading, val) {
   if (loading != undefined && isRef(loading)) {
-        loading.value = val
+    loading.value = val;
   } else if (loading != undefined && isReactive(loading)) {
-        loading.loading = val
+    loading.loading = val;
   }
 }
 
 export const useAsync = async (func: Promise<any>, loading: any): Promise<any> => {
-    setLoading(loading, true)
+  setLoading(loading, true);
 
-    return await func.finally(() => setLoading(loading, false))
+  return await func.finally(() => setLoading(loading, false));
-}
+};

src/hooks/useBattery.ts

@@ -1,11 +1,11 @@
-import { computed, onMounted, reactive, toRefs } from 'vue'
+import { computed, onMounted, reactive, toRefs } from 'vue';
 
 interface Battery {
-    charging: boolean // 当前电池是否正在充电
+  charging: boolean; // 当前电池是否正在充电
-    chargingTime: number // 距离充电完毕还需多少秒，如果为0则充电完毕
+  chargingTime: number; // 距离充电完毕还需多少秒，如果为0则充电完毕
-    dischargingTime: number // 代表距离电池耗电至空且挂起需要多少秒
+  dischargingTime: number; // 代表距离电池耗电至空且挂起需要多少秒
-    level: number // 代表电量的放大等级，这个值在 0.0 至 1.0 之间
+  level: number; // 代表电量的放大等级，这个值在 0.0 至 1.0 之间
-    [key: string]: any
+  [key: string]: any;
 }
 
 export const useBattery = () => {
@@ -14,56 +14,64 @@ export const useBattery = () => {
       charging: false,
       chargingTime: 0,
       dischargingTime: 0,
-            level: 100
+      level: 100,
-        }
+    },
-    })
+  });
 
   // 更新电池使用状态
   const updateBattery = (target) => {
     for (const key in state.battery) {
-            state.battery[key] = target[key]
+      state.battery[key] = target[key];
-        }
-        state.battery.level = state.battery.level * 100
     }
+    state.battery.level = state.battery.level * 100;
+  };
 
   // 计算电池剩余可用时间
   const calcDischargingTime = computed(() => {
-        const hour = state.battery.dischargingTime / 3600
+    const hour = state.battery.dischargingTime / 3600;
-        const minute = (state.battery.dischargingTime / 60) % 60
+    const minute = (state.battery.dischargingTime / 60) % 60;
-        return `${ ~~hour }小时${ ~~minute }分钟`
+    return `${~~hour}小时${~~minute}分钟`;
-    })
+  });
+
+  // 计算电池充满剩余时间
+  const calcChargingTime = computed(() => {
+    console.log(state.battery);
+    const hour = state.battery.chargingTime / 3600;
+    const minute = (state.battery.chargingTime / 60) % 60;
+    return `${~~hour}小时${~~minute}分钟`;
+  });
 
   // 电池状态
   const batteryStatus = computed(() => {
     if (state.battery.charging && state.battery.level >= 100) {
-            return '已充满'
+      return '已充满';
     } else if (state.battery.charging) {
-            return '充电中'
+      return '充电中';
     } else {
-            return '已断开电源'
+      return '已断开电源';
     }
-    })
+  });
 
   onMounted(async () => {
-        const BatteryManager: Battery = await (window.navigator as any).getBattery()
+    const BatteryManager: Battery = await (window.navigator as any).getBattery();
-        updateBattery(BatteryManager)
+    updateBattery(BatteryManager);
 
     // 电池充电状态更新时被调用
     BatteryManager.onchargingchange = ({ target }) => {
-            updateBattery(target)
+      updateBattery(target);
-        }
+    };
     // 电池充电时间更新时被调用
     BatteryManager.onchargingtimechange = ({ target }) => {
-            updateBattery(target)
+      updateBattery(target);
-        }
+    };
     // 电池断开充电时间更新时被调用
     BatteryManager.ondischargingtimechange = ({ target }) => {
-            updateBattery(target)
+      updateBattery(target);
-        }
+    };
     // 电池电量更新时被调用
     BatteryManager.onlevelchange = ({ target }) => {
-            updateBattery(target)
+      updateBattery(target);
-        }
+    };
 
     // new Intl.DateTimeFormat('zh', {
     //   year: 'numeric',
@@ -74,11 +82,12 @@ export const useBattery = () => {
     //   second: '2-digit',
     //   hour12: false
     // }).format(new Date())
-    })
+  });
 
   return {
     ...toRefs(state),
     batteryStatus,
-        calcDischargingTime
+    calcDischargingTime,
-    }
+    calcChargingTime,
-}
+  };
+};

src/hooks/useDomWidth.ts

@@ -1,23 +1,23 @@
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue';
-import { debounce } from 'lodash'
+import { debounce } from 'lodash';
 
 /**
  * description: 获取页面宽度
  */
 
 export function useDomWidth() {
-    const domWidth = ref(window.innerWidth)
+  const domWidth = ref(window.innerWidth);
 
   function resize() {
-        domWidth.value = document.body.clientWidth
+    domWidth.value = document.body.clientWidth;
   }
 
   onMounted(() => {
-        window.addEventListener('resize', debounce(resize, 80))
+    window.addEventListener('resize', debounce(resize, 80));
-    })
+  });
   onUnmounted(() => {
-        window.removeEventListener('resize', resize)
+    window.removeEventListener('resize', resize);
-    })
+  });
 
-    return domWidth
+  return domWidth;
 }

src/hooks/useOnline.ts

@@ -1,30 +1,30 @@
-import { ref, onMounted, onUnmounted, watch } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue';
 
 /**
  * @description 用户网络是否可用
  * */
 export function useOnline() {
-    const online = ref(true)
+  const online = ref(true);
 
   const showStatus = (val) => {
-        online.value = typeof val == 'boolean' ? val : val.target.online
+    online.value = typeof val == 'boolean' ? val : val.target.online;
-    }
+  };
 
   // 在页面加载后，设置正确的网络状态
-    navigator.onLine ? showStatus(true) : showStatus(false)
+  navigator.onLine ? showStatus(true) : showStatus(false);
 
   onMounted(() => {
     // 开始监听网络状态的变化
-        window.addEventListener('online', showStatus)
+    window.addEventListener('online', showStatus);
 
-        window.addEventListener('offline', showStatus)
+    window.addEventListener('offline', showStatus);
-    })
+  });
   onUnmounted(() => {
     // 移除监听网络状态的变化
-        window.removeEventListener('online', showStatus)
+    window.removeEventListener('online', showStatus);
 
-        window.removeEventListener('offline', showStatus)
+    window.removeEventListener('offline', showStatus);
-    })
+  });
 
-    return { online }
+  return { online };
 }

src/hooks/useTime.ts

@@ -1,33 +1,33 @@
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue';
 
 /**
  * @description 获取本地时间
  */
 export function useTime() {
-    let timer // 定时器
+  let timer; // 定时器
-    const year = ref(0) // 年份
+  const year = ref(0); // 年份
-    const month = ref(0) // 月份
+  const month = ref(0); // 月份
-    const week = ref('') // 星期几
+  const week = ref(''); // 星期几
-    const day = ref(0) // 天数
+  const day = ref(0); // 天数
-    const hour = ref<number | string>(0) // 小时
+  const hour = ref<number | string>(0); // 小时
-    const minute = ref<number | string>(0) // 分钟
+  const minute = ref<number | string>(0); // 分钟
-    const second = ref(0) // 秒
+  const second = ref(0); // 秒
 
   // 更新时间
   const updateTime = () => {
-        const date = new Date()
+    const date = new Date();
-        year.value = date.getFullYear()
+    year.value = date.getFullYear();
-        month.value = date.getMonth() + 1
+    month.value = date.getMonth() + 1;
-        week.value = '日一二三四五六'.charAt(date.getDay())
+    week.value = '日一二三四五六'.charAt(date.getDay());
-        day.value = date.getDate()
+    day.value = date.getDate();
     hour.value =
       (date.getHours() + '')?.padStart(2, '0') ||
-            new Intl.NumberFormat(undefined, { minimumIntegerDigits: 2 }).format(date.getHours())
+      new Intl.NumberFormat(undefined, { minimumIntegerDigits: 2 }).format(date.getHours());
     minute.value =
       (date.getMinutes() + '')?.padStart(2, '0') ||
-            new Intl.NumberFormat(undefined, { minimumIntegerDigits: 2 }).format(date.getMinutes())
+      new Intl.NumberFormat(undefined, { minimumIntegerDigits: 2 }).format(date.getMinutes());
-        second.value = date.getSeconds()
+    second.value = date.getSeconds();
-    }
+  };
 
   // 原生时间格式化
   // new Intl.DateTimeFormat('zh', {
@@ -40,16 +40,16 @@ export function useTime() {
   //     hour12: false
   // }).format(new Date())
 
-    updateTime()
+  updateTime();
 
   onMounted(() => {
-        clearInterval(timer)
+    clearInterval(timer);
-        timer = setInterval(() => updateTime(), 1000)
+    timer = setInterval(() => updateTime(), 1000);
-    })
+  });
 
   onUnmounted(() => {
-        clearInterval(timer)
+    clearInterval(timer);
-    })
+  });
 
-    return { month, day, hour, minute, second, week }
+  return { month, day, hour, minute, second, week };
 }

src/hooks/web/useECharts.ts

@@ -12,18 +12,16 @@ import echarts from '@/utils/lib/echarts';
 
 // import { useRootSetting } from '@/hooks/setting/useRootSetting';
 
-
 export function useECharts(
   elRef: Ref<HTMLDivElement>,
   theme: 'light' | 'dark' | 'default' = 'light'
 ) {
   // const { getDarkMode } = useRootSetting();
-    const getDarkMode = 'light'
+  const getDarkMode = 'light';
   let chartInstance: echarts.ECharts | null = null;
   let resizeFn: Fn = resize;
   const cacheOptions = ref<EChartsOption>({});
-    let removeResizeFn: Fn = () => {
+  let removeResizeFn: Fn = () => {};
-    };
 
   resizeFn = useDebounceFn(resize, 200);
 

src/hooks/web/usePermission.ts

@@ -1,4 +1,4 @@
-import { useUserStore } from '@/store/modules/user'
+import { useUserStore } from '@/store/modules/user';
 
 export function usePermission() {
   const userStore = useUserStore();
@@ -8,10 +8,10 @@ export function usePermission() {
    * @param accesses
    */
   function _someRoles(accesses: string[]) {
-        return userStore.getRoles.some(item => {
+    return userStore.getRoles.some((item) => {
-            const { value }: any = item
+      const { value }: any = item;
-            return accesses.includes(value)
+      return accesses.includes(value);
-        })
+    });
   }
 
   /**
@@ -19,8 +19,8 @@ export function usePermission() {
    * 可用于 v-if 显示逻辑
    * */
   function hasPermission(accesses: string[]): boolean {
-        if (!accesses.length) return true
+    if (!accesses || !accesses.length) return true;
-        return _someRoles(accesses)
+    return _someRoles(accesses);
   }
 
   /**
@@ -28,11 +28,11 @@ export function usePermission() {
    * @param accesses
    */
   function hasEveryPermission(accesses: string[]): boolean {
-        const rolesList = userStore.getRoles
+    const rolesList = userStore.getRoles;
     if (Array.isArray(accesses)) {
-            return accesses.every((access) => !!rolesList[access])
+      return accesses.every((access) => !!rolesList[access]);
     }
-        throw new Error(`[hasEveryPermission]: ${ accesses } should be a array !`)
+    throw new Error(`[hasEveryPermission]: ${accesses} should be a array !`);
   }
 
   /**
@@ -41,11 +41,11 @@ export function usePermission() {
    * @param accessMap
    */
   function hasSomePermission(accesses: string[]): boolean {
-        const rolesList = userStore.getRoles
+    const rolesList = userStore.getRoles;
     if (Array.isArray(accesses)) {
-            return accesses.some((access) => !!rolesList[access])
+      return accesses.some((access) => !!rolesList[access]);
     }
-        throw new Error(`[hasSomePermission]: ${ accesses } should be a array !`)
+    throw new Error(`[hasSomePermission]: ${accesses} should be a array !`);
   }
 
   return { hasPermission, hasEveryPermission, hasSomePermission };

src/layout/components/Footer/index.ts

@@ -1,3 +1,3 @@
-import PageFooter from './index.vue'
+import PageFooter from './index.vue';
 
-export { PageFooter }
+export { PageFooter };

src/layout/components/Footer/index.vue

@@ -1,48 +1,37 @@
 <template>
   <div class="page-footer">
     <div class="page-footer-link">
-      <a href="https://github.com/jekip/naive-ui-admin" target="_blank">
+      <a href="https://github.com/jekip/naive-ui-admin" target="_blank"> 官网 </a>
-        官网
+      <a href="https://github.com/jekip/naive-ui-admin" target="_blank"> 社区 </a>
-      </a>
+      <a href="https://github.com/jekip/naive-ui-admin/issues" target="_blank"> 交流 </a>
-      <a href="https://github.com/jekip/naive-ui-admin" target="_blank">
-        社区
-      </a>
-      <a href="https://github.com/jekip/naive-ui-admin/issues" target="_blank">
-        交流
-      </a>
     </div>
-    <div class="copyright">
+    <div class="copyright"> naive-ui-admin 1.4 · Made by Ah jung </div>
-      naive-ui-admin 1.3 · Made by Ah jung
   </div>
-  </div>
-
 </template>
 
 <script>
-import { GithubOutlined, CopyrightOutlined } from '@vicons/antd'
-
   export default {
     name: 'PageFooter',
-  components: { GithubOutlined, CopyrightOutlined },
+    components: {},
     props: {
       collapsed: {
-      type: Boolean
+        type: Boolean,
-    }
+      },
-  }
+    },
-}
+  };
 </script>
 
 <style lang="less" scoped>
   .page-footer {
-  margin: 48px 0 24px 0;
+    //margin: 28px 0 24px 0;
     padding: 0 16px;
     text-align: center;
 
     a {
       font-size: 14px;
       color: #808695;
-    -webkit-transition: all .2s ease-in-out;
+      -webkit-transition: all 0.2s ease-in-out;
-    transition: all .2s ease-in-out;
+      transition: all 0.2s ease-in-out;
 
       &:hover {
         color: #515a6e;

src/layout/components/Header/ProjectSetting.vue

@@ -7,17 +7,28 @@
         <div class="drawer-setting-item justify-center dark-switch">
           <n-tooltip placement="bottom">
             <template #trigger>
-              <n-switch v-model:value="designStore.darkTheme"/>
+              <n-switch v-model:value="designStore.darkTheme" class="dark-theme-switch">
+                <template #checked>
+                  <n-icon size="14" color="#ffd93b">
+                    <SunnySharp />
+                  </n-icon>
+                </template>
+                <template #unchecked>
+                  <n-icon size="14" color="#ffd93b">
+                    <Moon />
+                  </n-icon>
+                </template>
+              </n-switch>
             </template>
             <span>深色主题</span>
           </n-tooltip>
-
         </div>
 
         <n-divider title-placement="center">系统主题</n-divider>
 
         <div class="drawer-setting-item align-items-top">
-          <span class="theme-item"
+          <span
+            class="theme-item"
             v-for="(item, index) in appThemeList"
             :key="index"
             :style="{ 'background-color': item }"
@@ -35,7 +46,11 @@
           <div class="drawer-setting-item-style align-items-top">
             <n-tooltip placement="top">
               <template #trigger>
-                <img src="~@/assets/images/nav-theme-dark.svg" @click="togNavMode('vertical')"/>
+                <img
+                  src="~@/assets/images/nav-theme-dark.svg"
+                  @click="togNavMode('vertical')"
+                  alt="左侧菜单模式"
+                />
               </template>
               <span>左侧菜单模式</span>
             </n-tooltip>
@@ -45,14 +60,31 @@
           <div class="drawer-setting-item-style">
             <n-tooltip placement="top">
               <template #trigger>
-                <img src="~@/assets/images/nav-horizontal.svg" @click="togNavMode('horizontal')"/>
+                <img
+                  src="~@/assets/images/nav-horizontal.svg"
+                  alt="顶部菜单模式"
+                  @click="togNavMode('horizontal')"
+                />
               </template>
               <span>顶部菜单模式</span>
             </n-tooltip>
             <n-badge dot color="#19be6b" v-show="settingStore.navMode === 'horizontal'" />
           </div>
-        </div>
 
+          <div class="drawer-setting-item-style">
+            <n-tooltip placement="top">
+              <template #trigger>
+                <img
+                  src="~@/assets/images/nav-horizontal-mix.svg"
+                  @click="togNavMode('horizontal-mix')"
+                  alt="顶部菜单混合模式"
+                />
+              </template>
+              <span>顶部菜单混合模式</span>
+            </n-tooltip>
+            <n-badge dot color="#19be6b" v-show="settingStore.navMode === 'horizontal-mix'" />
+          </div>
+        </div>
 
         <n-divider title-placement="center">导航栏风格</n-divider>
 
@@ -60,7 +92,11 @@
           <div class="drawer-setting-item-style align-items-top">
             <n-tooltip placement="top">
               <template #trigger>
-                <img src="~@/assets/images/nav-theme-dark.svg" @click="togNavTheme('dark')"/>
+                <img
+                  src="~@/assets/images/nav-theme-dark.svg"
+                  alt="暗色侧边栏"
+                  @click="togNavTheme('dark')"
+                />
               </template>
               <span>暗色侧边栏</span>
             </n-tooltip>
@@ -70,7 +106,11 @@
           <div class="drawer-setting-item-style">
             <n-tooltip placement="top">
               <template #trigger>
-                <img src="~@/assets/images/nav-theme-light.svg" @click="togNavTheme('light')"/>
+                <img
+                  src="~@/assets/images/nav-theme-light.svg"
+                  alt="白色侧边栏"
+                  @click="togNavTheme('light')"
+                />
               </template>
               <span>白色侧边栏</span>
             </n-tooltip>
@@ -82,7 +122,11 @@
           <div class="drawer-setting-item-style">
             <n-tooltip placement="top">
               <template #trigger>
-                <img src="~@/assets/images/header-theme-dark.svg" @click="togNavTheme('header-dark')"/>
+                <img
+                  src="~@/assets/images/header-theme-dark.svg"
+                  @click="togNavTheme('header-dark')"
+                  alt="暗色顶栏"
+                />
               </template>
               <span>暗色顶栏</span>
             </n-tooltip>
@@ -93,9 +137,17 @@
         <n-divider title-placement="center">界面功能</n-divider>
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 分割菜单 </div>
-            固定顶栏
+          <div class="drawer-setting-item-action">
+            <n-switch
+              :disabled="settingStore.navMode === 'horizontal-mix' ? false : true"
+              v-model:value="settingStore.menuSetting.mixMenu"
+            />
           </div>
+        </div>
+
+        <div class="drawer-setting-item">
+          <div class="drawer-setting-item-title"> 固定顶栏 </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.headerSetting.fixed" />
           </div>
@@ -111,9 +163,7 @@
         <!--        </div>-->
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 固定多页签 </div>
-            固定多页签
-          </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.multiTabsSetting.fixed" />
           </div>
@@ -122,128 +172,117 @@
         <n-divider title-placement="center">界面显示</n-divider>
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 显示重载页面按钮 </div>
-            显示重载页面按钮
-          </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.headerSetting.isReload" />
           </div>
         </div>
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 显示面包屑导航 </div>
-            显示面包屑导航
-          </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.crumbsSetting.show" />
           </div>
         </div>
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 显示面包屑显示图标 </div>
-            显示面包屑显示图标
-          </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.crumbsSetting.showIcon" />
           </div>
         </div>
 
         <div class="drawer-setting-item">
-          <div class="drawer-setting-item-title">
+          <div class="drawer-setting-item-title"> 显示多页签 </div>
-            显示多页签
-          </div>
           <div class="drawer-setting-item-action">
             <n-switch v-model:value="settingStore.multiTabsSetting.show" />
           </div>
         </div>
-
+        <!--1.15废弃，没啥用，占用操作空间-->
-        <div class="drawer-setting-item">
+        <!--        <div class="drawer-setting-item">-->
-          <div class="drawer-setting-item-title">
+        <!--          <div class="drawer-setting-item-title"> 显示页脚 </div>-->
-            显示页脚
+        <!--          <div class="drawer-setting-item-action">-->
-          </div>
+        <!--            <n-switch v-model:value="settingStore.showFooter" />-->
-          <div class="drawer-setting-item-action">
+        <!--          </div>-->
-            <n-switch v-model:value="settingStore.showFooter"/>
+        <!--        </div>-->
-          </div>
-        </div>
-
 
         <div class="drawer-setting-item">
           <n-alert type="warning" :showIcon="false">
             <p>{{ alertText }}</p>
           </n-alert>
         </div>
-
       </div>
     </n-drawer-content>
   </n-drawer>
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, watch, createVNode, computed, unref } from 'vue'
+  import { defineComponent, reactive, toRefs, watch } from 'vue';
-import { useProjectSettingStore } from "@/store/modules/projectSetting";
+  import { useProjectSettingStore } from '@/store/modules/projectSetting';
-import { useDesignSettingStore } from "@/store/modules/designSetting";
+  import { useDesignSettingStore } from '@/store/modules/designSetting';
-import { CheckOutlined } from '@vicons/antd'
+  import { CheckOutlined } from '@vicons/antd';
-import { darkTheme } from 'naive-ui'
+  import { Moon, SunnySharp } from '@vicons/ionicons5';
+  import { darkTheme } from 'naive-ui';
 
   export default defineComponent({
     name: 'ProjectSetting',
+    components: { CheckOutlined, Moon, SunnySharp },
     props: {
       title: {
         type: String,
-      default: '项目配置'
+        default: '项目配置',
       },
       width: {
         type: Number,
-      default: 280
+        default: 280,
       },
     },
-  components: { CheckOutlined },
+    setup(props) {
-  setup(props, { emit }) {
+      const settingStore = useProjectSettingStore();
-    const settingStore = useProjectSettingStore()
+      const designStore = useDesignSettingStore();
-    const designStore = useDesignSettingStore()
-    const { width, title } = props
       const state = reactive({
-      width,
+        width: props.width,
-      title,
+        title: props.title,
         isDrawer: false,
-      placement: "right",
+        placement: 'right',
-      alertText: '该功能主要实时预览各种布局效果，更多完整配置在 projectSetting.ts 中设置，建议在生产环境关闭该布局预览功能。',
+        alertText:
-      appThemeList: designStore.appThemeList
+          '该功能主要实时预览各种布局效果，更多完整配置在 projectSetting.ts 中设置，建议在生产环境关闭该布局预览功能。',
-    })
+        appThemeList: designStore.appThemeList,
+      });
 
       watch(
         () => designStore.darkTheme,
         (to) => {
-          settingStore.navTheme = to ? 'header-dark' : 'dark'
+          settingStore.navTheme = to ? 'header-dark' : 'dark';
         }
-    )
+      );
 
-    function openDrawer(isDrawer) {
+      function openDrawer() {
-      state.isDrawer = true
+        state.isDrawer = true;
       }
 
       function closeDrawer() {
-      state.isDrawer = false
+        state.isDrawer = false;
       }
 
       function togNavTheme(theme) {
-      settingStore.navTheme = theme
+        settingStore.navTheme = theme;
-      if (settingStore.navMode === 'horizontal' && theme === 'light') {
+        if (settingStore.navMode === 'horizontal' && ['light'].includes(theme)) {
-        designStore.navTheme = 'dark'
+          settingStore.navTheme = 'dark';
         }
       }
 
       function togTheme(color) {
-      designStore.appTheme = color
+        designStore.appTheme = color;
       }
 
       function togNavMode(mode) {
-      settingStore.navMode = mode
+        settingStore.navMode = mode;
-      if (mode === 'horizontal') {
+        // if (mode === 'header-dark') {
-        settingStore.setNavTheme('light')
+        //   settingStore.setNavTheme('dark');
-      } else {
+        // } else {
-        settingStore.setNavTheme('dark')
+        //   settingStore.setNavTheme('light');
-      }
+        // }
       }
 
       return {
@@ -256,9 +295,9 @@ export default defineComponent({
         darkTheme,
         openDrawer,
         closeDrawer,
-    }
+      };
-  }
+    },
-})
+  });
 </script>
 
 <style lang="less" scoped>
@@ -301,7 +340,7 @@ export default defineComponent({
         text-align: center;
 
         .n-icon {
-        color: #fff
+          color: #fff;
         }
       }
     }
@@ -315,7 +354,7 @@ export default defineComponent({
       justify-content: center;
     }
 
-  .dark-switch .n-switch--active {
+    .dark-switch .n-switch {
       ::v-deep(.n-switch__rail) {
         background-color: #000e1c;
       }

src/layout/components/Header/components.ts

@@ -11,8 +11,8 @@ import {
   ReloadOutlined,
   LogoutOutlined,
   UserOutlined,
-    CheckOutlined
+  CheckOutlined,
-} from '@vicons/antd'
+} from '@vicons/antd';
 
 export default {
   SettingOutlined,
@@ -27,5 +27,5 @@ export default {
   ReloadOutlined,
   LogoutOutlined,
   UserOutlined,
-    CheckOutlined
+  CheckOutlined,
-}
+};

src/layout/components/Header/index.ts

@@ -1,3 +1,3 @@
-import PageHeader from './index.vue'
+import PageHeader from './index.vue';
 
-export { PageHeader }
+export { PageHeader };

src/layout/components/Header/index.vue

@@ -1,14 +1,24 @@
 <template>
-  <div class="layout-header" :class="{'layout-header-light':!(navTheme == 'header-dark')}">
+  <div class="layout-header">
     <!--顶部菜单-->
-    <div class="layout-header-left" v-if="navMode==='horizontal'">
+    <div
-      <AsideMenu v-model:collapsed="collapsed" mode="horizontal" class="n-menu-horizontal-light"/>
+      class="layout-header-left"
+      v-if="navMode === 'horizontal' || (navMode === 'horizontal-mix' && mixMenu)"
+    >
+      <AsideMenu
+        v-model:collapsed="collapsed"
+        v-model:location="getMenuLocation"
+        :inverted="getInverted"
+        mode="horizontal"
+      />
     </div>
     <!--左侧菜单-->
     <div class="layout-header-left" v-else>
       <!-- 菜单收起 -->
-      <div class="ml-1 layout-header-trigger layout-header-trigger-min"
+      <div
-           @click="() => $emit('update:collapsed', !collapsed)">
+        class="ml-1 layout-header-trigger layout-header-trigger-min"
+        @click="() => $emit('update:collapsed', !collapsed)"
+      >
         <n-icon size="18" v-if="collapsed">
           <MenuUnfoldOutlined />
         </n-icon>
@@ -17,8 +27,11 @@
         </n-icon>
       </div>
       <!-- 刷新 -->
-      <div class="mr-1 layout-header-trigger layout-header-trigger-min" v-if="headerSetting.isReload"
+      <div
-           @click="reloadPage">
+        class="mr-1 layout-header-trigger layout-header-trigger-min"
+        v-if="headerSetting.isReload"
+        @click="reloadPage"
+      >
         <n-icon size="18">
           <ReloadOutlined />
         </n-icon>
@@ -33,12 +46,18 @@
               @select="dropdownSelect"
             >
               <span class="link-text">
-                  <component v-if="crumbsSetting.showIcon && routeItem.meta.icon" :is="routeItem.meta.icon"></component>
+                <component
+                  v-if="crumbsSetting.showIcon && routeItem.meta.icon"
+                  :is="routeItem.meta.icon"
+                />
                 {{ routeItem.meta.title }}
               </span>
             </n-dropdown>
             <span class="link-text" v-else>
-                <component v-if="crumbsSetting.showIcon && routeItem.meta.icon" :is="routeItem.meta.icon"></component>
+              <component
+                v-if="crumbsSetting.showIcon && routeItem.meta.icon"
+                :is="routeItem.meta.icon"
+              />
               {{ routeItem.meta.title }}
             </span>
           </n-breadcrumb-item>
@@ -46,7 +65,11 @@
       </n-breadcrumb>
     </div>
     <div class="layout-header-right">
-      <div class="layout-header-trigger layout-header-trigger-min" v-for="item in iconList" :key="item.icon.name">
+      <div
+        class="layout-header-trigger layout-header-trigger-min"
+        v-for="item in iconList"
+        :key="item.icon.name"
+      >
         <n-tooltip placement="bottom">
           <template #trigger>
             <n-icon size="18">
@@ -71,7 +94,7 @@
       <div class="layout-header-trigger layout-header-trigger-min">
         <n-dropdown trigger="hover" @select="avatarSelect" :options="avatarOptions">
           <div class="avatar">
-            <n-avatar>
+            <n-avatar round>
               {{ username }}
               <template #icon>
                 <UserOutlined />
@@ -98,42 +121,39 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, ref, computed, unref } from 'vue'
+  import { defineComponent, reactive, toRefs, ref, computed, unref } from 'vue';
-import { useRouter, useRoute } from 'vue-router'
+  import { useRouter, useRoute } from 'vue-router';
-import components from './components'
+  import components from './components';
-import { NDialogProvider, useDialog, useMessage, useNotification } from 'naive-ui'
+  import { NDialogProvider, useDialog, useMessage } from 'naive-ui';
-import { TABS_ROUTES } from '@/store/mutation-types'
+  import { TABS_ROUTES } from '@/store/mutation-types';
-import { useUserStore } from '@/store/modules/user'
+  import { useUserStore } from '@/store/modules/user';
-import { useLockscreenStore } from '@/store/modules/lockscreen'
+  import { useLockscreenStore } from '@/store/modules/lockscreen';
-import ProjectSetting from './ProjectSetting.vue'
+  import ProjectSetting from './ProjectSetting.vue';
-import { AsideMenu } from '@/layout/components/Menu'
+  import { AsideMenu } from '@/layout/components/Menu';
-import { useProjectSetting } from "@/hooks/setting/useProjectSetting";
+  import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
 
   export default defineComponent({
     name: 'PageHeader',
     components: { ...components, NDialogProvider, ProjectSetting, AsideMenu },
     props: {
       collapsed: {
-      type: Boolean
+        type: Boolean,
-    }
+      },
+      inverted: {
+        type: Boolean,
+      },
     },
     setup(props) {
-    const userStore = useUserStore()
+      const userStore = useUserStore();
-    const useLockscreen = useLockscreenStore()
+      const useLockscreen = useLockscreenStore();
-    const message = useMessage()
+      const message = useMessage();
-    const notification = useNotification()
+      const dialog = useDialog();
-    const dialog = useDialog()
+      const { getNavMode, getNavTheme, getHeaderSetting, getMenuSetting, getCrumbsSetting } =
-    const {
+        useProjectSetting();
-      getNavMode,
-      getNavTheme,
-      getHeaderSetting,
-      getMenuSetting,
-      getCrumbsSetting
-    } = useProjectSetting()
 
-    const { username } = userStore?.info || {}
+      const { username } = userStore?.info || {};
 
-    const drawerSetting = ref()
+      const drawerSetting = ref();
 
       const state = reactive({
         username: username || '',
@@ -142,51 +162,64 @@ export default defineComponent({
         navTheme: getNavTheme,
         headerSetting: getHeaderSetting,
         crumbsSetting: getCrumbsSetting,
-    })
+      });
+
+      const getInverted = computed(() => {
+        const navTheme = unref(getNavTheme);
+        return ['light', 'header-dark'].includes(navTheme) ? props.inverted : !props.inverted;
+      });
+
+      const mixMenu = computed(() => {
+        return unref(getMenuSetting).mixMenu;
+      });
 
       const getChangeStyle = computed(() => {
-      const { collapsed } = props
+        const { collapsed } = props;
-      const { minMenuWidth, menuWidth }: any = unref(getMenuSetting)
+        const { minMenuWidth, menuWidth }: any = unref(getMenuSetting);
         return {
-        'left': collapsed ? `${ minMenuWidth }px` : `${ menuWidth }px`,
+          left: collapsed ? `${minMenuWidth}px` : `${menuWidth}px`,
-        'width': `calc(100% - ${ collapsed ? `${ minMenuWidth }px` : `${ menuWidth }px` })`
+          width: `calc(100% - ${collapsed ? `${minMenuWidth}px` : `${menuWidth}px`})`,
-      }
+        };
-    })
+      });
 
-    const router = useRouter()
+      const getMenuLocation = computed(() => {
-    const route = useRoute()
+        return 'header';
+      });
 
-    const generator: any = (routerMap, parent) => {
+      const router = useRouter();
-      return routerMap.map((item, key) => {
+      const route = useRoute();
+
+      const generator: any = (routerMap) => {
+        return routerMap.map((item) => {
           const currentMenu = {
             ...item,
             label: item.meta.title,
             key: item.name,
             disabled: item.path === '/',
-        }
+          };
           // 是否有子菜单，并递归处理
           if (item.children && item.children.length > 0) {
             // Recursion
-          currentMenu.children = generator(item.children, currentMenu)
+            currentMenu.children = generator(item.children, currentMenu);
-        }
-        return currentMenu
-      })
           }
+          return currentMenu;
+        });
+      };
 
       const breadcrumbList = computed(() => {
-      return generator(route.matched)
+        return generator(route.matched);
-    })
+      });
 
       const dropdownSelect = (key) => {
-      router.push({ name: key })
+        router.push({ name: key });
-    }
+      };
 
       // 刷新页面
       const reloadPage = () => {
         router.push({
-        path: '/redirect' + unref(route).fullPath
+          path: '/redirect' + unref(route).fullPath,
-      })
+        });
-    }
+      };
 
       // 退出登录
       const doLogout = () => {
@@ -196,92 +229,90 @@ export default defineComponent({
           positiveText: '确定',
           negativeText: '取消',
           onPositiveClick: () => {
-          userStore.logout().then((res) => {
+            userStore.logout().then(() => {
-            message.success('成功退出登录')
+              message.success('成功退出登录');
               // 移除标签页
-            localStorage.removeItem(TABS_ROUTES)
+              localStorage.removeItem(TABS_ROUTES);
               router
                 .replace({
                   name: 'Login',
                   query: {
-                    redirect: route.fullPath
+                    redirect: route.fullPath,
-                  }
-                })
-                .finally(() => location.reload())
-          })
                   },
-        onNegativeClick: () => {
-
-        }
                 })
-    }
+                .finally(() => location.reload());
+            });
+          },
+          onNegativeClick: () => {},
+        });
+      };
 
       // 切换全屏图标
       const toggleFullscreenIcon = () =>
         (state.fullscreenIcon =
-            document.fullscreenElement !== null ? 'FullscreenExitOutlined' : 'FullscreenOutlined')
+          document.fullscreenElement !== null ? 'FullscreenExitOutlined' : 'FullscreenOutlined');
 
       // 监听全屏切换事件
-    document.addEventListener('fullscreenchange', toggleFullscreenIcon)
+      document.addEventListener('fullscreenchange', toggleFullscreenIcon);
 
       // 全屏切换
       const toggleFullScreen = () => {
         if (!document.fullscreenElement) {
-        document.documentElement.requestFullscreen()
+          document.documentElement.requestFullscreen();
         } else {
           if (document.exitFullscreen) {
-          document.exitFullscreen()
+            document.exitFullscreen();
-        }
           }
         }
+      };
 
       // 图标列表
       const iconList = [
         {
           icon: 'SearchOutlined',
-        tips: '搜索'
+          tips: '搜索',
         },
         {
           icon: 'GithubOutlined',
           tips: 'github',
           eventObject: {
-          click: () => window.open('https://github.com/jekip/naive-ui-admin')
+            click: () => window.open('https://github.com/jekip/naive-ui-admin'),
-        }
+          },
         },
         {
           icon: 'LockOutlined',
           tips: '锁屏',
           eventObject: {
-          click: () => useLockscreen.setLock(true)
+            click: () => useLockscreen.setLock(true),
-        }
+          },
-      }
+        },
-    ]
+      ];
       const avatarOptions = [
         {
           label: '个人设置',
-        key: 1
+          key: 1,
         },
         {
           label: '退出登录',
-        key: 2
+          key: 2,
         },
-    ]
+      ];
 
       //头像下拉菜单
       const avatarSelect = (key) => {
         switch (key) {
           case 1:
-          router.push({ name: 'Setting' })
+            router.push({ name: 'Setting' });
             break;
           case 2:
-          doLogout()
+            doLogout();
             break;
         }
-    }
+      };
 
       function openSetting() {
-      const { openDrawer } = drawerSetting.value
+        const { openDrawer } = drawerSetting.value;
-      openDrawer()
+        openDrawer();
       }
 
       return {
@@ -298,9 +329,12 @@ export default defineComponent({
         reloadPage,
         drawerSetting,
         openSetting,
-    }
+        getInverted,
-  }
+        getMenuLocation,
-})
+        mixMenu,
+      };
+    },
+  });
 </script>
 
 <style lang="less" scoped>
@@ -311,14 +345,9 @@ export default defineComponent({
     padding: 0;
     height: @header-height;
     box-shadow: 0 1px 4px rgb(0 21 41 / 8%);
-  transition: all .2s ease-in-out;
+    transition: all 0.2s ease-in-out;
     width: 100%;
     z-index: 11;
-  //color: #fff;
-
-  //.n-icon {
-  //  color: #fff
-  //}
 
     &-left {
       display: flex;
@@ -328,13 +357,13 @@ export default defineComponent({
         color: #515a6e;
       }
 
-    ::v-deep(.n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link) {
-      color: #fff;
-    }
-
       .n-breadcrumb {
         display: inline-block;
       }
+
+      &-menu {
+        color: var(--text-color);
+      }
     }
 
     &-right {
@@ -369,7 +398,7 @@ export default defineComponent({
       }
 
       &:hover {
-      background: hsla(0, 0%, 100%, .08);
+        background: hsla(0, 0%, 100%, 0.08);
       }
 
       .anticon {
@@ -389,7 +418,7 @@ export default defineComponent({
     color: #515a6e;
 
     .n-icon {
-    color: #515a6e
+      color: #515a6e;
     }
 
     .layout-header-left {

src/layout/components/Logo/index.ts

@@ -1,3 +1,3 @@
-import Logo from './index.vue'
+import Logo from './index.vue';
 
-export { Logo }
+export { Logo };

src/layout/components/Logo/index.vue

@@ -10,10 +10,10 @@ export default {
     name: 'Index',
     props: {
       collapsed: {
-      type: Boolean
+        type: Boolean,
-    }
+      },
-  }
+    },
-}
+  };
 </script>
 
 <style lang="less" scoped>