删除组织提示

frontend/src/business/components/settings/system/Organization.vue

@@ -18,7 +18,7 @@
         </el-table-column>
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
+            <ms-table-operator @editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -164,6 +164,8 @@
       </template>
     </el-dialog>
 
+    <ms-delete-confirm :title="$t('organization.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
+
   </div>
 </template>
 
@@ -177,10 +179,12 @@
   import MsDialogFooter from "../../common/components/MsDialogFooter";
   import {getCurrentOrganizationId, getCurrentUser, refreshSessionAndCookies} from "../../../../common/js/utils";
   import {DEFAULT, ORGANIZATION} from "../../../../common/js/constants";
+  import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 
   export default {
     name: "MsOrganization",
     components: {
+      MsDeleteConfirm,
       MsCreateBox,
       MsTablePagination,
       MsTableHeader,
@@ -312,24 +316,19 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      del(row) {
+      handleDelete(organization) {
-        this.$confirm(this.$t('organization.delete_confirm'), '', {
+        this.$refs.deleteConfirm.open(organization);
-          confirmButtonText: this.$t('commons.confirm'),
+      },
-          cancelButtonText: this.$t('commons.cancel'),
+      _handleDelete(organization) {
-          type: 'warning'
+        this.result = this.$get(this.deletePath + organization.id, () => {
-        }).then(() => {
+          let lastOrganizationId = getCurrentOrganizationId();
-          this.result = this.$get(this.deletePath + row.id, () => {
+          let sourceId = organization.id;
-            let lastOrganizationId = getCurrentOrganizationId();
+          if (lastOrganizationId === sourceId) {
-            let sourceId = row.id;
+            let sign = DEFAULT;
-            if (lastOrganizationId === sourceId) {
+            refreshSessionAndCookies(sign, sourceId);
-              let sign = DEFAULT;
+          }
-              refreshSessionAndCookies(sign, sourceId);
+          this.$success(this.$t('commons.delete_success'));
-            }
+          this.initTableData();
-            this.$success(this.$t('commons.delete_success'));
-            this.initTableData();
-          });
-        }).catch(() => {
-          this.$info(this.$t('commons.delete_cancel'));
         });
       },
       delMember(row) {

frontend/src/i18n/en-US.js

@@ -117,6 +117,7 @@ export default {
   organization: {
     'create': 'Create Organization',
     'modify': 'Modify',
+    'delete': 'Delete Organization',
     'delete_confirm': 'Are you sure you want to delete this workspace?',
     'input_name': 'Please enter a organization name',
     'select_organization': 'Please select organization',

frontend/src/i18n/zh-CN.js

@@ -116,6 +116,7 @@ export default {
   organization: {
     'create': '创建组织',
     'modify': '修改组织',
+    'delete': '删除组织',
     'delete_confirm': '删除组织会关联删除该组织下的资源，确定要删除吗?',
     'input_name': '请输入组织名称',
     'select_organization': '请选择组织',

frontend/src/i18n/zh-TW.js

@@ -116,6 +116,7 @@ export default {
   organization: {
     'create': '創建組織',
     'modify': '修改組織',
+    'delete': '刪除組織',
     'delete_confirm': '刪除組織會關聯刪除該組織下的資源,確定要刪除嗎?',
     'input_name': '請輸入組織名稱',
     'select_organization': '請選擇組織',