From 501d86341a006d99a7b844433f27545cbe153bb9 Mon Sep 17 00:00:00 2001
From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com>
Date: Mon, 9 Oct 2023 19:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0=20(#192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix:add package

* fix:notice_info为null的情况

* fix:2 bugs

* feat:1.common增加通知配置 2.cmdb预定义值webhook&其他模型

* fix:json 不支持预定义值

* fix:json 不支持预定义值

* fix:删除代码
---
 cmdb-ui/src/modules/cmdb/api/CIType.js                 |  8 --------
 .../src/modules/cmdb/views/ci_types/triggerForm.vue    | 10 ++++------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/api/CIType.js b/cmdb-ui/src/modules/cmdb/api/CIType.js
index d7d6631..6bbe18e 100644
--- a/cmdb-ui/src/modules/cmdb/api/CIType.js
+++ b/cmdb-ui/src/modules/cmdb/api/CIType.js
@@ -205,11 +205,3 @@ export function ciTypeFilterPermissions(type_id) {
     method: 'get',
   })
 }
-
-export function getAllDagsName(params) {
-  return axios({
-      url: '/v1/dag/all_names',
-      method: 'GET',
-      params: params
-  })
-}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
index 13cdfdd..9fe69e0 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
@@ -256,7 +256,7 @@
 
 <script>
 import _ from 'lodash'
-import { addTrigger, updateTrigger, deleteTrigger, getAllDagsName } from '../../api/CIType'
+import { addTrigger, updateTrigger, deleteTrigger } from '../../api/CIType'
 import FilterComp from '@/components/CMDBFilterComp'
 import EmployeeTreeSelect from '@/views/setting/components/employeeTreeSelect.vue'
 import Webhook from '../../components/webhook'
@@ -346,9 +346,9 @@ export default {
   },
   mounted() {},
   methods: {
-    async getDags() {
-      await getAllDagsName().then((res) => {
-        this.dags = res.map((dag) => ({ id: dag[1], label: dag[0] }))
+    async getNoticeConfigAppBot() {
+      await getNoticeConfigAppBot().then((res) => {
+        this.appBot = res
       })
     },
     async getNoticeConfigAppBot() {
@@ -358,7 +358,6 @@ export default {
     },
     createFromTriggerTable(attrList) {
       this.visible = true
-      this.getDags()
       this.getNoticeConfigAppBot()
       this.attrList = attrList
       this.triggerId = null
@@ -378,7 +377,6 @@ export default {
     },
     async open(property, attrList) {
       this.visible = true
-      await this.getDags()
       this.getNoticeConfigAppBot()
       this.attrList = attrList
       if (property.has_trigger) {