From 6f6f0cea1c7271250aa62da0a81ce71a02a1d4ef Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Sun, 23 Apr 2023 19:51:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=88=96=E8=80=85=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=A4=B1=E8=B4=A5=20#I6Y6L4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/RoleMenuModal.vue  | 24 ++++++++----------------
 src/views/system/role/RoleScopeModal.vue | 20 ++++++--------------
 src/views/system/role/index.vue          |  4 ++--
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/views/system/role/RoleMenuModal.vue b/src/views/system/role/RoleMenuModal.vue
index 0e12dd41..318ad4b1 100644
--- a/src/views/system/role/RoleMenuModal.vue
+++ b/src/views/system/role/RoleMenuModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" title="修改角色菜单权限" @ok="handleSubmit">
     <BasicForm @register="registerForm">
       <template #menuIds="{ model, field }">
         <BasicTree
@@ -20,14 +20,13 @@ import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { menuScopeFormSchema } from './role.data'
-import { createRole, getRole, updateRole } from '@/api/system/role'
+import { getRole } from '@/api/system/role'
 import { BasicTree, TreeItem } from '@/components/Tree'
 import { listSimpleMenus } from '@/api/system/menu'
 import { handleTree } from '@/utils/tree'
-import { listRoleMenus } from '@/api/system/permission'
+import { assignRoleMenu, listRoleMenus } from '@/api/system/permission'
 
 const emit = defineEmits(['success', 'register'])
-const isUpdate = ref(true)
 const treeData = ref<TreeItem[]>([])
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
@@ -45,25 +44,18 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     const res = await listSimpleMenus()
     treeData.value = handleTree(res, 'id')
   }
-  isUpdate.value = !!data?.isUpdate
 
-  if (unref(isUpdate)) {
-    const res = await getRole(data.record.id)
-    const menuRes = await listRoleMenus(data.record.id)
-    res.menuIds = menuRes
-    setFieldsValue({ ...res })
-  }
+  const res = await getRole(data.record.id)
+  const menuRes = await listRoleMenus(data.record.id)
+  res.menuIds = menuRes
+  setFieldsValue({ ...res })
 })
 
 async function handleSubmit() {
   try {
     const values = await validate()
     setModalProps({ confirmLoading: true })
-    if (unref(isUpdate)) {
-      await updateRole(values)
-    } else {
-      await createRole(values)
-    }
+    await assignRoleMenu(values)
     closeModal()
     emit('success')
   } finally {
diff --git a/src/views/system/role/RoleScopeModal.vue b/src/views/system/role/RoleScopeModal.vue
index 587d9327..e8dabd66 100644
--- a/src/views/system/role/RoleScopeModal.vue
+++ b/src/views/system/role/RoleScopeModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" title="编辑角色数据权限" @ok="handleSubmit">
     <BasicForm @register="registerForm">
       <template #dataScopeDeptIds="{ model, field }">
         <BasicTree
@@ -21,12 +21,12 @@ import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { BasicTree, TreeItem } from '@/components/Tree'
 import { dataScopeFormSchema } from './role.data'
-import { createRole, getRole, updateRole } from '@/api/system/role'
+import { getRole } from '@/api/system/role'
 import { listSimpleDept } from '@/api/system/dept'
 import { handleTree } from '@/utils/tree'
+import { assignRoleDataScope } from '@/api/system/permission'
 
 const emit = defineEmits(['success', 'register'])
-const isUpdate = ref(true)
 const treeData = ref<TreeItem[]>([])
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
@@ -44,23 +44,15 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     const res = await listSimpleDept()
     treeData.value = handleTree(res, 'id')
   }
-  isUpdate.value = !!data?.isUpdate
-
-  if (unref(isUpdate)) {
-    const res = await getRole(data.record.id)
-    setFieldsValue({ ...res })
-  }
+  const res = await getRole(data.record.id)
+  setFieldsValue({ ...res })
 })
 
 async function handleSubmit() {
   try {
     const values = await validate()
     setModalProps({ confirmLoading: true })
-    if (unref(isUpdate)) {
-      await updateRole(values)
-    } else {
-      await createRole(values)
-    }
+    await assignRoleDataScope(values)
     closeModal()
     emit('success')
   } finally {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1e6c2b3d..2e2d236c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -91,11 +91,11 @@ function handleEdit(record: Recordable) {
 }
 
 function handleMenu(record: Recordable) {
-  openMenuModal(true, { record, isUpdate: true })
+  openMenuModal(true, { record })
 }
 
 function handleDataScope(record: Recordable) {
-  openScopeModal(true, { record, isUpdate: true })
+  openScopeModal(true, { record })
 }
 
 async function handleExport() {