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 ab4dc934a..6ea94a7a5 100644
Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.eot and b/frontend/pc/src/scss/icon/fonts/commonicon.eot differ
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 4495b7dc4..bd3ba9ad2 100644
Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.ttf and b/frontend/pc/src/scss/icon/fonts/commonicon.ttf differ
diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.woff b/frontend/pc/src/scss/icon/fonts/commonicon.woff
index 0adab649d..149e41f96 100644
Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.woff and b/frontend/pc/src/scss/icon/fonts/commonicon.woff differ
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["结束"]') }}
+
+
@@ -54,9 +54,9 @@
'bk-word-error': (node.nodeInfo.statusInfo === 'TERMINATED' || node.nodeInfo.statusInfo === 'FAILED'),
'bk-word-preview': node.nodeInfo.statusInfo === 'WAIT',
'bk-word-normal': normalColor
- }">
+ }" :title="node.name">
{{node.name || $t(`m.treeinfo["新增节点"]`)}}
-
+
@@ -213,33 +213,29 @@
/* 文字 */
.bk-more-word {
color: #3c96ff;
- border: 1px solid #3A84FF !important;;
- border-radius: 0 20px 20px 0;
+ border-radius: 0 3px 3px 0;
}
.bk-word-success {
color: #2DCB56;
- border: 1px solid #2DCB56 !important;
- border-radius: 0 20px 20px 0;
+ border-radius: 0 3px 3px 0;
}
.bk-word-error {
color: #FF5656;
- border: 1px solid #FF5656 !important;
- border-radius: 0 20px 20px 0;
+ border-radius: 0 3px 3px 0;
}
.bk-word-preview {
color: #c4c6cc;
- border-color: #c4c6cc !important;
- border-radius: 0 20px 20px 0;
+ border-radius: 0 3px 3px 0;
}
}
.bk-icon-status {
position: absolute;
- top: 10px;
- right: 6px;
+ top: -10px;
+ right: -10px;
width: 20px;
height: 20px;
border-radius: 50%;
@@ -249,7 +245,7 @@
.bk-icon {
position: absolute;
- top: 2px;
+ top: 1px;
right: 1px;
font-size: 18px;
}
diff --git a/frontend/pc/src/views/commonComponent/preview/nodeTemplate.scss b/frontend/pc/src/views/commonComponent/preview/nodeTemplate.scss
index 3d90c90d3..853ed2b9d 100644
--- a/frontend/pc/src/views/commonComponent/preview/nodeTemplate.scss
+++ b/frontend/pc/src/views/commonComponent/preview/nodeTemplate.scss
@@ -10,20 +10,40 @@
.startpoint,
.endpoint {
- width: 40px;
- height: 40px;
+ width: 58px;
+ height: 58px;
line-height: 37px;
border-radius: 50%;
- border: 2px solid #C9CACB;
text-align: center;
color: #63656E;
- background-color: #F0F1F5;
+ background-color: #fff;
font-size: 12px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
+ .icon-kaishi {
+ display: block;
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ font-size: 40px;
+ line-height: 60px;
+ margin: 0 auto;
+ color: #738abe;
+ }
+ .icon-jieshu {
+ display: block;
+ width: 42px;
+ height: 42px;
+ border: 2px solid #738abe;
+ border-radius: 50%;
+ font-size: 28px;
+ line-height: 40px;
+ margin: 0 auto;
+ color: #738abe;
+ }
}
.common-branch {
- border: 1px solid #C4C6CC;
+ color: #738abe;
border-radius: 50%;
width: 40px;
height: 40px;
@@ -50,16 +70,18 @@
}
.common-node {
- width: 150px;
- height: 40px;
- line-height: 38px;
+ width: 160px;
+ height: 56px;
+ display: flex;
+ align-items: center;
+ // line-height: 54px;
text-align: center;
background-color: #fff;
- padding-left: 40px;
+ padding-left: 32px;
color: #63656E;
font-size: 14px;
position: relative;
- border-radius: 25px;
+ border-radius: 4px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
border: 1px solid #DCDEE5;
cursor: pointer;
@@ -67,7 +89,7 @@
&:hover {
border: 1px solid #3A84FF;
- border-radius: 20px;
+ // border-radius: 20px;
color: #3A84FF;
.bk-node-delete {
@@ -84,12 +106,12 @@
top: 0;
left: 0;
font-size: 16px;
- width: 40px;
- height: 38px;
- line-height: 38px;
+ width: 32px;
+ height: 54px;
+ // line-height: 38px;
color: #fff;
background-color: #3A84FF;
- border-radius: 25px 0 0 25px;
+ border-radius: 3px 0 0 3px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
.bk-itsm-icon {
@@ -147,11 +169,16 @@
.bk-more-word {
display: inline-block;
box-sizing: border-box;
- width: 110px;
+ width: 126px;
+ text-align: left;
padding: 0 10px 0 4px;
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ // white-space: nowrap;
+ overflow: hidden;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.bk-node-delete {
diff --git a/frontend/pc/src/views/service/editService/ServiceProcessStep.vue b/frontend/pc/src/views/service/editService/ServiceProcessStep.vue
index 7679b54a6..69c0dfbb2 100644
--- a/frontend/pc/src/views/service/editService/ServiceProcessStep.vue
+++ b/frontend/pc/src/views/service/editService/ServiceProcessStep.vue
@@ -32,7 +32,7 @@
@handleNodeClick="handleNodeClick">
-
{{ nodeType }}
+
{{ nodeType }}(#{{ configur.id }})
+ :title="node.name">
- {{ $t(`m.treeinfo['开始']`) }}
+
-
- {{ $t('m.treeinfo["结束"]') }}
+
+
-
+
@@ -52,7 +47,7 @@
API
{{node.name || $t(`m.treeinfo['新增节点']`)}}
-
+
-
+
×
-
+
×
@@ -104,12 +99,13 @@
- {{ $t('m.treeinfo["配置"]') }}
-
+
+ {{ $t('m.treeinfo["删除"]') }}
+ @click.stop="clickDelete(node)">
@@ -159,9 +155,10 @@
{ type: 'SIGN', name: this.$t(`m.treeinfo['会签节点']`), iconStyle: 'icon-sign-node' },
{ type: 'APPROVAL', name: this.$t(`m.treeinfo['审批节点']`), iconStyle: 'icon-approval-node' },
{ type: 'COVERAGE', name: this.$t(`m.treeinfo["汇聚网关"]`), iconStyle: 'icon-flow-branch' },
- { type: 'ROUTER-P', name: this.$t(`m.treeinfo["并行网关"]`), iconStyle: 'icon-flow-convergence' },
- { type: 'COPY', name: this.$t(`m.treeinfo["复制节点"]`), iconStyle: 'icon-copy-new' }
+ { type: 'ROUTER-P', name: this.$t(`m.treeinfo["并行网关"]`), iconStyle: 'icon-flow-convergence' }
+ // { type: 'COPY', name: this.$t(`m.treeinfo["复制节点"]`), iconStyle: 'icon-copy-new' }
],
+ copyNodeInfo: { type: 'COPY', name: this.$t(`m.treeinfo["复制节点"]`), iconStyle: 'icon-copy-new' },
currentNode: {}
}
},
@@ -203,16 +200,22 @@
this.moveFlag = false
},
clickNode (node, event) {
- this.openconfigu()
- },
- // 右键事件
- rightClickNode (node, event) {
+ // this.openconfigu()
if (!node) {
return
}
this.$emit('closeShow')
node.showMore = true
},
+ // 右键事件
+ rightClickNode (node, event) {
+ this.openconfigu()
+ // if (!node) {
+ // return
+ // }
+ // this.$emit('closeShow')
+ // node.showMore = true
+ },
// 配置详情
openconfigu () {
const node = deepClone(this.node)
diff --git a/frontend/pc/src/views/service/editService/flowCanvas/Palette.vue b/frontend/pc/src/views/service/editService/flowCanvas/Palette.vue
index 515388e76..df735602c 100644
--- a/frontend/pc/src/views/service/editService/flowCanvas/Palette.vue
+++ b/frontend/pc/src/views/service/editService/flowCanvas/Palette.vue
@@ -25,14 +25,16 @@
- {{ $t('m.treeinfo["开始"]') }}
+
+
-
- {{ $t('m.treeinfo["结束"]') }}
+
+
@@ -117,7 +119,7 @@
z-index: 2;
}
.bk-itsm-icon {
- color: #737987;
+ color: #738abe;
&:hover {
color: #3A84FF;
}
@@ -136,6 +138,15 @@
color: #C6CFD9;
font-size: 12px;
}
+ .entry-start {
+ font-size: 33px;
+ line-height: 22px;
+ }
+ .entry-end {
+ font-size: 18px;
+ line-height: 28px;
+ border: 2px solid #738abe;
+ }
.entry-gateway {
border: none;
.bk-itsm-icon {
diff --git a/frontend/pc/src/views/service/editService/flowCanvas/jsflowCss/nodeTemplate.scss b/frontend/pc/src/views/service/editService/flowCanvas/jsflowCss/nodeTemplate.scss
index 2fcce7955..eac832a21 100644
--- a/frontend/pc/src/views/service/editService/flowCanvas/jsflowCss/nodeTemplate.scss
+++ b/frontend/pc/src/views/service/editService/flowCanvas/jsflowCss/nodeTemplate.scss
@@ -10,20 +10,40 @@
.startpoint,
.endpoint {
- width: 40px;
- height: 40px;
+ width: 58px;
+ height: 58px;
line-height: 37px;
border-radius: 50%;
- border: 2px solid #C9CACB;
+ // border: 2px solid #C9CACB;
text-align: center;
color: #63656E;
- background-color: #F0F1F5;
+ background-color: #fff;
font-size: 12px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
+ .icon-kaishi {
+ display: block;
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ font-size: 40px;
+ line-height: 60px;
+ margin: 0 auto;
+ color: #738abe;
+ }
+ .icon-jieshu {
+ display: block;
+ width: 42px;
+ height: 42px;
+ border: 2px solid #738abe;
+ border-radius: 50%;
+ font-size: 28px;
+ line-height: 40px;
+ margin: 0 auto;
+ color: #738abe;
+ }
}
.common-branch {
- border: 1px solid #C4C6CC;
border-radius: 50%;
width: 40px;
height: 40px;
@@ -52,25 +72,25 @@
.common-node {
display: flex;
align-items: center;
- width: 150px;
- height: 40px;
- line-height: 38px;
+ width: 160px;
+ height: 56px;
+ // line-height: 38px;
text-align: center;
background-color: #fff;
padding-left: 40px;
color: #63656E;
font-size: 14px;
position: relative;
- border-radius: 25px;
+ border-radius: 4px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
border: 1px solid #DCDEE5;
cursor: pointer;
position: relative;
&:hover {
- border: 1px solid #3A84FF;
- border-radius: 20px;
- color: #3A84FF;
+ border: 1px solid #3a84ff;
+ // border-radius: px;
+ color: #3a84ff;
.icon-edit-bold {
display: block;
}
@@ -81,9 +101,12 @@
.bk-toop-info {
color: #63656E;
}
- .bk-more-word {
- width: 80px;
+ .common-auto-icon {
+ background-color: #3a84ff;
}
+ // .bk-more-word {
+ // width: 112px;
+ // }
}
.icon-edit-bold {
display: none;
@@ -95,12 +118,12 @@
top: 0;
left: 0;
font-size: 16px;
- width: 40px;
- height: 38px;
- line-height: 38px;
+ width: 32px;
+ height: 54px;
+ line-height: 54px;
color: #fff;
- background-color: #3A84FF;
- border-radius: 25px 0 0 25px;
+ background-color: #738abe;
+ border-radius: 3px 0 0 3px;
box-shadow: 0px 2px 4px 0px rgba(196, 198, 204, 0.5);
.bk-itsm-icon {
@@ -156,12 +179,13 @@
.bk-more-word {
display: inline-block;
box-sizing: border-box;
- width: 80px;
- text-align: center;
- padding: 0 4px;
- overflow: hidden;
+ width: 112px;
+ text-align: left;
text-overflow: ellipsis;
- white-space: nowrap;
+ overflow: hidden;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.bk-node-delete {
@@ -187,8 +211,8 @@
.bk-flow-fast {
position: absolute;
- top: 30px;
- right: -178px;
+ top: 58px;
+ right: -2px;
background-color: #fff;
border: 1px solid #DDE4EB;
box-shadow: 0px 2px 4px 0px rgba(218, 218, 218, 0.5);
@@ -196,7 +220,7 @@
z-index: 100;
.bk-engine-node {
- width: 180px;
+ width: 160px;
ul {
@include clearfix;
@@ -216,7 +240,7 @@
line-height: 42px;
height: 42px;
text-align: center;
- color: #737987;
+ color: #52699d;
&:hover {
color: #3A84FF;
@@ -238,9 +262,10 @@
}
.bk-engine-word {
- color: #63656E;
+ color: #52699d;
line-height: 28px;
- font-size: 12px;
+ font-size: 14px;
+ text-align: right;
padding: 0 10px;
border-top: 1px solid #E9EDF1;
cursor: pointer;
diff --git a/frontend/pc/src/views/service/editService/lineConfigue/lineConfigu.scss b/frontend/pc/src/views/service/editService/lineConfigue/lineConfigu.scss
index a0ead39df..f299d30a8 100644
--- a/frontend/pc/src/views/service/editService/lineConfigue/lineConfigu.scss
+++ b/frontend/pc/src/views/service/editService/lineConfigue/lineConfigu.scss
@@ -17,7 +17,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: 540px;
+ width: 560px;
&.bk-line-small {
width: 320px;
}
@@ -31,7 +31,7 @@
width: 230px;
position: relative;
margin-right: 7px;
- height: 40px;
+ height: 56px;
.bk-line-word {
position: absolute;
@@ -54,7 +54,7 @@
height: 10px;
width: 100%;
background-color: #F0F1F5;
- top: 16px;
+ top: 24px;
left: 0;
z-index: 1;
@@ -70,7 +70,7 @@
.bk-line-squrea {
position: absolute;
- top: 17px;
+ top: 25px;
right: -4px;
width: 8px;
height: 8px;