diff --git a/dbm-ui/frontend/.vscode/settings.json b/dbm-ui/frontend/.vscode/settings.json
index 1e37538ab6..2e60813cc8 100644
--- a/dbm-ui/frontend/.vscode/settings.json
+++ b/dbm-ui/frontend/.vscode/settings.json
@@ -38,24 +38,8 @@
"peacock.remoteColor": "#45e35f",
"bk-code-ai.enable": false,
"typescript.tsdk": "node_modules/typescript/lib",
- "workbench.colorCustomizations": {
- "activityBar.activeBackground": "#65c89b",
- "activityBar.background": "#65c89b",
- "activityBar.foreground": "#15202b",
- "activityBar.inactiveForeground": "#15202b99",
- "activityBarBadge.background": "#945bc4",
- "activityBarBadge.foreground": "#e7e7e7",
- "commandCenter.border": "#15202b99",
- "sash.hoverBorder": "#65c89b",
- "statusBar.background": "#42b883",
- "statusBar.foreground": "#15202b",
- "statusBarItem.hoverBackground": "#359268",
- "statusBarItem.remoteBackground": "#42b883",
- "statusBarItem.remoteForeground": "#15202b",
- "titleBar.activeBackground": "#42b883",
- "titleBar.activeForeground": "#15202b",
- "titleBar.inactiveBackground": "#42b88399",
- "titleBar.inactiveForeground": "#15202b99"
- },
- "peacock.color": "#42b883"
+ "peacock.color": "#42b883",
+ "[vue]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ }
}
\ No newline at end of file
diff --git a/dbm-ui/frontend/lib/bk-icon/demo.html b/dbm-ui/frontend/lib/bk-icon/demo.html
index b0a9502cfa..4cd5efc308 100644
--- a/dbm-ui/frontend/lib/bk-icon/demo.html
+++ b/dbm-ui/frontend/lib/bk-icon/demo.html
@@ -117,6 +117,10 @@
+
+
+ tags
+
check-circle-fill
@@ -273,6 +277,10 @@
qiyeweixin
+
+
+ lianxi
+
sql
@@ -749,6 +757,10 @@
backup-2
+
+
+ loading-tubiao
+
host-select
@@ -829,6 +841,10 @@
dirty-host
+
+
+ tag-3
+
saoba
@@ -990,6 +1006,12 @@ 如何使用
+
+
+
+
+ tags
+
@@ -1224,6 +1246,12 @@ 如何使用
qiyeweixin
+
+
+
+
+ lianxi
+
@@ -1938,6 +1966,12 @@ 如何使用
backup-2
+
+
+
+
+ loading-tubiao
+
@@ -2058,6 +2092,12 @@ 如何使用
dirty-host
+
+
+
+
+ tag-3
+
diff --git a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.eot b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.eot
index 91666f38eb..6528400c51 100644
Binary files a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.eot and b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.eot differ
diff --git a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.svg b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.svg
index 65cf7f419b..e783836126 100644
--- a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.svg
+++ b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.svg
@@ -7,659 +7,683 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.ttf b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.ttf
index 58a61df889..cf3b281137 100644
Binary files a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.ttf and b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.ttf differ
diff --git a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.woff b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.woff
index 2593fb314e..a15e495428 100644
Binary files a/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.woff and b/dbm-ui/frontend/lib/bk-icon/fonts/iconcool.woff differ
diff --git a/dbm-ui/frontend/lib/bk-icon/iconcool.js b/dbm-ui/frontend/lib/bk-icon/iconcool.js
index d5655d4995..3b0970e0b2 100644
--- a/dbm-ui/frontend/lib/bk-icon/iconcool.js
+++ b/dbm-ui/frontend/lib/bk-icon/iconcool.js
@@ -1,6 +1,6 @@
!(function () {
var svgCode =
- ' ';
+ ' ';
if (document.body) {
document.body.insertAdjacentHTML('afterbegin', svgCode);
} else {
diff --git a/dbm-ui/frontend/lib/bk-icon/iconcool.json b/dbm-ui/frontend/lib/bk-icon/iconcool.json
index 407cdb5afe..f4bfb437fa 100644
--- a/dbm-ui/frontend/lib/bk-icon/iconcool.json
+++ b/dbm-ui/frontend/lib/bk-icon/iconcool.json
@@ -1 +1 @@
-{"iconName":"bk-dbm","icons":[{"name":"check-circle-fill","svgCode":"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\t \n \n\n\n\n\n\n\n\n\n\n\n\n \n","codepoint":"\\e1a7"},{"name":"exclamation-fill","svgCode":"\n\n\n\n \n \n","codepoint":"\\e173"},{"name":"help","svgCode":"\n\n\n\n\n\t \n\t\n\t\n \n \n","codepoint":"\\e1f5"},{"name":"help-document","svgCode":"\n\n\n\n\n\t \n\t\n\t\n \n \n","codepoint":"\\e1fa"},{"name":"auth","svgCode":" ","codepoint":"\\e152"},{"name":"apply","svgCode":" ","codepoint":"\\e144"},{"name":"increase","svgCode":" ","codepoint":"\\e1fb"},{"name":"close-circle-shape","svgCode":" ","codepoint":"\\e1be"},{"name":"right-shape","svgCode":" ","codepoint":"\\e1a3"},{"name":"bulk-edit","svgCode":" ","codepoint":"\\e15f"},{"name":"funnel","svgCode":" ","codepoint":"\\e1bd"},{"name":"copy-2","svgCode":" ","codepoint":"\\e1e4"},{"name":"paste","svgCode":" ","codepoint":"\\e1e5"},{"name":"keyboard","svgCode":" ","codepoint":"\\e1ae"},{"name":"draft","svgCode":" ","codepoint":"\\e145"},{"name":"todolist","svgCode":" ","codepoint":"\\e146"},{"name":"file","svgCode":" ","codepoint":"\\e136"},{"name":"script","svgCode":" ","codepoint":"\\e137"},{"name":"fast-script","svgCode":" ","codepoint":"\\e151"},{"name":"homepage","svgCode":" ","codepoint":"\\e158"},{"name":"template","svgCode":" ","codepoint":"\\e147"},{"name":"unlock-line","svgCode":" ","codepoint":"\\e166"},{"name":"sync-failed","svgCode":" ","codepoint":"\\e18c"},{"name":"sync-pending","svgCode":" ","codepoint":"\\e18f"},{"name":"sync-success","svgCode":" ","codepoint":"\\e18d"},{"name":"sync-default","svgCode":" ","codepoint":"\\e18e"},{"name":"pulsar","svgCode":" ","codepoint":"\\e1b8"},{"name":"abnormal","svgCode":" ","codepoint":"\\e187"},{"name":"normal","svgCode":" ","codepoint":"\\e188"},{"name":"unknown","svgCode":" ","codepoint":"\\e189"},{"name":"code","svgCode":" ","codepoint":"\\e139"},{"name":"download-line","svgCode":" ","codepoint":"\\e1f2"},{"name":"invisible1","svgCode":" ","codepoint":"\\e1ff"},{"name":"variable-manage","svgCode":" ","codepoint":"\\e1f7"},{"name":"visible1","svgCode":" ","codepoint":"\\e1c5"},{"name":"sync-waiting-01","svgCode":" ","codepoint":"\\e18a"},{"name":"script-template","svgCode":" ","codepoint":"\\e138"},{"name":"qiyeweixin","svgCode":" ","codepoint":"\\e1d9"},{"name":"sql","svgCode":" ","codepoint":"\\e1cb"},{"name":"daochu","svgCode":" ","codepoint":"\\e1ed"},{"name":"version","svgCode":" ","codepoint":"\\e156"},{"name":"copy","svgCode":" ","codepoint":"\\e103"},{"name":"database","svgCode":" ","codepoint":"\\e101"},{"name":"eyes","svgCode":" ","codepoint":"\\e102"},{"name":"setting-fill","svgCode":" ","codepoint":"\\e104"},{"name":"resource","svgCode":" ","codepoint":"\\e105"},{"name":"ticket","svgCode":" ","codepoint":"\\e106"},{"name":"pc","svgCode":" ","codepoint":"\\e1e6"},{"name":"edit","svgCode":" ","codepoint":"\\e108"},{"name":"loading","svgCode":" ","codepoint":"\\e1a8"},{"name":"help-fill","svgCode":" ","codepoint":"\\e109"},{"name":"unlock-line-2","svgCode":" ","codepoint":"\\e10b"},{"name":"lock-fill","svgCode":" ","codepoint":"\\e10c"},{"name":"un-full-screen","svgCode":" ","codepoint":"\\e10f"},{"name":"full-screen","svgCode":" ","codepoint":"\\e110"},{"name":"minus-fill","svgCode":" ","codepoint":"\\e111"},{"name":"plus-fill","svgCode":" ","codepoint":"\\e112"},{"name":"add","svgCode":" ","codepoint":"\\e116"},{"name":"delete-fill","svgCode":" ","codepoint":"\\e117"},{"name":"refresh","svgCode":" ","codepoint":"\\e118"},{"name":"more","svgCode":" ","codepoint":"\\e119"},{"name":"arrow-fill","svgCode":" ","codepoint":"\\e11e"},{"name":"attention-fill","svgCode":" ","codepoint":"\\e11f"},{"name":"attention","svgCode":" ","codepoint":"\\e120"},{"name":"up-big","svgCode":" ","codepoint":"\\e121"},{"name":"down-big","svgCode":" ","codepoint":"\\e123"},{"name":"arrow-down","svgCode":" ","codepoint":"\\e122"},{"name":"arrow-up","svgCode":" ","codepoint":"\\e124"},{"name":"right-big","svgCode":" ","codepoint":"\\e125"},{"name":"arrow-right","svgCode":" ","codepoint":"\\e126"},{"name":"arrow-left","svgCode":" ","codepoint":"\\e127"},{"name":"mysql","svgCode":" ","codepoint":"\\e128"},{"name":"redis","svgCode":" ","codepoint":"\\e129"},{"name":"mongo-db","svgCode":" ","codepoint":"\\e12a"},{"name":"kafka","svgCode":" ","codepoint":"\\e12b"},{"name":"approval-node","svgCode":" ","codepoint":"\\e155"},{"name":"down-shape","svgCode":" ","codepoint":"\\e12c"},{"name":"import","svgCode":" ","codepoint":"\\e12d"},{"name":"master","svgCode":" ","codepoint":"\\e13a"},{"name":"cluster","svgCode":" ","codepoint":"\\e13b"},{"name":"host","svgCode":" ","codepoint":"\\e13c"},{"name":"proxy","svgCode":" ","codepoint":"\\e13e"},{"name":"node","svgCode":" ","codepoint":"\\e13d"},{"name":"check","svgCode":" ","codepoint":"\\e13f"},{"name":"deploy","svgCode":" ","codepoint":"\\e140"},{"name":"switch","svgCode":" ","codepoint":"\\e141"},{"name":"refresh-2","svgCode":" ","codepoint":"\\e142"},{"name":"stop","svgCode":" ","codepoint":"\\e143"},{"name":"dns","svgCode":" ","codepoint":"\\e148"},{"name":"member","svgCode":" ","codepoint":"\\e14c"},{"name":"spec","svgCode":" ","codepoint":"\\e149"},{"name":"timed-task","svgCode":" ","codepoint":"\\e14d"},{"name":"history","svgCode":" ","codepoint":"\\e14a"},{"name":"backup","svgCode":" ","codepoint":"\\e14f"},{"name":"account","svgCode":" ","codepoint":"\\e14b"},{"name":"note","svgCode":" ","codepoint":"\\e150"},{"name":"single-node","svgCode":" ","codepoint":"\\e14e"},{"name":"dba-config","svgCode":" ","codepoint":"\\e154"},{"name":"db-config","svgCode":" ","codepoint":"\\e157"},{"name":"default-node","svgCode":" ","codepoint":"\\e159"},{"name":"position","svgCode":" ","codepoint":"\\e15c"},{"name":"plus-circle","svgCode":" ","codepoint":"\\e15d"},{"name":"minus-circle","svgCode":" ","codepoint":"\\e15e"},{"name":"rtx","svgCode":" ","codepoint":"\\e160"},{"name":"expand-line","svgCode":" ","codepoint":"\\e161"},{"name":"star","svgCode":" ","codepoint":"\\e162"},{"name":"search","svgCode":" ","codepoint":"\\e163"},{"name":"plus-8","svgCode":" ","codepoint":"\\e164"},{"name":"star-fill","svgCode":" ","codepoint":"\\e165"},{"name":"unlock","svgCode":" ","codepoint":"\\e167"},{"name":"return","svgCode":" ","codepoint":"\\e168"},{"name":"link","svgCode":" ","codepoint":"\\e169"},{"name":"new","svgCode":" ","codepoint":"\\e16b"},{"name":"drag","svgCode":" ","codepoint":"\\e1a4"},{"name":"warning-2","svgCode":" ","codepoint":"\\e18b"},{"name":"exclamation","svgCode":" ","codepoint":"\\e16c"},{"name":"close","svgCode":" ","codepoint":"\\e16d"},{"name":"check-line","svgCode":" ","codepoint":"\\e16e"},{"name":"early-warning","svgCode":" ","codepoint":"\\e16f"},{"name":"warning","svgCode":" ","codepoint":"\\e170"},{"name":"spce","svgCode":" ","codepoint":"\\e171"},{"name":"password","svgCode":" ","codepoint":"\\e172"},{"name":"redis-2","svgCode":" ","codepoint":"\\e176"},{"name":"mysql-2","svgCode":" ","codepoint":"\\e174"},{"name":"es","svgCode":" ","codepoint":"\\e177"},{"name":"hdfs","svgCode":" ","codepoint":"\\e175"},{"name":"delete","svgCode":" ","codepoint":"\\e178"},{"name":"excel","svgCode":" ","codepoint":"\\e179"},{"name":"history-2","svgCode":" ","codepoint":"\\e17a"},{"name":"migration","svgCode":" ","codepoint":"\\e17d"},{"name":"switch-2","svgCode":" ","codepoint":"\\e17e"},{"name":"remote","svgCode":" ","codepoint":"\\e17f"},{"name":"clearing","svgCode":" ","codepoint":"\\e180"},{"name":"alert","svgCode":" ","codepoint":"\\e181"},{"name":"rebuild","svgCode":" ","codepoint":"\\e182"},{"name":"clone","svgCode":" ","codepoint":"\\e183"},{"name":"associated","svgCode":" ","codepoint":"\\e184"},{"name":"rollback","svgCode":" ","codepoint":"\\e185"},{"name":"aa","svgCode":" ","codepoint":"\\e1f6"},{"name":"data","svgCode":" ","codepoint":"\\e186"},{"name":"audit","svgCode":" ","codepoint":"\\e190"},{"name":"yijinyong","svgCode":" ","codepoint":"\\e19a"},{"name":"kuorongzhong","svgCode":" ","codepoint":"\\e19d"},{"name":"zhongqizhong","svgCode":" ","codepoint":"\\e19b"},{"name":"suorongzhong","svgCode":" ","codepoint":"\\e19e"},{"name":"tihuanzong","svgCode":" ","codepoint":"\\e19c"},{"name":"shanchuzhong","svgCode":" ","codepoint":"\\e19f"},{"name":"jinyongzhong","svgCode":" ","codepoint":"\\e1a0"},{"name":"qiyongzhong","svgCode":" ","codepoint":"\\e1a1"},{"name":"help-fill-2","svgCode":" ","codepoint":"\\e1a2"},{"name":"2-jiantou-you","svgCode":" ","codepoint":"\\e1a5"},{"name":"2-jiantou-zuo","svgCode":" ","codepoint":"\\e1a6"},{"name":"tools","svgCode":" ","codepoint":"\\e1a9"},{"name":"todos","svgCode":" ","codepoint":"\\e1aa"},{"name":"manual","svgCode":" ","codepoint":"\\e1ac"},{"name":"minimap","svgCode":" ","codepoint":"\\e1ad"},{"name":"backup-2","svgCode":" ","codepoint":"\\e1af"},{"name":"host-select","svgCode":" ","codepoint":"\\e1b0"},{"name":"batch-host-select","svgCode":" ","codepoint":"\\e1b1"},{"name":"revoke","svgCode":" ","codepoint":"\\e1b3"},{"name":"en","svgCode":" ","codepoint":"\\e1b4"},{"name":"cn","svgCode":" ","codepoint":"\\e1b5"},{"name":"list","svgCode":" ","codepoint":"\\e1b7"},{"name":"influxdb","svgCode":" ","codepoint":"\\e1ba"},{"name":"summation","svgCode":" ","codepoint":"\\e1bb"},{"name":"folder-open","svgCode":" ","codepoint":"\\e1bc"},{"name":"wenjian","svgCode":" ","codepoint":"\\e1bf"},{"name":"drag","svgCode":" ","codepoint":"\\e1c0"},{"name":"gaokeyong","svgCode":" ","codepoint":"\\e1c2"},{"name":"fenbushijiqun","svgCode":" ","codepoint":"\\e1c3"},{"name":"danjiedian","svgCode":" ","codepoint":"\\e1c1"},{"name":"zhongkongji","svgCode":" ","codepoint":"\\e1c4"},{"name":"wenjian","svgCode":" ","codepoint":"\\e1c6"},{"name":"manual-2","svgCode":" ","codepoint":"\\e1c7"},{"name":"clock","svgCode":" ","codepoint":"\\e1c8"},{"name":"auto","svgCode":" ","codepoint":"\\e1c9"},{"name":"dirty-host","svgCode":" ","codepoint":"\\e1ca"},{"name":"saoba","svgCode":" ","codepoint":"\\e1f4"},{"name":"dongzuo-xiazai","svgCode":" ","codepoint":"\\e1f3"},{"name":"entry","svgCode":" ","codepoint":"\\e1d0"},{"name":"gaojingcelve","svgCode":" ","codepoint":"\\e1d1"},{"name":"lunzhi","svgCode":" ","codepoint":"\\e1d5"},{"name":"gaojing","svgCode":" ","codepoint":"\\e1d2"},{"name":"yonghuzu","svgCode":" ","codepoint":"\\e1d3"},{"name":"pingbi","svgCode":" ","codepoint":"\\e1d4"},{"name":"hongqi","svgCode":" ","codepoint":"\\e1d6"},{"name":"jiankong","svgCode":" ","codepoint":"\\e1d7"},{"name":"mimasuijihua","svgCode":" ","codepoint":"\\e1d8"},{"name":"jiqiren","svgCode":" ","codepoint":"\\e1da"},{"name":"qiyeweixin-2","svgCode":" ","codepoint":"\\e1db"},{"name":"weixin-2","svgCode":" ","codepoint":"\\e1dc"},{"name":"youjian","svgCode":" ","codepoint":"\\e1dd"},{"name":"duanxin","svgCode":" ","codepoint":"\\e1de"},{"name":"yuyin","svgCode":" ","codepoint":"\\e1df"},{"name":"warn-lightning","svgCode":" ","codepoint":"\\e1e1"},{"name":"unlink","svgCode":" ","codepoint":"\\e1e2"},{"name":"mobanshili","svgCode":" ","codepoint":"\\e1e3"},{"name":"qiangzhizhongzhi","svgCode":" ","codepoint":"\\e1e7"},{"name":"sqlserver","svgCode":" ","codepoint":"\\e1e8"},{"name":"qianyizhong","svgCode":" ","codepoint":"\\e1ea"},{"name":"liucheng","svgCode":" ","codepoint":"\\e1eb"},{"name":"kejian","svgCode":" ","codepoint":"\\e1ec"},{"name":"doris","svgCode":" ","codepoint":"\\e1ee"},{"name":"daochu-2","svgCode":" ","codepoint":"\\e1f0"},{"name":"daoru","svgCode":" ","codepoint":"\\e1ef"},{"name":"piliangluru","svgCode":" ","codepoint":"\\e1f1"},{"name":"cluster-standardize","svgCode":" ","codepoint":"\\e1f9"},{"name":"fill-1","svgCode":" ","codepoint":"\\e1fc"},{"name":"kelong","svgCode":" ","codepoint":"\\e1fe"},{"name":"yuandezhongjian","svgCode":" ","codepoint":"\\e1fd"}]}
+{"iconName":"bk-dbm","icons":[{"name":"tags","svgCode":"\n\n\n\n\n \n\n\t \n\t\n \n \n","codepoint":"\\e206"},{"name":"check-circle-fill","svgCode":"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\t \n \n\n\n\n\n\n\n\n\n\n\n\n \n","codepoint":"\\e1a7"},{"name":"exclamation-fill","svgCode":"\n\n\n\n \n \n","codepoint":"\\e173"},{"name":"help","svgCode":"\n\n\n\n\n\t \n\t\n\t\n \n \n","codepoint":"\\e1f5"},{"name":"help-document","svgCode":"\n\n\n\n\n\t \n\t\n\t\n \n \n","codepoint":"\\e1fa"},{"name":"check","svgCode":"\n\n\n\n\n\t \n\t \n \n \n","codepoint":"\\e205"},{"name":"auth","svgCode":" ","codepoint":"\\e152"},{"name":"apply","svgCode":" ","codepoint":"\\e144"},{"name":"increase","svgCode":" ","codepoint":"\\e1fb"},{"name":"close-circle-shape","svgCode":" ","codepoint":"\\e1be"},{"name":"right-shape","svgCode":" ","codepoint":"\\e1a3"},{"name":"bulk-edit","svgCode":" ","codepoint":"\\e15f"},{"name":"funnel","svgCode":" ","codepoint":"\\e1bd"},{"name":"copy-2","svgCode":" ","codepoint":"\\e1e4"},{"name":"paste","svgCode":" ","codepoint":"\\e1e5"},{"name":"keyboard","svgCode":" ","codepoint":"\\e1ae"},{"name":"draft","svgCode":" ","codepoint":"\\e145"},{"name":"todolist","svgCode":" ","codepoint":"\\e146"},{"name":"file","svgCode":" ","codepoint":"\\e136"},{"name":"script","svgCode":" ","codepoint":"\\e137"},{"name":"fast-script","svgCode":" ","codepoint":"\\e151"},{"name":"homepage","svgCode":" ","codepoint":"\\e158"},{"name":"template","svgCode":" ","codepoint":"\\e147"},{"name":"unlock-line","svgCode":" ","codepoint":"\\e166"},{"name":"sync-failed","svgCode":" ","codepoint":"\\e18c"},{"name":"sync-pending","svgCode":" ","codepoint":"\\e18f"},{"name":"sync-success","svgCode":" ","codepoint":"\\e18d"},{"name":"sync-default","svgCode":" ","codepoint":"\\e18e"},{"name":"pulsar","svgCode":" ","codepoint":"\\e1b8"},{"name":"abnormal","svgCode":" ","codepoint":"\\e187"},{"name":"normal","svgCode":" ","codepoint":"\\e188"},{"name":"unknown","svgCode":" ","codepoint":"\\e189"},{"name":"code","svgCode":" ","codepoint":"\\e139"},{"name":"download-line","svgCode":" ","codepoint":"\\e1f2"},{"name":"invisible1","svgCode":" ","codepoint":"\\e1ff"},{"name":"variable-manage","svgCode":" ","codepoint":"\\e1f7"},{"name":"visible1","svgCode":" ","codepoint":"\\e1c5"},{"name":"sync-waiting-01","svgCode":" ","codepoint":"\\e18a"},{"name":"script-template","svgCode":" ","codepoint":"\\e138"},{"name":"qiyeweixin","svgCode":" ","codepoint":"\\e1d9"},{"name":"lianxi","svgCode":" ","codepoint":"\\e209"},{"name":"sql","svgCode":" ","codepoint":"\\e1cb"},{"name":"daochu","svgCode":" ","codepoint":"\\e1ed"},{"name":"version","svgCode":" ","codepoint":"\\e156"},{"name":"copy","svgCode":" ","codepoint":"\\e103"},{"name":"database","svgCode":" ","codepoint":"\\e101"},{"name":"eyes","svgCode":" ","codepoint":"\\e102"},{"name":"setting-fill","svgCode":" ","codepoint":"\\e104"},{"name":"resource","svgCode":" ","codepoint":"\\e105"},{"name":"ticket","svgCode":" ","codepoint":"\\e106"},{"name":"pc","svgCode":" ","codepoint":"\\e1e6"},{"name":"edit","svgCode":" ","codepoint":"\\e108"},{"name":"loading","svgCode":" ","codepoint":"\\e1a8"},{"name":"help-fill","svgCode":" ","codepoint":"\\e109"},{"name":"unlock-line-2","svgCode":" ","codepoint":"\\e10b"},{"name":"lock-fill","svgCode":" ","codepoint":"\\e10c"},{"name":"un-full-screen","svgCode":" ","codepoint":"\\e10f"},{"name":"full-screen","svgCode":" ","codepoint":"\\e110"},{"name":"minus-fill","svgCode":" ","codepoint":"\\e111"},{"name":"plus-fill","svgCode":" ","codepoint":"\\e112"},{"name":"add","svgCode":" ","codepoint":"\\e116"},{"name":"delete-fill","svgCode":" ","codepoint":"\\e117"},{"name":"refresh","svgCode":" ","codepoint":"\\e118"},{"name":"more","svgCode":" ","codepoint":"\\e119"},{"name":"arrow-fill","svgCode":" ","codepoint":"\\e11e"},{"name":"attention-fill","svgCode":" ","codepoint":"\\e11f"},{"name":"attention","svgCode":" ","codepoint":"\\e120"},{"name":"up-big","svgCode":" ","codepoint":"\\e121"},{"name":"down-big","svgCode":" ","codepoint":"\\e123"},{"name":"arrow-down","svgCode":" ","codepoint":"\\e122"},{"name":"arrow-up","svgCode":" ","codepoint":"\\e124"},{"name":"right-big","svgCode":" ","codepoint":"\\e125"},{"name":"arrow-right","svgCode":" ","codepoint":"\\e126"},{"name":"arrow-left","svgCode":" ","codepoint":"\\e127"},{"name":"mysql","svgCode":" ","codepoint":"\\e128"},{"name":"redis","svgCode":" ","codepoint":"\\e129"},{"name":"mongo-db","svgCode":" ","codepoint":"\\e12a"},{"name":"kafka","svgCode":" ","codepoint":"\\e12b"},{"name":"approval-node","svgCode":" ","codepoint":"\\e155"},{"name":"down-shape","svgCode":" ","codepoint":"\\e12c"},{"name":"import","svgCode":" ","codepoint":"\\e12d"},{"name":"master","svgCode":" ","codepoint":"\\e13a"},{"name":"cluster","svgCode":" ","codepoint":"\\e13b"},{"name":"host","svgCode":" ","codepoint":"\\e13c"},{"name":"proxy","svgCode":" ","codepoint":"\\e13e"},{"name":"node","svgCode":" ","codepoint":"\\e13d"},{"name":"check-search","svgCode":" ","codepoint":"\\e13f"},{"name":"deploy","svgCode":" ","codepoint":"\\e140"},{"name":"switch","svgCode":" ","codepoint":"\\e141"},{"name":"refresh-2","svgCode":" ","codepoint":"\\e142"},{"name":"stop","svgCode":" ","codepoint":"\\e143"},{"name":"dns","svgCode":" ","codepoint":"\\e148"},{"name":"member","svgCode":" ","codepoint":"\\e14c"},{"name":"spec","svgCode":" ","codepoint":"\\e149"},{"name":"timed-task","svgCode":" ","codepoint":"\\e14d"},{"name":"history","svgCode":" ","codepoint":"\\e14a"},{"name":"backup","svgCode":" ","codepoint":"\\e14f"},{"name":"account","svgCode":" ","codepoint":"\\e14b"},{"name":"note","svgCode":" ","codepoint":"\\e150"},{"name":"single-node","svgCode":" ","codepoint":"\\e14e"},{"name":"dba-config","svgCode":" ","codepoint":"\\e154"},{"name":"db-config","svgCode":" ","codepoint":"\\e157"},{"name":"default-node","svgCode":" ","codepoint":"\\e159"},{"name":"position","svgCode":" ","codepoint":"\\e15c"},{"name":"plus-circle","svgCode":" ","codepoint":"\\e15d"},{"name":"minus-circle","svgCode":" ","codepoint":"\\e15e"},{"name":"rtx","svgCode":" ","codepoint":"\\e160"},{"name":"expand-line","svgCode":" ","codepoint":"\\e161"},{"name":"star","svgCode":" ","codepoint":"\\e162"},{"name":"search","svgCode":" ","codepoint":"\\e163"},{"name":"plus-8","svgCode":" ","codepoint":"\\e164"},{"name":"star-fill","svgCode":" ","codepoint":"\\e165"},{"name":"unlock","svgCode":" ","codepoint":"\\e167"},{"name":"return","svgCode":" ","codepoint":"\\e168"},{"name":"link","svgCode":" ","codepoint":"\\e169"},{"name":"new","svgCode":" ","codepoint":"\\e16b"},{"name":"drag","svgCode":" ","codepoint":"\\e1a4"},{"name":"warning-2","svgCode":" ","codepoint":"\\e18b"},{"name":"exclamation","svgCode":" ","codepoint":"\\e16c"},{"name":"close","svgCode":" ","codepoint":"\\e16d"},{"name":"check-line","svgCode":" ","codepoint":"\\e16e"},{"name":"early-warning","svgCode":" ","codepoint":"\\e16f"},{"name":"warning","svgCode":" ","codepoint":"\\e170"},{"name":"spce","svgCode":" ","codepoint":"\\e171"},{"name":"password","svgCode":" ","codepoint":"\\e172"},{"name":"redis-2","svgCode":" ","codepoint":"\\e176"},{"name":"mysql-2","svgCode":" ","codepoint":"\\e174"},{"name":"es","svgCode":" ","codepoint":"\\e177"},{"name":"hdfs","svgCode":" ","codepoint":"\\e175"},{"name":"delete","svgCode":" ","codepoint":"\\e178"},{"name":"excel","svgCode":" ","codepoint":"\\e179"},{"name":"history-2","svgCode":" ","codepoint":"\\e17a"},{"name":"migration","svgCode":" ","codepoint":"\\e17d"},{"name":"switch-2","svgCode":" ","codepoint":"\\e17e"},{"name":"remote","svgCode":" ","codepoint":"\\e17f"},{"name":"clearing","svgCode":" ","codepoint":"\\e180"},{"name":"alert","svgCode":" ","codepoint":"\\e181"},{"name":"rebuild","svgCode":" ","codepoint":"\\e182"},{"name":"clone","svgCode":" ","codepoint":"\\e183"},{"name":"associated","svgCode":" ","codepoint":"\\e184"},{"name":"rollback","svgCode":" ","codepoint":"\\e185"},{"name":"aa","svgCode":" ","codepoint":"\\e1f6"},{"name":"data","svgCode":" ","codepoint":"\\e186"},{"name":"audit","svgCode":" ","codepoint":"\\e190"},{"name":"yijinyong","svgCode":" ","codepoint":"\\e19a"},{"name":"kuorongzhong","svgCode":" ","codepoint":"\\e19d"},{"name":"zhongqizhong","svgCode":" ","codepoint":"\\e19b"},{"name":"suorongzhong","svgCode":" ","codepoint":"\\e19e"},{"name":"tihuanzong","svgCode":" ","codepoint":"\\e19c"},{"name":"shanchuzhong","svgCode":" ","codepoint":"\\e19f"},{"name":"jinyongzhong","svgCode":" ","codepoint":"\\e1a0"},{"name":"qiyongzhong","svgCode":" ","codepoint":"\\e1a1"},{"name":"help-fill-2","svgCode":" ","codepoint":"\\e1a2"},{"name":"2-jiantou-you","svgCode":" ","codepoint":"\\e1a5"},{"name":"2-jiantou-zuo","svgCode":" ","codepoint":"\\e1a6"},{"name":"tools","svgCode":" ","codepoint":"\\e1a9"},{"name":"todos","svgCode":" ","codepoint":"\\e1aa"},{"name":"manual","svgCode":" ","codepoint":"\\e1ac"},{"name":"minimap","svgCode":" ","codepoint":"\\e1ad"},{"name":"backup-2","svgCode":" ","codepoint":"\\e1af"},{"name":"loading-tubiao","svgCode":" ","codepoint":"\\e208"},{"name":"host-select","svgCode":" ","codepoint":"\\e1b0"},{"name":"batch-host-select","svgCode":" ","codepoint":"\\e1b1"},{"name":"revoke","svgCode":" ","codepoint":"\\e1b3"},{"name":"en","svgCode":" ","codepoint":"\\e1b4"},{"name":"cn","svgCode":" ","codepoint":"\\e1b5"},{"name":"list","svgCode":" ","codepoint":"\\e1b7"},{"name":"influxdb","svgCode":" ","codepoint":"\\e1ba"},{"name":"summation","svgCode":" ","codepoint":"\\e1bb"},{"name":"folder-open","svgCode":" ","codepoint":"\\e1bc"},{"name":"wenjian","svgCode":" ","codepoint":"\\e1bf"},{"name":"drag","svgCode":" ","codepoint":"\\e1c0"},{"name":"gaokeyong","svgCode":" ","codepoint":"\\e1c2"},{"name":"fenbushijiqun","svgCode":" ","codepoint":"\\e1c3"},{"name":"danjiedian","svgCode":" ","codepoint":"\\e1c1"},{"name":"zhongkongji","svgCode":" ","codepoint":"\\e1c4"},{"name":"wenjian","svgCode":" ","codepoint":"\\e1c6"},{"name":"manual-2","svgCode":" ","codepoint":"\\e1c7"},{"name":"clock","svgCode":" ","codepoint":"\\e1c8"},{"name":"auto","svgCode":" ","codepoint":"\\e1c9"},{"name":"dirty-host","svgCode":" ","codepoint":"\\e1ca"},{"name":"tag-3","svgCode":" ","codepoint":"\\e207"},{"name":"saoba","svgCode":" ","codepoint":"\\e1f4"},{"name":"dongzuo-xiazai","svgCode":" ","codepoint":"\\e1f3"},{"name":"entry","svgCode":" ","codepoint":"\\e1d0"},{"name":"gaojingcelve","svgCode":" ","codepoint":"\\e1d1"},{"name":"lunzhi","svgCode":" ","codepoint":"\\e1d5"},{"name":"gaojing","svgCode":" ","codepoint":"\\e1d2"},{"name":"yonghuzu","svgCode":" ","codepoint":"\\e1d3"},{"name":"pingbi","svgCode":" ","codepoint":"\\e1d4"},{"name":"hongqi","svgCode":" ","codepoint":"\\e1d6"},{"name":"jiankong","svgCode":" ","codepoint":"\\e1d7"},{"name":"mimasuijihua","svgCode":" ","codepoint":"\\e1d8"},{"name":"jiqiren","svgCode":" ","codepoint":"\\e1da"},{"name":"qiyeweixin-2","svgCode":" ","codepoint":"\\e1db"},{"name":"weixin-2","svgCode":" ","codepoint":"\\e1dc"},{"name":"youjian","svgCode":" ","codepoint":"\\e1dd"},{"name":"duanxin","svgCode":" ","codepoint":"\\e1de"},{"name":"yuyin","svgCode":" ","codepoint":"\\e1df"},{"name":"warn-lightning","svgCode":" ","codepoint":"\\e1e1"},{"name":"unlink","svgCode":" ","codepoint":"\\e1e2"},{"name":"mobanshili","svgCode":" ","codepoint":"\\e1e3"},{"name":"qiangzhizhongzhi","svgCode":" ","codepoint":"\\e1e7"},{"name":"sqlserver","svgCode":" ","codepoint":"\\e1e8"},{"name":"qianyizhong","svgCode":" ","codepoint":"\\e1ea"},{"name":"liucheng","svgCode":" ","codepoint":"\\e1eb"},{"name":"kejian","svgCode":" ","codepoint":"\\e1ec"},{"name":"doris","svgCode":" ","codepoint":"\\e1ee"},{"name":"daochu-2","svgCode":" ","codepoint":"\\e1f0"},{"name":"daoru","svgCode":" ","codepoint":"\\e1ef"},{"name":"piliangluru","svgCode":" ","codepoint":"\\e1f1"},{"name":"cluster-standardize","svgCode":" ","codepoint":"\\e1f9"},{"name":"fill-1","svgCode":" ","codepoint":"\\e1fc"},{"name":"kelong","svgCode":" ","codepoint":"\\e1fe"},{"name":"yuandezhongjian","svgCode":" ","codepoint":"\\e1fd"},{"name":"daihuishou-2","svgCode":" ","codepoint":"\\e202"},{"name":"daihuishou","svgCode":" ","codepoint":"\\e203"},{"name":"guzhangji","svgCode":" ","codepoint":"\\e204"}]}
\ No newline at end of file
diff --git a/dbm-ui/frontend/lib/bk-icon/style.css b/dbm-ui/frontend/lib/bk-icon/style.css
index 6b7f07362a..ea87d7c2b2 100644
--- a/dbm-ui/frontend/lib/bk-icon/style.css
+++ b/dbm-ui/frontend/lib/bk-icon/style.css
@@ -23,6 +23,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
-moz-osx-font-smoothing: grayscale;
}
+.db-icon-tags:before {
+ content: "\e206";
+}
.db-icon-check-circle-fill:before {
content: "\e1a7";
}
@@ -140,6 +143,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.db-icon-qiyeweixin:before {
content: "\e1d9";
}
+.db-icon-lianxi:before {
+ content: "\e209";
+}
.db-icon-sql:before {
content: "\e1cb";
}
@@ -497,6 +503,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.db-icon-backup-2:before {
content: "\e1af";
}
+.db-icon-loading-tubiao:before {
+ content: "\e208";
+}
.db-icon-host-select:before {
content: "\e1b0";
}
@@ -557,6 +566,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.db-icon-dirty-host:before {
content: "\e1ca";
}
+.db-icon-tag-3:before {
+ content: "\e207";
+}
.db-icon-saoba:before {
content: "\e1f4";
}
diff --git a/dbm-ui/frontend/src/layout/Index.vue b/dbm-ui/frontend/src/layout/Index.vue
index 19c4ad3a4a..fefc69d996 100644
--- a/dbm-ui/frontend/src/layout/Index.vue
+++ b/dbm-ui/frontend/src/layout/Index.vue
@@ -143,6 +143,7 @@
'DBMonitorAlarmGroup',
'StaffManage',
'TicketFlowSetting',
+ 'TicketCooperationSetting',
],
[menuEnum.resourceManage]: ['ResourceSpec', 'resourceManage', 'resourcePoolDirtyMachines'],
[menuEnum.platformManage]: [
diff --git a/dbm-ui/frontend/src/layout/components/ConfigManage.vue b/dbm-ui/frontend/src/layout/components/ConfigManage.vue
index e6a675fdce..6b62eec69c 100644
--- a/dbm-ui/frontend/src/layout/components/ConfigManage.vue
+++ b/dbm-ui/frontend/src/layout/components/ConfigManage.vue
@@ -62,6 +62,18 @@
{{ t('单据免审批设置') }}
+
+
+
+
+
+ {{ t('单据协作设置') }}
+
+
{
...getTicketManageRoutes(),
...getTemporaryPasswordModify(),
...getTicketFlowSettingBizRoutes(),
+ ...getTicketCooperationSettingRoutes(),
...getTicketFlowSettingGlobalRoutes(),
],
},
diff --git a/dbm-ui/frontend/src/services/model/function-controller/functionController.ts b/dbm-ui/frontend/src/services/model/function-controller/functionController.ts
index cd1e8a7c7b..10343f102e 100644
--- a/dbm-ui/frontend/src/services/model/function-controller/functionController.ts
+++ b/dbm-ui/frontend/src/services/model/function-controller/functionController.ts
@@ -79,6 +79,7 @@ interface ControllerData {
'bizConfigManage.dbConfigure': ControllerItem;
'bizConfigManage.StaffManage': ControllerItem;
'bizConfigManage.ticketFlowSetting': ControllerItem;
+ 'bizConfigManage.ticketCooperationSetting': ControllerItem;
databaseManage: ControllerItem;
'databaseManage.missionManage': ControllerItem;
'databaseManage.whitelistManage': ControllerItem;
@@ -219,6 +220,7 @@ export default class FunctionController {
'bizConfigManage.dbConfigure': ControllerItem;
'bizConfigManage.StaffManage': ControllerItem;
'bizConfigManage.ticketFlowSetting': ControllerItem;
+ 'bizConfigManage.ticketCooperationSetting': ControllerItem;
databaseManage: ControllerItem;
'databaseManage.missionManage': ControllerItem;
'databaseManage.whitelistManage': ControllerItem;
diff --git a/dbm-ui/frontend/src/views/ticket-cooperation-setting/Index.vue b/dbm-ui/frontend/src/views/ticket-cooperation-setting/Index.vue
new file mode 100644
index 0000000000..f8d87d1d80
--- /dev/null
+++ b/dbm-ui/frontend/src/views/ticket-cooperation-setting/Index.vue
@@ -0,0 +1,124 @@
+
+
+
+
+ {{ t('业务配置') }}
+
+
+
+
+
+
+ {{ t('开启后,您指定的协作人将能够协助处理单据执行、继续任务等事项,同时也会收到单据通知') }}
+
+
+
+
+
+
+
+ {{ t('保存') }}
+
+
+
+
+
+
+
diff --git a/dbm-ui/frontend/src/views/ticket-cooperation-setting/routes.ts b/dbm-ui/frontend/src/views/ticket-cooperation-setting/routes.ts
new file mode 100644
index 0000000000..c5a009ca94
--- /dev/null
+++ b/dbm-ui/frontend/src/views/ticket-cooperation-setting/routes.ts
@@ -0,0 +1,30 @@
+/*
+ * TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
+ *
+ * Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ * the specific language governing permissions and limitations under the License.
+ */
+import { checkDbConsole } from '@utils';
+
+import { t } from '@locales/index';
+
+const routes = [
+ {
+ name: 'TicketCooperationSetting',
+ path: 'ticket-cooperation-setting',
+ meta: {
+ navName: t('单据免审批设置'),
+ },
+ component: () => import('@views/ticket-cooperation-setting/Index.vue'),
+ },
+];
+
+export default function getRoutes() {
+ return checkDbConsole('bizConfigManage.ticketCooperationSetting') ? routes : [];
+}