Skip to content

Commit 0e2503a

Browse files
ywywZhouluofann
authored andcommitted
fix: 节点clone时勾选的输出变量clone逻辑异常问题修复 && 项目名统一规范调整 #ignore
# Reviewed, transaction id: 14815
1 parent 8c86d2f commit 0e2503a

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

frontend/desktop/src/config/i18n/cn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ const cn = {
18341834
'产品官网': '产品官网',
18351835
'联系bk助手': '联系bk助手',
18361836
'蓝鲸桌面': '蓝鲸桌面',
1837-
'蓝鲸': '蓝鲸'
1837+
'蓝鲸智云': '蓝鲸智云'
18381838
}
18391839

18401840
export default cn

frontend/desktop/src/config/i18n/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,7 @@ const en = {
18681868
'产品官网': 'Product Website',
18691869
'联系bk助手': 'Contact BK Assistant',
18701870
'蓝鲸桌面': 'BlueWhale Desktop',
1871-
'蓝鲸': 'BlueKing'
1871+
'蓝鲸智云': 'Tencent BlueKing'
18721872
}
18731873

18741874
export default en

frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/ExecuteInfoForm.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -795,9 +795,6 @@
795795
position: initial;
796796
}
797797
}
798-
.rf-tag-form {
799-
margin-left: 100px;
800-
}
801798
&:last-child {
802799
margin-bottom: 0;
803800
}

frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,6 @@
456456
position: initial;
457457
}
458458
}
459-
.rf-tag-form {
460-
margin-left: 100px;
461-
}
462459
&:last-child {
463460
margin-bottom: 0;
464461
}

frontend/desktop/src/store/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const store = new Vuex.Store({
3838
platformInfo: { // 项目全局配置
3939
bkAppCode: window.APP_CODE,
4040
name: window.APP_NAME || i18n.t('标准运维'),
41-
brandName: window.RUN_VER_NAME || i18n.t('蓝鲸'),
41+
brandName: window.RUN_VER_NAME || i18n.t('蓝鲸智云'),
4242
...getStateFavicon(),
4343
i18n: {}
4444
},

frontend/desktop/src/store/modules/template.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import tools from '@/utils/tools.js'
1616
import validatePipeline from '@/utils/validatePipeline.js'
1717
import axios from 'axios'
1818
import i18n from '@/config/i18n/index.js'
19+
import { STRING_LENGTH } from '@/constants/index.js'
1920

2021
const ATOM_TYPE_DICT = {
2122
startpoint: 'EmptyStartEvent',
@@ -784,7 +785,13 @@ const template = {
784785
Vue.set(source_info, location.id, info)
785786
} else if (source_type === 'component_outputs') { // 新建输出变量
786787
const constantsLen = Object.keys(state.constants).length
787-
const varId = '${' + info[0] + '_' + random4() + '}'
788+
let varId = ''
789+
const length = STRING_LENGTH.VARIABLE_KEY_MAX_LENGTH - key.length
790+
if (length >= 5) {
791+
varId = `${key.slice(0, -1)}_${random4()}}`
792+
} else {
793+
varId = `${key.slice(0, 5 - length - 1)}_${random4()}}`
794+
}
788795
const varValue = tools.deepClone(item)
789796
const changeObj = {
790797
source_info: { [location.id]: info },

0 commit comments

Comments
 (0)