tnx-shared 5.3.290 → 5.3.292

package/fesm2015/tnx-shared.js

@@ -1481,6 +1481,7 @@ class DropdownControlSchema extends DataSourceControlSchema {
         this.insertPlusUrl = '';
         this.loadInFirstDisplay = true;
         this.autoGetData = true;
+        this.isAllowDisabled = true;
         this.valueField = 'id';
         this.displayField = 'ten';
         this.autoDisplayFirst = false;
@@ -6661,6 +6662,7 @@ const EXCEL_TYPE$1 = 'application/vnd.openxmlformats-officedocument.spreadsheetm
 const EXCEL_EXTENSION$1 = '.xlsx';
 class BaseService {
     constructor(http, injector, serviceUri) {
+        var _a, _b;
         this.serviceUri = '';
         this.endPoint = '';
         this.serviceCode = '';
@@ -6670,8 +6672,6 @@ class BaseService {
         this.apiGetData = 'GetData';
         this.apiGetAll = 'GetAllByFilter';
         this.apiGetDetailByFilter = 'GetByFilter';
-        this.fieldSort = '';
-        this.fieldSuDung = '';
         this.disableFieldNotUse = false;
         this.RETRY_COUNT = 0;
         this.REPLAY_COUNT = 1;
@@ -6681,6 +6681,8 @@ class BaseService {
         this.serviceUri = serviceUri;
         this._commonService = injector.get(CommonService);
         this._signalrServicePrivate = injector.get(SignalRService);
+        const environment = this._injector.get(ModuleConfigService).getConfig().environment;
+        this.disableFieldNotUse = (_b = (_a = environment === null || environment === void 0 ? void 0 : environment.cauHinhNghiepVu) === null || _a === void 0 ? void 0 : _a.disableFieldNotUse) !== null && _b !== void 0 ? _b : false;
     }
     setCurrentServiceUri(key) {
     }
@@ -17132,6 +17134,8 @@ class CanBoHoSoService extends BaseService {
             }),
             new ColumnSchemaBase({
                 field: 'email',
+                operator: Operator.equal,
+                isOverrideFilter: true,
                 width: '180px'
             }),
             new ColumnSchemaBase({
@@ -17582,7 +17586,8 @@ class CanBoHoSoService extends BaseService {
             new EntityPickerColumn({
                 label: 'Email',
                 code: 'email',
-                fullTextSearch: true,
+                operator: Operator.equal,
+                isOverrideFilter: true,
                 width: '170px',
             }),
             new EntityPickerColumn({
@@ -17652,7 +17657,8 @@ class CanBoHoSoService extends BaseService {
             new EntityPickerColumn({
                 label: 'Email',
                 code: 'email',
-                fullTextSearch: true,
+                operator: Operator.equal,
+                isOverrideFilter: true,
                 width: '170px',
             })
         ];
@@ -20777,7 +20783,7 @@ class ListComponentBase extends ComponentBase {
                         isArrayField: col.isArrayField ? true : false
                     });
                     templateFilter.push(filter);
-                    this.filterSchema.dropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { appendTo: 'body', placeholder: `Chọn ${col.label}`, multiple: filterMuliple.includes(filter.operator), loadOnInit: true, isServerLoad: col.isServerLoad }));
+                    this.filterSchema.dropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { appendTo: 'body', placeholder: `Chọn ${col.label}`, multiple: filterMuliple.includes(filter.operator), loadOnInit: true, isServerLoad: col.isServerLoad, isAllowDisabled: false }));
                 }
                 else {
                     this._notifierService.showWarning(`Chưa cấu hình baseService hoặc dataSource cho cột ${col.field}: ${col.label}`);
@@ -21136,7 +21142,7 @@ class ListComponentBase extends ComponentBase {
                     }
                     else {
                         if (col.baseService || (col.dataSource && col.dataSource.length > 0)) {
-                            searchInfo.fieldDropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { label: col.label, operator: col.multiple ? Operator.in : Operator.equal, mdWidth: col.mdWidth ? col.mdWidth : 10, loadOnInit: true }));
+                            searchInfo.fieldDropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { label: col.label, operator: col.multiple ? Operator.in : Operator.equal, mdWidth: col.mdWidth ? col.mdWidth : 10, loadOnInit: true, isAllowDisabled: false }));
                             searchInfo.schema.push(searchInfo.fieldDropdown[col.field]);
                         }
                         else if (col.dataType == 'int') {
@@ -22111,6 +22117,9 @@ class CommonSearchFormComponent extends DataFormBase {
                     this.handleSearch(null, evt.control.field);
                 };
             }
