Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h3 class="modal-title">{{title}}</h3>

<section class="form-block">
<div class="form-group" style="padding-left: 135px;">
<label for="app_id" class="col-md-3 form-group-label-override required">应用</label>
<label for="app_id" class="col-md-3 form-group-label-override required">{{'DAEMONSET_ADMIN.CREATE.APP' | translate}}</label>
<div class="select form-control">
<select id="app_id" [(ngModel)]="daemonset.appId" [disabled]="actionType==1" name="app_id">
<option *ngFor="let app of apps" [ngValue]="app.id" [selected]="app.id == daemonset.appId">{{app.name}}
Expand All @@ -26,13 +26,13 @@ <h3 class="modal-title">{{title}}</h3>
maxlength="64"
(keyup)='handleValidation()'>
<span class="tooltip-content">
部署名称不符合规范,验证规则[a-z]([-a-z0-9]*[a-z0-9])?
{{'DAEMONSET_ADMIN.CREATE.RULE' | translate}}[a-z]([-a-z0-9]*[a-z0-9])?
</span>
</label>
<span class="spinner spinner-inline" [hidden]="!checkOnGoing"></span>
</div>
<div class="form-group" style="padding-left: 135px;">
<label for="daemonset_metadata" class="col-md-3 form-group-label-override">元数据</label>
<label for="daemonset_metadata" class="col-md-3 form-group-label-override">{{'DAEMONSET_ADMIN.CREATE.METADATA' | translate}}</label>
<wayne-ace-editor-box></wayne-ace-editor-box>

</div>
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/app/admin/daemonset/daemonset.component.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h2 class="header-title">守护进程列表</h2>
<h2 class="header-title">{{'DAEMONSET_ADMIN.DAEMONSET_LIST' | translate}}</h2>
</div>
<div class="row flex-items-xs-between" style="height:32px;">
<div class="option-left">
<button class="btn btn-link" (click)="openModal()">
<clr-icon shape="add"></clr-icon>
创建守护进程
{{'DAEMONSET_ADMIN.DAEMONSET_CREATE' | translate}}
</button>
<create-edit-daemonset (create)="createDaemonset($event)"></create-edit-daemonset>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h2 class="header-title">已删除守护进程集列表</h2>
<h2 class="header-title">{{'DAEMONSET_ADMIN.TRASH.DAEMONSET_DELETE_LIST' | translate}}</h2>
</div>
<clr-datagrid (clrDgRefresh)="refresh($event)">
<clr-dg-column [clrDgField]="'id'" class="col-query-id">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h3 class="modal-title">{{title}}</h3>

<section class="form-block">
<div class="form-group" style="padding-left: 135px;">
<label for="app_id" class="col-md-3 form-group-label-override required">应用</label>
<label for="app_id" class="col-md-3 form-group-label-override required">{{'STATEFULSET_ADMIN.CREATE.APP' | translate}}</label>
<div class="select form-control">
<select id="app_id" [(ngModel)]="statefulset.appId" [disabled]="actionType==1" name="app_id">
<!--这是一个坑,如果使用value获取到的是string,使用ngValue获取到的是model本身类型-->
Expand All @@ -27,13 +27,13 @@ <h3 class="modal-title">{{title}}</h3>
maxlength="64"
(keyup)='handleValidation()'>
<span class="tooltip-content">
部署名称不符合规范,验证规则[a-z]([-a-z0-9]*[a-z0-9])?
{{'STATEFULSET_ADMIN.CREATE.RULE' | translate}}[a-z]([-a-z0-9]*[a-z0-9])?
</span>
</label>
<span class="spinner spinner-inline" [hidden]="!checkOnGoing"></span>
</div>
<div class="form-group" style="padding-left: 135px;">
<label for="statefulset_metadata" class="col-md-3 form-group-label-override">元数据</label>
<label for="statefulset_metadata" class="col-md-3 form-group-label-override">{{'STATEFULSET_ADMIN.CREATE.METADATE' | translate}}</label>
<wayne-ace-editor-box></wayne-ace-editor-box>

</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h2 class="header-title">状态副本集列表</h2>
<h2 class="header-title">{{ 'STATEFULSET_ADMIN.STATEFULSET_LIST' | translate }}</h2>
</div>
<div class="row flex-items-xs-between" style="height:32px;">
<div class="option-left">
<button class="btn btn-link" (click)="openModal()">
<clr-icon shape="add"></clr-icon>
创建状态副本集
{{ 'STATEFULSET_ADMIN.STATEFULSET_CREATE' | translate }}
</button>
<create-edit-statefulset (create)="createStatefulset($event)"></create-edit-statefulset>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h2 class="header-title">已删除状态副本集列表</h2>
<h2 class="header-title">{{'STATEFULSET_ADMIN.TRASH.STATEFULSET_DELETE_LIST' | translate}}</h2>
</div>
<clr-datagrid (clrDgRefresh)="refresh($event)">
<clr-dg-column [clrDgField]="'id'" class="col-query-id">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h3 class="modal-title">{{title}}</h3>
name="{{cluster.name}}-replica"
type="number">
<span class="tooltip-content">
{{'LIMIT.DELOYMENT' | translate}}{{replicaLimit}}
{{'LIMIT.DEPLOYMENT' | translate}}{{replicaLimit}}
</span>
</label>
</div>
Expand Down
30 changes: 27 additions & 3 deletions src/frontend/src/assets/i18n/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,18 @@
"DELETE": "删除守护进程集",
"EDIT": "编辑守护进程集"
},
"DAEMONSET_ADMIN": {
"CREATE": {
"APP": "应用",
"METADATA": "元数据",
"RULE": "部署名称不符合规范,验证规则"
},
"DAEMONSET_CREATE": "创建守护进程",
"DAEMONSET_LIST": "守护进程列表",
"TRASH": {
"DAEMONSET_DELETE_LIST": "已删除守护进程集列表"
}
},
"DEPLOYMENT": {
"CREATE": "创建部署",
"CREATE_EDIT": {
Expand Down Expand Up @@ -246,7 +258,7 @@
"OTHER": "其他",
"PAGE": {
"PAGE": "页",
"TOTAL": "共{{value}}条记录"
"TOTAL": "共 {{value}} 条记录"
},
"PLACEHOLDER": {
"APP_NAME": "英文小写,中划线分隔",
Expand Down Expand Up @@ -332,9 +344,9 @@
"SHARED": {
"DIFF": {
"CHECK_DATA": "请检查数据",
"TRANS_ERROR": "模板切换失败,请检查数据",
"TMP_LESS": "请选择俩个模板",
"TMP_MORE": "选择多个模板仅对比俩个"
"TMP_MORE": "选择多个模板仅对比俩个",
"TRANS_ERROR": "模板切换失败,请检查数据"
},
"COMPONENT": {
"RESOURCE_LIMIT": {
Expand All @@ -358,6 +370,18 @@
"EDIT": "编辑状态副本集",
"TITLE": "状态副本集"
},
"STATEFULSET_ADMIN": {
"CREATE": {
"APP": "应用",
"METADATE": "元数据",
"RULE": "部署名称不符合规范,验证规则"
},
"STATEFULSET_CREATE": "创建状态副本集",
"STATEFULSET_LIST": "状态副本集列表",
"TRASH": {
"STATEFULSET_DELETE_LIST": "已删除状态副本集列表"
}
},
"TITLE": {
"ACTION": "操作",
"ALL_CONTENT": "所有内容",
Expand Down