From ab240cb0035f2f90e7dd5fdb5e9a5d12dae88545 Mon Sep 17 00:00:00 2001
From: songlh <song.lhlh@gmail.com>
Date: Mon, 26 Aug 2024 16:02:05 +0800
Subject: [PATCH] fix(ui): update builtIn params

---
 .../cmdb/views/ci_types/attributeEditForm.vue        |  6 +-----
 .../cmdb/views/ci_types/ceateNewAttribute.vue        |  5 +----
 .../src/modules/cmdb/views/ci_types/preValueArea.vue | 12 ++++--------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
index e6c71ec..5ddf3a8 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
@@ -246,7 +246,6 @@
                 <a-icon
                   style="position:absolute;top:2px;left:-17px;color:#A5A9BC;"
                   type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -281,7 +280,7 @@
 
       <a-col :span="6" v-if="!['6', '7', '10'].includes(currentValueType)">
         <a-form-item
-          :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
@@ -292,7 +291,6 @@
                 <a-icon
                   style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
                   type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -324,7 +322,6 @@
                 <a-icon
                   style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
                   type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -383,7 +380,6 @@
                   <a-icon
                     style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
                     type="info-circle"
-                    theme="filled"
                     @click="
                       (e) => {
                         e.stopPropagation()
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
index 074326c..b68152d 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
@@ -237,7 +237,6 @@
               <a-icon
                 style="position:absolute;top:2px;left:-17px;color:#A5A9BC;"
                 type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -272,7 +271,7 @@
 
     <a-col :span="6" v-if="!['6', '7', '10'].includes(currentValueType)">
       <a-form-item
-        :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
       >
         <template slot="label">
@@ -283,7 +282,6 @@
               <a-icon
                 style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
                 type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -316,7 +314,6 @@
               <a-icon
                 style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
                 type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
index 08136e3..f76427b 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
@@ -354,10 +354,9 @@ export default {
     getData() {
       if (this.activeKey === 'builtin') {
         return {
-          choice_value: this.valueList,
+          choice_value: [],
           choice_web_hook: null,
           choice_other: null,
-          choice_builtin: null,
         }
       } else if (this.activeKey === 'define') {
         if (this.validateDefine()) {
@@ -369,18 +368,16 @@ export default {
         return {
           choice_value: this.valueList.filter((item) => item?.[0]),
           choice_web_hook: null,
-          choice_other: null,
-          choice_builtin: null
+          choice_other: null
         }
       } else if (this.activeKey === 'webhook') {
         const choice_web_hook = this.$refs.webhook.getParams()
         choice_web_hook.ret_key = this.form.ret_key
-        return { choice_value: [], choice_web_hook, choice_other: null, choice_builtin: null }
+        return { choice_value: [], choice_web_hook, choice_other: null }
       } else if (this.activeKey === 'script') {
         return {
           choice_value: [],
           choice_web_hook: null,
-          choice_builtin: null,
           choice_other: {
             script: this.script,
             cascade_attributes: this.cascade_attributes,
@@ -395,8 +392,7 @@ export default {
         return {
           choice_value: [],
           choice_web_hook: null,
-          choice_other,
-          choice_builtin: null,
+          choice_other
         }
       }
     },