diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js index 47eda3b29..07cbee21f 100644 --- a/frontend/desktop/src/config/i18n/cn.js +++ b/frontend/desktop/src/config/i18n/cn.js @@ -1834,7 +1834,7 @@ const cn = { '产品官网': '产品官网', '联系bk助手': '联系bk助手', '蓝鲸桌面': '蓝鲸桌面', - '蓝鲸': '蓝鲸' + '蓝鲸智云': '蓝鲸智云' } export default cn diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js index 303cdccb7..6a0f621b3 100644 --- a/frontend/desktop/src/config/i18n/en.js +++ b/frontend/desktop/src/config/i18n/en.js @@ -1868,7 +1868,7 @@ const en = { '产品官网': 'Product Website', '联系bk助手': 'Contact BK Assistant', '蓝鲸桌面': 'BlueWhale Desktop', - '蓝鲸': 'BlueKing' + '蓝鲸智云': 'Tencent BlueKing' } export default en diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/ExecuteInfoForm.vue index 8f640605d..502015e71 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/ExecuteInfoForm.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/ExecuteInfoForm.vue @@ -795,9 +795,6 @@ position: initial; } } - .rf-tag-form { - margin-left: 100px; - } &:last-child { margin-bottom: 0; } diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue index a5407e537..d3e992a01 100644 --- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue +++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue @@ -456,9 +456,6 @@ position: initial; } } - .rf-tag-form { - margin-left: 100px; - } &:last-child { margin-bottom: 0; } diff --git a/frontend/desktop/src/store/index.js b/frontend/desktop/src/store/index.js index 26aff8031..0bf3de11d 100644 --- a/frontend/desktop/src/store/index.js +++ b/frontend/desktop/src/store/index.js @@ -38,7 +38,7 @@ const store = new Vuex.Store({ platformInfo: { // 项目全局配置 bkAppCode: window.APP_CODE, name: window.APP_NAME || i18n.t('标准运维'), - brandName: window.RUN_VER_NAME || i18n.t('蓝鲸'), + brandName: window.RUN_VER_NAME || i18n.t('蓝鲸智云'), ...getStateFavicon(), i18n: {} }, diff --git a/frontend/desktop/src/store/modules/template.js b/frontend/desktop/src/store/modules/template.js index b807bc808..e5c1ca523 100644 --- a/frontend/desktop/src/store/modules/template.js +++ b/frontend/desktop/src/store/modules/template.js @@ -16,6 +16,7 @@ import tools from '@/utils/tools.js' import validatePipeline from '@/utils/validatePipeline.js' import axios from 'axios' import i18n from '@/config/i18n/index.js' +import { STRING_LENGTH } from '@/constants/index.js' const ATOM_TYPE_DICT = { startpoint: 'EmptyStartEvent', @@ -784,7 +785,13 @@ const template = { Vue.set(source_info, location.id, info) } else if (source_type === 'component_outputs') { // 新建输出变量 const constantsLen = Object.keys(state.constants).length - const varId = '${' + info[0] + '_' + random4() + '}' + let varId = '' + const length = STRING_LENGTH.VARIABLE_KEY_MAX_LENGTH - key.length + if (length >= 5) { + varId = `${key.slice(0, -1)}_${random4()}}` + } else { + varId = `${key.slice(0, 5 - length - 1)}_${random4()}}` + } const varValue = tools.deepClone(item) const changeObj = { source_info: { [location.id]: info },