diff --git a/src/components/CodeMirrorForm/index.less b/src/components/CodeMirrorForm/index.less index 70c8c98b5..e76ca3dfd 100644 --- a/src/components/CodeMirrorForm/index.less +++ b/src/components/CodeMirrorForm/index.less @@ -26,7 +26,7 @@ } :global { .CodeMirror { - padding-top: 18px; + padding-bottom: 36px; } } .isAuto{ diff --git a/src/locales/en-US/app.js b/src/locales/en-US/app.js index 0d04fe0f2..efb5a891f 100644 --- a/src/locales/en-US/app.js +++ b/src/locales/en-US/app.js @@ -72,7 +72,7 @@ const appOverview = { 'appOverview.list.btn.addComponent.dockerRun': 'DockerRun', 'appOverview.list.btn.addComponent.market.title': 'Start with the app market', 'appOverview.list.btn.addComponent.update.title': 'Start by uploading the package', - 'appOverview.list.btn.addComponent.jwar': 'Jar、War', + 'appOverview.list.btn.addComponent.jwar': 'Software', 'appOverview.list.btn.addComponent.yaml': 'Yaml', 'appOverview.list.btn.addComponent.project': 'Project', //helm 应用 diff --git a/src/locales/zh-CN/app.js b/src/locales/zh-CN/app.js index 9015fb969..139bb80c0 100644 --- a/src/locales/zh-CN/app.js +++ b/src/locales/zh-CN/app.js @@ -72,7 +72,7 @@ const appOverview = { 'appOverview.list.btn.addComponent.dockerRun': '指定DockerRun命令', 'appOverview.list.btn.addComponent.market.title': '从应用市场开始', 'appOverview.list.btn.addComponent.update.title': '从上传文件包开始', - 'appOverview.list.btn.addComponent.jwar': 'Jar、War', + 'appOverview.list.btn.addComponent.jwar': '软件包', 'appOverview.list.btn.addComponent.yaml': 'Yaml', 'appOverview.list.btn.addComponent.project': '项目', diff --git a/src/pages/Group/AddServiceComponent.js b/src/pages/Group/AddServiceComponent.js index 852678082..411c26928 100644 --- a/src/pages/Group/AddServiceComponent.js +++ b/src/pages/Group/AddServiceComponent.js @@ -246,7 +246,7 @@ export default class AddServiceComponent extends PureComponent { } = this.state; const codeSvg = globalUtil.fetchSvg('codeSvg'); const docker_svg = globalUtil.fetchSvg('docker_svg'); - const JarWar_svg = globalUtil.fetchSvg('JarWar_svg'); + const JarWar_svg = globalUtil.fetchSvg('soft'); const yaml_svg = globalUtil.fetchSvg('yaml_svg'); const helm_svg = globalUtil.fetchSvg('helm_svg'); const codeDemo_svg = globalUtil.fetchSvg('codeDemo'); diff --git a/src/utils/global.js b/src/utils/global.js index 146cfbe19..44b2d7b1c 100644 --- a/src/utils/global.js +++ b/src/utils/global.js @@ -1743,6 +1743,9 @@ const global = { list: ( ), + soft: ( + + ) }; return svgType[type] || type; },