tnx-shared 5.1.204 → 5.1.205

package/bundles/tnx-shared.umd.js

@@ -34013,6 +34013,7 @@
             _this.filterFromParents = [];
             _this.dropdownOptions = [];
             _this.delayFilter = 100;
+            _this.firstScroll = true;
             _this.loading = false;
             _this.page = 1;
             _this.totalPage = 2;
@@ -34026,13 +34027,18 @@
             };
             _this.handleScroll = function (evt) {
                 if (evt.srcElement.scrollTop > 0
+                    && !_this.firstScroll
                     && evt.srcElement.offsetHeight + evt.srcElement.scrollTop == evt.srcElement.scrollHeight) {
+                    _this.firstScroll = true;
                     if (_this.timeoutScroll)
                         clearTimeout(_this.timeoutScroll);
                     _this.timeoutScroll = setTimeout(function (f) {
                         _this.getDataNextPage();
                     }, 150);
                 }
+                else {
+                    _this.firstScroll = false;
+                }
             };
             return _this;
         }
@@ -34056,7 +34062,24 @@
         });
         Object.defineProperty(DropdownComponent.prototype, "dataSource", {
             set: function (value) {
-                this.combineDataSource(value, 1);
+                var e_1, _a;
+                var dataSource = [];
+                if (value) {
+                    try {
+                        for (var value_1 = __values(value), value_1_1 = value_1.next(); !value_1_1.done; value_1_1 = value_1.next()) {
+                            var item = value_1_1.value;
+                            dataSource.push(this.reStructureItemObject(item));
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (value_1_1 && !value_1_1.done && (_a = value_1.return)) _a.call(value_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                }
+                this.combineDataSource(dataSource, 1);
                 this.checkAndFireEvent();
             },
             enumerable: false,
@@ -34107,7 +34130,8 @@
             this.setDefaultSetting();
             if (this.control.baseService) {
                 if (this.control.isServerLoad) {
-                    this.virtualScroll = false;
+                    // this.virtualScroll = false;
+                    this.control.maxItemDisplay = 9999;
                     this.createFilterFunction();
                     this.subscription = this.keyUp.pipe(operators.map(function (event) { return event.target.value; }), operators.debounceTime(500), operators.distinctUntilChanged()).subscribe(function (value) {
                         _this._getData();
@@ -34228,7 +34252,7 @@
             }
             else {
                 this.getFilterOnServerSearch = function (value) {
-                    var e_1, _a;
+                    var e_2, _a;
                     var result = new Filter({
                         logic: 'or',
                         filters: []
@@ -34240,12 +34264,12 @@
                             result.filters.push({ field: fieldSearch, operator: exports.Operator.contain, value: tmpValue });
                         }
                     }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
                         try {
                             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_2) throw e_2.error; }
                     }
                     return result;
                 };
@@ -34298,12 +34322,12 @@
                 dataSource.forEach(function (source) {
                     var index = destSource.findIndex(function (q) { return q.value[_this.control.fieldMaPhanCap] > source.value[_this.control.fieldMaPhanCap]; });
                     if (index == -1) {
-                        if (direction == -1) {
-                            destSource.unshift(source);
-                        }
-                        else {
-                            destSource.push(source);
+                        // Kiểm tra bản ghi cuối cùng là nó thì k insert
+                        if (destSource.length > 0
+                            && destSource[destSource.length - 1].value[_this.control.valueField] == source.value[_this.control.valueField]) {
+                            return;
                         }
+                        destSource.push(source);
                     }
                     else if (index == 0) {
                         destSource.unshift(source);
@@ -34419,13 +34443,13 @@
             return newValue;
         };
         DropdownComponent.prototype.appendValueFromDataSource = function (newValue, currentValue, dataSource) {
-            var e_2, _a;
+            var e_3, _a;
             if (!dataSource || !dataSource.length)
                 return;
             for (var i = 0; i < currentValue.length; i++) {
                 var selectedItem = currentValue[i];
                 try {
-                    for (var dataSource_1 = (e_2 = void 0, __values(dataSource)), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
+                    for (var dataSource_1 = (e_3 = void 0, __values(dataSource)), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
                         var item = dataSource_1_1.value;
                         if (this.control.funcCompare(item.value, selectedItem)
                             || this.control.funcCompare(item.value, selectedItem[this.control.valueField])) {
@@ -34436,12 +34460,12 @@
                         }
                     }
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
                         if (dataSource_1_1 && !dataSource_1_1.done && (_a = dataSource_1.return)) _a.call(dataSource_1);
                     }
-                    finally { if (e_2) throw e_2.error; }
+                    finally { if (e_3) throw e_3.error; }
                 }
             }
         };
@@ -34454,7 +34478,7 @@
             this.findItemFromDataSource(oldValue, this.dataSourceSelected);
         };
         DropdownComponent.prototype.findItemFromDataSource = function (oldValue, dataSource) {
-            var e_3, _a;
+            var e_4, _a;
             if (!dataSource || !dataSource.length)
                 return;
             try {
@@ -34467,12 +34491,12 @@
                     }
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
                     if (dataSource_2_1 && !dataSource_2_1.done && (_a = dataSource_2.return)) _a.call(dataSource_2);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_4) throw e_4.error; }
             }
         };
         DropdownComponent.prototype.checkReady = function () {
@@ -34575,7 +34599,7 @@
             if (pageSize === void 0) { pageSize = null; }
             return __awaiter(this, void 0, void 0, function () {
                 var dataSource, totalPage, dropdownOptions, response, result, dataSource_3, dataSource_3_1, item;
-                var e_4, _a;
+                var e_5, _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -34618,12 +34642,12 @@
                                     result.push(this.reStructureItemObject(item));
                                 }
                             }
-                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
                             finally {
                                 try {
                                     if (dataSource_3_1 && !dataSource_3_1.done && (_a = dataSource_3.return)) _a.call(dataSource_3);
                                 }
-                                finally { if (e_4) throw e_4.error; }
+                                finally { if (e_5) throw e_5.error; }
                             }
                             return [2 /*return*/, { dataSource: result, totalPage: totalPage }];
                     }
@@ -34798,8 +34822,12 @@
             if (!this.control.isServerLoad) {
                 return;
             }
-            // this.scrollContainer = this.dropdown.overlay.querySelector('.cdk-virtual-scroll-viewport');
-            this.scrollContainer = this.dropdown.overlay.querySelector('.p-dropdown-items-wrapper');
+            if (this.virtualScroll) {
+                this.scrollContainer = this.dropdown.overlay.querySelector('.cdk-virtual-scroll-viewport');
+            }
+            else {
+                this.scrollContainer = this.dropdown.overlay.querySelector('.p-dropdown-items-wrapper');
+            }
             this.scrollContainer.addEventListener('scroll', this.handleScroll);
             var defaultInput = this.dropdown.filterViewChild.nativeElement;
             this._insertTextboxAndFocus(defaultInput);