Skip to content

Commit

Permalink
fix: coding-#19869 (goodrain#1290)
Browse files Browse the repository at this point in the history 
Co-authored-by: xuzl <[email protected]>
  • Loading branch information
@xuzhonglin12138
xuzhonglin12138 and xuzl authored Sep 14, 2023
1 parent 2d736df commit 0cf98e5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/components/CodeMirrorForm/index.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
:global {
.CodeMirror {
padding-top: 18px;
padding-bottom: 36px;
}
}
.isAuto{
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en-US/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 应用
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh-CN/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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': '项目',

Expand Down
2 changes: 1 addition & 1 deletion src/pages/Group/AddServiceComponent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 3 additions & 0 deletions src/utils/global.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1743,6 +1743,9 @@ const global = {
list: (
<svg t="1692935072606" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5689" width={size} height={size}><path d="M872.802928 755.99406 872.864326 755.99406 872.864326 755.624646Z" fill={color} p-id="5690"></path><path d="M349.405343 154.62259 155.596266 154.62259c-29.150924 0-52.873208 23.724331-52.873208 52.845579l0 193.823404c0 29.150924 23.722284 52.844555 52.873208 52.844555l193.810101 0c29.136597 0 52.859905-23.693632 52.859905-52.844555L402.266271 207.467145C402.265248 178.345897 378.541941 154.62259 349.405343 154.62259M351.851045 207.467145l0 193.823404c0 1.339508-1.106194 2.474354-2.445702 2.474354L155.596266 403.764903c-1.338485 0-2.503007-1.134847-2.503007-2.474354L153.093259 207.467145c0-1.38351 1.134847-2.474354 2.503007-2.474354l193.810101 0C350.774527 204.992791 351.851045 206.084659 351.851045 207.467145" fill={color} p-id="5691"></path><path d="M349.405343 569.837266 155.596266 569.837266c-29.150924 0-52.873208 23.75196-52.873208 52.856835L102.723058 816.519552c0 29.164227 23.722284 52.857858 52.873208 52.857858l193.810101 0c29.136597 0 52.859905-23.693632 52.859905-52.857858L402.266271 622.694101C402.265248 593.589227 378.541941 569.837266 349.405343 569.837266M351.851045 622.694101 351.851045 816.519552c0 1.36816-1.106194 2.472308-2.445702 2.472308L155.596266 818.99186c-1.338485 0-2.503007-1.104147-2.503007-2.472308L153.093259 622.694101c0-1.367137 1.134847-2.474354 2.503007-2.474354l193.810101 0C350.774527 620.219747 351.851045 621.326964 351.851045 622.694101" fill={color} p-id="5692"></path><path d="M519.857457 224.930889c0.727571 0.480954 1.601474 0.801249 2.532683 0.801249l1.77646 0c0.434905 0.058328 0.900509 0.058328 1.36816 0l367.768061 0c0.233314 0.029676 0.493234 0.058328 0.697895 0.058328 0.233314 0 0.466628-0.028653 0.670266-0.058328l1.454118 0c0.787946 0 1.514493-0.261966 2.124384-0.626263 12.023848-2.081405 20.900006-12.341073 20.900006-24.464181 0-11.949146-8.586562-22.064528-20.345374-24.348548-0.756223-0.566912-1.687432-0.931209-2.679016-0.931209L522.389116 175.361937c-0.901533 0-1.775436 0.422625-2.501984 1.019213-11.614525 2.357697-20.200064 12.458753-20.200064 24.261567C499.687068 212.474183 508.272607 222.574215 519.857457 224.930889" fill={color} p-id="5693"></path><path d="M519.507486 411.493935c0.756223 0.683569 1.77646 1.134847 2.88163 1.134847l373.73496 0c0.903579 0 1.719154-0.39295 2.446725-0.932232 11.818163-2.196015 20.550035-12.369725 20.550035-24.405853 0-12.123109-8.847505-22.354124-20.784372-24.434505-0.668219-0.39295-1.425466-0.596588-2.212388-0.596588l-0.697895 0.115634c-0.581238-0.145309-1.456165-0.203638-2.297322-0.115634l-366.867552 0.115634c-0.611937-0.145309-1.457188-0.203638-2.300392-0.115634l-1.571798 0c-0.814552 0-1.542122 0.233314-2.213411 0.714268-11.786441 2.241041-20.459984 12.398378-20.459984 24.317848C499.715721 398.976854 508.040317 408.990928 519.507486 411.493935" fill={color} p-id="5694"></path><path d="M519.537162 660.680251c0.756223 0.667196 1.775436 1.075495 2.851954 1.075495l373.73496 0c0.408299 0 0.787946-0.058328 1.196245-0.174985 13.271258-0.608867 23.954575-11.641131 23.954575-25.118074 0-13.827937-11.294231-25.118074-25.15082-25.118074-0.202615 0-0.435928 0.027629-0.697895 0.058328L525.50406 611.402941c-0.437975-0.058328-0.873903-0.058328-1.36816 0l-1.746784 0c-0.842181 0-1.600451 0.25992-2.270716 0.725524-11.729136 2.270716-20.402679 12.428054-20.402679 24.334221C499.715721 648.166239 508.097622 658.176221 519.537162 660.680251" fill={color} p-id="5695"></path><path d="M897.755226 777.807878c-0.493234-0.203638-1.077541-0.319272-1.63115-0.319272L522.389116 777.488607c-0.959861 0-1.893116 0.462534-2.589988 1.1328-11.583826 2.416026-20.083407 12.485359-20.083407 24.275893 0 11.904121 8.674567 22.064528 20.402679 24.334221 0.669242 0.405229 1.428535 0.60989 2.270716 0.60989l0.728594-0.115634c0.290619 0.057305 0.726547 0.202615 2.620687 0.115634l368.639918-0.115634c0.466628 0.115634 1.340531 0.290619 1.74576 0.290619 13.856589 0 25.15082-11.291161 25.15082-25.119097C921.274896 789.565666 910.883221 778.679735 897.755226 777.807878" fill={color} p-id="5696"></path></svg>
),
soft: (
<svg t="1694661685946" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4185" data-spm-anchor-id="a313x.search_index.0.i1.654a3a81fF0Arz" width="40" height="40"><path d="M930 855.8H131.9c-16.6 0-30-13.4-30-30V279.3c0-16.6 13.4-30 30-30s30 13.4 30 30v516.5H900v-523H422.6c-16.6 0-30-13.4-30-30s13.4-30 30-30H930c16.6 0 30 13.4 30 30v583c0 16.6-13.5 30-30 30z" p-id="4186" fill="#338bff"></path><path d="M131.9 308.6c-16.6 0-30-13.4-30-30V130.1c0-16.6 13.4-30 30-30h217.8c10.9 0 21 5.9 26.3 15.5l46.5 97.1 41.5 0.1c16.6 0 30 13.5 29.9 30.1 0 16.5-13.5 29.9-30 29.9h-0.1l-59.2-0.1c-10.9 0-20.9-6-26.2-15.5L332 160.1H161.9v118.5c0 16.6-13.5 30-30 30z m642.7 358H517.1c-16.6 0-30-13.4-30-30s13.4-30 30-30h257.5c16.6 0 30 13.4 30 30s-13.5 30-30 30z" p-id="4187" fill="#338bff"></path></svg>
)
};
return svgType[type] || type;
},
Expand Down

0 comments on commit 0cf98e5

Please sign in to comment.