jsl-ui 9.14.3 → 9.14.5

package/lib/components/tree-view/TreeViewComponent.d.ts

@@ -14,6 +14,7 @@ export interface ITreeViewChild {
 }
 export declare class TreeViewComponent implements IJSLComponent {
     private options;
+    private filteredData;
     constructor(options: ITreeViewComponentOptions);
     isEqual(node: IJSLComponent): boolean;
     render(): IJSLVNode;

package/lib/components/tree-view/TreeViewComponent.js

@@ -7,17 +7,17 @@ var TreeViewComponent = /** @class */ (function () {
         return this.__proto__ === node.__proto__;
     };
     TreeViewComponent.prototype.render = function () {
-        var _a;
+        var _a, _b;
         return {
             tag: "div", attr: { style: this.options.style, class: "treeview-comp hover " + ((_a = this.options.class) !== null && _a !== void 0 ? _a : "") }, children: [
-                { tag: "ul", children: [this.renderNode(this.options.data)] }
+                { tag: "ul", attr: { class: "tv-input" }, children: [this.renderNode((_b = this.filteredData) !== null && _b !== void 0 ? _b : this.options.data)] }
             ]
         };
     };
     TreeViewComponent.prototype.renderNode = function (el) {
         var _this = this;
         function getInput() {
-            var res = { tag: "input", attr: { type: "checkbox", id: el.id } };
+            var res = { tag: "input", attr: { class: "tv-input", type: "checkbox", id: el.id } };
             if (el.collapsed) {
                 res.attr.checked = "checked";
             }
@@ -27,7 +27,7 @@ var TreeViewComponent = /** @class */ (function () {
             { tag: "li", children: [
                     getInput(),
                     this.addChild({ tag: "label", attr: { for: el.id } }, this.options.renderItem != null ? this.options.renderItem(el) : el.content),
-                    { tag: "ul", children: el.children.map(function (c) { return _this.renderNode(c); }) }
+                    { tag: "ul", attr: { class: "tv-input" }, children: el.children.map(function (c) { return _this.renderNode(c); }) }
                 ] } :
             this.addChild({ tag: "li" }, this.options.renderItem != null ? this.options.renderItem(el) : el.content);
     };

package/lib/components/tree-view/TreeViewStyle.scss

@@ -36,7 +36,7 @@ $defaultColor: rgba(50,50,50, 0.5);
   //   @include transition-duration(0.5s);
   // }
   
-  ul {
+  .tv-ul {
     // @include transition-duration;
     list-style: none;
     padding-left: 1em;
@@ -54,7 +54,7 @@ $defaultColor: rgba(50,50,50, 0.5);
     // }
   }
   
-  input{
+  .tv-input{
     display: none;
     
     &:checked ~ ul {

package/lib/grid/filterDialogs/excelFilter.js

@@ -67,19 +67,20 @@ var ExcelFilter = /** @class */ (function () {
                         filters = this.grid.getFilters();
                         currentFilters = filters.filter(function (f) { return f.columnId === col.id; });
                         mode = this.grid.getOptions().mode;
-                        if (!(mode === "client")) return [3 /*break*/, 1];
-                        // remove any filters for this column
-                        if (currentFilters.length > 0) {
-                            this.grid.clearFilter(col.id);
-                        }
-                        values = this.getDistinctValues(col);
-                        return [3 /*break*/, 3];
-                    case 1:
                         filterOptions = this.grid.getOptions().getFilterValues;
-                        if (filterOptions == null) {
+                        if (!(filterOptions == null)) return [3 /*break*/, 1];
+                        if (mode === "client") {
+                            // remove any filters for this column
+                            if (currentFilters.length > 0) {
+                                this.grid.clearFilter(col.id);
+                            }
+                            values = this.getDistinctValues(col);
+                        }
+                        else {
                             throw new Error("getFilterValues option has to be set when filter mode = server");
                         }
-                        return [4 /*yield*/, filterOptions(col)];
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, filterOptions(col)];
                     case 2:
                         values = _b.sent();
                         _b.label = 3;