From 17366886df47b72197a2c4b921c1d1dfdfaaca9d Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 21 May 2020 15:40:02 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8=EF=BC=8C=E5=88=A0=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84fields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/org/OrgFieldsFormatter.vue | 38 -----------------
 src/views/xpack/org/OrganizationList.vue   | 49 +---------------------
 2 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 src/views/xpack/org/OrgFieldsFormatter.vue

diff --git a/src/views/xpack/org/OrgFieldsFormatter.vue b/src/views/xpack/org/OrgFieldsFormatter.vue
deleted file mode 100644
index c8481c32e..000000000
--- a/src/views/xpack/org/OrgFieldsFormatter.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <el-popover
-    placement="bottom"
-    trigger="click"
-  >
-    <span v-for="item in getCellValue" :key="item">{{ item }} <br></span>
-    <el-button slot="reference" type="text">{{ getCellValueLength }}</el-button>
-  </el-popover>
-</template>
-
-<script>
-import BaseFormatter from '@/components/ListTable/formatters/base'
-export default {
-  name: 'LengthFormatter',
-  extends: BaseFormatter,
-  data() {
-    return {
-      visible: false,
-      dataContent: this.cellValue
-    }
-  },
-  computed: {
-    getCellValueLength() {
-      if (this.cellValue instanceof Array) {
-        return this.cellValue.length
-      }
-      return this.cellValue
-    },
-    getCellValue() {
-      return this.cellValue
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/xpack/org/OrganizationList.vue b/src/views/xpack/org/OrganizationList.vue
index e70b30a3e..c21cf078b 100644
--- a/src/views/xpack/org/OrganizationList.vue
+++ b/src/views/xpack/org/OrganizationList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import OrgFieldsFormatter from './OrgFieldsFormatter'
 
 export default {
   components: {
@@ -14,53 +13,7 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/orgs/orgs/',
-        columns: [
-          'name', 'admins', 'auditors', 'users', 'user_groups', 'assets', 'domains',
-          'admin_users', 'system_users', 'labels', 'perms', 'comment', 'actions'
-        ],
-        columnsMeta: {
-          admins: {
-            label: this.$t('xpack.Admin'),
-            formatter: OrgFieldsFormatter
-          },
-          auditors: {
-            label: this.$t('xpack.Auditor'),
-            formatter: OrgFieldsFormatter
-          },
-          users: {
-            label: this.$t('xpack.User'),
-            formatter: OrgFieldsFormatter
-          },
-          user_groups: {
-            label: this.$t('xpack.UserGroup'),
-            formatter: OrgFieldsFormatter
-          },
-          assets: {
-            label: this.$t('xpack.Asset'),
-            formatter: OrgFieldsFormatter
-          },
-          domains: {
-            label: this.$t('xpack.Domain'),
-            formatter: OrgFieldsFormatter
-          },
-          admin_users: {
-            label: this.$t('xpack.AdminUser'),
-            formatter: OrgFieldsFormatter
-          },
-          system_users: {
-            label: this.$t('xpack.SystemUser'),
-            formatter: OrgFieldsFormatter
-          },
-          labels: {
-            label: this.$t('xpack.Admin'),
-            formatter: OrgFieldsFormatter
-          },
-          perms: {
-            label: this.$t('xpack.Label'),
-            formatter: OrgFieldsFormatter
-          }
-        },
-        detailRoute: 'OrganizationDetail'
+        columns: ['name', 'comment', 'actions']
       },
       headerActions: {
         hasExport: false,