Merge pull request #745 from WeBankPartners/744_ci_attribute_show_des…

…cription #744 ci attribute support update and show description
WeBankPartners · Mar 20, 2020 · 2dfb9d7 · 2dfb9d7
2 parents 2155998 + 079afa8
commit 2dfb9d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git 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
@@ -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,