From 63792c242f4e4b76b4d03a7b79d65d84852140e1 Mon Sep 17 00:00:00 2001
From: kdyq007 <kdyq@vip.qq.com>
Date: Sat, 23 Nov 2019 20:16:31 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/acl/module/resourceTypeForm.vue      | 29 ++++---------------
 ui/src/views/cmdb/acl/resource_types.vue      | 13 +++++++--
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/ui/src/views/cmdb/acl/module/resourceTypeForm.vue b/ui/src/views/cmdb/acl/module/resourceTypeForm.vue
index c7be895..9c325f5 100644
--- a/ui/src/views/cmdb/acl/module/resourceTypeForm.vue
+++ b/ui/src/views/cmdb/acl/module/resourceTypeForm.vue
@@ -27,7 +27,7 @@
         :wrapper-col="formItemLayout.wrapperCol"
         label="描述"
       >
-        <a-textarea placeholder="请输入描述信息..." name="description" :rows="4" />
+        <a-textarea placeholder="请输入描述信息..." name="description" :rows="4"  v-decorator="['description', {rules: []} ]"/>
       </a-form-item>
 
       <a-form-item
@@ -35,13 +35,8 @@
         :wrapper-col="formItemLayout.wrapperCol"
         label="权限"
       >
-        <div :style="{ borderBottom: '1px solid #E9E9E9' }">
-          <a-checkbox :indeterminate="indeterminate" @change="onCheckAllChange" :checked="checkAll">
-            全选
-          </a-checkbox>
-        </div>
-        <br />
-        <a-checkbox-group :options="plainOptions" v-model="perms" @change="onPermChange" />
+        <a-select mode="tags" v-model="perms" style="width: 100%" placeholder="请输入权限名...">
+        </a-select>
 
       </a-form-item>
 
@@ -89,10 +84,7 @@ export default {
       drawerTitle: '新增资源类型',
       drawerVisible: false,
       formLayout: 'vertical',
-      perms: ['1'],
-      indeterminate: true,
-      checkAll: false,
-      plainOptions: ['1', '2']
+      perms: []
     }
   },
 
@@ -101,7 +93,6 @@ export default {
   },
 
   computed: {
-
     formItemLayout () {
       const { formLayout } = this
       return formLayout === 'horizontal' ? {
@@ -127,17 +118,6 @@ export default {
   mounted () {
   },
   methods: {
-    onPermChange (perms) {
-      this.indeterminate = !!perms.length && perms.length < this.plainOptions.length
-      this.checkAll = perms.length === this.plainOptions.length
-    },
-    onCheckAllChange (e) {
-      Object.assign(this, {
-        perms: e.target.checked ? this.plainOptions : [],
-        indeterminate: false,
-        checkAll: e.target.checked
-      })
-    },
     handleCreate () {
       this.drawerVisible = true
     },
@@ -152,6 +132,7 @@ export default {
     handleEdit (record) {
       this.drawerVisible = true
       console.log(record)
+      this.perms = record.perms
       this.$nextTick(() => {
         this.form.setFieldsValue({
           id: record.id,
diff --git a/ui/src/views/cmdb/acl/resource_types.vue b/ui/src/views/cmdb/acl/resource_types.vue
index 592fe2b..167dcfd 100644
--- a/ui/src/views/cmdb/acl/resource_types.vue
+++ b/ui/src/views/cmdb/acl/resource_types.vue
@@ -112,7 +112,7 @@ export default {
           title: '类型名',
           dataIndex: 'name',
           sorter: false,
-          width: 50,
+          width: 300,
           scopedSlots: {
             customRender: 'nameSearchRender',
             filterDropdown: 'filterDropdown',
@@ -130,7 +130,7 @@ export default {
         {
           title: '描述',
           dataIndex: 'description',
-          width: 250,
+          width: 500,
           sorter: false,
           scopedSlots: { customRender: 'description' }
         },
@@ -241,6 +241,15 @@ export default {
     },
 
     handleEdit (record) {
+      var perms = []
+      var permList = this.id2perms[record.id]
+      if (permList) {
+        for (var i = 0; i < permList.length; i++) {
+          perms.push(permList[i].name)
+        }
+      }
+      record.perms = perms
+      console.log(record)
       this.$refs.resourceTypeForm.handleEdit(record)
     },
     handleDelete (record) {