diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue index c8ad3b8..f1778b5 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue @@ -51,7 +51,7 @@ @pushCITypeList="pushCITypeList" @addPlugin="openEditDrawer(null, 'add', 'plugin')" /> - + diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/editDrawer.vue b/cmdb-ui/src/modules/cmdb/views/discovery/editDrawer.vue index 2243077..8796ea0 100644 --- a/cmdb-ui/src/modules/cmdb/views/discovery/editDrawer.vue +++ b/cmdb-ui/src/modules/cmdb/views/discovery/editDrawer.vue @@ -22,11 +22,11 @@ - + - + {{ $t('cmdb.custom_dashboard.default') }} plugin @@ -137,9 +137,9 @@ export default { AgentTable }, props: { - is_inner: { + isDiscoveryPage: { type: Boolean, - default: true, + default: false, }, }, data() { @@ -152,7 +152,7 @@ export default { ruleData: {}, type: 'add', adType: '', - form: { name: '', is_plugin: false }, + form: { name: '', is_plugin: true }, rules: {}, customIcon: { name: '', color: '' }, tableData: [], @@ -195,11 +195,9 @@ export default { this.type = type this.ruleData = data this.adType = adType - if (!this.is_inner) { - this.form = { - name: '', - is_plugin: true, - } + this.form = { + name: '', + is_plugin: true, } if (adType === DISCOVERY_CATEGORY_TYPE.HTTP || adType === DISCOVERY_CATEGORY_TYPE.SNMP) { return @@ -225,7 +223,7 @@ export default { // eslint-disable-next-line no-useless-escape this.plugin_script = this.default_plugin_script } - if (data?.is_plugin || !this.is_inner) { + if (this.form?.is_plugin) { this.$nextTick(() => { this.$refs.codemirror.initCodeMirror(this.plugin_script) }) @@ -281,7 +279,7 @@ export default { const params = { ...this.form, type, - is_inner: this.is_inner, + is_inner: !this.form.is_plugin, option: { icon: this.customIcon }, attributes: this.form.is_plugin ? undefined @@ -301,14 +299,14 @@ export default { this.type = 'edit' this.ruleData = res this.$message.success(this.$t('updateSuccess')) - if (this.is_inner) { + if (this.isDiscoveryPage) { this.getDiscovery() } return } this.handleClose() - console.log(this.is_inner) - if (this.is_inner) { + + if (this.isDiscoveryPage) { this.$message.success(this.$t('saveSuccess')) this.getDiscovery() } else { diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue index a0197a2..61e1bf5 100644 --- a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue @@ -78,7 +78,7 @@

{{ $t('noData') }}

- +