From fa8b33acbe1641e805f7d4f21628abd35de09a79 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Wed, 21 Jul 2021 18:33:02 +0800
Subject: [PATCH] fix Bug or add example

---
 CHANGELOG.md                                  |  12 +
 README.md                                     |   3 +
 mock/system/menu.ts                           |  93 ++++++++
 mock/system/role.ts                           |  27 ++-
 mock/user/user.ts                             |   8 +
 package.json                                  |   6 +-
 src/api/system/menu.ts                        |  23 +-
 src/components/Table/README.md                |   6 +-
 src/components/Table/index.ts                 |   4 +
 .../Table/src/components/TableAction.vue      | 145 ++++++++++++
 src/components/Table/src/hooks/useColumns.ts  |  33 ++-
 src/components/Table/src/props.ts             |   6 +-
 src/components/Table/src/types/tableAction.ts |  26 +++
 src/enums/pageEnum.ts                         |   2 +
 src/hooks/web/usePermission.ts                |   2 +-
 src/layout/components/Footer/index.vue        |   2 +-
 src/layout/components/TagsView/index.vue      |  67 +++---
 src/plugins/naive.ts                          |   6 +-
 src/router/index.ts                           |   2 +-
 src/router/modules/list.ts                    |   9 +
 src/utils/index.ts                            |  31 +++
 src/views/form/basicForm/index.vue            |  25 +-
 src/views/list/basicList/columns.ts           |  67 +++---
 src/views/list/basicList/index.vue            |  88 ++++++-
 src/views/list/basicList/info.vue             |  38 ++++
 src/views/login/index.vue                     |   3 +-
 src/views/system/menu/CreateDrawer.vue        | 137 +++++++++++
 src/views/system/menu/menu.vue                | 214 ++++++++++++------
 src/views/system/role/columns.ts              |  30 ---
 src/views/system/role/role.vue                | 187 ++++++++++++---
 tailwind.config.js                            |  26 +--
 yarn.lock                                     |  55 +++--
 32 files changed, 1096 insertions(+), 287 deletions(-)
 create mode 100644 mock/system/menu.ts
 create mode 100644 src/components/Table/src/components/TableAction.vue
 create mode 100644 src/components/Table/src/types/tableAction.ts
 create mode 100644 src/views/list/basicList/info.vue
 create mode 100644 src/views/system/menu/CreateDrawer.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602d69c..53ac8ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 1.4 (2021-07-21)
+### 🐛 Bug Fixes
+- vite降至2.3.6
+- 多标签页交互优化
+
+- ### ✨ Features
+- 新增 `TableAction` 组件
+- 新增 `菜单权限管理` 示例
+- 新增 `角色权限管理` 示例
+- 持续更新更多实用组件及示例，感谢Star
+
+
 # 1.3 (2021-07-19)
 ### 🐛 Bug Fixes
 - 修复多标签页左右切换按钮自适应展示
