From 81d44e9a0d506d5cbd363850b76a1cf1db8d085b Mon Sep 17 00:00:00 2001 From: zyxazhang <17379744014@163.com> Date: Thu, 7 Apr 2022 15:39:32 +0800 Subject: [PATCH] =?UTF-8?q?improvement:=E8=8A=82=E7=82=B9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pc/src/i18n/lang/en.js | 1 + frontend/pc/src/i18n/lang/zh.js | 1 + frontend/pc/src/scss/bk-new-change.scss | 4 +- .../pc/src/scss/icon/fonts/commonicon.eot | Bin 55136 -> 55876 bytes .../pc/src/scss/icon/fonts/commonicon.svg | 6 ++ .../pc/src/scss/icon/fonts/commonicon.ttf | Bin 54968 -> 55708 bytes .../pc/src/scss/icon/fonts/commonicon.woff | Bin 31216 -> 31636 bytes frontend/pc/src/scss/icon/iconfont.css | 7 ++ .../commonComponent/preview/NodeTemplate.vue | 32 +++---- .../commonComponent/preview/nodeTemplate.scss | 61 +++++++++---- .../editService/ServiceProcessStep.vue | 2 +- .../editService/flowCanvas/NodeTemplate.vue | 49 +++++----- .../editService/flowCanvas/Palette.vue | 19 +++- .../flowCanvas/jsflowCss/nodeTemplate.scss | 85 +++++++++++------- .../editService/lineConfigue/lineConfigu.scss | 8 +- 15 files changed, 176 insertions(+), 99 deletions(-) diff --git a/frontend/pc/src/i18n/lang/en.js b/frontend/pc/src/i18n/lang/en.js index 635e68a04..73adf475c 100644 --- a/frontend/pc/src/i18n/lang/en.js +++ b/frontend/pc/src/i18n/lang/en.js @@ -2465,6 +2465,7 @@ export const m = { '暂未开放': 'Unopen', '请输入模板内容': 'Please enter the template content', '确认要删除?': 'Are you sure you want to delete?', + '复制': 'Copy', '导入': 'Import', '导出': 'Export', '文件': 'File', diff --git a/frontend/pc/src/i18n/lang/zh.js b/frontend/pc/src/i18n/lang/zh.js index 272dda1d5..b50a0ca52 100644 --- a/frontend/pc/src/i18n/lang/zh.js +++ b/frontend/pc/src/i18n/lang/zh.js @@ -2547,6 +2547,7 @@ export const m = { '暂未开放': '暂未开放', '请输入模板内容': '请输入模板内容', '确认要删除?': '确认要删除?', + '复制': '复制', '导入': '导入', '导出': '导出', '文件': '文件', diff --git a/frontend/pc/src/scss/bk-new-change.scss b/frontend/pc/src/scss/bk-new-change.scss index 0a0ff2a13..9ab68dafe 100644 --- a/frontend/pc/src/scss/bk-new-change.scss +++ b/frontend/pc/src/scss/bk-new-change.scss @@ -78,12 +78,12 @@ padding: 0 20px; display: inline-block; border: 1px solid #C4C6CC; - border-radius: 11px; + // border-radius: 11px; color: #979BA5; font-size: 12px; padding: 0 8px; line-height: 22px; - background-color: #fff; + background-color: #fbf9e2; white-space: nowrap; cursor: pointer; &:hover { diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.eot b/frontend/pc/src/scss/icon/fonts/commonicon.eot index ab4dc934aec901601fc4eef18af28cfbf8576b4b..6ea94a7a578e4c2b3ab343d743d226540676de55 100644 GIT binary patch delta 1087 zcmY*YUuaup6#t#?-uzjT-84;hZ*sfD-Q+gyG~C_BEd`xX*<2la*ozh`G70HwgrzH5 zp^7XIoqZ`oW55UTq58b)Mhg1i(;TCW$fOm-Alni_CRJ-6_AqD@Pm*;^xWDr|-}(2Q zbHDGq`?Yj^MRFdm17G}Fc4p*_?fH%J3yY;OfIb8;o-gKRqKnNb!0{W<_t#tJ-k=u%jz2J+E1vzttrxsN?H&hwG;{vl*^j?lJP6#H0X$DtCMljI0pe)J z#{BlioBpHs;g#6{+#SVS4%uh`?7dVEW-;Q z_94c_(^)!fQ9_}RswHBS&Kyq0ok2D-g;as?u%-=%P0KQ0CHrNYzgNtTv<0aLtzlKz zWA-mSOY04?Pul!(BXICuV=^R_chX_vD8@=aFeb9X5{l3sDNn~JOBN}lk)hDO0QX^N zsy32&o{TJw1}u_{xSxiS2_s;v%DQRp_wMP+wj&26ZC+#eC~;O_?q#T5C%hquHSDb?fHf09Q){|F?)n_u5>`j?!182X{_~ zB6KA{6u3f>khmJucTV@0%l%@UuO3gC;we-7M>QmHsB$K$ms~N@6mnTKl-XoAfsMuZ87_6HS)84tG2W*%j-)$Ikg~33sYSwr5;b>A_JY^$C4)> zWi72=EbXRoGM|Lt9-osor2!~>5}=SG;+8m)!Kez?ZkwYqk~U9WTDh@u>6C-QYikt# zR$88)UzWO(Qh9c;KhF;C^xoR8hy9)7Mn7)%Za+|M-uztf6RBSKahu!%tO_AjKe+X~ ZE8%)?`t6s}BPV*Cwjc7yL+-rr{{ZtQ46y(J delta 369 zcmX@Ih55lcX10Xu3=BK2O=L4;NuG1)^F)X4dS?a(#u^3&hOp$^!~*Gt(?SdktY;V) z1h%B-RHpg;KM}&fAko0UuyIXBYGR7&z3J^hwGV*UECVROH<4Qp$le3QDjB&Y6+(*t z-GJs@VPIhXk&~aC7=1=>4FiK%15oT=Zem3NlQ6?eAX@^cULh|rH+2GsR0cN#!zmpG z2By}6{NfVc+7~Mr7|v{AVBlh&oWiK2#_*4U5vUr7KOdTt9M5m_m4TZDD8RsQ_s%L+ z7(ICnqXZMfzsbiK7c$Ci&S2tUncTuAY<&Q%mw{;)12dSV1EjftZacuh!qf-UE5;xI z6k%hicxd|2{Gs#1!w=s*{QB_cBd$ksn=i5DG68k5O}@xkHTei<9~aLTkZnMx2yc$z ldd9Q4Nc<1u<}%6k8#hlpyPOGV`(~>PKoPr3kJ*`l$^gW+Z`1$) diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.svg b/frontend/pc/src/scss/icon/fonts/commonicon.svg index 9908079a5..4168c6283 100644 --- a/frontend/pc/src/scss/icon/fonts/commonicon.svg +++ b/frontend/pc/src/scss/icon/fonts/commonicon.svg @@ -857,6 +857,12 @@ + + + + + + diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.ttf b/frontend/pc/src/scss/icon/fonts/commonicon.ttf index 4495b7dc46b1f9ae66725a81feca228f5758331a..bd3ba9ad29809ef7f1096530b50ab6dedb509520 100644 GIT binary patch delta 1060 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 G=Klj$)0vh4 delta 11091 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 diff --git a/frontend/pc/src/scss/icon/iconfont.css b/frontend/pc/src/scss/icon/iconfont.css index 31bbf7beb..a32de282d 100644 --- a/frontend/pc/src/scss/icon/iconfont.css +++ b/frontend/pc/src/scss/icon/iconfont.css @@ -8,6 +8,7 @@ url("scss/icon/fonts/commonicon.eot?#iefix") format("embedded-opentype"); font-style: normal; } + .bk-itsm-icon { /* use !important to prevent issues with browser extensions that change fonts */ font-family: 'commonicon' !important; @@ -851,3 +852,9 @@ url("scss/icon/fonts/commonicon.eot?#iefix") format("embedded-opentype"); .icon-pinglun:before { content: "\e220"; } +.icon-kaishi:before { + content: "\e221"; +} +.icon-jieshu:before { + content: "\e222"; +} diff --git a/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue b/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue index ac034ed8a..ff1ab3473 100644 --- a/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue +++ b/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue @@ -28,10 +28,10 @@ @mousemove="moveFn" @mouseup="onNodeClick(node, $event)">
- {{ $t('m.treeinfo["开始"]') }} +
-
- {{ $t('m.treeinfo["结束"]') }} +
+