From 9c9ee029e686413337125b87710e6035c0782cbb Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 23 Mar 2023 16:46:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10773=E3=80=8110772=E3=80=8110829?=
 =?UTF-8?q?=E3=80=8110826?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Platforms/Api/components/ApiTest.vue      | 11 ++++++---
 .../Platforms/Api/components/ChooseApi.vue    | 23 ++++++++++++-------
 .../system/Role/Detail/Permiss/index.vue      | 16 ++++++++-----
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index df1d8124..14afd101 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -19,6 +19,7 @@
                             :dataSource="paramsTable"
                             :pagination="false"
                             size="small"
+                            bordered
                         >
                             <template #bodyCell="{ column, record, index }">
                                 <template v-if="column.key === 'name'">
@@ -65,8 +66,7 @@
                                 </template>
                                 <template v-else-if="column.key === 'action'">
                                     <PermissionButton
-                                        type="link"
-                                        :hasPermission="`{permission}:delete`"
+                                        type="text"
                                         :popConfirm="{
                                             title: `确定删除`,
                                             onConfirm: () =>
@@ -88,8 +88,9 @@
                         style="text-align: center"
                     />
                     <j-button
+                        type="dashed"
                         @click="requestBody.addRow"
-                        style="width: 100%; text-align: center"
+                        style="width: 100%; text-align: center; margin-top: 5px;"
                     >
                         <AIcon type="PlusOutlined" />新增
                     </j-button>
@@ -305,11 +306,15 @@ type requestObj = {
                 }
             }
             .table {
+                margin-bottom: 22px;
                 :deep(.ant-table-cell) {
                     padding: 0 8px;
                     height: 56px;
                 }
             }
+            :deep(.ant-form-item) {
+                margin-bottom: 0;
+            }
         }
     }
 }
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index be147aa1..e6783527 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -79,7 +79,7 @@ const rowSelection = {
     },
     selectedRowKeys: ref<string[]>([]),
 };
-const save = () => {
+const save = async () => {
     const keys = props.selectedRowKeys;
 
     const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key));
@@ -87,13 +87,20 @@ const save = () => {
 
     if (props.mode === 'api') {
         // 此时是api配置
-        removeKeys.length &&
-            delOperations_api(removeKeys)
-                .finally(() => addOperations_api(addKeys))
-                .then(() => {
-                    message.success('操作成功');
-                    emits('refresh')
-                });
+        // removeKeys.length &&
+        //     delOperations_api(removeKeys)
+        //         .finally(() => addOperations_api(addKeys))
+        //         .then(() => {
+        //             message.success('操作成功');
+        //             emits('refresh');
+        //         });
+        // fix: bug#10829
+        removeKeys.length && (await delOperations_api(removeKeys));
+        const res = await addOperations_api(addKeys);
+        if (res.success) {
+            message.success('操作成功');
+            emits('refresh');
+        }
     } else if (props.mode === 'appManger') {
         const removeItems = removeKeys.map((key) => ({
             id: key,
diff --git a/src/views/system/Role/Detail/Permiss/index.vue b/src/views/system/Role/Detail/Permiss/index.vue
index 8c1fe792..21898ba0 100644
--- a/src/views/system/Role/Detail/Permiss/index.vue
+++ b/src/views/system/Role/Detail/Permiss/index.vue
@@ -78,12 +78,16 @@ const form = reactive({
         });
     },
     clickSave: () => {
-        const updateRole = updateRole_api(form.data);
-        const updateTree = updatePrimissTree_api(roleId, { menus: form.menus });
+        formRef.value?.validate().then(() => {
+            const updateRole = updateRole_api(form.data);
+            const updateTree = updatePrimissTree_api(roleId, {
+                menus: form.menus,
+            });
 
-        Promise.all([updateRole, updateTree]).then((resp) => {
-            message.success('操作成功');
-            router.push('/system/Role');
+            Promise.all([updateRole, updateTree]).then((resp) => {
+                message.success('操作成功');
+                router.push('/system/Role');
+            });
         });
     },
 });
@@ -123,7 +127,7 @@ form.getForm();
             :deep(.ant-form-item-required) {
                 padding-right: 12px;
 
-                &::before{
+                &::before {
                     right: 0;
                 }
             }