npm - @kigi/components - Versions diffs - 1.4.3 → 1.4.7 - Mend

@kigi/components 1.4.3 → 1.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@kigi/components",
-  "version": "1.4.3",
+  "version": "1.4.7",
   "description": "@kigi/components",
   "main": "src/components/index.ts",
   "scripts": {

package/src/components/mbg-address/modals/mbg-address-manual/mbg-address-manual.html CHANGED Viewed

@@ -31,6 +31,10 @@
         <div class="mbg-input-wrapper input-cep-wrapper">
           <input autocomplete="{{ $ctrl.autocompleteValue }}"
                  autocorrect="{{ $ctrl.autocompleteValue }}"
+                 ng-class="{'mbg-error': !$ctrl.entity.zipCode && $ctrl.inputErrors}"
+                 mbg-error="!$ctrl.entity.zipCode"
+                 mbg-error-when="$ctrl.inputErrors"
+                 mbg-error-message="É necessário informar o CEP"
                  spellcheck="false"
                  type="text"
                  ng-change="$ctrl.onChangeCep()"
@@ -91,7 +95,7 @@
   <div class="content-confirm-upload">
     <mbg-btn-form label="Salvar"
                   loading="$ctrl.loading"
-                  ng-click="$ctrl.finish()"></mbg-btn-form>
+                  ng-click="$ctrl.finish(manualAddress.$valid)"></mbg-btn-form>
     <a class="btn-cancel"
        ng-click="$ctrl.dismiss()">Cancelar</a>
   </div>

package/src/components/mbg-address/modals/mbg-address-manual/mbg-address-manual.ts CHANGED Viewed

@@ -26,6 +26,7 @@ class MbgAddressManualController {
   public navigatorData
   public entity: any = {}
   public countries: any[]
+  public inputErrors: boolean = false
   constructor(
     public $scope,
@@ -149,7 +150,11 @@ class MbgAddressManualController {
     })
   }
-  finish() {
+  finish(valid) {
+    this.inputErrors = true
+    if (!valid) {
+      return
+    }
     this.$uibModalInstance.close(this.entity)
   }
 }

package/src/components/mbg-product-grid/mbg-product-grid.html CHANGED Viewed

@@ -72,7 +72,6 @@
                    ng-model="$ctrl.gridValues[$index][$parent.$index].stock"
                    placeholder="0"
                    ng-keydown="$ctrl.onKeydown($event)"
-                   positive-number="true"
                    ng-class="{ 'grid-disable': $ctrl.activeAddOrRemove && !$ctrl.gridValues[$index][$parent.$index].enable }"
                    ng-change="$ctrl.handleGridValues()"
                    ng-model-options="{ debounce: 500 }"
@@ -92,4 +91,4 @@
       </tr>
     </tbody>
   </table>
-</div>
+</div>

package/src/components/mbg-product-inline/mbg-product-inline.html CHANGED Viewed

@@ -53,7 +53,6 @@
                    ng-model="item.stock"
                    ng-keydown="$ctrl.onKeydown($event)"
                    placeholder="0"
-                   positive-number="true"
                    placeholder="Estoque"
                    ng-model-options="{ debounce: 500 }"
                    class="inline-product-stock" />
@@ -72,4 +71,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

package/src/components/mbg-repasse/interfaces/condition-fields-interface.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 export interface ConditionFields {
   label: string
   type: string
-  search: Function
+  search?: Function
   operators: Array<
-    'EQUAL' | 'GT' | 'LT' | 'GEQ' | 'LEQ' | 'NOT_EQUAL' | 'CONTAINING' | 'STARTS_WITH'
+    'EQUAL' | 'GT' | 'LT' | 'GEQ' | 'LEQ' | 'NOT_EQUAL' | 'CONTAINING' | 'STARTS_WITH' | 'BETWEEN'
   >
 }

package/src/components/mbg-repasse/mbg-repasse.html CHANGED Viewed

@@ -8,7 +8,7 @@
       <label>Comparação</label>
     </div>
     <div class="col-md-3">
-      <label>Pesquisa</label>
+      <label>Valor</label>
     </div>
   </div>
   <div class="condition-content">
@@ -26,7 +26,8 @@
                       label="operator"
                       fetch="$ctrl.searchOperators(item)"></mbg-select>
         </div>
-        <div class="col-md-3">
+        <div class="col-md-3"
+             ng-if="(item.operator && item.operator.name !== 'BETWEEN') || !item.operator">
           <mbg-select ng-model="item.selected"
                       ng-disabled="!item.field"
                       label="label"
@@ -34,7 +35,15 @@
                       on-unselect="$ctrl.handleNgModel()"
                       fetch="item.field.search(query)"></mbg-select>
         </div>
-        <div class="col-md-3">
+        <div class="col-md-4"
+             ng-if="item.operator && item.operator.name == 'BETWEEN'">
+          <mbg-input-date ng-model="item.selected"
+                          placeholder-start="Data início"
+                          placeholder-end="Data fim"
+                          calendar="true"
+                          between="true"></mbg-input-date>
+        </div>
+        <div class="col-md-2">
           <div class="options-action">
             <label class="add"
                    ng-click="$ctrl.addCondition()"
@@ -102,4 +111,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

package/src/components/mbg-repasse/mbg-repasse.scss CHANGED Viewed

@@ -25,7 +25,6 @@
     .apply-item {
       margin-bottom: 8px;
     }
   }
   .options-action {

package/src/components/mbg-repasse/mbg-repasse.ts CHANGED Viewed

@@ -24,6 +24,7 @@ class MbgRepasseController {
       { name: 'NOT_EQUAL', operator: 'diferente de' },
       { name: 'CONTAINING', operator: 'contém' },
       { name: 'STARTS_WITH', operator: 'começa com' },
+      { name: 'BETWEEN', operator: 'entre' },
     ]
     this.$scope.$watch('$ctrl.ngModel', (data) => {
       if (!data || Object.keys(data).length === 0) {

package/src/components/mbg-text-area/mbg-text-area.html CHANGED Viewed

@@ -1,14 +1,14 @@
-<div class="mbg-text-wrapper mb-text-area-wrapper">
+<div class="mbg-text-area-wrapper mb-text-area-wrapper">
     <textarea type="text"
-           ng-model="$ctrl.ngModel"
-           ng-change="$ctrl.onChange()"
-           ng-required="$ctrl.ngRequired"
-           ng-disabled="$ctrl.ngDisabled"
-           ng-blur="$ctrl.ngBlur({ $event })"
-           ng-focus="$ctrl.ngFocus({ $event })"
-           ng-keyup="$ctrl.ngKeyup({ $event })"
-           ng-keypress="$ctrl.ngKeypress({ $event })"
-           ng-keydown="$ctrl.ngKeydown({ $event })"
-           placeholder="{{ $ctrl.placeholder }}" >
+              ng-model="$ctrl.ngModel"
+              ng-change="$ctrl.onChange()"
+              ng-required="$ctrl.ngRequired"
+              ng-disabled="$ctrl.ngDisabled"
+              ng-blur="$ctrl.ngBlur({ $event })"
+              ng-focus="$ctrl.ngFocus({ $event })"
+              ng-keyup="$ctrl.ngKeyup({ $event })"
+              ng-keypress="$ctrl.ngKeypress({ $event })"
+              ng-keydown="$ctrl.ngKeydown({ $event })"
+              placeholder="{{ $ctrl.placeholder }}">
     </textarea>
 </div>

package/src/components/mbg-text-area/mbg-text-area.scss CHANGED Viewed

@@ -1,3 +1,23 @@
-// .mbg-text-area-wrapper {
-// }
+.mbg-text-area-wrapper {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    display: flex;
+    height: 74px;
+    background: #fff;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    textarea {
+        border: none;
+        padding: 8px 14px;
+        flex: 1;
+        background: transparent;
+        outline: none;
+        width: 500px;
+        &[disabled="disabled"] {
+            background: #f5f5f5;
+        }
+        font-weight: 500;
+    }
+}

package/src/components/mbg-text-editor/mbg-text-editor.html CHANGED Viewed

@@ -4,4 +4,4 @@
             placeholder="{{ $ctrl.placeholder }}"
             id="editor-{{$ctrl.uid}}"
             name="editor-{{$ctrl.uid}}"></textarea>
-</div>
+</div>

package/src/helpers/mbg-error/mbg-error.ts CHANGED Viewed

@@ -78,6 +78,8 @@ export class MbgError {
       return currentInput.length === 0
         ? elm[0].nodeName === 'MBG-SELECT' || elm[0].nodeName === 'MBG-MULTI-SELECT'
           ? angular.element(document.querySelector(`.mbg-select-list[uid="${selectUid}"] input`))
+          : elm[0].nodeName === 'MBG-TEXT-AREA'
+          ? elm.find('textarea')
           : elm.find('input')
         : elm.find('input')
     }
@@ -127,6 +129,11 @@ export class MbgError {
           element = elm.find('.mbg-select-input-fake')
           handleClassError(element, type)
           break
+        case 'MBG-TEXT-AREA':
+          element = elm.find('.mbg-text-area-wrapper')
+          handleClassError(element, type)
+          break
         case 'MBG-INPUT-STEP':
           element = elm.find('.mb-input-step-wrapper')
           handleClassError(element, type)
@@ -169,4 +176,4 @@ export class MbgError {
   }
 }
-MbgError.$inject = ['$timeout']
+MbgError['$inject'] = ['$timeout']