fix(ui): attr editor control type display

Author: LHRUN

cmdb-ui/src/modules/cmdb/components/ciTable/index.vue

@@ -73,7 +73,7 @@
           <vxe-input v-else-if="col.is_password" v-model="passwordValue[col.field]" />
 
           <a-textarea
-            v-else-if="col.value_type === '2' && !col.is_index"
+            v-else-if="isLongText(col)"
             :value="col.is_list && Array.isArray(row[col.field]) ? row[col.field].join(',') : row[col.field]"
             :style="{ resize: 'none' }"
             :rows="1"
@@ -226,6 +226,8 @@
 import _ from 'lodash'
 import { getCITypes } from '@/modules/cmdb/api/CIType'
 import { searchCI } from '@/modules/cmdb/api/ci'
+import { isLongText } from '@/modules/cmdb/utils/helper.js'
+
 import JsonEditor from '../JsonEditor/jsonEditor.vue'
 import PasswordField from '../passwordField/index.vue'
 import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
@@ -353,6 +355,7 @@ export default {
   },
 
   methods: {
+    isLongText,
     getVxetableRef() {
       return this?.$refs?.['xTable']?.getVxetableRef?.() || null
     },
@@ -541,7 +544,7 @@ export default {
     },
 
     showCustomEditComponent(col) {
-      if (col.value_type === '2' && !col.is_index) {
+      if (isLongText(col)) {
         return true
       }
 

cmdb-ui/src/modules/cmdb/utils/helper.js

@@ -128,6 +128,7 @@ export function getCITableColumns(data, attrList, width = 1600, height) {
             is_fixed: attr.is_fixed,
             is_bool: attr.is_bool,
             is_reference: attr.is_reference,
+            is_index: attr.is_index,
             reference_type_id: attr.reference_type_id
         })
     }
@@ -295,4 +296,8 @@ export const getAllParentNodesLabel = (node, label) => {
 }
 export const getTreeSelectLabel = (node) => {
     return `${getAllParentNodesLabel(node, node.label)}`
-}
+}
+
+export const isLongText = (attr) => {
+  return attr.value_type === '2' && attr.is_index === false && !attr.is_link && !attr.is_attachment && !attr.is_password
+}

cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue

@@ -181,11 +181,13 @@ import moment from 'moment'
 import { Select, Option } from 'element-ui'
 import { getCIType, getCITypeGroupById } from '@/modules/cmdb/api/CIType'
 import { addCI } from '@/modules/cmdb/api/ci'
-import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
+import { getCITypeParent, getCanEditByParentIdChildId } from '@/modules/cmdb/api/CITypeRelation'
 import { valueTypeMap } from '../../../utils/const'
+import { isLongText } from '@/modules/cmdb/utils/helper'
+
 import CreateInstanceFormByGroup from './createInstanceFormByGroup.vue'
-import { getCITypeParent, getCanEditByParentIdChildId } from '@/modules/cmdb/api/CITypeRelation'
 import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
+import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 
 export default {
   name: 'CreateInstanceForm',
@@ -465,7 +467,7 @@ export default {
           return 'input_number'
         } else if (_find.value_type === '4' || _find.value_type === '3') {
           return _find.value_type
-        } else if (_find.value_type === '2' && !_find.is_index) {
+        } else if (isLongText(_find)) {
           return 'textarea'
         } else {
           return 'input'

cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue

@@ -110,7 +110,7 @@
           />
 
           <a-textarea
-            v-else-if="attr.value_type === '2' && !attr.is_index"
+            v-else-if="isLongText(attr)"
             size="small"
             v-decorator="[
               attr.name,
@@ -209,9 +209,11 @@
 import _ from 'lodash'
 import moment from 'moment'
 import { updateCI } from '@/modules/cmdb/api/ci'
+import { getAttrPassword } from '../../../api/CITypeAttr'
+import { isLongText } from '@/modules/cmdb/utils/helper'
+
 import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 import PasswordField from '../../../components/passwordField/index.vue'
-import { getAttrPassword } from '../../../api/CITypeAttr'
 import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
 
 export default {
@@ -245,6 +247,7 @@ export default {
   },
   methods: {
     moment,
+    isLongText,
     eventListener(e) {
       const datePickerContainer = document.getElementsByClassName('ant-calendar-picker-container')
       if (this.isEdit && !datePickerContainer.length) {

cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue

@@ -40,7 +40,7 @@
             ]"
           />
           <a-textarea
-            v-else-if="attr.value_type === '2' && !attr.is_index"
+            v-else-if="isLongText(attr)"
             v-decorator="[
               attr.name,
               {
@@ -164,6 +164,8 @@
 <script>
 import _ from 'lodash'
 import moment from 'moment'
+import { isLongText } from '@/modules/cmdb/utils/helper'
+
 import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
 
@@ -196,6 +198,7 @@ export default {
   },
   methods: {
     moment,
+    isLongText,
     handleFocusInput(e, attr) {
       console.log(attr)
       const _tempFind = this.attributeList.find((item) => item.name === attr.name)