From d501436e3d881363840a6ccff1fed264b3f72a09 Mon Sep 17 00:00:00 2001 From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0=20(#189)?= 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 不支持预定义值 --- cmdb-ui/public/iconfont/demo_index.html | 190 ++- cmdb-ui/public/iconfont/iconfont.css | 38 +- cmdb-ui/public/iconfont/iconfont.js | 2 +- cmdb-ui/public/iconfont/iconfont.json | 56 + cmdb-ui/public/iconfont/iconfont.ttf | Bin 260520 -> 262792 bytes cmdb-ui/public/iconfont/iconfont.woff | Bin 145904 -> 147448 bytes cmdb-ui/public/iconfont/iconfont.woff2 | Bin 118832 -> 120068 bytes cmdb-ui/src/api/employee.js | 261 +-- cmdb-ui/src/api/noticeSetting.js | 40 + .../components/CMDBFilterComp/expression.vue | 578 +++---- .../cmdb/components/noticeContent/index.vue | 6 +- .../modules/cmdb/components/webhook/body.vue | 5 +- .../cmdb/views/ci_types/attributeEditForm.vue | 1429 +++++++++-------- .../cmdb/views/ci_types/attributesTable.vue | 1135 +++++++------ .../cmdb/views/ci_types/ceateNewAttribute.vue | 1098 ++++++------- .../cmdb/views/ci_types/preValueArea.vue | 557 ++++--- .../cmdb/views/ci_types/triggerForm.vue | 125 +- .../modules/triggerTable.vue | 6 + cmdb-ui/src/router/config.js | 28 + .../src/views/setting/companyInfo/index.vue | 751 ++++----- cmdb-ui/src/views/setting/notice/bot.vue | 122 ++ cmdb-ui/src/views/setting/notice/dingding.vue | 151 ++ .../src/views/setting/notice/email/index.less | 17 + .../src/views/setting/notice/email/index.vue | 33 + .../views/setting/notice/email/receive.vue | 196 +++ .../src/views/setting/notice/email/send.vue | 169 ++ cmdb-ui/src/views/setting/notice/feishu.vue | 131 ++ cmdb-ui/src/views/setting/notice/wx.vue | 135 ++ cmdb-ui/src/views/setting/person/index.vue | 773 ++++----- 29 files changed, 4835 insertions(+), 3197 deletions(-) create mode 100644 cmdb-ui/src/api/noticeSetting.js create mode 100644 cmdb-ui/src/views/setting/notice/bot.vue create mode 100644 cmdb-ui/src/views/setting/notice/dingding.vue create mode 100644 cmdb-ui/src/views/setting/notice/email/index.less create mode 100644 cmdb-ui/src/views/setting/notice/email/index.vue create mode 100644 cmdb-ui/src/views/setting/notice/email/receive.vue create mode 100644 cmdb-ui/src/views/setting/notice/email/send.vue create mode 100644 cmdb-ui/src/views/setting/notice/feishu.vue create mode 100644 cmdb-ui/src/views/setting/notice/wx.vue diff --git a/cmdb-ui/public/iconfont/demo_index.html b/cmdb-ui/public/iconfont/demo_index.html index 2a0be2d..4e6515b 100644 --- a/cmdb-ui/public/iconfont/demo_index.html +++ b/cmdb-ui/public/iconfont/demo_index.html @@ -54,6 +54,48 @@