@kigi/components 1.8.11 → 1.9.0

package/package.json

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

package/src/components/mbg-multi-select/mbg-multi-select.html

@@ -3,7 +3,7 @@
        ng-class="{'disabled': $ctrl.ngDisabled, 'inline-mode-wrapper': $ctrl.inlineMode}">
     <div class="mbg-multi-select-content">
       <ul class="items-selected">
-        <li ng-repeat="item in $ctrl.ngModel track by $index"
+        <li ng-repeat="item in $ctrl.ngModel"
             draggable="true">
           <label data-text="{{ $ctrl.label ? item[$ctrl.label] : item }}"
                  ng-style="{width: $ctrl.widthEllipsis && $ctrl.inlineMode ? $ctrl.widthEllipsis : 'auto'}">{{
@@ -24,13 +24,11 @@
                   fetch="$ctrl.fetch({ query })"
                   ng-disabled="$ctrl.ngDisabled"
                   ignore-items="$ctrl.ngModel"
-                  on-select="$ctrl.onSelect(value)"
+                  on-select="$ctrl.onSelect()"
                   ng-blur="$ctrl.ngBlur({ $event })"
                   ng-focus="$ctrl.ngFocus({ $event })"
                   placeholder="{{ $ctrl.placeholder }}"
                   enable-add="$ctrl.enableAdd"
-                  enable-favorite="$ctrl.enableFavorite"
-                  many-favorite="true"
                   label="{{ $ctrl.label }}"></mbg-select>
     </div>
   </div>

package/src/components/mbg-multi-select/mbg-multi-select.ts

@@ -19,7 +19,6 @@ class MbgMultiSelectController {
   private enableAdd: boolean
   private inlineMode: boolean
   private widthEllipsis: string
-  private enableFavorite: boolean
 
   constructor(public $scope, public $element, public $attrs, public $timeout) {}
 
@@ -54,26 +53,26 @@ class MbgMultiSelectController {
     })
   }
 
-  onSelect(item?) {
+  onSelect() {
     this.$timeout(() => {
-      const currentModel = this.searchModel || item
-      if (currentModel) {
+      if (this.searchModel) {
         this.ngModel = this.ngModel || []
         if (this.ngModel && typeof this.ngModel[0] === 'string') {
           if (
-            this.ngModel.filter((v) => v.toLowerCase() === currentModel.toLowerCase()).length === 0
+            this.ngModel.filter((v) => v.toLowerCase() === this.searchModel.toLowerCase())
+              .length === 0
           ) {
             if (this.inlineMode) {
-              this.ngModel.unshift(currentModel)
+              this.ngModel.unshift(this.searchModel)
             } else {
-              this.ngModel.push(currentModel)
+              this.ngModel.push(this.searchModel)
             }
           }
         } else {
           if (this.inlineMode) {
-            this.ngModel.unshift(currentModel)
+            this.ngModel.unshift(this.searchModel)
           } else {
-            this.ngModel.push(currentModel)
+            this.ngModel.push(this.searchModel)
           }
         }
         this.verifyScroll()
@@ -243,7 +242,6 @@ const mbgMultiSelect = {
     ngDisabled: '=?',
     inlineMode: '=?',
     widthEllipsis: '@?',
-    enableFavorite: '=?',
   },
   template,
   controller: MbgMultiSelectController,

package/src/components/mbg-select/mbg-select.ts

@@ -1,4 +1,4 @@
-import { Capitalize } from '@kigi/components/src/helpers/capitalize'
+import { Capitalize } from '@kigi/components/src/helpers/capitalize';
 import * as angular from 'angular'
 import './mbg-select.scss'
 import template from './mbg-select.html'
@@ -44,7 +44,6 @@ class MbgSelectController {
   private transcludeSize: any
   private getCustomModel: Function
   private capitalize
-  private manyFavorite: boolean
 
   constructor(
     public $scope,
@@ -53,7 +52,7 @@ class MbgSelectController {
     public $timeout,
     public $compile,
     public $transclude,
-  ) {}
+  ) { }
 
   $onInit() {
     this.fixedValue = this.ngValue || 'id'
@@ -431,12 +430,6 @@ class MbgSelectController {
     this.executeCallback(isNew)
     this.pressEnter = false
     this.hasFocus = false
-    if (item instanceof Array) {
-      if (this.onSelect) {
-        item.forEach((i) => this.onSelect({ value: i }))
-        return
-      }
-    }
     await this.updateModelValue(this.ngValue ? item[this.ngValue] : item)
     if (this.onSelect) {
       this.onSelect({ value: this.ngModel })
@@ -606,19 +599,8 @@ class MbgSelectController {
   favorite(evt, item) {
     evt.preventDefault()
     evt.stopPropagation()
-    if (this.isFavorite(item) && !this.manyFavorite) {
+    if (this.isFavorite(item)) {
       MbgCookie.set(this.getFavoriteKey(), null)
-    } else if (this.manyFavorite) {
-      if (this.isFavorite(item)) {
-        const favorite = MbgCookie.get(this.getFavoriteKey())
-        const index = favorite.findIndex((i) => i.id == item.id)
-        favorite.splice(index, 1)
-        MbgCookie.set(this.getFavoriteKey(), favorite)
-      } else {
-        const favorite = MbgCookie.get(this.getFavoriteKey())
-        const favoriteArray = favorite ? (favorite instanceof Array ? favorite : [favorite]) : []
-        MbgCookie.set(this.getFavoriteKey(), [...favoriteArray, item])
-      }
     } else {
       MbgCookie.set(this.getFavoriteKey(), item)
     }
@@ -639,11 +621,7 @@ class MbgSelectController {
 
   isFavorite(item) {
     const favorite = MbgCookie.get(this.getFavoriteKey())
-    if (this.manyFavorite) {
-      return favorite && (favorite || []).find((i) => i && i.id == item.id)
-    } else {
-      return favorite && angular.equals(favorite, item)
-    }
+    return favorite && angular.equals(favorite, item)
   }
 
   async fixedOption(evt, item) {
@@ -694,8 +672,7 @@ const mbgSelect = {
     callbackAddFixedOption: '&?',
     transcludeSize: '=?',
     getCustomModel: '&?',
-    capitalize: '=?',
-    manyFavorite: '=?',
+    capitalize: '=?'
   },
   controller: MbgSelectController,
   template,