tnx-shared 5.1.531 → 5.1.532

package/bundles/tnx-shared.umd.js

@@ -1201,6 +1201,7 @@
             _this.fieldAlias = '';
             _this.data = {};
             _this.isHtmlLabel = false;
+            _this.order = 0;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -2097,6 +2098,9 @@
             _this.includeSelect = true;
             _this.hasOperatorCanBo = false;
             _this.minimizeFilter = false;
+            _this.forceLoading = false; // cho phép load lại crud-list khi column này không phải là property của baservice (dùng trong common-search)
+            _this.autoDisplayFirst = false;
+            _this.notInCrudForm = false;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -49562,8 +49566,11 @@
                     if (!(column instanceof TextControlSchema) || column instanceof NumberRangeControlSchema) {
                         column.onChanged = function (evt) { return _this.handleSearch(null, evt.control.field); };
                     }
+                    if (column instanceof NumberRangeControlSchema) {
+                        _this.lstNumberRangeControl.push(column.field);
+                    }
                 });
-                this.setting.schema = this.addSearchBox(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);
@@ -49582,7 +49589,7 @@
             var _this = this;
             var result = [];
             columns.forEach(function (column) {
-                if (!column.isInTable) {
+                if (!column.isInTable || !column.includeSelect) {
                     _this.lstControlNotIn.push(column.field);
                 }
                 var isBool = column.dataType == exports.DataType.boolean;
@@ -49609,7 +49616,9 @@
                                         _this.formControls[bindingFilterVal]._component.filterFromParents = [];
                                         _this.formControls[bindingFilterVal]._component._getDataSource();
                                     }
-                                    return;
+                                    if ((!column.includeSelect || !column.isInTable) && !column.forceLoading) {
+                                        return;
+                                    }
                                 }
                                 _this.handleSearch();
                             } })));
@@ -49682,13 +49691,14 @@
             }
             if (!data) {
                 data = this.model.data;
+                var lstFilters_1 = this._crudService.getFilterFromTemplate(this.templateFilter, data);
                 if (!this.isAddDefaultValues && Object.keys(this.defaultValues).length) {
                     data = Object.assign(data, this.defaultValues);
                     this.isAddDefaultValues = true;
                 }
                 if (this.isCustomGenerateSearch) {
                     var rs = {
-                        filters: filterFullTextSearch,
+                        filters: __spread(lstFilters_1, filterFullTextSearch),
                         dataForm: Object.assign(Object.assign({}, data), { keywords: this.keywords })
                     };
                     if (field) {