From f78ca68b2eaecb8e0efa0fb709073fefcfdc3d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Thu, 24 Mar 2022 01:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E5=88=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/role/role-assign-permissions.vue   | 75 +++++++++----------
 .../src/views/system/role/role-list.vue       |  5 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/magic-boot-ui/src/views/system/role/role-assign-permissions.vue b/magic-boot-ui/src/views/system/role/role-assign-permissions.vue
index 705238a..2adf0bc 100644
--- a/magic-boot-ui/src/views/system/role/role-assign-permissions.vue
+++ b/magic-boot-ui/src/views/system/role/role-assign-permissions.vue
@@ -1,44 +1,43 @@
 <template>
-  <mb-tree ref="tree" :el="{ 'show-checkbox': true }" url="menu/tree" :search="true" search-width="230px" :select-values.sync="menus" />
+  <mb-tree ref="tree" :el="{ 'show-checkbox': true }" url="menu/tree" :search="true" search-width="230px" v-model:select-values="menus" />
 </template>
 
-<script>
-
-export default {
-  name: 'RoleAssignPermissions',
-  props: {
-    id: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      menus: ''
-    }
-  },
-  created() {
-    this.$get('menu/by/role',{ roleId: this.id }).then(res => {
-      this.menus = res.data.join(',')
-    })
-  },
-  methods: {
-    save(d) {
-      d.loading()
-      this.$post('role/save', {
-        id: this.id,
-        menus: this.menus
-      }).then((response) => {
-        d.hideLoading()
-        this.$notify({
-          title: '成功',
-          message: '分配成功',
-          type: 'success',
-          duration: 2000
-        })
-        this.$emit('close')
-      }).catch(() => d.hideLoading())
-    }
+<script setup>
+import {getCurrentInstance, ref, defineExpose} from 'vue'
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['close'])
+const props = defineProps({
+  id: {
+    type: String,
+    default: ''
   }
+})
+
+console.log(props.id)
+
+const menus = ref('')
+
+proxy.$get('menu/by/role',{ roleId: props.id }).then(res => {
+  menus.value = res.data.join(',')
+})
+
+function save(d) {
+  d.loading()
+  proxy.$post('role/save', {
+    id: props.id,
+    menus: menus.value
+  }).then((response) => {
+    d.hideLoading()
+    proxy.$notify({
+      title: '成功',
+      message: '分配成功',
+      type: 'success',
+      duration: 2000
+    })
+    emit('close')
+  }).catch(() => d.hideLoading())
 }
+
+defineExpose({ save })
+
 </script>
diff --git a/magic-boot-ui/src/views/system/role/role-list.vue b/magic-boot-ui/src/views/system/role/role-list.vue
index c8a7180..e88c407 100644
--- a/magic-boot-ui/src/views/system/role/role-list.vue
+++ b/magic-boot-ui/src/views/system/role/role-list.vue
@@ -57,7 +57,7 @@
 
     <mb-dialog ref="assignPermissionsDialog" title="分配权限" width="550px" @confirm-click="assignPermissions.save($event)">
       <template #content>
-        <role-assign-permissions ref="assignPermissions" :key="Math.random()" :id="temp.id" @close="() => { assignPermissionsDialog.value.hide(); temp.id = '' }" />
+        <role-assign-permissions ref="assignPermissions" :key="temp.id" :id="temp.id" @close="() => { assignPermissionsDialog.hide(); temp.id = '' }" />
       </template>
     </mb-dialog>
 
@@ -83,6 +83,7 @@ const permissionData = reactive([{
         label: '本级',
         value: '3'
       }])
+const assignPermissions = ref()
 const assignPermissionsDialog = ref()
 const table = ref()
 const roleFormDialog = ref()
@@ -150,7 +151,7 @@ const tableOptions = reactive({
                 type: 'text',
                 icon: 'ElPlus',
                 click: (row) => {
-                  temp.id = row.id
+                  temp.value.id = row.id
                   assignPermissionsDialog.value.show()
                 }
               },