Merge pull request #146 from gh-ca/lian_data_731

Lian data 731
gh-ca · Dec 15, 2021 · 3003d5d · 3003d5d
2 parents 46b8892 + 3a81b5e
commit 3003d5d
Show file tree

Hide file tree

Showing 11 changed files with 743 additions and 665 deletions.
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
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
@@ -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
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
@@ -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
@@ -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 (lastCapacity<parseFloat(this.maxOpCapacity)){
-      this.newCapacity=0;
-      this.capacityErr=false;
-      return false;
-    }else {
-      this.capacityErr=true;
-      return true;
-    }
-
-  }*/
+  /* 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 (lastCapacity<parseFloat(this.maxOpCapacity)){
+       this.newCapacity=0;
+       this.capacityErr=false;
+       return false;
+     }else {
+       this.capacityErr=true;
+       return true;
+     }
+   }*/
   checkNewCapacity(){
     console.log('reduce',this.newCapacity)
     console.log(typeof this.newCapacity)
@@ -176,7 +175,7 @@ export class NfsReduceComponent implements OnInit{
         break;
     }
     if (capacity>parseFloat(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
@@ -123,12 +123,24 @@
         <input clrInput style="width: 19%;text-align: center;" readonly value="{{'vmfs.multiply' | translate}}">
         <input clrInput min="0" (blur)="countBlur();" style="width: 27%;" type="number" [(ngModel)]="form.count"
           name="count" formControlName="count" required />
-        <clr-control-helper *ngIf="!capacityErr">
-          <clr-icon shape="exclamation-circle"></clr-icon>{{'vmfs.capacityTips' | translate}}
+        <clr-control-helper *ngIf="!capacityErr&&form.capacityUnit==='GB'">
+          <clr-icon shape="exclamation-circle" class="is-solid"></clr-icon>
+          {{'vmfs.capacityTipsGB' | translate}}
         </clr-control-helper>
-        <clr-control-helper *ngIf="capacityErr">
+        <clr-control-helper *ngIf="capacityErr&&form.capacityUnit==='GB'">
           <div class="errorTips" readonly>
-            <clr-icon shape="exclamation-circle" class="is-solid"></clr-icon>{{'vmfs.capacityTips' | translate}}
+            <clr-icon shape="exclamation-circle" class="is-solid"></clr-icon>
+            {{'vmfs.capacityTipsGB' | translate}}
+          </div>
+        </clr-control-helper>
+        <clr-control-helper *ngIf="!capacityErr&&form.capacityUnit==='TB'">
+          <clr-icon shape="exclamation-circle" class="is-solid"></clr-icon>
+          {{'vmfs.capacityTipsTB' | translate}}
+        </clr-control-helper>
+        <clr-control-helper *ngIf="capacityErr&&form.capacityUnit==='TB'">
+          <div class="errorTips" readonly>
+            <clr-icon shape="exclamation-circle" class="is-solid"></clr-icon>
+            {{'vmfs.capacityTipsTB' | translate}}
           </div>
         </clr-control-helper>
         <!-- <clr-control-error>{{'validations.required' | translate}}</clr-control-error> -->

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
@@ -820,13 +820,19 @@ 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;
                 }
               } else {
                 if (capacity < 2 / 1024) {
                   capacity = '';
                   this.capacityErr = true;
+                } else if (capacity > 256) {
+                  capacity = '';
+                  this.capacityErr = true;
                 } else {
                   this.capacityErr = false;
                 }
@@ -870,13 +876,19 @@ 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;
                 }
               } else {
                 if (capacity < 2) {
                   capacity = '';
                   this.capacityErr = true;
+                } else if (capacity > 262144) {
+                  capacity = '';
+                  this.capacityErr = true;
                 } else {
                   this.capacityErr = false;
                 }