From 994681fd1b4b8b8879566a9a53c601b17d486518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Thu, 1 Jul 2021 13:50:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  9 +++++++++
 src/api/menu.js                               | 16 ++++++++++++++--
 src/components/menu_tree/index.vue            |  3 ++-
 src/components/menu_tree/select.vue           |  1 -
 src/components/table/index.vue                |  2 +-
 src/config/setting.config.js                  |  4 ++--
 src/pages/system/view/menu/MenuManagement.vue |  2 +-
 src/pages/system/view/menu/form.vue           |  5 +++--
 src/pages/system/view/role/RoleManagement.vue |  2 +-
 src/pages/system/view/role/form.vue           |  2 +-
 src/pages/user/components/message.vue         | 10 +++++++++-
 11 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 7344e31..ea4d147 100644
--- a/README.md
+++ b/README.md
@@ -30,3 +30,12 @@ $ npm run serve
 
  css 工具函数 地址
  https://www.tailwindcss.cn/docs/installation#post-css-7
+
+已完成：
+1、菜单增删改
+
+
+问题：
+1、通知接口 404 导致后续没开发了
+2、角色，新增，修改， functionAuthority 菜单权限这个字段不知道怎么传
+3、系统日志，没发现api，之前系统也没页面。不知道怎么搞
diff --git a/src/api/menu.js b/src/api/menu.js
index 8cc8ca6..251636d 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -4,14 +4,26 @@ export function delMenuApi(id) {
     return delReq(`/api/v1/menus/${id}`);
 }
 
