#917 modify expression button

metatron-app · Dec 7, 2018 · 59621ca · 59621ca
1 parent f3ff58a
commit 59621ca
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/...dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component.html b/...dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component.html
@@ -19,7 +19,7 @@
         </div>
 
         <div class="ddp-ui-buttons">
-          <a href="javascript:" class="ddp-btn-minus" (click)="deleteFormula(item.id)"></a>
+          <a href="javascript:" [ngClass]="(formulas.length==1)?'ddp-btn-minus ddp-disabled':'ddp-btn-minus'" (click)="deleteFormula(item.id)"></a>
         </div>
       </div>
     </div>

diff --git a/...w/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component.ts b/...w/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-aggregate.component.ts
@@ -164,7 +164,9 @@ export class EditRuleAggregateComponent extends EditRuleComponent implements OnI
    * @param {number} idx
    */
   public deleteFormula(idx:number) {
-    this.formulas = this.formulas.filter(({ id }) => id !== idx);
+    if(!isUndefined(this.formulas) && this.formulas.length > 1) {
+      this.formulas = this.formulas.filter(({id}) => id !== idx);
+    }
   } // function - deleteFormula
 
   /**

diff --git a/...low/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-pivot.component.html b/...low/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-pivot.component.html
@@ -42,7 +42,7 @@
             (onChange)="item.value = $event"></rule-condition-input>
         </div>
         <div class="ddp-ui-buttons">
-          <a href="javascript:" class="ddp-btn-minus" (click)="deleteFormula(item.id)"></a>
+          <a href="javascript:" [ngClass]="(formulas.length==1)?'ddp-btn-minus ddp-disabled':'ddp-btn-minus'" (click)="deleteFormula(item.id)"></a>
         </div>
       </div>
     </div>

diff --git a/...aflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-pivot.component.ts b/...aflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-pivot.component.ts
@@ -180,7 +180,9 @@ export class EditRulePivotComponent extends EditRuleComponent implements OnInit,
    * @param {number} idx
    */
   public deleteFormula(idx:number) {
-    this.formulas = this.formulas.filter(({ id }) => id !== idx);
+    if(!isUndefined(this.formulas) && this.formulas.length > 1) {
+      this.formulas = this.formulas.filter(({id}) => id !== idx);
+    }
   } // function - deleteFormula
 
   /**

diff --git a/...ow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-window.component.html b/...ow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-window.component.html
@@ -31,7 +31,7 @@
             (onChange)="item.value = $event"></rule-condition-input>
         </div>
         <div class="ddp-ui-buttons">
-          <a href="javascript:" class="ddp-btn-minus" (click)="deleteFormula(item.id)"></a>
+          <a href="javascript:" [ngClass]="(formulas.length==1)?'ddp-btn-minus ddp-disabled':'ddp-btn-minus'" (click)="deleteFormula(item.id)"></a>
         </div>
       </div>
     </div>

diff --git a/...flow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-window.component.ts b/...flow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-window.component.ts
@@ -114,7 +114,9 @@ export class EditRuleWindowComponent extends EditRuleComponent implements OnInit
    * @param {number} idx
    */
   public deleteFormula(idx:number) {
-    this.formulas = this.formulas.filter(({ id }) => id !== idx);
+    if(!isUndefined(this.formulas) && this.formulas.length > 1) {
+      this.formulas = this.formulas.filter(({id}) => id !== idx);
+    }
   } // function - deleteFormula
 
   /**

diff --git a/...overy-frontend/src/assets/css/metatron/page/metatron.page.99Preperation_dataflow_rule.css b/...overy-frontend/src/assets/css/metatron/page/metatron.page.99Preperation_dataflow_rule.css
@@ -22,6 +22,17 @@
 
 
 
+.page-prep-dataflow .ddp-box-contents .ddp-box-part .ddp-box-title span.ddp-box-title-in {padding-right:19px;}
+.page-prep-dataflow .ddp-box-contents .ddp-box-part .ddp-box-title a.ddp-btn-plus {display:inline-block; width:13px; height:13px; top:0; background:url(../../../images/icon_add.png) no-repeat; background-position:-84px -22px; border:none;}
+.page-prep-dataflow .ddp-box-contents .ddp-box-part .ddp-box-title a.ddp-btn-plus:before {display:none;}
+.page-prep-dataflow .ddp-box-contents .ddp-box-part .ddp-box-title a.ddp-btn-plus:hover {background-position-x:-98px; border:none;}
+.page-prep-dataflow .ddp-wrap-boxadd .ddp-ui-buttons a.ddp-btn-minus {border:none; background:none;}
+.page-prep-dataflow .ddp-wrap-boxadd .ddp-ui-buttons a.ddp-btn-minus:before {display:inline-block; position:absolute; top:50%; left:50%; margin:-8px 0 0 -8px; width:15px; height:15px; background:url(../../../images/icon_delete.png) no-repeat; background-position:left -14px;}
+.page-prep-dataflow .ddp-wrap-boxadd .ddp-ui-buttons a.ddp-btn-minus.ddp-disabled {opacity:0.5; cursor:no-drop;}
+
+
+
+