From 079afa84a57ab8da267dfc6e0f815d5a50be3f93 Mon Sep 17 00:00:00 2001
From: zhangsenfeng <729346129@qq.com>
Date: Fri, 20 Mar 2020 16:55:59 +0800
Subject: [PATCH] #744 ci attribute support update and show description

---
 cmdb-ui/src/pages/admin/cmdb-model-management.vue | 12 ++++++++++++
 cmdb-ui/src/pages/designing/ci-data.vue           |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/cmdb-ui/src/pages/admin/cmdb-model-management.vue b/cmdb-ui/src/pages/admin/cmdb-model-management.vue
index 24232ed30..977a73885 100755
--- a/cmdb-ui/src/pages/admin/cmdb-model-management.vue
+++ b/cmdb-ui/src/pages/admin/cmdb-model-management.vue
@@ -332,6 +332,15 @@
                   <FormItem prop="name" :label="$t('ci_attribute_name')">
                     <Input v-model="item.form.name" :disabled="item.form.status === 'decommissioned'"></Input>
                   </FormItem>
+                  <FormItem prop="description" :label="$t('description')">
+                    <Input
+                      v-model="item.form.description"
+                      :disabled="item.form.status === 'decommissioned'"
+                      type="textarea"
+                      :rows="1"
+                      :autosize="true"
+                    />
+                  </FormItem>
                   <FormItem
                     v-if="item.form.inputType !== 'password'"
                     :label="$t('search_filter_number')"
@@ -580,6 +589,9 @@
           <FormItem :label="$t('ci_attribute_name')" prop="name">
             <Input v-model="addNewAttrForm.name"></Input>
           </FormItem>
+          <FormItem :label="$t('description')" prop="description">
+            <Input v-model="addNewAttrForm.description" type="textarea" :rows="1" :autosize="true" />
+          </FormItem>
           <FormItem prop="propertyName" :label="$t('ci_attribute_id')">
             <Input v-model="addNewAttrForm.propertyName"></Input>
           </FormItem>
diff --git a/cmdb-ui/src/pages/designing/ci-data.vue b/cmdb-ui/src/pages/designing/ci-data.vue
index a72a359f5..0b42fe987 100755
--- a/cmdb-ui/src/pages/designing/ci-data.vue
+++ b/cmdb-ui/src/pages/designing/ci-data.vue
@@ -886,6 +886,11 @@ export default {
               ..._,
               tooltip: true,
               title: _.name,
+              renderHeader: (h, params) => (
+                <Tooltip content={_.description} placement="top">
+                  <span>{_.name}</span>
+                </Tooltip>
+              ),
               key: renderKey,
               inputKey: _.propertyName,
               inputType: _.inputType,