diff --git a/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.html b/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.html index 20c2ddb5d..044b91bc4 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.html +++ b/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.html @@ -6,9 +6,9 @@ + (click)="modifyData()">{{'menu.modify' | translate}} + (click)="expandView()">{{'menu.expand' | translate}}
{{'menu.reduce' | translate}}
+ (click)="reduceView();">{{'menu.reduce' | translate}}
{{'menu.mount' | translate}}
+ (click)="mount();"> {{'menu.mount' | translate}}
{{'menu.unmount' | translate}}
+ (click)="unmountBtnFunc();">{{'menu.unmount' | translate}}
{{'menu.del' | translate}}
+ (click)="delBtnFunc();">{{'menu.del' | translate}}
{{'menu.Synchronize' | translate}}
@@ -63,28 +63,28 @@ + style="position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.totalCapacity' | translate}} + style="position: absolute;right: 0.1rem;"> + style="position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.freeCapacity' | translate}} + style="position: absolute;right: 0.1rem;"> + style="min-width:11rem;position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.capacityUsage' | translate}} + style="position: absolute;right: 0.1rem;"> + style="position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.provisioningCapacity' | translate}} + style="position: absolute;right: 0.1rem;"> {{'nfs.device' | translate}} @@ -101,34 +101,36 @@ {{'nfs.fileSystem' | translate}} + style="position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.ops' | translate}} + style="position: absolute;right: 1.1rem;"> + style="position: relative" (clrDgSortedChange)="sortFunc($event);"> {{'nfs.bandwidth' | translate}} + style="position: absolute;right: 1.1rem;"> + [clrDgField]="'readResponseTime'" style="position: relative" + (clrDgSortedChange)="sortFunc($event);"> {{'nfs.respRt' | translate}} + style="position: absolute;right: 1.1rem;"> + [clrDgField]="'writeResponseTime'" style="position: relative" + (clrDgSortedChange)="sortFunc($event);"> {{'nfs.respWt' | translate}} + style="position: absolute;right: 1.1rem;"> {{'tips.noData' | translate}} - {{item.name ? item.name:'--'}} + {{item.name ? item.name : '--'}} - - + name="sameName" formControlName="sameName" disabled/> + + @@ -303,14 +308,14 @@ + maxlength="256" + clrInput + [(ngModel)]="addForm.fsName" + name="fsName" + required + formControlName="fsName" + (change)="checkFsName();" + (blur)="checkFsName();"/> @@ -326,20 +331,20 @@ + clrInput + maxlength="256" + name="shareName" + [(ngModel)]="addForm.shareName" + formControlName="shareName" + (blur)="checkShareName();" + (change)="checkShareName();"/>

{{'errorMsg.require' | translate}}

-

{{'validations.required_share_name' | translate:'{length:254}'}}

+

{{'errorMsg.numberAndLetter' | translate}}

{{'errorMsg.sharerepeat' | translate}}

