fix:json 不支持预定义值

cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue

@@ -633,9 +633,11 @@ export default {
             values = { ...values, ...computedAreaData }
           } else {
             // 如果是非计算属性，就看看有没有预定义值
+            if (values.value_type !== '6') {
               const preValueAreaData = this.$refs.preValueArea.getData()
               values = { ...values, ...preValueAreaData }
             }
+          }
 
           const fontOptions = this.$refs.fontArea.getData()
           if (values.id) {

cmdb-ui/src/modules/cmdb/views/ci_types/attributesTable.vue

@@ -100,12 +100,6 @@
               :CITypeId="CITypeId"
             />
             <i></i> <i></i> <i></i> <i></i> <i></i>
-
-            <!-- <a-col :xxl="4" :xl="6" :lg="8" :md="12" :sm="24">
-              <div class="property-item-empty filter-empty" @click="handleAddGroupAttr(index)">
-                <a><a-icon type="plus"/></a>
-              </div>
-            </a-col> -->
           </draggable>
         </div>
       </div>
@@ -145,10 +139,6 @@
             :CITypeId="CITypeId"
           />
           <i></i> <i></i> <i></i> <i></i> <i></i>
-          <!-- <a-col :xxl="4" :xl="6" :lg="8" :md="12" :sm="24">
-            <div class="property-item-empty filter-empty" @click="handleAddGroupAttr(undefined)">
-              <a><a-icon type="plus"/></a></div
-            ></a-col> -->
         </draggable>
       </div>
     </div>
@@ -262,7 +252,6 @@ export default {
         group.editable = false
         group.originOrder = group.order
         group.originName = group.name
-        // group.attributes = group.attributes.sort((a, b) => a.order - b.order)
       })
 
       this.otherGroupAttributes = this.attributes
@@ -390,7 +379,6 @@ export default {
               group.attributes = group.attributes.filter((x) => !values.checkedAttributes.includes(x.id))
             }
           })
-          // this.CITypeGroups = this.CITypeGroups
 
           this.otherGroupAttributes.forEach((attributes) => {
             if (values.groupId === null) {

cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue

@@ -294,7 +294,7 @@
           <FontArea ref="fontArea" />
         </a-form-item>
       </a-col>
-      <a-col :span="24">
+      <a-col :span="24" v-if="currentValueType !== '6'">
         <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" label="预定义值">
           <PreValueArea ref="preValueArea" :disabled="isShowComputedArea" />
         </a-form-item>
@@ -428,9 +428,11 @@ export default {
             values = { ...values, ...computedAreaData }
           } else {
             // 如果是非计算属性，就看看有没有预定义值
+            if (values.value_type !== '6') {
               const preValueAreaData = this.$refs.preValueArea.getData()
               values = { ...values, ...preValueAreaData }
             }
+          }
           const fontOptions = this.$refs.fontArea.getData()
 
           // is_index进行操作，除了文本   索引隐藏掉  文本  索引默认是true