From 0abf64ad8b6d2b2c139f5b636367640b6fd96cda Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 10:49:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=90=E5=91=98tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrganizationMembershipList.vue            | 132 ------------------
 .../settings/Org/OrganizationDetail/index.vue |   6 -
 2 files changed, 138 deletions(-)
 delete mode 100644 src/views/settings/Org/OrganizationDetail/OrganizationMembershipList.vue

diff --git a/src/views/settings/Org/OrganizationDetail/OrganizationMembershipList.vue b/src/views/settings/Org/OrganizationDetail/OrganizationMembershipList.vue
deleted file mode 100644
index 7ba1cfebe..000000000
--- a/src/views/settings/Org/OrganizationDetail/OrganizationMembershipList.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <el-row :gutter="20">
-    <el-col :md="14" :sm="24">
-      <GenericListTable ref="GenericListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    </el-col>
-    <el-col :md="10" :sm="24">
-      <RelationCard type="primary" v-bind="memberRelationConfig" class="RelationCard">
-        <el-radio-group v-model="defaultOrgRole" style="padding: 8px">
-          <el-radio v-for="item in group" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </RelationCard>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import GenericListTable from '@/layout/components/GenericListTable'
-import RelationCard from '@/components/RelationCard'
-import { DeleteActionFormatter } from '@/components/TableFormatters'
-
-export default {
-  name: 'OrganizationMembershipList',
-  components: {
-    GenericListTable,
-    RelationCard
-  },
-  props: {
-    object: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      defaultOrgRole: 'User',
-      group: [
-        {
-          label: this.$t('users.OrgAdmin'),
-          value: 'Admin'
-        }, {
-          label: this.$t('users.OrgAuditor'),
-          value: 'Auditor'
-        }, {
-          label: this.$t('users.OrgUser'),
-          value: 'User'
-        }
-      ],
-      tableConfig: {
-        url: `/api/v1/orgs/org-member-relation/?org_id=${this.object.id}`,
-        columns: [
-          'user_display', 'role_display', 'delete_action'
-        ],
-        columnsMeta: {
-          user_display: {
-            label: this.$t('common.Name')
-          },
-          role_display: {
-            label: this.$t('xpack.Organization.OrgRole'),
-            width: 150
-          },
-          delete_action: {
-            prop: 'id',
-            label: this.$t('common.Actions'),
-            align: 'center',
-            width: 80,
-            objects: 'all',
-            formatter: DeleteActionFormatter,
-            hasBackSlash: true,
-            deleteUrl: `/api/v1/orgs/org-member-relation/?id=`
-          }
-        },
-        tableAttrs: {
-          border: false
-        }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasExport: false,
-        hasImport: false
-      },
-      memberRelationConfig: {
-        icon: 'fa-user',
-        title: this.$t('xpack.Organization.AddOrgMembers'),
-        showHasMore: false,
-        objectsAjax: {
-          url: '/api/v1/users/users/?fields_size=mini&order=name&all=1',
-          transformOption: (item) => {
-            return { label: item.name + '(' + item.username + ')', value: item.id }
-          }
-        },
-        hasObjectsId: this.object.users,
-        showHasObjects: false,
-        performAdd: (items) => {
-          const relationUrl = `/api/v1/orgs/org-member-relation/`
-          const data = []
-          for (const user of items) {
-            data.push({ org: this.object.id, user: user.value, role: this.defaultOrgRole })
-          }
-          return this.$axios.post(relationUrl, data)
-        },
-        onAddSuccess: (objects, that) => {
-          this.$log.debug('Select value', that.select2.value)
-          that.iHasObjects = [...that.iHasObjects, ...objects]
-          that.$refs.select2.clearSelected()
-          this.$message.success(this.$t('common.updateSuccessMsg'))
-          this.$refs.GenericListTable.$refs.ListTable.reloadTable()
-          window.location.reload()
-        }
-      }
-    }
-  },
-  watch: {
-    defaultOrgRole(value) {
-      if (value === 'Admin') {
-        this.$set(this.memberRelationConfig, 'hasObjectsId', this.object.admins)
-      }
-      if (value === 'Auditor') {
-        this.$set(this.memberRelationConfig, 'hasObjectsId', this.object.auditors)
-      }
-      if (value === 'User') {
-        this.$set(this.memberRelationConfig, 'hasObjectsId', this.object.users)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.RelationCard ::v-deep .CardTable{
-  table-layout:inherit !important;
-}
-</style>
diff --git a/src/views/settings/Org/OrganizationDetail/index.vue b/src/views/settings/Org/OrganizationDetail/index.vue
index a68ad8059..bfb9f9ee3 100644
--- a/src/views/settings/Org/OrganizationDetail/index.vue
+++ b/src/views/settings/Org/OrganizationDetail/index.vue
@@ -9,7 +9,6 @@
 <script>
 import { GenericDetailPage, TabPage } from '@/layout/components'
 import OrganizationDetail from './OrganizationDetail'
-import OrganizationMembershipList from './OrganizationMembershipList'
 import { getApiPath } from '@/utils/common'
 const performDelete = function() {
   const url = getApiPath(this)
@@ -19,7 +18,6 @@ export default {
   components: {
     GenericDetailPage,
     OrganizationDetail,
-    OrganizationMembershipList,
     TabPage
   },
   data() {
@@ -32,10 +30,6 @@ export default {
           {
             title: this.$t('xpack.Organization.OrganizationDetail'),
             name: 'OrganizationDetail'
-          },
-          {
-            title: this.$t('xpack.Organization.OrganizationMembership'),
-            name: 'OrganizationMembershipList'
           }
         ],
         actions: {