+            if (column instanceof DropdownControlSchema) {
+                column.isAllowDisabled = false;
+            }
             if (column instanceof NumberRangeControlSchema) {
                 this.lstNumberRangeControl.push(column.field);
             }
@@ -22156,7 +22165,7 @@ class CommonSearchFormComponent extends DataFormBase {
                     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ọn ${column.label}`, multiple: !column.single, dataSource: dataSource, mdWidth: this.mdWidth, isLazyLoad: isLazyLoad, showLabel: false, 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}`, isAllowDisabled: false, multiple: !column.single, dataSource: dataSource, mdWidth: this.mdWidth, isLazyLoad: isLazyLoad, showLabel: false, 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);
@@ -23649,7 +23658,7 @@ class ListBase extends ComponentBaseWithButton {
     }
     _edit(rowData, scopeDataEdit = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const resultValidate = yield this.validateEdit();
+            const resultValidate = yield this.validateEdit(rowData);
             if (!resultValidate) {
                 return;
             }
@@ -23666,7 +23675,7 @@ class ListBase extends ComponentBaseWithButton {
             this.showDetailForm = true;
         });
     }
-    validateEdit() {
+    validateEdit(rowData) {
         return __awaiter(this, void 0, void 0, function* () {
             return true;
         });
@@ -23690,34 +23699,45 @@ class ListBase extends ComponentBaseWithButton {
     getPromiseDeleteItem(rowData) {
         return this.setting.baseService.delete(rowData.id, this.deletePlusUrl);
     }
+    validateDelete(items) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     _delete(rowData) {
-        if (rowData.__disableDelete) {
-            return;
-        }
-        this._notifierService.showDeleteConfirm().then(rs => {
-            if (!rs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (rowData.__disableDelete) {
                 return;
             }
-            if (this.setting.baseService) {
-                this.getPromiseDeleteItem(rowData)
-                    .then(response => {
-                    if (response.success) {
-                        this.beforeReloadAfterDelete([rowData.id]);
-                        if (this.setting.showVersionButton) {
-                            this.context.fireEvent(ComCtxConstants.COMMON.RELOAD_DATA_VERSION, {}, true);
+            const resultValidate = yield this.validateDelete([rowData]);
+            if (!resultValidate) {
+                return;
+            }
+            this._notifierService.showDeleteConfirm().then(rs => {
+                if (!rs) {
+                    return;
+                }
+                if (this.setting.baseService) {
+                    this.getPromiseDeleteItem(rowData)
+                        .then(response => {
+                        if (response.success) {
+                            this.beforeReloadAfterDelete([rowData.id]);
+                            if (this.setting.showVersionButton) {
+                                this.context.fireEvent(ComCtxConstants.COMMON.RELOAD_DATA_VERSION, {}, true);
+                            }
+                            else {
+                                this._triggerProcessData();
+                            }
+                            this._notifierService.showDeleteDataSuccess();
                         }
                         else {
-                            this._triggerProcessData();
+                            this._notifierService.showWarningByResponse(response);
                         }
-                        this._notifierService.showDeleteDataSuccess();
-                    }
-                    else {
-                        this._notifierService.showWarningByResponse(response);
-                    }
-                }, error => {
-                    this._notifierService.showDeleteDataError();
-                });
-            }
+                    }, error => {
+                        this._notifierService.showDeleteDataError();
+                    });
+                }
+            });
         });
     }
     getPromiseDeleteItems(items) {
@@ -23725,22 +23745,28 @@ class ListBase extends ComponentBaseWithButton {
         return this.setting.baseService.deleteMany(ids, this.deleteManyPlusUrl);
     }
     _deleteMultiple(items) {
-        this._notifierService.showDeleteConfirm('Bạn có chắc chắn muốn xóa bản ghi đã chọn (Và các bản ghi con tương ứng)?').then(rs => {
-            if (!rs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resultValidate = yield this.validateDelete(items);
+            if (!resultValidate) {
                 return;
             }
-            if (this.setting.baseService) {
-                this.getPromiseDeleteItems(items).then(response => {
-                    if (response.success) {
-                        this.beforeReloadAfterDelete(items.map(q => q.id));
-                        this._triggerProcessData();
-                        this._notifierService.showDeleteDataSuccess();
-                    }
-                    else {
-                        this._notifierService.showWarningByResponse(response);
-                    }
-                });
-            }
+            this._notifierService.showDeleteConfirm('Bạn có chắc chắn muốn xóa bản ghi đã chọn (Và các bản ghi con tương ứng)?').then(rs => {
+                if (!rs) {
+                    return;
+                }
+                if (this.setting.baseService) {
+                    this.getPromiseDeleteItems(items).then(response => {
+                        if (response.success) {
+                            this.beforeReloadAfterDelete(items.map(q => q.id));
+                            this._triggerProcessData();
+                            this._notifierService.showDeleteDataSuccess();
+                        }
+                        else {
+                            this._notifierService.showWarningByResponse(response);
+                        }
+                    });
+                }
+            });
         });
     }
     beforeReloadAfterDelete(ids) {
@@ -28117,6 +28143,8 @@ class DropdownComponent extends ComponentBase {
         this.loading = false;
         this.page = 1;
         this.totalPage = 2;
+        this.fieldSuDung = 'suDung';
+        this.disableFieldNotUse = false;
         this.modifyOptionWhenFilter = (options) => {
             this.dropdownOptions = this.dropdown._options;
             this._modifyOptionWhenFilter(options);
@@ -28216,13 +28244,14 @@ class DropdownComponent extends ComponentBase {
             if (this.control.loadOnInit && !this.control.isLazyLoad) {
                 this._getData();
             }
+            if (this.control.baseService instanceof MasterDataService) {
+                this.control.maxItemDisplay = 9999;
+            }
+            this.disableFieldNotUse = this.control.baseService['disableFieldNotUse'];
         }
         if (!this._deviceDetectorService.isDesktop()) {
             this.hideTransitionOptions = this.showTransitionOptions = '';
         }
-        if (this.control.baseService instanceof MasterDataService) {
-            this.control.maxItemDisplay = 9999;
-        }
         if (this.control.onInit) {
             this.control.onInit(this);
         }
@@ -28411,9 +28440,9 @@ class DropdownComponent extends ComponentBase {
                 this._hasLoadedDatasource = true;
             }
         }
-        if (this.control.baseService && this.control.baseService['disableFieldNotUse']) {
-            const fieldSuDung = this.control.baseService['fieldSuDung'];
-            this.dataSourceInternal.forEach(item => item.inactive = !item.value[fieldSuDung]);
+        if (this.disableFieldNotUse && this.control.isAllowDisabled
+            && this.dataSourceInternal.some(p => p.value.hasOwnProperty(this.fieldSuDung))) {
+            this.dataSourceInternal.forEach(item => item.inactive = !item.value[this.fieldSuDung]);
         }
     }
     appendDataSource(destSource, dataSource, direction = 1) {
@@ -28662,17 +28691,6 @@ class DropdownComponent extends ComponentBase {
         return __awaiter(this, void 0, void 0, function* () {
             let dataSource = null;
             let totalPage = 1;
-            if (this.control.baseService['fieldSort']) {
-                this.control.sorts = [this.newSort(this.control.baseService['fieldSort'])];
-            }
-            const fieldSuDung = this.control.baseService['fieldSuDung'];
-            if (fieldSuDung) {
-                this.control.sorts.splice(0, 0, this.newSort(fieldSuDung, -1));
-                this.control.fieldPlus += `,${fieldSuDung}`;
-                this.control.funcGetLabel = (item) => {
-                    return item[fieldSuDung] ? item[this.control.displayField] : `${item[this.control.displayField]} (Không sử dụng)`;
-                };
-            }
             const dropdownOptions = this._crudService.createDropdownOptions(this.control);
             dropdownOptions.page = page;
             if (pageSize) {
@@ -28776,14 +28794,18 @@ class DropdownComponent extends ComponentBase {
     onChangeSelected(event) {
         if (this.control.multiple) {
             if (!event.itemValue) {
-                // Trường hợp select all
-                if (event.value.length) {
-                    this._value = this.dataSourceInternal.map(q => q.value);
-                }
                 // Trường hợp unselect all
-                else {
+                if (!event.value.length || event.value.every(p => p.hasOwnProperty(this.fieldSuDung) && !p[this.fieldSuDung])) {
                     this._value = [];
                 }
+                // Trường hợp select all
+                else {
+                    let tmpDataSource = [...this.dataSourceInternal];
+                    if (this.dataSourceInternal.some(p => p.hasOwnProperty('inactive'))) {
+                        tmpDataSource = tmpDataSource.filter(p => !p.inactive);
+                    }
+                    this._value = tmpDataSource.map(q => q.value);
+                }
             }
             else if (this.control.selectDescendant) {
                 const parentIds = [event.itemValue[this.control.valueField]];
@@ -35113,7 +35135,6 @@ class DmChucVuService extends BaseService {
         this.entityName = 'DM_ChucVu';
         this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
         this._moduleConfig = _moduleConfigService.getConfig();
-        this.fieldSuDung = 'trangThai';
     }
 }
 DmChucVuService.ɵprov = i0.ɵɵdefineInjectable({ factory: function DmChucVuService_Factory() { return new DmChucVuService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: DmChucVuService, providedIn: "root" });
@@ -38138,6 +38159,7 @@ class EntityPickerDataComponent extends DataListBase {
                     funcSetValueRow: column.funcSetValueRow,
                     dataSource: column.dataSource,
                     groupCode: column.groupCode,
+                    isOverrideFilter: column.isOverrideFilter,
                     order: column.order
                 });
                 if (column.dataType == 'custom') {
@@ -38348,6 +38370,7 @@ class EntityPickerSelectedComponent extends DataListBase {
                     funcSetValueRow: column.funcSetValueRow,
                     dataSource: column.dataSource,
                     groupCode: column.groupCode,
+                    isOverrideFilter: column.isOverrideFilter,
                     order: column.order
                 });
                 if (column.dataType == 'custom') {
@@ -38737,8 +38760,10 @@ class AutoCompletePickerComponent extends ComponentBase {
         }
     }
     buildFilterKeyword() {
+        var _a;
+        const operator = (_a = this.control.operatorFieldSearchText) !== null && _a !== void 0 ? _a : Operator.contain;
         if (this.fieldSearchText.length == 1) {
-            this.getFilterOnSearch = value => this.newFilter(this.control.displayField, Operator.contain, value);
+            this.getFilterOnSearch = value => this.newFilter(this.control.displayField, operator, value);
         }
         else {
             this.getFilterOnSearch = value => {
@@ -38747,7 +38772,7 @@ class AutoCompletePickerComponent extends ComponentBase {
                     filters: []
                 });
                 for (const fieldSearch of this.fieldSearchText) {
-                    result.filters.push(this.newFilter(fieldSearch, Operator.contain, value));
+                    result.filters.push(this.newFilter(fieldSearch, operator, value));
                 }
                 return result;
             };