From 61cf9e7f14e97b9d4af0ec120a719520cd724738 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 8 Aug 2023 10:27:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20System=20=E7=BB=84=E7=BB=87=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Org/OrganizationList.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/settings/Org/OrganizationList.vue b/src/views/settings/Org/OrganizationList.vue
index 1f765bd7f..224994d30 100644
--- a/src/views/settings/Org/OrganizationList.vue
+++ b/src/views/settings/Org/OrganizationList.vue
@@ -1,9 +1,10 @@
 <template>
-  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+  <GenericListPage :header-actions="headerActions" :table-config="tableConfig" />
 </template>
 
 <script>
 import { GenericListPage } from '@/layout/components'
+
 const performDelete = function({ row, col }) {
   const id = row.id
   const url = `${this.url}${id}/`
@@ -46,7 +47,7 @@ export default {
             formatterArgs: {
               canUpdate: this.$hasPerm('orgs.change_organization'),
               canDelete: function({ row }) {
-                return !row.is_default && vm.$hasPerm('orgs.delete_organization')
+                return !row.internal && vm.$hasPerm('orgs.delete_organization')
               },
               onDelete: function({ row, col, cellValue, reload }) {
                 const msg = this.$t('xpack.Organization.DeleteOrgMsg')
@@ -61,9 +62,11 @@ export default {
                     try {
                       await performDelete.bind(this)({ row: row, col: col })
                       this.$store.dispatch('users/deleteAdminOrg', { id: row.id, name: row.name })
-                      done()
-                      reload()
-                      this.$message.success(this.$tc('common.deleteSuccessMsg'))
+                        .then(() => {
+                          done()
+                          reload()
+                          this.$message.success(this.$tc('common.deleteSuccessMsg'))
+                        })
                     } finally {
                       instance.confirmButtonLoading = false
                     }