You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ti...@apache.org on 2021/05/21 01:22:16 UTC
[servicecomb-service-center] branch master updated: fix: 测试问题修复 (#992)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 2383aed fix: 测试问题修复 (#992)
2383aed is described below
commit 2383aed49e99e21cc57ab6947357162bd16da99f
Author: tuan <ya...@126.com>
AuthorDate: Fri May 21 09:19:06 2021 +0800
fix: 测试问题修复 (#992)
服务级别配置删除版本选择
修复edge 低版本数字自动添加下划线
添加标签校验提示
Co-authored-by: tuan <>
---
.../select-service/select-service.component.html | 136 +++++++++------------
.../select-service/select-service.component.ts | 12 +-
.../config-create/config-create.component.html | 10 +-
.../pages/config-create/config-create.component.ts | 16 ++-
ux/src/app/config-list/pipe/config-type.pipe.ts | 1 -
ux/src/assets/i18n/zh_CN.json | 4 +-
ux/src/index.html | 1 +
7 files changed, 75 insertions(+), 105 deletions(-)
diff --git a/ux/src/app/config-list/modal/select-service/select-service.component.html b/ux/src/app/config-list/modal/select-service/select-service.component.html
index df0ebf3..e69c027 100644
--- a/ux/src/app/config-list/modal/select-service/select-service.component.html
+++ b/ux/src/app/config-list/modal/select-service/select-service.component.html
@@ -18,91 +18,65 @@ limitations under the License.
<h2>{{ "kie.create.serviceSelect" | translate }}</h2>
<div class="container">
- <form dForm ngForm>
- <d-form-item>
- <d-form-label [required]="true">
- {{ "kie.create.serviceSelect" | translate }}
- </d-form-label>
- <d-form-control>
- <d-data-table
- [dataSource]="dataSource"
- [scrollable]="true"
- [type]="'striped'"
- [tableWidthConfig]="tableWidthConfig"
- [headerBg]="true"
- >
- <thead dTableHead>
- <tr dTableRow>
- <th dHeadCell></th>
- <th dHeadCell>{{ "kie.modal.serviceName" | translate }}</th>
- <th dHeadCell>{{ "kie.modal.app" | translate }}</th>
- <th dHeadCell>{{ "kie.modal.environment" | translate }}</th>
- </tr>
- </thead>
- <tbody dTableBody>
- <ng-template let-rowItem="rowItem" let-rowIndex="rowIndex">
- <tr dTableRow style="line-height: 100%">
- <td dTableCell field="radio">
- <d-radio
- style="vertical-align: middle; padding-right: 0"
- [name]="'radio'"
- [(ngModel)]="selectService"
- (ngModelChange)="onChangeService(rowItem)"
- [value]="rowItem"
- ></d-radio>
- </td>
- <td dTableCell field="serviceName">
- {{ rowItem.serviceName }}
- </td>
- <td dTableCell field="appId">
- {{ rowItem.appId }}
- </td>
- <td dTableCell field="environment">
- {{ rowItem.environment | EnvironmentPipe }}
- </td>
- </tr>
- </ng-template>
- </tbody>
- </d-data-table>
- <d-pagination
- class="cse-mg-top-xs"
- [autoHide]="true"
- [size]="'sm'"
- [total]="pager.total"
- [(pageSize)]="pager.pageSize"
- [(pageIndex)]="pager.pageIndex"
- [canViewTotal]="true"
- [canChangePageSize]="true"
- [pageSizeOptions]="pager.pageSizeOptions"
- [maxItems]="5"
- (pageIndexChange)="onPaginationChange($event, pager.pageSize)"
- (pageSizeChange)="onPaginationChange(pager.pageIndex, $event)"
- >
- </d-pagination>
- </d-form-control>
- </d-form-item>
- <d-form-item>
- <d-form-label [required]="true">
- {{ "kie.modal.vision" | translate }}
- </d-form-label>
- <d-form-control>
- <d-select
- class="w-200"
- [placeholder]="'kie.modal.visionPlaceholder' | translate"
- [options]="options"
- [filterKey]="'version'"
- [readonly]="true"
- [(ngModel)]="selectVersion"
- [ngModelOptions]="{ standalone: true }"
- ></d-select>
- </d-form-control>
- </d-form-item>
- </form>
+ <d-data-table
+ [dataSource]="dataSource"
+ [scrollable]="true"
+ [type]="'striped'"
+ [tableWidthConfig]="tableWidthConfig"
+ [headerBg]="true"
+ >
+ <thead dTableHead>
+ <tr dTableRow>
+ <th dHeadCell></th>
+ <th dHeadCell>{{ "kie.modal.serviceName" | translate }}</th>
+ <th dHeadCell>{{ "kie.modal.app" | translate }}</th>
+ <th dHeadCell>{{ "kie.modal.environment" | translate }}</th>
+ </tr>
+ </thead>
+ <tbody dTableBody>
+ <ng-template let-rowItem="rowItem" let-rowIndex="rowIndex">
+ <tr dTableRow style="line-height: 100%">
+ <td dTableCell field="radio">
+ <d-radio
+ style="vertical-align: middle; padding-right: 0"
+ [name]="'radio'"
+ [(ngModel)]="selectService"
+ [value]="rowItem"
+ ></d-radio>
+ </td>
+ <td dTableCell field="serviceName">
+ {{ rowItem.serviceName }}
+ </td>
+ <td dTableCell field="appId">
+ {{ rowItem.appId }}
+ </td>
+ <td dTableCell field="environment">
+ {{ rowItem.environment | EnvironmentPipe }}
+ </td>
+ </tr>
+ </ng-template>
+ </tbody>
+ </d-data-table>
+ <d-pagination
+ class="cse-mg-top-xs"
+ [autoHide]="true"
+ [size]="'sm'"
+ [total]="pager.total"
+ [(pageSize)]="pager.pageSize"
+ [(pageIndex)]="pager.pageIndex"
+ [canViewTotal]="true"
+ [canChangePageSize]="true"
+ [pageSizeOptions]="pager.pageSizeOptions"
+ [maxItems]="5"
+ (pageIndexChange)="onPaginationChange($event, pager.pageSize)"
+ (pageSizeChange)="onPaginationChange(pager.pageIndex, $event)"
+ >
+ </d-pagination>
</div>
<div class="footer">
<d-button
bsStyle="danger"
- [disabled]="!selectService || !selectVersion"
+ [disabled]="!selectService"
(click)="onConfirm()"
>
{{ "common.confirm" | translate }}
diff --git a/ux/src/app/config-list/modal/select-service/select-service.component.ts b/ux/src/app/config-list/modal/select-service/select-service.component.ts
index 19d4fd3..29f4b7d 100644
--- a/ux/src/app/config-list/modal/select-service/select-service.component.ts
+++ b/ux/src/app/config-list/modal/select-service/select-service.component.ts
@@ -44,8 +44,6 @@ export class SelectServiceComponent implements OnInit {
pageSize: 10,
pageSizeOptions: [5, 10],
};
- options!: any[];
- selectVersion!: any;
tableWidthConfig: TableWidthConfig[] = [
{
@@ -75,7 +73,6 @@ export class SelectServiceComponent implements OnInit {
this.selectService = this.dataSource.find(
(item: any, index: number) => index === 0
);
- this.onChangeService(this.selectService);
},
(err) => {
// todo 提示
@@ -108,15 +105,8 @@ export class SelectServiceComponent implements OnInit {
}
}
- onChangeService(rowItem: any): void {
- this.options = rowItem.versions || [];
- this.selectVersion = this.options.find(
- (item: any, index: number) => index === 0
- );
- }
-
onConfirm(): void {
- this.data.onClose(this.selectService, this.selectVersion.version);
+ this.data.onClose(this.selectService);
}
onCancel(): void {
diff --git a/ux/src/app/config-list/pages/config-create/config-create.component.html b/ux/src/app/config-list/pages/config-create/config-create.component.html
index a235f8d..517d447 100644
--- a/ux/src/app/config-list/pages/config-create/config-create.component.html
+++ b/ux/src/app/config-list/pages/config-create/config-create.component.html
@@ -133,10 +133,7 @@ limitations under the License.
[placeholder]="'kie.create.tagKeyPlaceholder' | translate"
[(ngModel)]="configTageKey"
[ngModelOptions]="{ standalone: true }"
- [dValidateRules]="[
- { required: true },
- { whitespace: true },
- ]"
+ [dValidateRules]="tagRules"
/>
<input
type="text"
@@ -145,10 +142,7 @@ limitations under the License.
[placeholder]="'kie.create.tagValuePlaceholder' | translate"
[(ngModel)]="configTageValue"
[ngModelOptions]="{ standalone: true }"
- [dValidateRules]="[
- { required: true },
- { whitespace: true },
- ]"
+ [dValidateRules]="tagRules"
/>
<d-button
icon="icon-add"
diff --git a/ux/src/app/config-list/pages/config-create/config-create.component.ts b/ux/src/app/config-list/pages/config-create/config-create.component.ts
index 4604c8d..4662f6c 100644
--- a/ux/src/app/config-list/pages/config-create/config-create.component.ts
+++ b/ux/src/app/config-list/pages/config-create/config-create.component.ts
@@ -56,6 +56,9 @@ export class ConfigCreateComponent implements OnInit {
this.translate.get('kie.create.configMessage').subscribe((res) => {
this.configNameRules[4].message = res;
});
+ this.translate.get('kie.create.tagKeyRulesMsg').subscribe((res) => {
+ this.tagRules[3].message = res;
+ });
}
formGroup = new FormGroup({
@@ -126,6 +129,16 @@ export class ConfigCreateComponent implements OnInit {
configTageKey!: string;
configTageValue!: string;
+ tagRules = [
+ { required: false },
+ { whitespace: true },
+ { maxlength: 32 },
+ {
+ pattern: /^[a-zA-Z0-9]([a-zA-Z0-9_\-.]*[a-zA-Z0-9])*$/,
+ message: '',
+ },
+ ];
+
ngOnInit(): void {
if (this.kvId) {
this.service.getKie(this.kvId).subscribe(
@@ -191,14 +204,13 @@ export class ConfigCreateComponent implements OnInit {
backdropCloseable: false,
component: SelectServiceComponent,
data: {
- onClose: (rowItem?: any, version?: string) => {
+ onClose: (rowItem?: any) => {
if (rowItem?.appId) {
this.serviceId = rowItem.serviceName;
this.tags = [
`service=${rowItem.serviceName}`,
`app=${rowItem.appId}`,
`environment=${rowItem.environment}`,
- `version=${version}`,
];
}
results.modalInstance.hide();
diff --git a/ux/src/app/config-list/pipe/config-type.pipe.ts b/ux/src/app/config-list/pipe/config-type.pipe.ts
index 81cdedc..0133409 100644
--- a/ux/src/app/config-list/pipe/config-type.pipe.ts
+++ b/ux/src/app/config-list/pipe/config-type.pipe.ts
@@ -51,7 +51,6 @@ export const configTypeFn = (value: Lables): type => {
if (
value.app &&
value.service &&
- value.version &&
value.environment !== undefined
) {
return 'service';
diff --git a/ux/src/assets/i18n/zh_CN.json b/ux/src/assets/i18n/zh_CN.json
index c065a18..7fbf96e 100644
--- a/ux/src/assets/i18n/zh_CN.json
+++ b/ux/src/assets/i18n/zh_CN.json
@@ -60,11 +60,13 @@
"configPlaceholder": "请输入配置项",
"configMessage": "请输入由数字/字母/下划线/中划线或小数点组成对1-128位字符",
"tag": "标签",
+ "tagKeyRulesMsg": "不满足正则 ^[a-zA-Z0-9]([a-zA-Z0-9_\\-.]*[a-zA-Z0-9])*$",
"tagKeyPlaceholder": "请输入标签键",
"tagValuePlaceholder": "请输入标签值",
"size": "配置格式",
"isAvailable": "是否启用",
"configContent": "配置内容"
+
},
"modal": {
"title": "选择配置类型",
@@ -74,8 +76,6 @@
"customConfigContent": "自定义一个新到配置文件。",
"appName": "应用名称",
"environment": "环境",
- "vision": "选择版本",
- "visionPlaceholder": "选择版本",
"serviceName": "服务名称",
"app": "应用"
}
diff --git a/ux/src/index.html b/ux/src/index.html
index ebdcb74..41bc89f 100644
--- a/ux/src/index.html
+++ b/ux/src/index.html
@@ -21,6 +21,7 @@ limitations under the License.
<title>ServiceComb</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
+ <meta name="format-detection" content="telephone=no,email=no,address=no">
<link rel="icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>