-export function getMenuDataApi() {
-    return getReq('/api/v1/menus');
+/**
+ * 缓存下，菜单变化的可能性比较小
+ */
+let menus = [];
+export async function getMenuDataApi(useCache) {
+    if (menus.length && useCache) return menus;
+    return getReq('/api/v1/menus').then(res => {
+        menus = res;
+        return res;
+    });
 }
 
 export function addMenuApi(data) {
     return postReq('/api/v1/menus', data);
 }
 
+export function updateMenuApi(data) {
+    return putReq('/api/v1/menus', data);
+}
+
 export function addRoleApi(data) {
     return postReq('/api/v1/roles', data);
 }
diff --git a/src/components/menu_tree/index.vue b/src/components/menu_tree/index.vue
index 020365e..b3a255d 100644
--- a/src/components/menu_tree/index.vue
+++ b/src/components/menu_tree/index.vue
@@ -38,7 +38,8 @@ export default {
         };
     },
     async mounted() {
-        this.rawData = await getMenuDataApi();
+        // 使用 缓存
+        this.rawData = await getMenuDataApi(true);
         this.treeData = convertListToTree(this.rawData, !this.showMenu);
         this.$emit('check', this.defaultCheckedKeys);
         this.expandedKeys = this.defaultCheckedKeys;
diff --git a/src/components/menu_tree/select.vue b/src/components/menu_tree/select.vue
index 46088dd..4f778ff 100644
--- a/src/components/menu_tree/select.vue
+++ b/src/components/menu_tree/select.vue
@@ -34,7 +34,6 @@ export default {
     },
     async mounted() {
         this.treeData = convertListToTree(await getMenuDataApi(), true);
-        console.log(this.treeData);
     },
 };
 </script>
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index c4a0f34..51e8a67 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -125,7 +125,7 @@ export default {
     },
     watch: {
         addVisible(val) {
-            if (!val && this.addBtn.onCancel) this.addBtn.onCancel();
+            if (!val && this?.addBtn?.onCancel) this.addBtn.onCancel();
         },
     },
     mounted() {
diff --git a/src/config/setting.config.js b/src/config/setting.config.js
index 2d83105..e5ec754 100644
--- a/src/config/setting.config.js
+++ b/src/config/setting.config.js
@@ -18,8 +18,8 @@ const settingConfig = {
     multiPage: true, //多页签模式，true:开启，false:不开启
     cachePage: true, //是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
     hideSetting: false, //隐藏设置抽屉，true:隐藏，false:不隐藏
-    systemCode: "Akina", //系统编码
-    systemName: "Akina Antd Vue Pro", //系统名称
+    systemCode: "Karot", //系统编码
+    systemName: "Karot文档管理系统", //系统名称
     copyright: "2021~ C.T 工作室出品", //copyright
     asyncRoutes: false, //异步加载路由，true:开启，false:不开启
     showPageTitle: true, //是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
diff --git a/src/pages/system/view/menu/MenuManagement.vue b/src/pages/system/view/menu/MenuManagement.vue
index 867c1cd..8c0c507 100644
--- a/src/pages/system/view/menu/MenuManagement.vue
+++ b/src/pages/system/view/menu/MenuManagement.vue
@@ -55,7 +55,7 @@ export default {
         edit(data) {
             this.$refs['table']?.show({ type: 1 });
             this.$nextTick(() => {
-                this.$refs['addForm'].setEdit(data);
+                this.$refs['addForm'].setEdit({ ...data });
             });
         },
     },
diff --git a/src/pages/system/view/menu/form.vue b/src/pages/system/view/menu/form.vue
index 314ca4e..d31e689 100644
--- a/src/pages/system/view/menu/form.vue
+++ b/src/pages/system/view/menu/form.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { addMenuApi } from '@/api';
+import { addMenuApi, updateMenuApi } from '@/api';
 import MenuTree from '@/components/menu_tree/select.vue';
 
 export default {
@@ -58,7 +58,8 @@ export default {
     methods: {
         async submit() {
             await this.$refs['form'].validate();
-            return addMenuApi({ ...this.form, parentMenuId: this.form.parentMenuId ?? 0 });
+            const reqData = { ...this.form, parentMenuId: this.form.parentMenuId ?? 0 };
+            return this.isEdit ? updateMenuApi(reqData) : addMenuApi(reqData);
         },
         setEdit(data) {
             this.type = 1;
diff --git a/src/pages/system/view/role/RoleManagement.vue b/src/pages/system/view/role/RoleManagement.vue
index 012b63a..acbfd68 100644
--- a/src/pages/system/view/role/RoleManagement.vue
+++ b/src/pages/system/view/role/RoleManagement.vue
@@ -34,7 +34,7 @@ export default {
             this.$refs['table']?.getData();
         },
         view(data, type) {
-            this.$refs['table']?.show({ type });
+            this.$refs['table']?.show({ type, noFooter: type === 2 });
             this.$nextTick(() => {
                 this.$refs['form'].setData({ ...data }, type);
             });
diff --git a/src/pages/system/view/role/form.vue b/src/pages/system/view/role/form.vue
index a3a94f8..ca4208b 100644
--- a/src/pages/system/view/role/form.vue
+++ b/src/pages/system/view/role/form.vue
@@ -41,7 +41,7 @@ export default {
     computed: {},
     methods: {
         submit() {
-            const query = { ...this.form, authorityList: this.$refs['menuTree'].get() };
+            const query = { ...this.form, functionAuthority: this.checkedKeys.map(i => i.toString()) };
             return this.isEdit ? updateRoleApi(query) : addRoleApi(query);
         },
         setData(data, type) {
diff --git a/src/pages/user/components/message.vue b/src/pages/user/components/message.vue
index 5fb17f6..487eee8 100644
--- a/src/pages/user/components/message.vue
+++ b/src/pages/user/components/message.vue
@@ -1,3 +1,11 @@
 <template>
-    <h1>消息仲系</h1>
+    <my-table url="/api/v1/messages/notice">
+        <a-table-column title="标题" data-index="noticeTitle" />
+        <a-table-column title="内容" data-index="noticeContent" />
+        <a-table-column title="创建时间" data-index="createTime"  />
+        <a-table-column title="发送者" data-index="noticeSenderName" />
+        <a-table-column title="接受者" data-index="noticeReceiverName" />
+        <a-table-column title="是否已读" data-index="isReadName" />
+        <a-table-column title="已读时间" data-index="readTime" />
+    </my-table>
 </template>
-- 
GitLab