@inspark/inspark-components 1.0.40 → 1.0.42

package/full/bundles/inspark-inspark-components.umd.js

@@ -2080,6 +2080,12 @@
                     return _this.groupInfo[key] = { isExpanded: true };
                 });
                 this.sortByGroup();
+                if (this.dt && this.dt.filteredValue) {
+                    this.sortByGroup(this.dt.filteredValue, this.dt._sortOrder);
+                }
+                else if (this.dt && this.dt._value && this.dt._sortOrder) {
+                    this.sortByGroup(this.dt._value, this.dt._sortOrder);
+                }
             }
         };
         TableComponent.prototype.isShowGroup = function (key, rowIndex) {
@@ -2103,8 +2109,18 @@
         TableComponent.prototype.localSearch = function (dt, searchText) {
             dt.filterGlobal(searchText, 'contains');
         };
-        TableComponent.prototype.sortByGroup = function () {
+        TableComponent.prototype.sortByGroup = function (values, sortOrder) {
             var g = this.groupMode;
+            if (values) {
+                return values.sort(function (row1, row2) {
+                    if (typeof (row1.groupOrder[g]) === 'number') {
+                        return sortOrder * (row1.groupOrder[g] - row2.groupOrder[g]);
+                    }
+                    else {
+                        return sortOrder * row1.groupOrder[g].localeCompare(row2.groupOrder[g], undefined, { numeric: true, sensitivity: 'base' });
+                    }
+                });
+            }
             this.values.sort(function (row1, row2) {
                 if (typeof (row1.groupOrder[g]) === 'number') {
                     return row1.groupOrder[g] - row2.groupOrder[g];
@@ -2516,7 +2532,7 @@
                 template: "<div class=\"toolbar-wrapper\">\n  <in-sticky top=\"60\">\n\n    <div class=\"c-panel toolbar-container\">\n      <div class=\"c-toolbar\">\n        <div class=\"c-toolbar__side-left\">\n          <div class=\"c-toolbar__title\">{{title}}</div>\n        </div>\n        <div class=\"c-toolbar__side-center\">\n\n        </div>\n        <div class=\"c-toolbar__side-right\">\n          <ng-content></ng-content>\n        </div>\n\n      </div>\n    </div>\n  </in-sticky>\n</div>\n",
                 changeDetection: core.ChangeDetectionStrategy.OnPush,
                 entryComponents: [],
-                styles: [".toolbar-wrapper{padding-bottom:4px}.toolbar-container{padding:8px;position:relative}:host{position:-webkit-sticky;position:sticky;z-index:2}.c-toolbar{display:inline-flex;width:100%}.c-toolbar__side-left{flex:1;text-align:left}.c-toolbar__title{display:inline-flex;vertical-align:middle;font-size:22px}.c-toolbar__side-right{display:flex;text-align:right}.add-widget{position:fixed;right:16px;bottom:16px}.widget-container{position:absolute;left:0;top:40px;right:0;bottom:0;overflow:auto}.widget-block{position:absolute;left:5px;top:5px;right:5px;bottom:5px}.sidebar{background:var(--main-background);position:absolute;left:0;top:35px;bottom:0;height:100vh;z-index:100;width:300px;box-shadow:0 0 3px 8px rgba(0,0,0,.1);overflow:auto}.right-side{display:flex;align-items:center;justify-content:flex-end;flex:1}.right-side>*{margin-left:5px}.left-side{white-space:nowrap;display:flex;align-items:center;justify-content:flex-start}.left-side>*{margin-right:5px}.controls-panel{height:41px;border-radius:2px;padding:4px 0;margin:0 5px 5px;display:flex}.dashboard-list{position:relative}.title{font-size:22px}"]
+                styles: [".toolbar-wrapper{padding-bottom:4px}.toolbar-container{padding:8px;position:relative}:host{position:sticky;z-index:2}.c-toolbar{display:inline-flex;width:100%}.c-toolbar__side-left{flex:1;text-align:left}.c-toolbar__title{display:inline-flex;vertical-align:middle;font-size:22px}.c-toolbar__side-right{display:flex;text-align:right}.add-widget{position:fixed;right:16px;bottom:16px}.widget-container{position:absolute;left:0;top:40px;right:0;bottom:0;overflow:auto}.widget-block{position:absolute;left:5px;top:5px;right:5px;bottom:5px}.sidebar{background:var(--main-background);position:absolute;left:0;top:35px;bottom:0;height:100vh;z-index:100;width:300px;box-shadow:0 0 3px 8px rgba(0,0,0,.1);overflow:auto}.right-side{display:flex;align-items:center;justify-content:flex-end;flex:1}.right-side>*{margin-left:5px}.left-side{white-space:nowrap;display:flex;align-items:center;justify-content:flex-start}.left-side>*{margin-right:5px}.controls-panel{height:41px;border-radius:2px;padding:4px 0;margin:0 5px 5px;display:flex}.dashboard-list{position:relative}.title{font-size:22px}"]
             }),
             __metadata("design:paramtypes", [core.ElementRef, core.ChangeDetectorRef, router.Router])
         ], ToolbarComponent);
@@ -3727,14 +3743,12 @@
         }
         ContentToggleComponent.prototype.ngOnInit = function () {
             this.isOpen = this.defaultOpen;
-            console.log('defaultOpen', this.defaultOpen);
-            console.log('isOpen', this.isOpen);
         };
         ContentToggleComponent.prototype.toggleOpen = function (e) {
             // Получаем родительский элемент div
             var parentElement = this.elementButtons.nativeElement;
             // Проверяем, входит ли цель события в родительский элемент
-            if (!parentElement.contains(e.target)) {
+            if (!parentElement.contains(e.target) || e.target === parentElement) {
                 this.isOpen = !this.isOpen;
                 this.toggle.emit(this.isOpen);
                 this.cdr.detectChanges();
@@ -3775,7 +3789,7 @@
             core.Component({
                 selector: 'in-content-toggle',
                 template: "<div class=\"block\" (click)=\"toggleOpen($event)\" tabIndex=\"1\">\n    <span [ngClass]=\"{arrow: true, close: !isOpen}\">\n        <in-svg *ngIf=\"manualArrow\" [src]=\"'arrow-down.svg'\" width=\"48px\" height=\"48px\"></in-svg>\n        <ng-content select=\"[arrow]\"></ng-content>\n    </span>\n  <span class=\"label\">\n    <in-svg *ngIf=\"icon\" class=\"label-icon\" [src]=\"icon\"></in-svg>\n    {{label}}\n  </span>\n  <span class=\"counter\">\n    <ng-content select=\"[header]\"></ng-content>\n  </span>\n  <div class=\"buttons\" #buttons>\n    <ng-content select=\"[buttons]\"></ng-content>\n  </div>\n</div>\n<div class=\"container\" *ngIf=\"isOpen\">\n  <ng-content select=\"[body]\"></ng-content>\n</div>\n",
-                styles: ["@charset \"UTF-8\";.block{font-size:12px;text-transform:uppercase;cursor:pointer;display:flex;white-space:nowrap}.block .buttons{flex:1;display:flex;justify-content:flex-end}.block:hover{background:var(--colorBgLevel2)}.block>span{display:inline-block;margin-right:4px}.block .label{margin-right:8px;display:flex;align-items:center;overflow:hidden;text-overflow:ellipsis}.block .counter{display:flex;align-items:center;padding-right:8px}.block .arrow{margin-right:0}.block .arrow.close{transform:rotate(-90deg)}.label-icon{margin-right:4px;width:16px;height:16px}"]
+                styles: ["@charset \"UTF-8\";.block{font-size:12px;text-transform:uppercase;cursor:pointer;display:flex;white-space:nowrap}.block .buttons{flex:1;display:flex;justify-content:flex-end;align-items:center;-webkit-user-select:none;-moz-user-select:none;user-select:none}.block:hover{background:var(--colorBgLevel2)}.block>span{display:inline-block;margin-right:4px}.block .label{margin-right:8px;display:flex;align-items:center;overflow:hidden;text-overflow:ellipsis}.block .counter{display:flex;align-items:center;padding-right:8px}.block .arrow{margin-right:0}.block .arrow.close{transform:rotate(-90deg)}.label-icon{margin-right:4px;width:16px;height:16px}"]
             }),
             __metadata("design:paramtypes", [core.ChangeDetectorRef])
         ], ContentToggleComponent);