7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #600 from veops/dev_ui_240826 

fix(ui): update builtIn params
This commit is contained in:
Leo Song 2024-08-26 16:03:37 +08:00 committed by GitHub
parent ffcb533957 dec7435e9b
commit 65ecd827ba
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
View File

@ -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()

5
cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
View File

@ -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()

12
cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
View File

@ -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
}
}
},