From 82b59872796dc1769eacfdd9fb0915c07b5e44f2 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Mon, 11 Dec 2023 15:46:14 +0800
Subject: [PATCH] update role list after add

---
 frontend/src/views/Batch/components/UpdateBatch.vue | 2 +-
 frontend/src/views/Role/Role.vue                    | 2 +-
 frontend/src/views/Role/components/AddRole.vue      | 6 +++++-
 frontend/src/views/User/components/AddUser.vue      | 2 +-
 frontend/src/views/User/components/UpdateUser.vue   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/Batch/components/UpdateBatch.vue b/frontend/src/views/Batch/components/UpdateBatch.vue
index 4f017ef..f41a144 100644
--- a/frontend/src/views/Batch/components/UpdateBatch.vue
+++ b/frontend/src/views/Batch/components/UpdateBatch.vue
@@ -49,7 +49,6 @@ function onUpdateBatch() {
             }).then((resp: any) => {
                 if (resp.code == RespCodeOK) {
                     emits('batchUpdated')
-                    emits('close')
                     ElMessage.success("update batch info success")
                 } else {
                     ElMessage.error("failed to update batch info:" + resp.msg)
@@ -57,6 +56,7 @@ function onUpdateBatch() {
             }).catch((error) => {
                 ElMessage.error("failed to update batch info:" + error)
             })
+            emits('close')
         } else {
             ElMessage.error("数据填写错误")
         }
diff --git a/frontend/src/views/Role/Role.vue b/frontend/src/views/Role/Role.vue
index abddd54..6783daa 100644
--- a/frontend/src/views/Role/Role.vue
+++ b/frontend/src/views/Role/Role.vue
@@ -38,7 +38,7 @@
 
         <el-dialog :title="roleOperateTitle" v-model="showRoleOperate">
             <UpdateRole v-if="operate === 'UpdateRole'" />
-            <AddRole v-if="operate === 'AddRole'" />
+            <AddRole v-if="operate === 'AddRole'" @rolesUpdated="updateRoles" @close="showRoleOperate = false"/>
         </el-dialog>
 
         <el-drawer :title="roleDetailTitle" v-model="showDetail" direction="rtl">
diff --git a/frontend/src/views/Role/components/AddRole.vue b/frontend/src/views/Role/components/AddRole.vue
index efd1da3..7af0ee9 100644
--- a/frontend/src/views/Role/components/AddRole.vue
+++ b/frontend/src/views/Role/components/AddRole.vue
@@ -17,12 +17,14 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, defineEmits } from 'vue';
 import { ElMessage } from 'element-plus';
 
 import { RespCodeOK } from "@/request/request";
 import { addRole } from "@/request/role";
 
+const emits = defineEmits(["rolesUpdated", "close"])
+
 const rules = {
     rolename: [
         {
@@ -50,6 +52,7 @@ function onAddRole() {
                 .then((resp: any) => {
                     if (resp.code === RespCodeOK) {
                         // TODO: update role list
+                        emits("rolesUpdated")
                         ElMessage.success(resp.msg);
                     } else {
                         ElMessage.error(resp.msg);
@@ -58,6 +61,7 @@ function onAddRole() {
                 .catch((err: any) => {
                     ElMessage.error("添加失败,请检查输入内容", err.msg);
                 });
+            emits("close")
         } else {
             ElMessage.error("请检查输入内容");
         }
diff --git a/frontend/src/views/User/components/AddUser.vue b/frontend/src/views/User/components/AddUser.vue
index 89ebe60..097d037 100644
--- a/frontend/src/views/User/components/AddUser.vue
+++ b/frontend/src/views/User/components/AddUser.vue
@@ -143,7 +143,6 @@ function onAddUser() {
             addUser(params).then((res: any) => {
                 if (res.code === RespCodeOK) {
                     emits('userUpdated')
-                    emits('close')
                     ElMessage.success(res.msg);
                     formRef.value.resetFields();
                 } else {
@@ -152,6 +151,7 @@ function onAddUser() {
             }).catch((err: any) => {
                 ElMessage.error("添加用户失败:", err.msg);
             });
+            emits('close')
         } else {
             ElMessage.error("内容填写错误");
         }
diff --git a/frontend/src/views/User/components/UpdateUser.vue b/frontend/src/views/User/components/UpdateUser.vue
index 472714e..dc51a9b 100644
--- a/frontend/src/views/User/components/UpdateUser.vue
+++ b/frontend/src/views/User/components/UpdateUser.vue
@@ -121,7 +121,6 @@ function onUpdateUser() {
             }).then((res: any) => {
                 if (res.code === RespCodeOK) {
                     emits('userUpdated')
-                    emits('close')
                     ElMessage.success(res.msg);
                     formRef.value.resetFields();
                 } else {
@@ -130,6 +129,7 @@ function onUpdateUser() {
             }).catch((err: any) => {
                 ElMessage.error("修改用户信息失败", err.msg);
             });
+            emits('close')
         } else {
             ElMessage.error("内容填写错误");
         }
-- 
Gitee