tnx-shared 5.3.182 → 5.3.184

package/fesm2015/tnx-shared.js

@@ -674,6 +674,7 @@ class CrudListSetting {
         this.disableViewWorkflowAttach = false;
         this.hiddenWorkflowCoreStatus = true;
         this.requiredVanBanDiAfterTrinhKy = false;
+        this.disableLazyLoadCommonSearch = false;
         this.showExportAll = false;
         this.showExportSelectedItems = true;
         this.showExportWordSelectedItems = false;
@@ -892,6 +893,7 @@ class FormSchemaBase extends SchemaBase {
         this.isHtmlLabel = false;
         this.isHorizontallyLabel = false;
         this.order = 0;
+        this.isLazyLoad = false;
         for (const key in init) {
             this[key] = init[key];
         }
@@ -1464,7 +1466,6 @@ class DropdownControlSchema extends DataSourceControlSchema {
         this.searchMultiple = true;
         this.disableDisplayFieldServerSearch = false;
         this.loadOnInit = false;
-        this.isLazyLoad = false;
         this.allowLoadDataWhenParentNull = false;
         this.disabledParentItem = true;
         for (const key in init) {
@@ -15956,6 +15957,9 @@ class DataFormBase extends ComponentBaseWithButton {
     }
     showMessageAfterInsert(isSuccess = false, error) {
         if (isSuccess) {
+            if (!this.messageInsertSuccess) {
+                this.messageInsertSuccess = this._translateService.instant('MESSAGE.INSERT_DATA_SUCCESS');
+            }
             if (this.messageInsertSuccess) {
                 this._notifierService.showSuccess(this.messageInsertSuccess);
             }
@@ -15966,6 +15970,8 @@ class DataFormBase extends ComponentBaseWithButton {
     }
     showMessageAfterUpdate(isSuccess = false, error) {
         if (isSuccess) {
+            if (!this.messageUpdateSuccess)
+                this.messageUpdateSuccess = this._translateService.instant('MESSAGE.UPDATE_DATA_SUCCESS');
             if (this.messageUpdateSuccess) {
                 this._notifierService.showSuccess(this.messageUpdateSuccess);
             }
@@ -21571,6 +21577,7 @@ class CommonSearchFormComponent extends DataFormBase {
         this.lstBoolControl = [];
         this.lstControlNotIn = [];
         this.lstControlAddToGridInfo = [];
+        this.lstControlLazyLoad = [];
         this.defaultValues = {};
         this.isAddDefaultValues = false;
         this.mapControlBindingFilter = new Map();
@@ -21598,7 +21605,6 @@ class CommonSearchFormComponent extends DataFormBase {
             this.searchBoxTooltip += `${(lstTextSearchControl.map(x => x.label)).join(', ')}`;
         }
         if (this.isCustomGenerateSearch) {
-            this.lstControlAddToGridInfo = this.parentSetting.commonSchemas.filter(p => p.addToGridInfo).map(p => p.field);
             this.parentSetting.commonSchemas.forEach(column => {
                 column.showLabel = false;
                 column.mdWidth = this.mdWidth;
@@ -21611,27 +21617,35 @@ class CommonSearchFormComponent extends DataFormBase {
                 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.addSearchBox(this.parentSetting.commonSchemas.sort((prev, next) => prev.order - next.order));
-            this.genFormSchema(this.parentSetting.commonSchemas);
+            this.setting.schema = this.genFormSchema(this.parentSetting.commonSchemas);
         }
         else {
             this.setting.schema = this.genFormSchema(columnFilters);
         }
         this.isDisableOpenFull = this.setting.schema.length <= 4 && !this._commonService.isMobile();
         super.ngOnInit();
-        const controlSetDefaultValue = this.setting.schema.filter(p => p.hasOwnProperty('defaultValue') && (p instanceof DropdownControlSchema || p instanceof DateTimeControlSchema));
-        if (controlSetDefaultValue.length) {
-            controlSetDefaultValue.forEach(item => {
-                this.defaultValues[item.field] = item.defaultValue;
-            });
+        if (Object.keys(this.defaultValues).length) {
             this.handleSearch();
         }
     }
     genFormSchema(columns) {
         const result = [];
+        const totalControlPerRow = 12 / this.mdWidth;
+        let i = 1;
         columns.forEach(column => {
             var _a;
+            const 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);
             }
@@ -21649,7 +21663,7 @@ class CommonSearchFormComponent extends DataFormBase {
                     });
                 }
                 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ọn ${column.label}`, multiple: !column.single, dataSource: dataSource, mdWidth: this.mdWidth, showLabel: false, loadOnInit: true, showClear: true, onChanged: (evt) => {
+                    result.push(new DropdownControlSchema(Object.assign(Object.assign({}, column), { placeholder: (_a = column.placeholder) !== null && _a !== void 0 ? _a : `Chọn ${column.label}`, multiple: !column.single, dataSource: dataSource, mdWidth: this.mdWidth, showLabel: false, isLazyLoad: isLazyLoad, showClear: true, onChanged: (evt) => {
                             var _a;
                             if (column.dataType == DataType.boolean) {
                                 evt.parentModel[column.field] = column.single ? (_a = evt.value.id) !== null && _a !== void 0 ? _a : evt.value : evt.value.map(p => p.id);
@@ -21698,6 +21712,7 @@ class CommonSearchFormComponent extends DataFormBase {
                         break;
                 }
             }
+            i++;
         });
         return this.addSearchBox(result.sort((prev, next) => prev.order - next.order));
     }
@@ -21710,7 +21725,7 @@ class CommonSearchFormComponent extends DataFormBase {
             label: 'Từ khóa',
             fullLabel: 'Từ khóa',
             showLabel: false,
-            mdWidth: this.mdWidth
+            mdWidth: this.mdWidth,
         });
         const index = Number(12 / this.mdWidth) - 1;
         if (this._commonService.isMobile()) {
@@ -21739,7 +21754,7 @@ class CommonSearchFormComponent extends DataFormBase {
                 data = Object.assign(data, this.defaultValues);
                 this.isAddDefaultValues = true;
             }
-            let lstFilters = this._crudService.getFilterFromTemplate(this.templateFilter, data);
+            const lstFilters = this._crudService.getFilterFromTemplate(this.templateFilter, data);
             const lstFilterAddCustom = lstFilters.filter(p => this.lstControlAddToGridInfo.includes(p.field));
             if (this.isCustomGenerateSearch) {
                 const rs = {
@@ -21809,8 +21824,19 @@ class CommonSearchFormComponent extends DataFormBase {
     }
     toggleMenuSearch() {
         this.isOpenFull = !this.isOpenFull;
+        if (this.lstControlLazyLoad.length) {
+            this.triggerLazyLoadDropdown();
+        }
         this.onAfterToggleMenuSearch.emit(true);
     }
+    triggerLazyLoadDropdown() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const promises = [];
+            this.lstControlLazyLoad.forEach(control => promises.push(this.formControls[control]._component._getDataSource()));
+            yield Promise.all(promises);
+            this.lstControlLazyLoad = [];
+        });
+    }
     onFormInitialized(formEvent) {
         return __awaiter(this, void 0, void 0, function* () {
             // tiền xử lý dữ liệu (ví dụ tổng hợp datasource), trước khi gọi api get detail
@@ -27604,7 +27630,7 @@ class DropdownComponent extends ComponentBase {
                 this.createFilterFunction();
                 this.createSearchSubscription();
             }
-            if (this.control.loadOnInit) {
+            if (this.control.loadOnInit && !this.control.isLazyLoad) {
                 this._getData();
             }
         }