tnx-shared 5.3.184 → 5.3.186

package/bundles/tnx-shared.umd.js

@@ -1365,7 +1365,6 @@
             _this.isHtmlLabel = false;
             _this.isHorizontallyLabel = false;
             _this.order = 0;
-            _this.isLazyLoad = false;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -1455,6 +1454,7 @@
             _this.enableCaching = false;
             _this.hasOperatorCanBo = false;
             _this.addToGridInfo = false;
+            _this.isLazyLoad = false;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -2049,6 +2049,7 @@
             _this.searchMultiple = true;
             _this.disableDisplayFieldServerSearch = false;
             _this.loadOnInit = false;
+            _this.isLazyLoad = false;
             _this.allowLoadDataWhenParentNull = false;
             _this.disabledParentItem = true;
             for (var key in init) {
@@ -31654,6 +31655,7 @@
             _this.isOpenFull = false;
             _this.isCustomGenerateSearch = false;
             _this.isDisableOpenFull = false;
+            _this._index = 1;
             return _this;
         }
         CommonSearchFormComponent.prototype.ngOnInit = function () {
@@ -31674,7 +31676,9 @@
                 var lstTextSearchControl = columnFilters.filter(function (p) { return p.fullTextSearch; });
                 this.lstTextControl = lstTextSearchControl.map(function (p) { return p.field; });
                 this.searchBoxTooltip += "" + (lstTextSearchControl.map(function (x) { return x.label; })).join(', ');
+                this._index = 2;
             }
+            var totalControlPerRow = 12 / this.mdWidth;
             if (this.isCustomGenerateSearch) {
                 this.parentSetting.commonSchemas.forEach(function (column) {
                     column.showLabel = false;
@@ -31694,8 +31698,14 @@
                     if (column.addToGridInfo) {
                         _this.lstControlAddToGridInfo.push(column.field);
                     }
+                    column.isLazyLoad = !_this.parentSetting.disableLazyLoadCommonSearch && _this._index > totalControlPerRow
+                        && column instanceof DropdownControlSchema && !!column.baseService && !(column.baseService instanceof MasterDataService);
+                    if (column.isLazyLoad) {
+                        _this.lstControlLazyLoad.push(column.field);
+                    }
+                    _this._index++;
                 });
-                this.setting.schema = this.genFormSchema(this.parentSetting.commonSchemas);
+                this.setting.schema = this.addSearchBox(this.parentSetting.commonSchemas.sort(function (prev, next) { return prev.order - next.order; }));
             }
             else {
                 this.setting.schema = this.genFormSchema(columnFilters);
@@ -31710,14 +31720,8 @@
             var _this = this;
             var result = [];
             var totalControlPerRow = 12 / this.mdWidth;
-            var i = 1;
             columns.forEach(function (column) {
                 var _a;
-                var isLazyLoad = !_this.parentSetting.disableLazyLoadCommonSearch && i > totalControlPerRow
-                    && column instanceof DropdownControlSchema && !!column.baseService && column.baseService instanceof BaseService;
-                if (isLazyLoad) {
-                    _this.lstControlLazyLoad.push(column.field);
-                }
                 if (!column.isInTable || !column.includeSelect) {
                     _this.lstControlNotIn.push(column.field);
                 }
@@ -31735,7 +31739,12 @@
                         });
                     }
                     if (column.baseService || (dataSource && dataSource.length > 0)) {
-                        result.push(new DropdownControlSchema(Object.assign(Object.assign({}, column), { placeholder: (_a = column.placeholder) !== null && _a !== void 0 ? _a : "Ch\u1ECDn " + column.label, multiple: !column.single, dataSource: dataSource, mdWidth: _this.mdWidth, showLabel: false, isLazyLoad: isLazyLoad, showClear: true, onChanged: function (evt) {
+                        var isLazyLoad = !_this.parentSetting.disableLazyLoadCommonSearch && _this._index > totalControlPerRow
+                            && !!column.baseService && !(column.baseService instanceof MasterDataService);
+                        if (isLazyLoad) {
+                            _this.lstControlLazyLoad.push(column.field);
+                        }
+                        result.push(new DropdownControlSchema(Object.assign(Object.assign({}, column), { placeholder: (_a = column.placeholder) !== null && _a !== void 0 ? _a : "Ch\u1ECDn " + column.label, multiple: !column.single, dataSource: dataSource, mdWidth: _this.mdWidth, isLazyLoad: isLazyLoad, showLabel: false, showClear: true, onChanged: function (evt) {
                                 var _a;
                                 if (column.dataType == exports.DataType.boolean) {
                                     evt.parentModel[column.field] = column.single ? (_a = evt.value.id) !== null && _a !== void 0 ? _a : evt.value : evt.value.map(function (p) { return p.id; });
@@ -31752,6 +31761,7 @@
                                 }
                                 _this.handleSearch();
                             } })));
+                        _this._index++;
                     }
                 }
                 else {
@@ -31767,6 +31777,7 @@
                             addColumn.showTime = column.dataType == exports.DataType.datetime;
                             result.push(new DateTimeRangeControlSchema(addColumn));
                             _this.lstDatetimeControl.push(column.field);
+                            _this._index++;
                             break;
                         case exports.DataType.int:
                         case exports.DataType.intWithoutMask:
@@ -31779,12 +31790,12 @@
                             };
                             result.push(new NumberRangeControlSchema(addColumn));
                             _this.lstNumberRangeControl.push(addColumn.field);
+                            _this._index++;
                             break;
                         default:
                             break;
                     }
                 }
-                i++;
             });
             return this.addSearchBox(result.sort(function (prev, next) { return prev.order - next.order; }));
         };