@@ -347,19 +352,21 @@ + name="size" formControlName="size" required (blur)="checkSize()"/>
- {{'errorMsg.require' | translate}}{{'nfs.overSizeGB'|translate}} + + {{'errorMsg.require' | translate}}{{'nfs.overSizeGB'|translate}}
- {{'errorMsg.require' | translate}}{{'nfs.overSizeTB'|translate}} + + {{'errorMsg.require' | translate}}{{'nfs.overSizeTB'|translate}}
@@ -370,7 +377,7 @@ + [(ngModel)]="addForm.securityType" value="AUTH_SYS"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5I"/> @@ -420,7 +427,7 @@ @@ -428,7 +435,7 @@ @@ -461,14 +468,14 @@
- +
+ [(ngModel)]="addForm.qosFlag"/>
@@ -478,15 +485,15 @@ + (change)="controlPolicyChangeFunc('control_policyUpper', 'control_policyLower', false, addForm, true);" + name="control_policyUpper"/> + (change)="controlPolicyChangeFunc('control_policyUpper', 'control_policyLower', false, addForm, false);" + name="control_policyLower"/> @@ -497,14 +504,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxBandwidthChoose, 'maxbandwidth');qosV6Check('add');" + name="maxbandwidthChoose" clrCheckbox/> @@ -520,14 +527,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxIopsChoose, 'maxiops');qosV6Check('add');" + name="maxiopsChoose" clrCheckbox/> @@ -542,19 +549,20 @@ + style="color: #9F9F9F;">{{'vmfs.trafficControlObject' | translate}} + style="color: #9F9F9F;"> + (ngModelChange)="resetQosFlag(addForm.minBandwidthChoose, 'minbandwidth');qosV6Check('add');" + name="minbandwidthChoose" clrCheckbox/> @@ -571,14 +579,14 @@ + (ngModelChange)="resetQosFlag(addForm.minIopsChoose, 'miniops');qosV6Check('add');" + name="minIopsChoose" clrCheckbox/> @@ -593,22 +601,22 @@ + (ngModelChange)="resetQosFlag(addForm.latencyChoose, 'latency')" name="latencyChoose" + clrCheckbox/> - +
@@ -640,7 +648,7 @@
- + @@ -663,7 +671,7 @@
- +
@@ -684,40 +692,40 @@ - + - + - + - + + [(ngModel)]="updateNfs.qosFlag"/>
+ [(ngModel)]="updateNfs.contolPolicy"/> + [(ngModel)]="updateNfs.contolPolicy"/> @@ -725,33 +733,36 @@ - + + [(ngModel)]="updateNfs.maxBandwidth"> MB/s - + + [(ngModel)]="updateNfs.maxIops" name="maxIops"> + MB/s - + + [(ngModel)]="updateNfs.minBandwidth"> MB/s - + + [(ngModel)]="updateNfs.minIops" name="minIops"> + MB/s - + + [(ngModel)]="updateNfs.latency" name="latency"> + ms
@@ -760,7 +771,7 @@ - + @@ -781,7 +792,7 @@ - + @@ -793,7 +804,7 @@ + [clrModalClosable]="false"> diff --git a/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.ts b/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.ts index 220422e75..e14aa88cc 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.ts +++ b/dmestore-ui/src/main/angular/src/app/routes/nfs/nfs.component.ts @@ -738,9 +738,9 @@ export class NfsComponent extends NfsComponentCommon implements OnInit ,AfterVie this.checkNfsNameExist(this.addForm.nfsName); } } else { + this.matchErr = true; //不满足的时候置空,触发错误提示 this.addForm.nfsName = null; - this.matchErr = true; console.log('验证不通过'); } } diff --git a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.html b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.html index 1190edab2..3f924382e 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.html +++ b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.html @@ -6,13 +6,13 @@
{{'vmfs.loadingTips' | translate}} + style="margin-left: 20px;">
{{'vmfs.dataHandleLoadingTips' | translate}} + style="margin-left: 20px;">
@@ -22,9 +22,9 @@ {{'errorMsg.require' | translate}} @@ -32,8 +32,8 @@ {{'errorMsg.require' | translate}} @@ -52,9 +52,9 @@ {{'errorMsg.require' | translate}} @@ -62,10 +62,12 @@ + (blur)="checkNfsName();" formControlName="nfsName" required/> -

{{'errorMsg.require' | translate}}

-

{{'validations.required_nfs_name' | translate:'{length:42}'}}

+
+
{{'errorMsg.require' | translate}}
+ {{'validations.required_nfs_name' | translate:'{length:42}'}} +

{{'errorMsg.fsrepeat' | translate}}

{{'errorMsg.fsrepeat' | translate}}

{{'errorMsg.sharerepeat' | translate}}

@@ -76,11 +78,11 @@ + (change)="setSameName();" name="sameName" formControlName="sameName"/> + name="sameName" formControlName="sameName" disabled/> - + @@ -89,7 +91,7 @@ + formControlName="fsName" (blur)="checkFsName();"/>

{{'validations.nameRequiredTwo' | translate}}

@@ -103,8 +105,8 @@ + name="shareName" + formControlName="shareName" (blur)="checkShareName();"/>

{{'validations.shareNameRequired' | translate}}

@@ -120,19 +122,21 @@ + name="size" formControlName="size" required (blur)="checkSize()"/>
- {{'errorMsg.require' | translate}}{{'nfs.overSizeGB'|translate}} + + {{'errorMsg.require' | translate}}{{'nfs.overSizeGB'|translate}}
- {{'errorMsg.require' | translate}}{{'nfs.overSizeTB'|translate}} + + {{'errorMsg.require' | translate}}{{'nfs.overSizeTB'|translate}}
@@ -143,7 +147,7 @@ + [(ngModel)]="addForm.securityType" value="AUTH_SYS"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5I"/> @@ -193,8 +197,8 @@ @@ -202,7 +206,7 @@ @@ -231,14 +235,14 @@
- +
+ [(ngModel)]="addForm.qosFlag"/>
@@ -248,14 +252,14 @@ + name="control_policyUpper"/> - + @@ -266,14 +270,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxBandwidthChoose, 'maxbandwidth');qosV6Check('add');" + name="maxbandwidthChoose" clrCheckbox/> @@ -289,14 +293,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxIopsChoose, 'maxiops');qosV6Check('add');" + name="maxiopsChoose" clrCheckbox/> @@ -311,19 +315,20 @@ + style="color: #9F9F9F;">{{'vmfs.trafficControlObject' | translate}} + style="color: #9F9F9F;"> + (ngModelChange)="resetQosFlag(addForm.minBandwidthChoose, 'minbandwidth');qosV6Check('add');" + name="minbandwidthChoose" clrCheckbox/> @@ -339,15 +344,15 @@ + [(ngModel)]="addForm.minIopsChoose" + (ngModelChange)="resetQosFlag(addForm.minIopsChoose, 'miniops');qosV6Check('add');" + name="minbandwidthChoose" clrCheckbox/> @@ -362,21 +367,22 @@ + (ngModelChange)="resetQosFlag(addForm.latencyChoose, 'latency')" name="latencyChoose" + clrCheckbox/> - +
@@ -408,7 +414,7 @@
- + @@ -431,7 +437,7 @@
- +
@@ -450,13 +456,13 @@
{{'vmfs.loadingTips' | translate}} + style="margin-left: 20px;">
{{'vmfs.dataHandleLoadingTips' | translate}} + style="margin-left: 20px;">
@@ -468,9 +474,9 @@ {{'errorMsg.require' | translate}} @@ -478,8 +484,8 @@ {{'errorMsg.require' | translate}} @@ -498,9 +504,9 @@ {{'errorMsg.require' | translate}} @@ -508,10 +514,13 @@ + (blur)="checkNfsName();" formControlName="nfsName" required/> -

