From 80947a608e94a56cf5335280f4a7ae949523d80c Mon Sep 17 00:00:00 2001
From: zy7y <13271962515@163.com>
Date: Sun, 18 Sep 2022 14:57:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E9=80=89=E4=B8=AD=E5=AD=90=E8=8F=9C=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=E6=B2=A1=E6=9C=89=E5=B8=A6=E4=B8=8A=E6=A0=B9?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/table/conf.js        |  3 +-
 frontend/src/views/main/system/role/role.vue | 49 ++++++++++++--------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/table/conf.js b/frontend/src/components/table/conf.js
index 4696f31..adc1aea 100644
--- a/frontend/src/components/table/conf.js
+++ b/frontend/src/components/table/conf.js
@@ -4,7 +4,8 @@ import { ref } from 'vue'
 export const menuType = {
   0: '目录',
   1: '菜单',
-  2: '按钮'
+  2: '按钮',
+  3: '数据'
 }
 
 // 请求方法颜色映射
diff --git a/frontend/src/views/main/system/role/role.vue b/frontend/src/views/main/system/role/role.vue
index 910a52e..22a4f6e 100644
--- a/frontend/src/views/main/system/role/role.vue
+++ b/frontend/src/views/main/system/role/role.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, onMounted, watch } from 'vue'
+import { ref, reactive, onMounted } from 'vue'
 import Table from '@/components/table/table.vue'
 
 import { getRoles, queryRole, delRole, putRole, addRole } from '@/service/role'
@@ -85,6 +85,15 @@ const newRoleForm = reactive({
   menus: []
 })
 
+// 记录选中的子节点
+const checkedKeys = ref([])
+// 展开的节点
+const expandedKeys = ref([])
+// 选中事件
+const check = (checkedKeys, e) => {
+  newRoleForm.menus = [...e.halfCheckedKeys, ...checkedKeys]
+}
+
 const addClick = () => {
   addVisible.value = !addVisible.value
   // 弹出modal 并获取菜单树
@@ -102,6 +111,8 @@ const onOk = () => {
         addVisible.value = !addVisible.value
         // 2. 重置响应式数据
         formRef.value.resetFields()
+        checkedKeys.value = []
+        expandedKeys.value = []
         // 3. 刷新页面数据
         getPageData()
       }
@@ -113,6 +124,8 @@ const onOk = () => {
 const onCancel = () => {
   // 2. 重置响应式数据
   formRef.value.resetFields()
+  checkedKeys.value = []
+  expandedKeys.value = []
 }
 
 /**更新 */
@@ -122,6 +135,13 @@ const onCancel = () => {
  * @param {} record  行数据
  */
 
+// modal 里表达响应式数据
+const putRoleForm = reactive({
+  name: '',
+  remark: '',
+  menus: []
+})
+
 // 点击编辑弹modal事件
 const putClick = (record) => {
   putVisible.value = !putVisible.value
@@ -132,12 +152,12 @@ const putClick = (record) => {
 const getPutModalData = (record) => {
   // 打开编辑的modal
   getMenus().then((res) => (treeData.value = res.data))
-  // 通过角色获取菜单
+  // 通过角色获取菜单, 已有菜单
   getRoleMenu(record.id).then((res) => {
     function _mids(menus) {
       for (const menu of menus) {
-        if (menu.childer) {
-          _mids(menu.childer)
+        if (menu.children) {
+          _mids(menu.children)
         } else {
           putRoleForm.menus.push(menu.id)
         }
@@ -155,12 +175,7 @@ const putVisible = ref(false)
 
 // modal 里的 表单 对象
 const putRoleFormRef = ref()
-// modal 里表达响应式数据
-const putRoleForm = reactive({
-  name: '',
-  remark: '',
-  menus: []
-})
+
 // 记录 数据的 id 方便修改
 const putId = ref()
 
@@ -189,18 +204,10 @@ const onCancelPut = () => {
 
 // tree
 const treeData = ref()
-
-// 监听menus
-watch(
-  () => newRoleForm.menus,
-  (newValue, oldvalue) => {
-    console.log('menu', newValue, oldvalue)
-  }
-)
 </script>
 
 <template>
-  <div class="user">
+  <div class="role">
     <!-- 查询 -->
     <div class="search">
       <a-form ref="queryFormRef" layout="inline" :model="queryForm">
@@ -246,7 +253,9 @@ watch(
             checkable
             :tree-data="treeData"
             :fieldNames="treeFieldNames"
-            v-model:checkedKeys="newRoleForm.menus"
+            @check="check"
+            v-model:checkedKeys="checkedKeys"
+            v-model:expandedKeys="expandedKeys"
           >
           </a-tree>
         </a-form-item>