@kigi/components 1.8.7 → 1.8.9

package/package.json

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

package/src/components/mbg-list/index.ts

@@ -4,9 +4,10 @@ import { mbgListColumn } from './components/mbg-list-column/mbg-list-column'
 import { mbgListRow } from './components/mbg-list-row/mbg-list-row'
 
 const mbgListModule = angular
-  .module('mbg.components.mbgList', [])
-  .component('mbgList', mbgList)
-  .component('mbgListColumn', mbgListColumn)
-  .component('mbgListRow', mbgListRow).name
+    .module('mbg.components.mbgList', [])
+    .component('mbgList', mbgList)
+    .component('mbgListColumn', mbgListColumn)
+    .component('mbgListRow', mbgListRow)
+    .name
 
 export { mbgListModule }

package/src/components/mbg-list/mbg-list.html

@@ -30,8 +30,7 @@
         </td>
         <td ng-if="$ctrl.radio && !$row.isAdicional">
           <mbg-radio ng-model="$ctrl.selectedMap[$ctrl.removeCircularJson($row.$json)]"
-                     ng-change="$ctrl.toogleRadio($ctrl.removeCircularJson($row.$json))"
-                     ng-if="!$ctrl.checkboxIf || $ctrl.checkboxIf({ $row: $row })"></mbg-radio>
+                     ng-change="$ctrl.toogleRadio($ctrl.removeCircularJson($row.$json))"></mbg-radio>
         </td>
         <td ng-repeat="column in $ctrl.columns"
             ng-if="!$row.isAdicional && !column.hidden"

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

@@ -209,13 +209,7 @@ export class MbgListController {
   handleClickRow(row, index) {
     if (this.rowsAdicional !== index && (this.checkbox || this.radio) && this.enableOnSelectByRow) {
       if (this.radio) {
-        if (this.checkboxIf) {
-          if (this.checkboxIf({ $row: row })) {
-            this.toogleRadio(row.$json)
-          }
-        } else {
-          this.toogleRadio(row.$json)
-        }
+        this.toogleRadio(row.$json)
       } else {
         if (this.checkboxIf) {
           if (this.checkboxIf({ $row: row })) {

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

@@ -13,8 +13,8 @@
                               placeholder="$ctrl.placeholderLeft"
                               ng-model-options="{ debounce: 300 }"
                               ng-change="$ctrl.executeFetch()"></mbg-input-search>
-            <div ng-if="$ctrl.listHeaderTransclude"
-                 mbg-dynamic-html="$ctrl.listHeaderTransclude"></div>
+            <div ng-if="$ctrl.listHeaderDataTransclude"
+                 mbg-dynamic-html="$ctrl.listHeaderDataTransclude"></div>
             <div class="mbg-multi-list-wrapper"
                  ng-show="$ctrl.data.length > 0">
                 <div ng-if="$ctrl.listRowTransclude"
@@ -32,10 +32,14 @@
                  ng-show="$ctrl.count">
                 <span>{{$ctrl.data.length}} / {{$ctrl.count}}</span>
             </div>
-             <div class="row m-b-24 m-t-14" ng-show="$ctrl.pagination.data.length > 0">
+            <div class="row m-b-24 m-t-14"
+                 ng-show="$ctrl.pagination.data.length > 0">
                 <div class="col-md-12">
-                    <mbg-pagination active-page="$ctrl.pagination.page" page-size="$ctrl.pagination.pageSize"
-                        on-change="$ctrl.fetch()" count="$ctrl.pagination.count" page-range-displayed="10">
+                    <mbg-pagination active-page="$ctrl.pagination.page"
+                                    page-size="$ctrl.pagination.pageSize"
+                                    on-change="$ctrl.fetch()"
+                                    count="$ctrl.pagination.count"
+                                    page-range-displayed="10">
                     </mbg-pagination>
                 </div>
             </div>
@@ -45,8 +49,8 @@
                               ng-model-options="{ debounce: 300 }"
                               placeholder="$ctrl.placeholderRight"
                               ng-change="$ctrl.searchNgModel()"></mbg-input-search>
-            <div ng-if="$ctrl.listHeaderTransclude"
-                 mbg-dynamic-html="$ctrl.listHeaderTransclude"></div>
+            <div ng-if="$ctrl.listHeaderResultTransclude"
+                 mbg-dynamic-html="$ctrl.listHeaderResultTransclude"></div>
             <div class="mbg-multi-list-wrapper result-multi-list-wrapper"
                  ng-show="$ctrl.dataModel.length > 0">
                 <div ng-if="$ctrl.listRowTransclude"

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

@@ -3,6 +3,7 @@ import './mbg-select-multi-list.scss'
 import template from './mbg-select-multi-list.html'
 import * as Fuse from 'fuse.js'
 import { UtilUID } from '../../helpers/util-uid'
+import _get from 'lodash.get'
 
 export class MbgSelectMultiListController {
   private data: Array<any>
@@ -13,11 +14,14 @@ export class MbgSelectMultiListController {
   private isLoading: boolean
   private inputValue: string
   private listRowTransclude: string
-  private listHeaderTransclude: string
+  private listHeaderDataTransclude: string
+  private listHeaderResultTransclude: string
   private placeholderLeft: string
   private placeholderRight: string
   private inputValueResult: string
   private pagination
+  private order
+  private fieldOrder
 
   constructor(
     public $scope,
@@ -34,6 +38,7 @@ export class MbgSelectMultiListController {
     this.$scope.$c = this.$scope.$parent
     this.findTransclude()
     this.findTranscludeHeader()
+    this.findTranscludeResultHeader()
     this.$scope.$watch(
       '$ctrl.data',
       (data) => {
@@ -63,7 +68,18 @@ export class MbgSelectMultiListController {
       angular.forEach(cloneEl, (cl) => {
         let element = angular.element(cl)[0]
         if (element.nodeName && element.nodeName === 'MBG-HEADER-CONTENT') {
-          this.listHeaderTransclude = element.innerHTML
+          this.listHeaderDataTransclude = element.innerHTML
+        }
+      })
+    })
+  }
+
+  findTranscludeResultHeader() {
+    this.$transclude(this.$scope, (cloneEl) => {
+      angular.forEach(cloneEl, (cl) => {
+        let element = angular.element(cl)[0]
+        if (element.nodeName && element.nodeName === 'MBG-HEADER-RESULT-CONTENT') {
+          this.listHeaderResultTransclude = element.innerHTML
         }
       })
     })
@@ -144,6 +160,16 @@ export class MbgSelectMultiListController {
       this.$timeout(() => element.removeClass('active'), 300)
     }, 100)
   }
+
+  executeSort(field, dir) {
+    this.order = dir
+    this.fieldOrder = field
+    this.dataModel = this.dataModel.sort((a, b) =>
+      typeof _get(a, field) == 'string'
+        ? _get(dir == 'asc' ? a : b, field).localeCompare(_get(dir == 'asc' ? b : a, field))
+        : _get(dir == 'asc' ? a : b, field) - _get(dir == 'asc' ? b : a, field),
+    )
+  }
 }
 
 MbgSelectMultiListController.$inject = [