{{'errorMsg.require' | translate}}

-

{{'validations.required_nfs_name' | translate:'{length:42}'}}

+ +
+
{{'errorMsg.require' | translate}}
+ {{'validations.required_nfs_name' | translate:'{length:42}'}} +

{{'errorMsg.fsrepeat' | translate}}

{{'errorMsg.sharerepeat' | translate}}

@@ -521,11 +530,11 @@ + (change)="setSameName();" name="sameName" formControlName="sameName"/> + name="sameName" formControlName="sameName" disabled/> - + @@ -534,7 +543,7 @@ + formControlName="fsName" (blur)="checkFsName();"/>

{{'validations.nameRequiredTwo' | translate}}

@@ -548,7 +557,7 @@ + formControlName="shareName" (blur)="checkShareName();"/>

{{'validations.shareNameRequired' | translate}}

@@ -562,7 +571,7 @@ + name="size" formControlName="size" required/> + name="characterEncoding" required> @@ -603,17 +612,17 @@ + [(ngModel)]="addForm.securityType" value="AUTH_SYS"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5"/> + [(ngModel)]="addForm.securityType" value="SEC_KRB5I"/> @@ -625,7 +634,7 @@ @@ -633,7 +642,7 @@ @@ -662,14 +671,14 @@
- +
+ [(ngModel)]="addForm.qosFlag"/>
@@ -678,15 +687,15 @@ + (change)="controlPolicyChangeFunc('control_policyUpper', 'control_policyLower', false, addForm, true);" + name="control_policyUpper"/> + (change)="controlPolicyChangeFunc('control_policyUpper', 'control_policyLower', false, addForm, false);" + name="control_policyLower"/> @@ -697,14 +706,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxBandwidthChoose, 'maxbandwidth');qosV6Check('add');" + name="maxbandwidthChoose" clrCheckbox/> @@ -720,14 +729,14 @@ + (ngModelChange)="resetQosFlag(addForm.maxIopsChoose, 'maxiops');qosV6Check('add');" + name="maxiopsChoose" clrCheckbox/> @@ -742,19 +751,20 @@ + style="color: #9F9F9F;">{{'vmfs.trafficControlObject' | translate}} + style="color: #9F9F9F;"> + (ngModelChange)="resetQosFlag(addForm.minBandwidthChoose, 'minbandwidth');qosV6Check('add');" + name="minbandwidthChoose" clrCheckbox/> @@ -770,14 +780,14 @@ + (ngModelChange)="resetQosFlag(addForm.minIopsChoose, 'miniops');qosV6Check('add');" + name="minbandwidthChoose" clrCheckbox/> @@ -792,21 +802,22 @@ + (ngModelChange)="resetQosFlag(addForm.latencyChoose, 'latency')" name="latencyChoose" + clrCheckbox/> - +
@@ -838,7 +849,7 @@
- + @@ -861,7 +872,7 @@
- +
@@ -881,6 +892,6 @@ diff --git a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.ts b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.ts index cbba4c440..bb8b48468 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.ts +++ b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/add/nfs-add.component.ts @@ -596,8 +596,8 @@ export class NfsAddComponent extends NfsComponentCommon implements OnInit { } } else { //不满足的时候置空,触发错误提示 - this.addForm.nfsName = null; this.matchErr = true; + this.addForm.nfsName = null; console.log('验证不通过'); } } diff --git a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/reduce/nfs-reduce.component.ts b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/reduce/nfs-reduce.component.ts index 46f4cef67..29e06f1a4 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/reduce/nfs-reduce.component.ts +++ b/dmestore-ui/src/main/angular/src/app/routes/nfs/subpages/reduce/nfs-reduce.component.ts @@ -13,7 +13,7 @@ export class NfsReduceComponent implements OnInit{ storeObjectId:string; viewPage: string; unit='GB'; - newCapacity = 0; + newCapacity =1; pluginFlag: string;//来至插件的标记 rowSelected = []; // 当前选中数据 errorMsg: string; @@ -142,27 +142,26 @@ export class NfsReduceComponent implements OnInit{ this.closeModel(); } } - /* checkCapacity(){ - let capacity; - switch (this.unit) { - case 'TB': - capacity = this.newCapacity * 1024; - break; - default: // 默认GB 不变 - capacity = this.newCapacity; - break; - } - const lastCapacity = this.updateNfs.capacity - capacity; - if (lastCapacityparseFloat(this.maxOpCapacity)||capacity<0.001){ - this.newCapacity=null + this.newCapacity=1 this.newCapacityError=true return false }else { diff --git a/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.html b/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.html index b62f15582..f9ca62f96 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.html +++ b/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.html @@ -123,12 +123,24 @@ - - {{'vmfs.capacityTips' | translate}} + + + {{'vmfs.capacityTipsGB' | translate}} - +
- {{'vmfs.capacityTips' | translate}} + + {{'vmfs.capacityTipsGB' | translate}} +
+
+ + + {{'vmfs.capacityTipsTB' | translate}} + + +
+ + {{'vmfs.capacityTipsTB' | translate}}
diff --git a/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.ts b/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.ts index 852a14d74..292d82079 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.ts +++ b/dmestore-ui/src/main/angular/src/app/routes/vmfs/add/add.component.ts @@ -820,6 +820,9 @@ export class AddComponent extends VmfsCommon implements OnInit { if (capacity < 1 / 1024) { capacity = ''; this.capacityErr = true; + } else if (capacity > 256) { + capacity = ''; + this.capacityErr = true; } else { this.capacityErr = false; } @@ -827,6 +830,9 @@ export class AddComponent extends VmfsCommon implements OnInit { if (capacity < 2 / 1024) { capacity = ''; this.capacityErr = true; + } else if (capacity > 256) { + capacity = ''; + this.capacityErr = true; } else { this.capacityErr = false; } @@ -870,6 +876,9 @@ export class AddComponent extends VmfsCommon implements OnInit { if (capacity < 1) { capacity = ''; this.capacityErr = true; + } else if (capacity > 262144) { + capacity = ''; + this.capacityErr = true; } else { this.capacityErr = false; } @@ -877,6 +886,9 @@ export class AddComponent extends VmfsCommon implements OnInit { if (capacity < 2) { capacity = ''; this.capacityErr = true; + } else if (capacity > 262144) { + capacity = ''; + this.capacityErr = true; } else { this.capacityErr = false; } diff --git a/dmestore-ui/src/main/angular/src/app/routes/vmfs/list/list.component.html b/dmestore-ui/src/main/angular/src/app/routes/vmfs/list/list.component.html index 4b7e4544f..eb7e3c0a2 100644 --- a/dmestore-ui/src/main/angular/src/app/routes/vmfs/list/list.component.html +++ b/dmestore-ui/src/main/angular/src/app/routes/vmfs/list/list.component.html @@ -10,10 +10,10 @@ + (click)="modifyBtnClick()">{{'menu.edit' | translate}} + [disabled]="rowSelected.length !== 1">{{'menu.expand' | translate}} - +

{{'errorMsg.detailDescription'|translate}}

{{mountFailOrPartSuccessDesc}} @@ -1191,7 +1199,8 @@
- {{'errorMsg.mountPartError' | translate}} + + {{'errorMsg.mountPartError' | translate}}
@@ -1199,7 +1208,7 @@ clrSignpostTrigger> {{'tips.details'|translate}} - +

{{'errorMsg.mountFailHost'|translate}}

{{item}}
@@ -1275,16 +1284,18 @@ [mountType]="selectMountType" [tree]="deviceList" [vmfsMount]=true - (valueChange)="handleChooseDeviceChange(this.addForm,'chooseDevice',$event)"> - - + (valueChange)="handleChooseDeviceChange(this.addForm,'chooseDevice',$event)"> + +
@@ -1295,7 +1306,7 @@
{{'vmfs.dataHandleLoadingTips' | translate}} + style="margin-left: 20px;">
@@ -1303,7 +1314,9 @@ {{deleteDesc}}
-
{{'vmfs.del.warning'|translate}}
+
+ + {{'vmfs.del.warning'|translate}}

{{'vmfs.del.content' | translate}}

@@ -1314,25 +1327,24 @@ -
@@ -1426,7 +1439,7 @@
@@ -1445,7 +1458,7 @@
{{'vmfs.dataHandleLoadingTips' | translate}} + style="margin-left: 20px;">

{{'vmfs.reclaim.content' | translate}}

@@ -1453,7 +1466,7 @@ @@ -1470,15 +1483,15 @@
{{'vmfs.dataHandleLoadingTips' | translate}} + height="20px" style="margin-left: 20px;">
- - - - - - + + + + + +
@@ -1488,82 +1501,82 @@ {{item.name}} + style="height: 50px; line-height: 50px;color: #333;font-size:16px;">{{item.name}} - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + height="40px"> @@ -1571,7 +1584,7 @@
@@ -1583,7 +1596,7 @@
{{'vmfs.dataHandleLoadingTips' | translate}} + style="margin-left: 20px;">
@@ -1591,15 +1604,17 @@ {{'errorMsg.expandError' | translate}} -
{{'vmfs.currentSize'|translate}}{{lunCapacity}}GB
+
{{'vmfs.currentSize'|translate}} + {{lunCapacity}}GB
+ [(ngModel)]="expandForm.vo_add_capacity" name="vo_add_capacity" (ngModelChange)="expandOnChange()" + required/> @@ -1627,7 +1642,8 @@ {{'validations.required' | translate}}:{{'vmfs.expandTips' | translate}} -
{{'vmfs.expanedCapacity'|translate}}{{expandedCapacity}}GB
+
{{'vmfs.expanedCapacity'|translate}} + {{expandedCapacity}}GB
@@ -1686,7 +1702,7 @@ @@ -1696,7 +1712,7 @@ @@ -1710,7 +1726,8 @@