tnx-shared 5.3.184 → 5.3.185

package/bundles/tnx-shared.umd.js

@@ -1116,7 +1116,6 @@
             this.disableViewWorkflowAttach = false;
             this.hiddenWorkflowCoreStatus = true;
             this.requiredVanBanDiAfterTrinhKy = false;
-            this.disableLazyLoadCommonSearch = false;
             this.showExportAll = false;
             this.showExportSelectedItems = true;
             this.showExportWordSelectedItems = false;
@@ -1365,7 +1364,6 @@
             _this.isHtmlLabel = false;
             _this.isHorizontallyLabel = false;
             _this.order = 0;
-            _this.isLazyLoad = false;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -2049,6 +2047,7 @@
             _this.searchMultiple = true;
             _this.disableDisplayFieldServerSearch = false;
             _this.loadOnInit = false;
+            _this.isLazyLoad = false;
             _this.allowLoadDataWhenParentNull = false;
             _this.disabledParentItem = true;
             for (var key in init) {
@@ -31646,7 +31645,6 @@
             _this.lstBoolControl = [];
             _this.lstControlNotIn = [];
             _this.lstControlAddToGridInfo = [];
-            _this.lstControlLazyLoad = [];
             _this.defaultValues = {};
             _this.isAddDefaultValues = false;
             _this.mapControlBindingFilter = new Map();
@@ -31676,6 +31674,7 @@
                 this.searchBoxTooltip += "" + (lstTextSearchControl.map(function (x) { return x.label; })).join(', ');
             }
             if (this.isCustomGenerateSearch) {
+                this.lstControlAddToGridInfo = this.parentSetting.commonSchemas.filter(function (p) { return p.addToGridInfo; }).map(function (p) { return p.field; });
                 this.parentSetting.commonSchemas.forEach(function (column) {
                     column.showLabel = false;
                     column.mdWidth = _this.mdWidth;
@@ -31688,36 +31687,28 @@
                     if (column instanceof NumberRangeControlSchema) {
                         _this.lstNumberRangeControl.push(column.field);
                     }
-                    if (column.hasOwnProperty('defaultValue') && (column instanceof DropdownControlSchema || column instanceof DateTimeControlSchema)) {
-                        _this.defaultValues[column.field] = column.defaultValue;
-                    }
-                    if (column.addToGridInfo) {
-                        _this.lstControlAddToGridInfo.push(column.field);
-                    }
                 });
-                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; }));
+                this.genFormSchema(this.parentSetting.commonSchemas);
             }
             else {
                 this.setting.schema = this.genFormSchema(columnFilters);
             }
             this.isDisableOpenFull = this.setting.schema.length <= 4 && !this._commonService.isMobile();
             _super.prototype.ngOnInit.call(this);
-            if (Object.keys(this.defaultValues).length) {
+            var controlSetDefaultValue = this.setting.schema.filter(function (p) { return p.hasOwnProperty('defaultValue') && (p instanceof DropdownControlSchema || p instanceof DateTimeControlSchema); });
+            if (controlSetDefaultValue.length) {
+                controlSetDefaultValue.forEach(function (item) {
+                    _this.defaultValues[item.field] = item.defaultValue;
+                });
                 this.handleSearch();
             }
         };
         CommonSearchFormComponent.prototype.genFormSchema = function (columns) {
             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 +31726,7 @@
                         });
                     }
                     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) {
+                        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, loadOnInit: true, 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; });
@@ -31784,7 +31775,6 @@
                             break;
                     }
                 }
-                i++;
             });
             return this.addSearchBox(result.sort(function (prev, next) { return prev.order - next.order; }));
         };
@@ -31797,7 +31787,7 @@
                 label: 'Từ khóa',
                 fullLabel: 'Từ khóa',
                 showLabel: false,
-                mdWidth: this.mdWidth,
+                mdWidth: this.mdWidth
             });
             var index = Number(12 / this.mdWidth) - 1;
             if (this._commonService.isMobile()) {
@@ -31894,29 +31884,8 @@
         };
         CommonSearchFormComponent.prototype.toggleMenuSearch = function () {
             this.isOpenFull = !this.isOpenFull;
-            if (this.lstControlLazyLoad.length) {
-                this.triggerLazyLoadDropdown();
-            }
             this.onAfterToggleMenuSearch.emit(true);
         };
-        CommonSearchFormComponent.prototype.triggerLazyLoadDropdown = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var promises;
-                var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            promises = [];
-                            this.lstControlLazyLoad.forEach(function (control) { return promises.push(_this.formControls[control]._component._getDataSource()); });
-                            return [4 /*yield*/, Promise.all(promises)];
-                        case 1:
-                            _b.sent();
-                            this.lstControlLazyLoad = [];
-                            return [2 /*return*/];
-                    }
-                });
-            });
-        };
         CommonSearchFormComponent.prototype.onFormInitialized = function (formEvent) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
@@ -32170,7 +32139,7 @@
                     this.createFilterFunction();
                     this.createSearchSubscription();
                 }
-                if (this.control.loadOnInit && !this.control.isLazyLoad) {
+                if (this.control.loadOnInit) {
                     this._getData();
                 }
             }