diff --git a/README.md b/README.md
index e3b2215..6cca18f 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ Naive Ui Admin 是一个免费开源的中后台模版，使用了最新的`vue3
 - [x] 异常页面
 - [x] 结果页面
 - [x] 设置页面
+- [x] 系统设置
+- [x] 菜单权限
+- [x] 角色权限
 
 ### 页面组件
 #### ProTable
diff --git a/mock/system/menu.ts b/mock/system/menu.ts
new file mode 100644
index 0000000..90d130a
--- /dev/null
+++ b/mock/system/menu.ts
@@ -0,0 +1,93 @@
+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
+                }
+            );
+        },
+    }
+]
+
+
diff --git a/mock/system/role.ts b/mock/system/role.ts
index bedef36..2a5796c 100644
--- a/mock/system/role.ts
+++ b/mock/system/role.ts
@@ -1,14 +1,26 @@
 import { resultSuccess, doCustomTimes } from '../_util'
 
+
+function getMenuKeys() {
+    let keys = ['dashboard', 'console', 'workplace', 'basic-form', 'step-form', 'detail']
+    let newKeys = []
+    doCustomTimes(parseInt(Math.random()*6), () => {
+        let 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,()=> {
+    const result: any[] = []
+    doCustomTimes(pageSize, () => {
         result.push({
             id: '@integer(10,100)',
             name: '@cname()',
-            explain:'@cname()',
-            isDefault:'@boolean()',
-            create_date: `@date('yyyy-MM-dd')`,
+            explain: '@cname()',
+            isDefault: '@boolean()',
+            menu_keys: getMenuKeys(),
+            create_date: `@date('yyyy-MM-dd hh:mm:ss')`,
             'status|1': ['normal', 'enable', 'disable'],
         });
     })
@@ -17,7 +29,6 @@ const roleList = ((pageSize) => {
 
 
 export default [
-    //表格数据列表
     {
         url: '/api/role/list',
         timeout: 1000,
@@ -26,8 +37,8 @@ export default [
             const { page = 1, pageSize = 10 } = query;
             const list = roleList(Number(pageSize))
             return resultSuccess({
-                    page:Number(page),
-                    pageSize:Number(pageSize),
+                    page: Number(page),
+                    pageSize: Number(pageSize),
                     pageCount: 60,
                     list
                 }
diff --git a/mock/user/user.ts b/mock/user/user.ts
index e6f2a5f..cf802f7 100644
--- a/mock/user/user.ts
+++ b/mock/user/user.ts
@@ -25,6 +25,14 @@ const adminInfo = {
     {
       roleName: '工作台',
       value: 'dashboard_workplace',
+    },
+    {
+      roleName: '基础列表',
+      value: 'basic_list',
+    },
+    {
+      roleName: '基础列表删除',
+      value: 'basic_list_delete',
     }
   ],
 }
diff --git a/package.json b/package.json
index d3b3226..eb179e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "naive-ui-admin",
-  "version": "1.3",
+  "version": "1.4",
   "author": {
     "name": "Ahjung",
     "email": "735878602@qq.com",
@@ -80,9 +80,9 @@
     "stylelint-scss": "^3.19.0",
     "tailwindcss": "^2.2.4",
     "typescript": "^4.3.2",
-    "vite": "^2.4.2",
+    "vite": "2.3.6",
     "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"
   },
diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
index c81d1b2..ed186ca 100644
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.ts
@@ -1,32 +1,23 @@
 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>({
-        url: Api.adminMenus,
+    return http.request({
+        url: '/menus',
         method: 'GET'
     })
 }
 
+
 /**
- * 根据用户Id获取权限编码
+ * 获取tree菜单列表
  * @param params
  */
-export function getBtnCodeListByUserId(params: GetByUserIdParams) {
-    return http.request<GetAuthCodeByUserIdResult>({
-        url: Api.GetBtnCodeListByUserId,
+export function getMenuList(params) {
+    return http.request({
+        url: '/menu/list',
         method: 'GET',
         params
     })
diff --git a/src/components/Table/README.md b/src/components/Table/README.md
index 25d38df..7540989 100644
--- a/src/components/Table/README.md
+++ b/src/components/Table/README.md
@@ -43,7 +43,11 @@ const columns = [
     },
     {
       title: '地址',
-      key: 'address'
+      key: 'address',
+      auth: ['amdin'], // 同时根据权限控制是否显示
+      ifShow: (row) => {
+        return true; // 根据业务控制是否显示
+      },
     },
     {
       title: '日期',
diff --git a/src/components/Table/index.ts b/src/components/Table/index.ts
index 4f33e83..fa14d27 100644
--- a/src/components/Table/index.ts
+++ b/src/components/Table/index.ts
@@ -1 +1,5 @@
 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';
+
diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
new file mode 100644
index 0000000..368cdf7
--- /dev/null
+++ b/src/components/Table/src/components/TableAction.vue
@@ -0,0 +1,145 @@
+<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 { isString, 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,
+    },
+    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, { emit }) {
+    const { hasPermission } = usePermission();
+
+    const getTooltip = computed(() => {
+      return (data: string | TooltipProps): TooltipProps => {
+        if (isString(data)) {
+          return { title: data, placement: 'bottom' };
+        } else {
+          return Object.assign({ placement: 'bottom' }, data);
+        }
+      };
+    });
+
+    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, index) => {
+            const { label, 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,
+      getTooltip,
+      getMoreProps
+    }
+  }
+})
+</script>
diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
index 7e7312e..2e5bbea 100644
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -2,6 +2,9 @@ import { ref, Ref, ComputedRef, unref, computed, watch, toRaw } from 'vue';
 import type { BasicColumn, BasicTableProps } from '../types/table';
 import { isEqual, cloneDeep } from 'lodash-es';
 import { isArray, isString } from '@/utils/is';
+import { usePermission } from '@/hooks/web/usePermission';
+import { isString, isBoolean, isFunction } from "@/utils/is";
+import { ActionItem } from "@/components/Table";
 
 export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
     const columnsRef = ref(unref(propsRef).columns) as unknown as Ref<BasicColumn[]>;
@@ -9,13 +12,34 @@ 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 getPageColumns = computed(() => {
         const pageColumns = unref(getColumnsRef);
         const columns = cloneDeep(pageColumns);
-        return columns
+        return columns.filter((column) => {
+            return hasPermission(column.auth) && isIfShow(column);
+        })
     })
 
     watch(
@@ -26,6 +50,13 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
         }
     );
 
+    function handleActionColumn(propsRef: ComputedRef<BasicTableProps>, columns: BasicColumn[]) {
+        const { actionColumn } = unref(propsRef);
+        if (!actionColumn) return;
+        columns.push({
+            ...actionColumn
+        });
+    }
 
     //设置
     function setColumns(columnList: string[]) {
diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts
index 0696ca9..3a31e6f 100644
--- a/src/components/Table/src/props.ts
+++ b/src/components/Table/src/props.ts
@@ -41,5 +41,9 @@ export const basicProps = {
     showPagination: {
         type: [String, Boolean],
         default: 'auto'
-    }
+    },
+    actionColumn: {
+        type: Object as PropType<BasicColumn>,
+        default: null,
+    },
 }
diff --git a/src/components/Table/src/types/tableAction.ts b/src/components/Table/src/types/tableAction.ts
new file mode 100644
index 0000000..d635b95
--- /dev/null
+++ b/src/components/Table/src/types/tableAction.ts
@@ -0,0 +1,26 @@
+import { NButton, NTooltip } from 'naive-ui';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+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);
+    tooltip?: string | TooltipProps;
+}
+
+export interface PopConfirm {
+    title: string;
+    okText?: string;
+    cancelText?: string;
+    confirm: Fn;
+    cancel?: Fn;
+    icon?: string;
+}
diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index aa0f800..ce0cf95 100644
--- a/src/enums/pageEnum.ts
+++ b/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',
 }
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index c03750e..83fbf5a 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -19,7 +19,7 @@ export function usePermission() {
      * 可用于 v-if 显示逻辑
      * */
     function hasPermission(accesses: string[]): boolean {
-        if (!accesses.length) return true
+        if (!accesses ||!accesses.length) return true
         return _someRoles(accesses)
     }
 
diff --git a/src/layout/components/Footer/index.vue b/src/layout/components/Footer/index.vue
index 88175f8..2ebb690 100644
--- a/src/layout/components/Footer/index.vue
+++ b/src/layout/components/Footer/index.vue
@@ -12,7 +12,7 @@
       </a>
     </div>
     <div class="copyright">
-      naive-ui-admin 1.3 · Made by Ah jung
+      naive-ui-admin 1.4 · Made by Ah jung
     </div>
   </div>
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 46eee16..f2edbd3 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -20,15 +20,15 @@
         </span>
         <div ref="navScroll" class="tabs-card-scroll">
           <div ref="navRef" class="tabs-card-nav" :style="getNavStyle">
-            <Draggable :list="tabsList" animation="300" item-key="fullPath">
+            <Draggable :list="tabsList" animation="300" item-key="fullPath" class="flex">
               <template #item="{element}">
                 <div class="tabs-card-scroll-item"
                      :class="{'active-item':activeKey === element.path }"
                      @click.stop="goPage(element)"
-                     @contextmenu="handleContextMenu">
+                     @contextmenu="handleContextMenu($event,element)">
                   <span>{{ element.meta.title }}</span>
-                  <n-icon size="14" @click.stop="closeTabItem(element)">
-                    <CloseOutlined/>
+                  <n-icon size="14" @click.stop="closeTabItem(element)" v-if="element.path != baseHome">
+                    <CloseOutlined />
                   </n-icon>
                 </div>
               </template>
@@ -73,6 +73,7 @@ import { useAsyncRouteStore } from '@/store/modules/asyncRoute'
 import { RouteItem } from '@/store/modules/tabsView'
 import { useProjectSetting } from '@/hooks/setting/useProjectSetting'
 import { useMessage } from 'naive-ui'
+// @ts-ignore
 import Draggable from 'vuedraggable/src/vuedraggable'
 import { PageEnum } from '@/enums/pageEnum'
 import {
@@ -86,7 +87,6 @@ import {
 } from '@vicons/antd'
 import { renderIcon } from '@/utils/index'
 import elementResizeDetectorMaker from 'element-resize-detector'
-import { useProjectSettingStore } from "@/store/modules/projectSetting";
 import { useDesignSetting } from '@/hooks/setting/useDesignSetting'
 
 export default defineComponent({
@@ -118,6 +118,7 @@ export default defineComponent({
     const navRef: any = ref(null)
     const navScroll: any = ref(null)
     const navWrap: any = ref(null)
+    const isCurrent = ref(false)
 
     const state = reactive({
       activeKey: route.fullPath,
@@ -152,28 +153,34 @@ export default defineComponent({
     })
 
     //tags 右侧下拉菜单
-    const TabsMenuOptions = [
-      {
-        label: '刷新当前',
-        key: '1',
-        icon: renderIcon(ReloadOutlined)
-      },
-      {
-        label: '关闭当前',
-        key: '2',
-        icon: renderIcon(CloseOutlined)
-      },
-      {
-        label: '关闭其他',
-        key: '3',
-        icon: renderIcon(ColumnWidthOutlined)
-      },
-      {
-        label: '关闭全部',
-        key: '4',
-        icon: renderIcon(MinusOutlined)
-      }
-    ]
+    const TabsMenuOptions = computed(() => {
+      const isDisabled = unref(tabsList).length <= 1 ? true : false
+     return [
+        {
+          label: '刷新当前',
+          key: '1',
+          icon: renderIcon(ReloadOutlined)
+        },
+        {
+          label: `关闭当前`,
+          key: '2',
+          disabled: unref(isCurrent) || isDisabled,
+          icon: renderIcon(CloseOutlined)
+        },
+        {
+          label: '关闭其他',
+          key: '3',
+          disabled:isDisabled,
+          icon: renderIcon(ColumnWidthOutlined)
+        },
+        {
+          label: '关闭全部',
+          key: '4',
+          disabled:isDisabled,
+          icon: renderIcon(MinusOutlined)
+        }
+      ]
+    })
 
     let routes: RouteItem[] = []
 
@@ -288,7 +295,7 @@ export default defineComponent({
     const closeAll = () => {
       localStorage.removeItem('routes')
       tabsViewStore.closeAllTabs()
-      router.replace('/')
+      router.replace(PageEnum.BASE_HOME)
       updateNavScroll()
     }
 
@@ -373,8 +380,9 @@ export default defineComponent({
       return state.navStyle
     })
 
-    function handleContextMenu(e) {
+    function handleContextMenu(e,item) {
       e.preventDefault()
+      isCurrent.value = PageEnum.BASE_HOME_REDIRECT === item.path
       state.showDropdown = false
       nextTick().then(() => {
         state.showDropdown = true
@@ -419,6 +427,7 @@ export default defineComponent({
       navScroll,
       route,
       tabsList,
+      baseHome:PageEnum.BASE_HOME_REDIRECT,
       goPage,
       closeTabItem,
       closeLeft,
diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts
index 95780cd..ed2e731 100644
--- a/src/plugins/naive.ts
+++ b/src/plugins/naive.ts
@@ -61,7 +61,8 @@ import {
     NLoadingBarProvider,
     NModal,
     NUpload,
-    NTree
+    NTree,
+    NSpin
 } from 'naive-ui'
 
 const naive = create({
@@ -126,7 +127,8 @@ const naive = create({
         NLoadingBarProvider,
         NModal,
         NUpload,
-        NTree
+        NTree,
+        NSpin
     ]
 })
 
diff --git a/src/router/index.ts b/src/router/index.ts
index d71973f..039e008 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -45,7 +45,7 @@ export const asyncRoutes = [ErrorPageRoute, ...routeModuleList];
 
 
 //普通路由 无需验证权限
-export const constantRouter = [LoginRoute, RootRoute, RedirectRoute]
+export const constantRouter:any[] = [LoginRoute, RootRoute, RedirectRoute]
 
 const router = createRouter({
     history: createWebHashHistory(''),
diff --git a/src/router/modules/list.ts b/src/router/modules/list.ts
index 538bd17..9b5adc1 100644
--- a/src/router/modules/list.ts
+++ b/src/router/modules/list.ts
@@ -33,6 +33,15 @@ const routes: Array<RouteRecordRaw> = [
                     title: '基础列表',
                 },
                 component: () => import('@/views/list/basicList/index.vue')
+            },
+            {
+                path: 'basic-info/:id?',
+                name: 'basic-info',
+                meta: {
+                    title: '基础详情',
+                    hidden:true
+                },
+                component: () => import('@/views/list/basicList/info.vue')
             }
         ],
     }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 5dac687..8aed354 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -42,3 +42,34 @@ export const withInstall = <T>(component: T, alias?: string) => {
     };
     return component as T & Plugin;
 };
+
+/**
+ *  找到对应的节点
+ * */
+let result = null
+export function getTreeItem(data: any[], key?: string | number) {
+    data.map(item => {
+        if (item.key === key) {
+            result = item;
+        } else {
+            if (item.children && item.children.length) {
+                getTreeItem(item.children, key);
+            }
+        }
+    });
+    return result
+}
+
+/**
+ *  找到所有节点
+ * */
+let treeAll = []
+export function getTreeAll(data: any[]) {
+    data.map(item => {
+        treeAll.push(item.key)
+        if (item.children && item.children.length) {
+            getTreeAll(item.children);
+        }
+    });
+    return treeAll
+}
diff --git a/src/views/form/basicForm/index.vue b/src/views/form/basicForm/index.vue
index 5f1f6a1..ca672bd 100644
--- a/src/views/form/basicForm/index.vue
+++ b/src/views/form/basicForm/index.vue
@@ -5,7 +5,7 @@
         表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。表单域标签也可支持响应式。
       </n-card>
     </div>
-    <n-card :bordered="false" class="proCard mt-4">
+    <n-card :bordered="false" class="mt-4 proCard">
       <n-grid cols="2 s:1 m:3 l:3 xl:3 2xl:3" responsive="screen">
         <n-grid-item offset="0 s:0 m:1 l:1 xl:1 2xl:1">
           <n-form
@@ -16,7 +16,7 @@
               ref="formRef"
               class="py-8"
           >
-            <n-form-item label="预约姓名" path="name">
+            <n-form-item label="预约姓名1" path="name">
               <n-input v-model:value="formValue.name" placeholder="输入姓名"/>
             </n-form-item>
             <n-form-item label="预约号码" path="mobile">
@@ -155,16 +155,18 @@ export default defineComponent({
     const message = useMessage()
     const { uploadUrl } = globSetting
 
+    const defaultValueRef = () => ({
+      name: '',
+      mobile: '',
+      remark: '',
+      sex: 1,
+      matter: null,
+      doctor: null,
+      datetime: [],
+    })
+
     const state = reactive({
-      formValue: {
-        name: '',
-        mobile: '',
-        remark: '',
-        sex: 1,
-        matter: null,
-        doctor: null,
-        datetime: [],
-      },
+      formValue: defaultValueRef(),
       //图片列表 通常查看和编辑使用 绝对路径 | 相对路径都可以
       uploadList: [
         'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
@@ -188,6 +190,7 @@ export default defineComponent({
 
     function resetForm() {
       formRef.value.restoreValidation()
+      state.formValue = Object.assign(state.formValue, defaultValueRef())
     }
 
     function uploadChange(list: string[]) {
diff --git a/src/views/list/basicList/columns.ts b/src/views/list/basicList/columns.ts
index dbaec86..d970e5a 100644
--- a/src/views/list/basicList/columns.ts
+++ b/src/views/list/basicList/columns.ts
@@ -25,7 +25,11 @@ export const columns = [
     },
     {
         title: '地址',
-        key: 'address'
+        key: 'address',
+        auth: ['basic_list'], // 同时根据权限控制是否显示
+        ifShow: (_column) => {
+            return true; // 根据业务控制是否显示
+        },
     },
     {
         title: '开始日期',
@@ -39,34 +43,35 @@ export const columns = [
         title: '创建时间',
         key: 'date',
     },
-    {
-        title: '操作',
-        key: 'actions',
-        width: 150,
-        //简单写一下例子，不建议这么写，过段时间，这里封二次封装
-        render() {
-            return [
-                h(
-                    NButton,
-                    {
-                        size: 'small',
-                        type: 'error',
-                        style: 'margin-right:10px',
-                        onClick: () => {
-                        }
-                    },
-                    { default: () => '删除' }
-                ),
-                h(
-                    NButton,
-                    {
-                        size: 'small',
-                        onClick: () => {
-                        }
-                    },
-                    { default: () => '编辑' }
-                )
-            ]
-        }
-    }
+    // {
+    //     title: '操作',
+    //     key: 'actions',
+    //     width: 150,
+    //     //简单写一下例子，不建议这么写，过段时间，这里封二次封装
+    //     render() {
+    //         return [
+    //             h(
+    //                 NButton,
+    //                 {
+    //                     size: 'small',
+    //                     type: 'error',
+    //                     style: 'margin-right:10px',
+    //                     onClick: () => {
+    //                     }
+    //                 },
+    //                 { default: () => '删除' }
+    //             ),
+    //             h(
+    //                 NButton,
+    //                 {
+    //                     size: 'small',
+    //                     onClick: () => {
+    //
+    //                     }
+    //                 },
+    //                 { default: () => '编辑' }
+    //             )
+    //         ]
+    //     }
+    // }
 ]
diff --git a/src/views/list/basicList/index.vue b/src/views/list/basicList/index.vue
index 65b9081..4d290bd 100644
--- a/src/views/list/basicList/index.vue
+++ b/src/views/list/basicList/index.vue
@@ -5,6 +5,7 @@
         :request="loadDataTable"
         :row-key="row => row.id"
         ref="actionRef"
+        :actionColumn="actionColumn"
         @update:checked-row-keys="onCheckedRow"
     >
       <template #tableTitle>
@@ -17,9 +18,14 @@
           新建
         </n-button>
       </template>
+
       <template #toolbar>
         <n-button type="primary" @click="reloadTable">刷新数据</n-button>
       </template>
+
+      <template #action="{ record }">
+        <TableAction></TableAction>
+      </template>
     </BasicTable>
 
     <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" title="新建">
@@ -57,10 +63,11 @@
 <script lang="ts">
 import { defineComponent, reactive, toRefs, ref, h } from 'vue'
 import { useMessage } from 'naive-ui'
-import { BasicTable } from '@/components/Table'
+import { BasicTable, TableAction } from '@/components/Table'
 import { getTableList } from '@/api/table/list'
 import { columns } from './columns'
 import { PlusOutlined } from '@vicons/antd'
+import { useRouter } from 'vue-router'
 
 const rules = {
   name: {
@@ -82,8 +89,9 @@ const rules = {
 }
 
 export default defineComponent({
-  components: { BasicTable, PlusOutlined },
+  components: { BasicTable, PlusOutlined, TableAction },
   setup() {
+    const router = useRouter()
     const formRef: any = ref(null)
     const message = useMessage()
     const actionRef = ref()
@@ -99,6 +107,62 @@ export default defineComponent({
         pageSize: 5,
         name: 'xiaoMa'
       },
+      actionColumn: {
+        width: 250,
+        title: '操作',
+        dataIndex: 'action',
+        fixed: 'right',
+        render(record) {
+          return h(
+              TableAction,
+              {
+                style: 'button',
+                actions: [
+                  {
+                    label: '删除',
+                    icon: 'ic:outline-delete-outline',
+                    onClick: handleDelete.bind(null, record),
+                    // 根据业务控制是否显示 isShow 和 auth 是并且关系
+                    ifShow: () => {
+                      return true;
+                    },
+                    // 根据权限控制是否显示: 有权限，会显示，支持多个
+                    auth: ['basic_list'],
+                  },
+                  {
+
+                    label: '编辑',
+                    onClick: handleEdit.bind(null, record),
+                    ifShow: () => {
+                      return true;
+                    },
+                    auth: ['basic_list'],
+                  },
+                ],
+                dropDownActions: [
+                  {
+                    label: '启用',
+                    key: 'enabled',
+                    // 根据业务控制是否显示: 非enable状态的不显示启用按钮
+                    ifShow: (record) => {
+                      return true;
+                    },
+                  },
+                  {
+                    label: '禁用',
+                    key: 'disabled',
+                    ifShow: () => {
+                      return true
+                    },
+                  }
+                ],
+                select:(key) => {
+                  message.info(`您点击了，${key} 按钮`)
+                }
+              }
+          )
+        }
+      },
     })
 
     function addTable() {
@@ -135,6 +199,21 @@ export default defineComponent({
       })
     }
 
+    function handleEdit(record: Recordable) {
+      console.log('点击了编辑', record);
+      router.push({ name: 'basic-info', params: { id: record.id } })
+    }
+
+    function handleDelete(record: Recordable) {
+      console.log('点击了删除', record);
+      message.info('点击了删除')
+    }
+
+    function handleOpen(record: Recordable) {
+      console.log('点击了启用', record);
+      message.info('点击了删除')
+    }
+
     return {
       ...toRefs(state),
       formRef,
@@ -145,7 +224,10 @@ export default defineComponent({
       loadDataTable,
       onCheckedRow,
       reloadTable,
-      addTable
+      addTable,
+      handleEdit,
+      handleDelete,
+      handleOpen
     }
   }
 })
diff --git a/src/views/list/basicList/info.vue b/src/views/list/basicList/info.vue
new file mode 100644
index 0000000..4dca318
--- /dev/null
+++ b/src/views/list/basicList/info.vue
@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <div class="n-layout-page-header">
+      <n-card :bordered="false" title="基础详情">
+        基础详情，有时也用于显示只读信息。
+      </n-card>
+    </div>
+    <n-card :bordered="false" class="proCard mt-4" size="small" :segmented="{content: 'hard'}">
+      <n-descriptions label-placement="left" class="py-2">
+        <n-descriptions-item>
+          <template #label>收款人姓名</template>
+          啊俊
+        </n-descriptions-item>
+        <n-descriptions-item label="收款账户">NaiveUiAdmin@qq.com</n-descriptions-item>
+        <n-descriptions-item label="付款类型">支付宝</n-descriptions-item>
+        <n-descriptions-item label="付款账户">NaiveUiAdmin@163.com</n-descriptions-item>
+        <n-descriptions-item label="转账金额">￥1980.00</n-descriptions-item>
+        <n-descriptions-item label="状态">
+          <n-tag type="success"> 已到账</n-tag>
+        </n-descriptions-item>
+      </n-descriptions>
+    </n-card>
+  </div>
+</template>
+
+<script>
+import { defineComponent, ref } from 'vue'
+
+export default defineComponent({
+  setup() {
+    return {}
+  }
+})
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7022073..e48c0a9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -29,7 +29,6 @@
             </n-input>
           </n-form-item>
           <n-form-item
-
               path="isCaptcha">
             <div class="w-full">
               <mi-captcha
@@ -110,7 +109,7 @@ export default defineComponent({
       formInline: {
         username: 'admin',
         password: '123456',
-        isCaptcha: false
+        isCaptcha: true
       }
     })
     const rules = {
diff --git a/src/views/system/menu/CreateDrawer.vue b/src/views/system/menu/CreateDrawer.vue
new file mode 100644
index 0000000..402ca96
--- /dev/null
+++ b/src/views/system/menu/CreateDrawer.vue
@@ -0,0 +1,137 @@
+<template>
+  <n-drawer v-model:show="isDrawer" :width="width" :placement="placement">
+    <n-drawer-content :title="title" closable>
+      <n-form
+          :model="formParams"
+          :rules="rules"
+          ref="formRef"
+          label-placement="left"
+          :label-width="100"
+      >
+        <n-form-item label="类型" path="type">
+          <span>{{ formParams.type === 1 ? '侧边栏菜单' : '' }}</span>
+        </n-form-item>
+        <n-form-item label="标题" path="label">
+          <n-input placeholder="请输入标题" v-model:value="formParams.label"/>
+        </n-form-item>
+        <n-form-item label="副标题" path="subtitle">
+          <n-input placeholder="请输入副标题" v-model:value="formParams.subtitle"/>
+        </n-form-item>
+        <n-form-item label="路径" path="path">
+          <n-input placeholder="请输入路径" v-model:value="formParams.path"/>
+        </n-form-item>
+        <n-form-item label="打开方式" path="openType">
+          <n-radio-group v-model:value="formParams.openType" name="openType">
+            <n-space>
+              <n-radio :value="1">当前窗口</n-radio>
+              <n-radio :value="2">新窗口</n-radio>
+            </n-space>
+          </n-radio-group>
+        </n-form-item>
+        <n-form-item label="菜单权限" path="auth">
+          <n-input placeholder="请输入权限，多个权限用，分割" v-model:value="formParams.auth"/>
+        </n-form-item>
+        <n-form-item label="隐藏侧边栏" path="hidden">
+          <n-switch v-model:value="formParams.hidden"/>
+        </n-form-item>
+      </n-form>
+
+      <template #footer>
+        <n-space>
+          <n-button type="primary" :loading="subLoading" @click="formSubmit">提交</n-button>
+          <n-button @click="handleReset">重置</n-button>
+        </n-space>
+      </template>
+
+    </n-drawer-content>
+  </n-drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive, ref, toRefs, watch, createVNode, computed, unref } from 'vue'
+import { CheckOutlined } from '@vicons/antd'
+import { useMessage } from 'naive-ui'
+
+const rules = {
+  label: {
+    required: true,
+    message: '请输入标题',
+    trigger: 'blur'
+  },
+  path: {
+    required: true,
+    message: '请输入路径',
+    trigger: 'blur'
+  }
+}
+export default defineComponent({
+  name: 'CreateDrawer',
+  props: {
+    title: {
+      type: String,
+      default: '添加顶级菜单'
+    },
+    width: {
+      type: Number,
+      default: 450
+    },
+  },
+  components: { CheckOutlined },
+  setup(props, { emit }) {
+    const message = useMessage()
+    const formRef: any = ref(null)
+    const defaultValueRef = () => ({
+      label: '',
+      type: 1,
+      subtitle: '',
+      openType: 1,
+      auth: '',
+      path: '',
+      hidden: false
+    })
+
+    const state = reactive({
+      isDrawer: false,
+      subLoading: false,
+      formParams: defaultValueRef(),
+      placement: "right",
+      alertText: '该功能主要实时预览各种布局效果，更多完整配置在 projectSetting.ts 中设置，建议在生产环境关闭该布局预览功能。',
+    })
+
+    function openDrawer(isDrawer) {
+      state.isDrawer = true
+    }
+
+    function closeDrawer() {
+      state.isDrawer = false
+    }
+
+    function formSubmit() {
+      formRef.value.validate((errors) => {
+        if (!errors) {
+          message.success('添加成功')
+          handleReset()
+          closeDrawer()
+        } else {
+          message.error('请填写完整信息')
+        }
+      })
+    }
+
+    function handleReset() {
+      formRef.value.restoreValidation()
+      state.formParams = Object.assign(state.formParams, defaultValueRef())
+    }
+
+    return {
+      ...toRefs(state),
+      formRef,
+      rules,
+      formSubmit,
+      handleReset,
+      openDrawer,
+      closeDrawer
+    }
+  }
+})
+</script>
diff --git a/src/views/system/menu/menu.vue b/src/views/system/menu/menu.vue
index a7c4fe8..bde0ff0 100644
--- a/src/views/system/menu/menu.vue
+++ b/src/views/system/menu/menu.vue
@@ -11,7 +11,7 @@
         <n-card :segmented="{ content: 'hard' }" :bordered="false" size="small">
           <template #header>
             <n-space>
-              <n-dropdown trigger="hover" :options="addMenuOptions">
+              <n-dropdown trigger="hover" @select="selectAddMenu" :options="addMenuOptions">
                 <n-button type="info" ghost icon-placement="right">
                   添加菜单
                   <template #icon>
@@ -23,8 +23,8 @@
                   </template>
                 </n-button>
               </n-dropdown>
-              <n-button type="info" ghost icon-placement="left">
-                全部收起
+              <n-button type="info" ghost icon-placement="left" @click="packHandle">
+                全部{{ expandedKeys.length ? '收起' : '展开' }}
                 <template #icon>
                   <div class="flex items-center">
                     <n-icon size="14">
@@ -37,7 +37,7 @@
           </template>
 
           <div class="w-full menu">
-            <n-input type="input" placeholder="输入菜单名称搜索">
+            <n-input type="input" v-model:value="pattern" placeholder="输入菜单名称搜索">
               <template #suffix>
                 <n-icon size="18" class="cursor-pointer">
                   <SearchOutlined/>
@@ -45,13 +45,24 @@
               </template>
             </n-input>
             <div class="py-3 menu-list">
-              <n-tree
-                  block-line
-                  cascade
-                  checkable
-                  :data="treeData"
-                  :default-expanded-keys="defaultExpandedKeys"
-              />
+              <template v-if="loading">
+                <div class="flex items-center justify-center py-4">
+                  <n-spin size="medium"/>
+                </div>
+              </template>
+              <template v-else>
+                <n-tree
+                    block-line
+                    cascade
+                    checkable
+                    :virtual-scroll="true"
+                    :pattern="pattern"
+                    :data="treeData"
+                    :expandedKeys="expandedKeys"
+                    style="max-height: 650px;overflow: hidden"
+                    @update:selected-keys="selectedTree"
+                />
+              </template>
             </div>
           </div>
 
@@ -62,9 +73,9 @@
           <template #header>
             <n-space>
               <n-icon size="18">
-                <EditOutlined />
+                <FormOutlined />
               </n-icon>
-              编辑菜单
+              <span>编辑菜单{{ treeItemTitle ? `：${treeItemTitle}`:''}}</span>
             </n-space>
           </template>
           <n-alert type="info" closable>
@@ -76,18 +87,20 @@
               ref="formRef"
               label-placement="left"
               :label-width="100"
+              v-if="isEditMenu"
+              class="py-4"
           >
             <n-form-item label="类型" path="type">
-              <span>{{formParams.type}}</span>
+              <span>{{ formParams.type === 1 ? '侧边栏菜单' : '' }}</span>
             </n-form-item>
-            <n-form-item label="标题" path="title">
-              <n-input placeholder="请输入标题" v-model:value="formParams.title" />
+            <n-form-item label="标题" path="label">
+              <n-input placeholder="请输入标题" v-model:value="formParams.label"/>
             </n-form-item>
-            <n-form-item label="副标题" path="subTitle">
-              <n-input placeholder="请输入副标题" v-model:value="formParams.subTitle" />
+            <n-form-item label="副标题" path="subtitle">
+              <n-input placeholder="请输入副标题" v-model:value="formParams.subtitle"/>
             </n-form-item>
             <n-form-item label="路径" path="path">
-              <n-input placeholder="请输入路径" v-model:value="formParams.path" />
+              <n-input placeholder="请输入路径" v-model:value="formParams.path"/>
             </n-form-item>
             <n-form-item label="打开方式" path="openType">
               <n-radio-group v-model:value="formParams.openType" name="openType">
@@ -98,12 +111,12 @@
               </n-radio-group>
             </n-form-item>
             <n-form-item label="菜单权限" path="auth">
-              <n-input placeholder="请输入权限，多个权限用，分割" v-model:value="formParams.auth" />
+              <n-input placeholder="请输入权限，多个权限用，分割" v-model:value="formParams.auth"/>
             </n-form-item>
             <n-form-item path="auth" style="margin-left: 100px">
               <n-space>
-                <n-button type="primary">保存修改</n-button>
-                <n-button>重置</n-button>
+                <n-button type="primary" :loading="subLoading" @click="formSubmit">保存修改</n-button>
+                <n-button @click="handleReset">重置</n-button>
               </n-space>
             </n-form-item>
           </n-form>
@@ -111,24 +124,42 @@
       </n-gi>
     </n-grid>
 
+    <CreateDrawer ref="createDrawerRef" :title="drawerTitle"></CreateDrawer>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, reactive, toRefs, } from 'vue'
+import { defineComponent, ref, unref, reactive, toRefs, onMounted, computed } from 'vue'
 import { useMessage } from 'naive-ui'
-import { DownOutlined, AlignLeftOutlined, SearchOutlined, EditOutlined } from '@vicons/antd'
+import { DownOutlined, AlignLeftOutlined, SearchOutlined, FormOutlined } from '@vicons/antd'
+import { getMenuList } from '@/api/system/menu'
+import { getTreeItem } from '@/utils/index'
+import CreateDrawer from './CreateDrawer.vue'
 
 const rules = {
-
+  label: {
+    required: true,
+    message: '请输入标题',
+    trigger: 'blur'
+  },
+  path: {
+    required: true,
+    message: '请输入路径',
+    trigger: 'blur'
+  }
 }
 
 export default defineComponent({
-  components: { DownOutlined, AlignLeftOutlined, SearchOutlined, EditOutlined },
+  components: { DownOutlined, AlignLeftOutlined, SearchOutlined, FormOutlined, CreateDrawer },
   setup() {
-
+    const formRef: any = ref(null)
+    const createDrawerRef = ref()
     const message = useMessage()
 
+    const isAddSon = computed(() => {
+      return state.treeItemKey.length ? false : true
+    })
+
     const state = reactive({
       addMenuOptions: [
         {
@@ -139,57 +170,98 @@ export default defineComponent({
         {
           label: '添加子菜单',
           key: 'son',
-          disabled: false
+          disabled: isAddSon
         },
       ],
-      treeData: [
-        {
-          label: 'Dashboard',
-          key: 'dashboard',
-          children: [
-            {
-              label: '主控台',
-              key: 'console',
-            },
-            {
-              label: '工作台',
-              key: 'workplace',
-            }
-          ]
-        },
-        {
-          label: '表单管理',
-          key: 'form',
-          children: [
-            {
-              label: '基础表单',
-              key: 'basic-form',
-            },
-            {
-              label: '分步表单',
-              key: 'step-form',
-            },
-            {
-              label: '表单详情',
-              key: 'detail',
-            }
-          ]
-        }
+      loading: true,
+      subLoading: false,
+      isEditMenu: false,
+      treeData: [],
+      treeItemKey: [],
+      treeItemTitle: '',
+      expandedKeys: [],
+      formParams: {},
+      pattern: '',
+      drawerTitle: ''
+    })
 
-      ],
-      defaultExpandedKeys: ref(['home', 'dashboard']),
-      formParams: {
-        type: '侧边栏菜单',
-        title: '工作台',
-        subTitle:'',
-        path:'/dashboard/workplace',
-        openType:1
-      },
+
+    function selectAddMenu(key) {
+      state.drawerTitle = key === 'home' ? '添加顶栏菜单' : `添加子菜单：${ state.treeItemTitle }`
+      openCreateDrawer()
+    }
+
+    function openCreateDrawer() {
+      const { openDrawer } = createDrawerRef.value
+      openDrawer()
+    }
+
+    function selectedTree(keys) {
+      if (keys.length) {
+        const treeItem = getTreeItem(unref(state.treeData), keys[0])
+        state.treeItemKey = keys
+        state.treeItemTitle = treeItem.label
+        state.formParams = Object.assign(state.formParams, treeItem)
+        state.isEditMenu = true
+      } else {
+        state.isEditMenu = false
+        state.treeItemKey = []
+        state.treeItemTitle = ''
+      }
+    }
+
+    function handleReset() {
+      const treeItem = getTreeItem(unref(state.treeData), state.treeItemKey[0])
+      state.formParams = Object.assign(state.formParams, treeItem)
+    }
+
+    function formSubmit() {
+      formRef.value.validate((errors) => {
+        if (!errors) {
+          message.error('抱歉，您没有该权限')
+        } else {
+          message.error('请填写完整信息')
+        }
+      })
+    }
+
+    function packHandle() {
+      if (state.expandedKeys.length) {
+        state.expandedKeys = []
+      } else {
+        state.expandedKeys = state.treeData.map(item => item.key)
+      }
+    }
+
+    function onExpandedKeys(keys) {
+      // let key = keys[0]
+      // console.log(state.expandedKeys)
+      // if(state.expandedKeys.includes(key)){
+      //   state.expandedKeys.splice(state.expandedKeys.findIndex(item => item === key), 1)
+      //   console.log(state.expandedKeys)
+      // }else{
+      //   state.expandedKeys.push(key)
+      // }
+    }
+
+    onMounted(async () => {
+      const treeMenuList = await getMenuList()
+      state.expandedKeys = treeMenuList.list.map(item => item.key)
+      state.treeData = treeMenuList.list
+      state.loading = false
     })
 
     return {
       ...toRefs(state),
-      rules
+      createDrawerRef,
+      formRef,
+      rules,
+      selectedTree,
+      handleReset,
+      formSubmit,
+      packHandle,
+      onExpandedKeys,
+      selectAddMenu
     }
   }
 })
diff --git a/src/views/system/role/columns.ts b/src/views/system/role/columns.ts
index e266cfa..ff2ec17 100644
--- a/src/views/system/role/columns.ts
+++ b/src/views/system/role/columns.ts
@@ -32,35 +32,5 @@ export const columns = [
     {
         title: '创建时间',
         key: 'create_date'
-    },
-    {
-        title: '操作',
-        key: 'actions',
-        width: 150,
-        //简单写一下例子，不建议这么写，过段时间，这里封二次封装
-        render() {
-            return [
-                h(
-                    NButton,
-                    {
-                        size: 'small',
-                        type: 'error',
-                        style: 'margin-right:10px',
-                        onClick: () => {
-                        }
-                    },
-                    { default: () => '删除' }
-                ),
-                h(
-                    NButton,
-                    {
-                        size: 'small',
-                        onClick: () => {
-                        }
-                    },
-                    { default: () => '编辑' }
-                )
-            ]
-        }
     }
 ]
diff --git a/src/views/system/role/role.vue b/src/views/system/role/role.vue
index bac02a3..d4d02b2 100644
--- a/src/views/system/role/role.vue
+++ b/src/views/system/role/role.vue
@@ -11,61 +11,72 @@
           :request="loadDataTable"
           :row-key="row => row.id"
           ref="actionRef"
+          :actionColumn="actionColumn"
           @update:checked-row-keys="onCheckedRow"
       >
         <template #tableTitle>
-          <n-button type="primary" @click="addTable">
+          <n-button type="primary">
             <template #icon>
               <n-icon>
                 <PlusOutlined/>
               </n-icon>
             </template>
-            新建角色
+            添加角色
           </n-button>
         </template>
-      </BasicTable>
 
-      <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" title="新建">
-        <n-form
-            :model="formParams"
-            :rules="rules"
-            ref="formRef"
-            label-placement="left"
-            :label-width="80"
-            class="py-4"
-        >
-          <n-form-item label="名称" path="name">
-            <n-input placeholder="请输入名称" v-model:value="formParams.name"/>
-          </n-form-item>
-          <n-form-item label="地址" path="address">
-            <n-input type="textarea" placeholder="请输入地址" v-model:value="formParams.address"/>
-          </n-form-item>
-          <n-form-item label="日期" path="date">
-            <n-date-picker type="datetime" placeholder="请选择日期" v-model:value="formParams.date"/>
-          </n-form-item>
-        </n-form>
-
-        <template #action>
-          <n-space>
-            <n-button @click="()=> showModal = false">取消</n-button>
-            <n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
-          </n-space>
+        <template #action="{ record }">
+          <TableAction></TableAction>
         </template>
 
-      </n-modal>
+      </BasicTable>
+
 
     </n-card>
+
+    <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editRoleTitle">
+      <div class="py-3 menu-list">
+        <n-tree
+            block-line
+            cascade
+            checkable
+            :virtual-scroll="true"
+            :data="treeData"
+            :expandedKeys="expandedKeys"
+            :checked-keys="checkedKeys"
+            style="max-height: 950px;overflow: hidden"
+            @update:checked-keys="checkedTree"
+        />
+      </div>
+      <template #action>
+        <n-space>
+          <n-button type="info" ghost icon-placement="left" @click="packHandle">
+            全部{{ expandedKeys.length ? '收起' : '展开' }}
+          </n-button>
+
+          <n-button type="info" ghost icon-placement="left" @click="checkedAllHandle">
+            全部{{ checkedAll ? '取消' : '选择' }}
+          </n-button>
+          <n-button type="primary" :loading="formBtnLoading" @click="confirmForm">提交</n-button>
+        </n-space>
+      </template>
+
+    </n-modal>
+
   </div>
 
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, ref, h } from 'vue'
+import { defineComponent, reactive, toRefs, ref, h, onMounted } from 'vue'
 import { useMessage } from 'naive-ui'
-import { BasicTable } from '@/components/Table'
+import { DownOutlined, AlignLeftOutlined, SearchOutlined, FormOutlined } from '@vicons/antd'
+import { BasicTable, TableAction } from '@/components/Table'
 import { getRoleList } from '@/api/system/role'
+import { getMenuList } from '@/api/system/menu'
 import { columns } from './columns'
 import { PlusOutlined } from '@vicons/antd'
+import { getTreeAll } from "@/utils";
 
 const rules = {
   name: {
@@ -87,7 +98,7 @@ const rules = {
 }
 
 export default defineComponent({
-  components: { BasicTable, PlusOutlined },
+  components: { BasicTable, TableAction, PlusOutlined, AlignLeftOutlined },
   setup() {
     const formRef: any = ref(null)
     const message = useMessage()
@@ -95,6 +106,11 @@ export default defineComponent({
     const state = reactive({
       showModal: false,
       formBtnLoading: false,
+      checkedAll: false,
+      editRoleTitle: '',
+      treeData: [],
+      expandedKeys: [],
+      checkedKeys: ['console', 'step-form'],
       formParams: {
         name: '',
         address: '',
@@ -104,11 +120,53 @@ export default defineComponent({
         pageSize: 5,
         name: 'xiaoMa'
       },
-    })
+      actionColumn: {
+        width: 250,
+        title: '操作',
+        dataIndex: 'action',
+        fixed: 'right',
+        render(record) {
+          return h(
+              TableAction,
+              {
+                style: 'button',
+                actions: [
+                  {
+                    label: '菜单权限',
+                    onClick: handleMenuAuth.bind(null, record),
+                    // 根据业务控制是否显示 isShow 和 auth 是并且关系
+                    ifShow: () => {
+                      return true;
+                    },
+                    // 根据权限控制是否显示: 有权限，会显示，支持多个
+                    auth: ['basic_list'],
+                  },
+                  {
 
-    function addTable() {
-      state.showModal = true
-    }
+                    label: '编辑',
+                    onClick: handleEdit.bind(null, record),
+                    ifShow: () => {
+                      return true;
+                    },
+                    auth: ['basic_list'],
+                  },
+                  {
+                    label: '删除',
+                    icon: 'ic:outline-delete-outline',
+                    onClick: handleDelete.bind(null, record),
+                    // 根据业务控制是否显示 isShow 和 auth 是并且关系
+                    ifShow: () => {
+                      return true;
+                    },
+                    // 根据权限控制是否显示: 有权限，会显示，支持多个
+                    auth: ['basic_list'],
+                  },
+                ]
+              }
+          )
+        }
+      },
+    })
 
     const loadDataTable = async (params) => {
       const data = await getRoleList(params);
@@ -140,6 +198,55 @@ export default defineComponent({
       })
     }
 
+    function handleEdit(record: Recordable) {
+      console.log('点击了编辑', record);
+      router.push({ name: 'basic-info', params: { id: record.id } })
+    }
+
+    function handleDelete(record: Recordable) {
+      console.log('点击了删除', record);
+      message.info('点击了删除')
+    }
+
+    function handleOpen(record: Recordable) {
+      console.log('点击了启用', record);
+      message.info('点击了删除')
+    }
+
+    function handleMenuAuth(record: Recordable) {
+      state.editRoleTitle = `分配 ${ record.name } 的菜单权限`
+      state.checkedKeys = record.menu_keys
+      state.showModal = true
+    }
+
+    function checkedTree(keys) {
+      state.checkedKeys = [state.checkedKeys, ...keys]
+    }
+
+    function packHandle() {
+      if (state.expandedKeys.length) {
+        state.expandedKeys = []
+      } else {
+        state.expandedKeys = state.treeData.map(item => item.key)
+      }
+    }
+
+    function checkedAllHandle() {
+      if (!state.checkedAll) {
+        state.checkedKeys = getTreeAll(state.treeData)
+        state.checkedAll = true
+      } else {
+        state.checkedKeys = []
+        state.checkedAll = false
+      }
+    }
+
+    onMounted(async () => {
+      const treeMenuList = await getMenuList()
+      state.expandedKeys = treeMenuList.list.map(item => item.key)
+      state.treeData = treeMenuList.list
+    })
+
     return {
       ...toRefs(state),
       formRef,
@@ -150,7 +257,13 @@ export default defineComponent({
       loadDataTable,
       onCheckedRow,
       reloadTable,
-      addTable
+      handleEdit,
+      handleDelete,
+      handleOpen,
+      handleMenuAuth,
+      checkedTree,
+      packHandle,
+      checkedAllHandle
     }
   }
 })
diff --git a/tailwind.config.js b/tailwind.config.js
index 4b1d937..116d260 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,7 +3,7 @@ module.exports = {
   // darkMode: 'class',
   plugins: [createEnterPlugin()],
   purge: {
-    enabled: false,
+    enable: process.env.NODE_ENV === 'production',
     content: ['./index.html', './src/**/*.{vue,ts,tsx}'],
   },
   theme: {
@@ -11,19 +11,19 @@ module.exports = {
       zIndex: {
         '-1': '-1',
       },
-    },
-    colors: {
-      primary: {
-        DEFAULT: '#0960bd',
-        // dark: primaryColorDark,
+      colors: {
+        primary: {
+          DEFAULT: '#0960bd',
+          // dark: primaryColorDark,
+        },
+      },
+      screens: {
+        sm: '576px',
+        md: '768px',
+        lg: '992px',
+        xl: '1200px',
+        '2xl': '1600px',
       },
-    },
-    screens: {
-      sm: '576px',
-      md: '768px',
-      lg: '992px',
-      xl: '1200px',
-      '2xl': '1600px',
     },
   },
 };
diff --git a/yarn.lock b/yarn.lock
index e2de3b3..07ef22e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -505,10 +505,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@rollup/plugin-node-resolve@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.nlark.com/@rollup/plugin-node-resolve/download/@rollup/plugin-node-resolve-13.0.0.tgz#352f07e430ff377809ec8ec8a6fd636547162dc4"
-  integrity sha1-NS8H5DD/N3gJ7I7Ipv1jZUcWLcQ=
+"@rollup/plugin-node-resolve@^13.0.2":
+  version "13.0.2"
+  resolved "https://registry.nlark.com/@rollup/plugin-node-resolve/download/@rollup/plugin-node-resolve-13.0.2.tgz?cache=0&sync_timestamp=1626393688566&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40rollup%2Fplugin-node-resolve%2Fdownload%2F%40rollup%2Fplugin-node-resolve-13.0.2.tgz#bfe58e9bfc7284ee0fabc6da7fabcb268f04e0a4"
+  integrity sha1-v+WOm/xyhO4Pq8baf6vLJo8E4KQ=
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
@@ -620,10 +620,10 @@
   resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
   integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
-"@types/mockjs@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.nlark.com/@types/mockjs/download/@types/mockjs-1.0.3.tgz?cache=0&sync_timestamp=1621241889026&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmockjs%2Fdownload%2F%40types%2Fmockjs-1.0.3.tgz#bd8ee3c7cbbd9a18788ab677b9e4f97c8d0bb0bf"
-  integrity sha1-vY7jx8u9mhh4irZ3ueT5fI0LsL8=
+"@types/mockjs@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.nlark.com/@types/mockjs/download/@types/mockjs-1.0.4.tgz?cache=0&sync_timestamp=1625771765667&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmockjs%2Fdownload%2F%40types%2Fmockjs-1.0.4.tgz#e706951d5e33b4f0a4bb73b1f8b124e26f081de0"
+  integrity sha1-5waVHV4ztPCku3Ox+LEk4m8IHeA=
 
 "@types/node@*":
   version "15.12.4"
@@ -2016,6 +2016,11 @@ esbuild@0.11.3:
   resolved "https://registry.nlark.com/esbuild/download/esbuild-0.11.3.tgz#b57165b907be4ffba651f6450538ce8d8c1d5eb0"
   integrity sha1-tXFluQe+T/umUfZFBTjOjYwdXrA=
 
+esbuild@^0.12.5:
+  version "0.12.15"
+  resolved "https://registry.nlark.com/esbuild/download/esbuild-0.12.15.tgz?cache=0&sync_timestamp=1625545660518&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fesbuild%2Fdownload%2Fesbuild-0.12.15.tgz#9d99cf39aeb2188265c5983e983e236829f08af0"
+  integrity sha1-nZnPOa6yGIJlxZg+mD4jaCnwivA=
+
 esbuild@^0.12.6, esbuild@^0.12.8:
   version "0.12.14"
   resolved "https://registry.nlark.com/esbuild/download/esbuild-0.12.14.tgz?cache=0&sync_timestamp=1625183314696&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fesbuild%2Fdownload%2Fesbuild-0.12.14.tgz#43157dbd0b36d939247d4eb4909a4886ac40f82e"
@@ -2297,7 +2302,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.5:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
-fast-glob@^3.2.6:
+fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE=
@@ -4204,7 +4209,7 @@ postcss@^8.1.10:
     nanoid "^3.1.23"
     source-map-js "^0.6.2"
 
-postcss@^8.1.6, postcss@^8.2.1, postcss@^8.3.5:
+postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.10, postcss@^8.3.5:
   version "8.3.5"
   resolved "https://registry.nlark.com/postcss/download/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
   integrity sha1-mCIWsRNBK8IKhiiekeuZSVKltwk=
@@ -5307,19 +5312,19 @@ vite-plugin-html@^2.0.7:
     fs-extra "^9.1.0"
     html-minifier-terser "^5.1.1"
 
-vite-plugin-mock@^2.9.1:
-  version "2.9.1"
-  resolved "https://registry.nlark.com/vite-plugin-mock/download/vite-plugin-mock-2.9.1.tgz?cache=0&sync_timestamp=1625545918347&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvite-plugin-mock%2Fdownload%2Fvite-plugin-mock-2.9.1.tgz#bc67868082c0a7bfa13a3deb97f6a1bf57be12ff"
-  integrity sha1-vGeGgILAp7+hOj3rl/ahv1e+Ev8=
+vite-plugin-mock@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.nlark.com/vite-plugin-mock/download/vite-plugin-mock-2.9.3.tgz#1afedd17a5a0a64c71acb7355f86977398f46912"
+  integrity sha1-Gv7dF6WgpkxxrLc1X4aXc5j0aRI=
   dependencies:
-    "@rollup/plugin-node-resolve" "^13.0.0"
-    "@types/mockjs" "^1.0.3"
+    "@rollup/plugin-node-resolve" "^13.0.2"
+    "@types/mockjs" "^1.0.4"
     chalk "^4.1.1"
     chokidar "^3.5.2"
     connect "^3.7.0"
     debug "^4.3.2"
     esbuild "0.11.3"
-    fast-glob "^3.2.6"
+    fast-glob "^3.2.7"
     path-to-regexp "^6.2.0"
 
 vite-plugin-style-import@^1.0.1:
@@ -5333,17 +5338,17 @@ vite-plugin-style-import@^1.0.1:
     es-module-lexer "^0.6.0"
     magic-string "^0.25.7"
 
-vite@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.nlark.com/vite/download/vite-2.4.2.tgz#07d00615775c808530bc9f65641062b349b67929"
-  integrity sha1-B9AGFXdcgIUwvJ9lZBBis0m2eSk=
+vite@2.3.6:
+  version "2.3.6"
+  resolved "https://registry.nlark.com/vite/download/vite-2.3.6.tgz#1f7cfde88a51a802d69000c7bac85d481c2e871c"
+  integrity sha1-H3z96IpRqALWkADHushdSBwuhxw=
   dependencies:
-    esbuild "^0.12.8"
-    postcss "^8.3.5"
-    resolve "^1.20.0"
+    esbuild "^0.12.5"
+    postcss "^8.2.10"
+    resolve "^1.19.0"
     rollup "^2.38.5"
   optionalDependencies:
-    fsevents "~2.3.2"
+    fsevents "~2.3.1"
 
 vooks@^0.2.4, vooks@^0.2.6:
   version "0.2.6"