From 834da1f0201f6e1c7fefbfe9f2660e7090ad6b70 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 7 Apr 2020 15:05:40 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9select2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                           | 15 ++++++--
 src/components/Select2/index.vue          |  7 +++-
 src/views/users/UserGroupDetail/index.vue | 45 ++++++++++-------------
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 1b9e094da..ca6689f86 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -23,16 +23,23 @@ export function getUserList(data) {
     params: data
   })
 }
-export function getUserGroupList(data) {
+export function getUserGroupList(params) {
   return request({
     url: '/api/v1/users/groups/',
     method: 'get',
-    params: data
+    params: params
   })
 }
-export function getUserGroup(data) {
+export function getUserGroupDetail(id) {
   return request({
-    url: '/api/v1/users/groups/' + data + '/',
+    url: `/api/v1/users/groups/${id}/`,
+    method: 'get'
+  })
+}
+
+export function getUserGroupMembers(id) {
+  return request({
+    url: `/api/v1/users/users-groups-relations/?usergroup=${id}`,
     method: 'get'
   })
 }
diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue
index 933acb3dd..c1a59bda5 100644
--- a/src/components/Select2/index.vue
+++ b/src/components/Select2/index.vue
@@ -106,6 +106,9 @@ export default {
       },
       defaultProcessSelected: data => {
         return data.map(item => {
+          if (item.label && item.value) {
+            return item
+          }
           return { label: item.name, value: item.id }
         })
       },
@@ -135,7 +138,7 @@ export default {
     }
   },
   watch: {
-    initialOptions: (newValue) => {
+    initialOptions: function(newValue) {
       const notInclude = newValue.filter(v => {
         return this.optionsValues.indexOf(v.value) === -1
       })
@@ -155,7 +158,6 @@ export default {
   },
   methods: {
     loadMore() {
-      console.log('Load more ...', this.params.hasMore)
       if (!this.params.hasMore) {
         return
       }
@@ -190,6 +192,7 @@ export default {
           }
         })
       }).catch(err => {
+        this.$message.error(err)
         console.log(err)
       }).then(() => {
         this.loading = false
diff --git a/src/views/users/UserGroupDetail/index.vue b/src/views/users/UserGroupDetail/index.vue
index 40184055a..8dfa51667 100644
--- a/src/views/users/UserGroupDetail/index.vue
+++ b/src/views/users/UserGroupDetail/index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getUserGroup } from '@/api/user'
+import { getUserGroupDetail, getUserGroupMembers } from '@/api/user'
 import { BaseDetailPage } from '@/layout/components'
 import DetailCard from '@/components/DetailCard'
 import Select2 from '@/components/Select2'
@@ -36,16 +36,13 @@ export default {
   data() {
     return {
       activeSubMenu: 'info',
+      groupMembers: [],
       group: { name: '' },
       submenu: [
         {
           title: this.$tc('baseInfo'),
           name: 'info'
         },
-        {
-          title: this.$t('users.Group members'),
-          name: 'members'
-        },
         {
           title: this.$t('perms.Asset permissions'),
           name: 'assetPermissions'
@@ -54,21 +51,9 @@ export default {
       cardTitle: '基本信息',
       select2: {
         url: '/api/v1/users/users/',
-        initial: [
-          {
-            name: 'hello',
-            id: '1a775bbf-6861-4acb-8ae4-2f684794c8cc'
-          },
-          {
-            name: 'test',
-            id: '4dccdf84-7728-4de0-a507-67c905b3091b'
-          },
-          {
-            name: 'whold',
-            id: 'c5ec4b91-1fb2-478e-89bc-5a4abc0f9c6c'
-          }
-        ]
-      },
+        initial: this.groupMembers,
+        value: []
+      }
     }
   },
   computed: {
@@ -97,14 +82,22 @@ export default {
     }
   },
   mounted() {
-    this.getGroupDetail()
+    getUserGroupDetail(this.$route.params.id).then(data => {
+      this.group = data
+    })
+
+    getUserGroupMembers(this.$route.params.id).then(data => {
+      this.groupMembers = data.map(v => {
+        const member = {}
+        member.id = v.user
+        member.name = v.user_display
+        return member
+      })
+      this.select2.initial = this.groupMembers
+      console.log(this.groupMembers)
+    })
   },
   methods: {
-    getGroupDetail() {
-      getUserGroup(this.$route.params.id).then(response => {
-        this.group = response
-      })
-    }
   }
 }
 </script>