tnx-shared 5.3.187 → 5.3.189

package/esm2015/services/logger.service.js

@@ -82,28 +82,13 @@ export class LoggerService {
         this.flushGroupWarning(category);
     }
     flushGroupInfo(category) {
-        if (this.logGroups.info[category]) {
-            this.logGroups.info[category] = [];
-        }
-        else {
-            this.logGroups.info[category] = [];
-        }
+        this.logGroups.info[category] = [];
     }
     flushGroupError(category) {
-        if (this.logGroups.error[category]) {
-            this.logGroups.error[category] = [];
-        }
-        else {
-            this.logGroups.error[category] = [];
-        }
+        this.logGroups.error[category] = [];
     }
     flushGroupWarning(category) {
-        if (this.logGroups.warning[category]) {
-            this.logGroups.warning[category] = [];
-        }
-        else {
-            this.logGroups.warning[category] = [];
-        }
+        this.logGroups.warning[category] = [];
     }
 }
 LoggerService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LoggerService_Factory() { return new LoggerService(i0.ɵɵinject(i1.ModuleConfigService)); }, token: LoggerService, providedIn: "root" });
@@ -115,4 +100,4 @@ LoggerService.decorators = [
 LoggerService.ctorParameters = () => [
     { type: ModuleConfigService }
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../../../projects/tnx-shared/src/lib/services/logger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;;;AAK9D,MAAM,OAAO,aAAa;IAQtB,YACI,oBAAyC;QAR7C,cAAS,GAAG;YACR,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;SACd,CAAC;QAME,IAAI,CAAC,WAAW,GAAG,oBAAoB,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC;IACpE,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB;eACjC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,OAAQ,EAAE,GAAG,cAAmB;QACpC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;SACzC;IACL,CAAC;IAED,QAAQ,CAAC,OAAQ,EAAE,GAAG,cAAmB;QACrC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;SAC1C;IACL,CAAC;IAED,UAAU,CAAC,OAAQ,EAAE,GAAG,cAAmB;QACvC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;SACzC;IACL,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,GAAG,QAAe;QAC7C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;YAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,aAAa,CAAC,QAAgB,EAAE,GAAG,QAAe;QAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;YAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,eAAe,CAAC,QAAgB,EAAE,GAAG,QAAe;QAChD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC7E,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,cAAc,CAAC,QAAgB;QAC3B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aACjC;SACJ;IACL,CAAC;IAED,eAAe,CAAC,QAAgB;QAC5B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAClC;SACJ;IACL,CAAC;IAED,iBAAiB,CAAC,QAAgB;QAC9B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aACjC;SACJ;IACL,CAAC;IAED,sBAAsB,CAAC,QAAgB;QACnC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB,CAAC,QAAgB;QACpC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,yBAAyB,CAAC,QAAgB;QACtC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,QAAgB;QAC3B,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACtC;aACI;YACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACtC;IACL,CAAC;IAED,eAAe,CAAC,QAAgB;QAC5B,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAChC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACvC;aACI;YACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACvC;IACL,CAAC;IAED,iBAAiB,CAAC,QAAgB;QAC9B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACzC;aACI;YACD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACzC;IACL,CAAC;;;;YA1HJ,UAAU,SAAC;gBACR,UAAU,EAAE,MAAM;aACrB;;;YAJQ,mBAAmB","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ModuleConfigService } from './module-config.service';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class LoggerService {\n    logGroups = {\n        info: {},\n        error: {},\n        warning: {}\n    };\n\n    environment: any;\n    constructor(\n        _moduleConfigService: ModuleConfigService\n    ) {\n        this.environment = _moduleConfigService.getConfig().environment;\n    }\n\n    disableConsole() {\n        return this.environment.systemLogSetting\n            && this.environment.systemLogSetting.disableConsole;\n    }\n\n    logInfo(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.info(message, optionalParams);\n        }\n    }\n\n    logError(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.error(message, optionalParams);\n        }\n    }\n\n    logWarning(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.warn(message, optionalParams);\n        }\n    }\n\n    logGroupInfo(category: string, ...messages: any[]) {\n        if (!this.logGroups.info[category]) this.logGroups.info[category] = [];\n        this.logGroups.info[category].push(...messages);\n    }\n\n    logGroupError(category: string, ...messages: any[]) {\n        if (!this.logGroups.error[category]) this.logGroups.error[category] = [];\n        this.logGroups.error[category].push(...messages);\n    }\n\n    logGroupWarning(category: string, ...messages: any[]) {\n        if (!this.logGroups.warning[category]) this.logGroups.warning[category] = [];\n        this.logGroups.warning[category].push(...messages);\n    }\n\n    writeGroupInfo(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.info[category];\n            if (items) {\n                console.info(category, items);\n            }\n        }\n    }\n\n    writeGroupError(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.error[category];\n            if (items) {\n                console.error(category, items);\n            }\n        }\n    }\n\n    writeGroupWarning(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.warning[category];\n            if (items) {\n                console.warn(category, items);\n            }\n        }\n    }\n\n    writeAndFlushGroupInfo(category: string) {\n        this.writeGroupInfo(category);\n        this.flushGroupInfo(category);\n    }\n\n    writeAndFlushGroupError(category: string) {\n        this.writeGroupError(category);\n        this.flushGroupError(category);\n    }\n\n    writeAndFlushGroupWarning(category: string) {\n        this.writeGroupWarning(category);\n        this.flushGroupWarning(category);\n    }\n\n    flushGroupInfo(category: string) {\n        if (this.logGroups.info[category]) {\n            this.logGroups.info[category] = [];\n        }\n        else {\n            this.logGroups.info[category] = [];\n        }\n    }\n\n    flushGroupError(category: string) {\n        if (this.logGroups.error[category]) {\n            this.logGroups.error[category] = [];\n        }\n        else {\n            this.logGroups.error[category] = [];\n        }\n    }\n\n    flushGroupWarning(category: string) {\n        if (this.logGroups.warning[category]) {\n            this.logGroups.warning[category] = [];\n        }\n        else {\n            this.logGroups.warning[category] = [];\n        }\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../../../projects/tnx-shared/src/lib/services/logger.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ModuleConfigService } from './module-config.service';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class LoggerService {\n    logGroups = {\n        info: {},\n        error: {},\n        warning: {}\n    };\n\n    environment: any;\n    constructor(\n        _moduleConfigService: ModuleConfigService\n    ) {\n        this.environment = _moduleConfigService.getConfig().environment;\n    }\n\n    disableConsole() {\n        return this.environment.systemLogSetting\n            && this.environment.systemLogSetting.disableConsole;\n    }\n\n    logInfo(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.info(message, optionalParams);\n        }\n    }\n\n    logError(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.error(message, optionalParams);\n        }\n    }\n\n    logWarning(message?, ...optionalParams: any) {\n        if (!this.disableConsole()) {\n            console.warn(message, optionalParams);\n        }\n    }\n\n    logGroupInfo(category: string, ...messages: any[]) {\n        if (!this.logGroups.info[category]) this.logGroups.info[category] = [];\n        this.logGroups.info[category].push(...messages);\n    }\n\n    logGroupError(category: string, ...messages: any[]) {\n        if (!this.logGroups.error[category]) this.logGroups.error[category] = [];\n        this.logGroups.error[category].push(...messages);\n    }\n\n    logGroupWarning(category: string, ...messages: any[]) {\n        if (!this.logGroups.warning[category]) this.logGroups.warning[category] = [];\n        this.logGroups.warning[category].push(...messages);\n    }\n\n    writeGroupInfo(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.info[category];\n            if (items) {\n                console.info(category, items);\n            }\n        }\n    }\n\n    writeGroupError(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.error[category];\n            if (items) {\n                console.error(category, items);\n            }\n        }\n    }\n\n    writeGroupWarning(category: string) {\n        if (!this.disableConsole()) {\n            const items = this.logGroups.warning[category];\n            if (items) {\n                console.warn(category, items);\n            }\n        }\n    }\n\n    writeAndFlushGroupInfo(category: string) {\n        this.writeGroupInfo(category);\n        this.flushGroupInfo(category);\n    }\n\n    writeAndFlushGroupError(category: string) {\n        this.writeGroupError(category);\n        this.flushGroupError(category);\n    }\n\n    writeAndFlushGroupWarning(category: string) {\n        this.writeGroupWarning(category);\n        this.flushGroupWarning(category);\n    }\n\n    flushGroupInfo(category: string) {\n        this.logGroups.info[category] = [];\n        \n\n    }\n\n    flushGroupError(category: string) {\n        this.logGroups.error[category] = [];\n    }\n\n    flushGroupWarning(category: string) {\n        this.logGroups.warning[category] = [];\n    }\n}\n"]}

package/fesm2015/tnx-shared.js

@@ -686,6 +686,7 @@ class CrudListSetting {
         this.showHistory = false;
         this.colorFilterField = '';
         this.colorFilterTable = [];
+        this.buttonsPermissionCustom = [];
         this.entityMetadataSetting = new CrudFormSetting();
         this.fieldSearchText = [];
         this.function = new CrudListCustomFunction();
@@ -3323,6 +3324,20 @@ class CommonService {
     getCurrentMonth() {
         return new Date().getMonth();
     }
+    getRangeYearBetween(previousYear, nextYear) {
+        let dataSourceYear = [];
+        if (nextYear >= previousYear) {
+            const tmp = [...Array(nextYear - previousYear + 1).keys()].map(x => {
+                const year = x + previousYear;
+                return {
+                    id: year,
+                    ten: year
+                };
+            });
+            dataSourceYear = tmp;
+        }
+        return dataSourceYear.reverse();
+    }
     getDynamicFormId(service, entity, action) {
         return `${service}_${entity}_${action}`.toUpperCase();
     }
@@ -4803,28 +4818,13 @@ class LoggerService {
         this.flushGroupWarning(category);
     }
     flushGroupInfo(category) {
-        if (this.logGroups.info[category]) {
-            this.logGroups.info[category] = [];
-        }
-        else {
-            this.logGroups.info[category] = [];
-        }
+        this.logGroups.info[category] = [];
     }
     flushGroupError(category) {
-        if (this.logGroups.error[category]) {
-            this.logGroups.error[category] = [];
-        }
-        else {
-            this.logGroups.error[category] = [];
-        }
+        this.logGroups.error[category] = [];
     }
     flushGroupWarning(category) {
-        if (this.logGroups.warning[category]) {
-            this.logGroups.warning[category] = [];
-        }
-        else {
-            this.logGroups.warning[category] = [];
-        }
+        this.logGroups.warning[category] = [];
     }
 }
 LoggerService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LoggerService_Factory() { return new LoggerService(i0.ɵɵinject(ModuleConfigService)); }, token: LoggerService, providedIn: "root" });
@@ -11673,7 +11673,7 @@ class PhoneNumberValidator {
         const value = event.value;
         if (value == null || value === '')
             return true;
-        const re = /^[ ]|[+(]*[0-9]{1,4}[)]{0,1}[-\s\./0-9]*$/g;
+        const re = /^([ ]|[+(]*[0-9]{1,4}[)]{0,1}[-\s\./0-9]*)$/g;
         return re.test(String(value).toLowerCase());
     }
     getError() {
@@ -21370,11 +21370,14 @@ class ListComponentBase extends ComponentBase {
                 if (!buttonText || lstBtnAction.some(p => p.rawText === buttonText)) {
                     continue;
                 }
-                this.addButtonAction(lstBtnAction, this.authorizeButtonKey, buttonText);
+                this.addButtonAction(lstBtnAction, buttonText);
             }
             const lstMenuButtons = (_e = yield this.menuButtons({})) !== null && _e !== void 0 ? _e : [];
             if (lstMenuButtons.length) {
-                lstMenuButtons.forEach(item => this.addButtonAction(lstBtnAction, this.authorizeButtonKey, item.label));
+                lstMenuButtons.forEach(item => this.addButtonAction(lstBtnAction, item.label));
+            }
+            if (this.setting.buttonsPermissionCustom.length) {
+                lstBtnAction.push(...this.setting.buttonsPermissionCustom);
             }
             const buttonSetting = JSON.parse(sessionStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.BUTTON_AUTHORIZE) || '{}');
             ((_f = buttonSetting[this.authorizeButtonKey]) === null || _f === void 0 ? void 0 : _f.length) && buttonSetting[this.authorizeButtonKey].forEach(item => {
@@ -21400,13 +21403,13 @@ class ListComponentBase extends ComponentBase {
     setBtnReady(isReady) {
         this.isBtnReady = isReady;
     }
-    addButtonAction(lstBtnAction, key, rawText, id) {
+    addButtonAction(lstBtnAction, rawText, id) {
         id !== null && id !== void 0 ? id : (id = this._commonService.guid());
         const permissionCode = this._commonService.convertStringToUnSign(rawText).replace(/ /g, '_').toUpperCase();
         lstBtnAction.push(new ButtonAction({
             id: id,
             rawText: rawText,
-            permissionCode: `[${key}]_[${permissionCode}]`
+            permissionCode: `[${this.authorizeButtonKey}]_[${permissionCode}]`
         }));
     }
     setAuthorizeButton(lstButtonTemplate) {
@@ -21432,7 +21435,7 @@ class ListComponentBase extends ComponentBase {
                 this.isBtnReady = true;
                 return;
             }
-            lstMenuButtons.forEach(item => this.addButtonAction(lstMenuButton, this.authorizeButtonKey, item.label));
+            lstMenuButtons.forEach(item => this.addButtonAction(lstMenuButton, item.label));
             buttonSetting[this.authorizeButtonKey].forEach(item => {
                 const itemBtnMenu = lstMenuButton.find(p => p.permissionCode == item.code);
                 if (itemBtnMenu) {
@@ -21605,34 +21608,8 @@ class CommonSearchFormComponent extends DataFormBase {
             this.searchBoxTooltip += `${(lstTextSearchControl.map(x => x.label)).join(', ')}`;
             this._index = 2;
         }
-        const totalControlPerRow = 12 / this.mdWidth;
         if (this.isCustomGenerateSearch) {
-            this.parentSetting.commonSchemas.forEach(column => {
-                column.showLabel = false;
-                column.mdWidth = this.mdWidth;
-                column['placeholder'] = column.label;
-                if (!(column instanceof TextControlSchema) || column instanceof NumberRangeControlSchema || column instanceof DropdownControlSchema) {
-                    column.onAfterChanged = (evt) => {
-                        this.handleSearch(null, evt.control.field);
-                    };
-                }
-                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);
-                }
-                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.addSearchBox(this.parentSetting.commonSchemas.sort((prev, next) => prev.order - next.order));
+            this.getFormSchemaCustom();
         }
         else {
             this.setting.schema = this.genFormSchema(columnFilters);
@@ -21643,6 +21620,35 @@ class CommonSearchFormComponent extends DataFormBase {
             this.handleSearch();
         }
     }
+    getFormSchemaCustom() {
+        const totalControlPerRow = 12 / this.mdWidth;
+        this.parentSetting.commonSchemas.forEach(column => {
+            column.showLabel = false;
+            column.mdWidth = this.mdWidth;
+            column['placeholder'] = column.label;
+            if (!(column instanceof TextControlSchema) || column instanceof NumberRangeControlSchema || column instanceof DropdownControlSchema) {
+                column.onAfterChanged = (evt) => {
+                    this.handleSearch(null, evt.control.field);
+                };
+            }
+            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);
+            }
+            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.addSearchBox(this.parentSetting.commonSchemas.sort((prev, next) => prev.order - next.order));
+    }
     genFormSchema(columns) {
         const result = [];
         const totalControlPerRow = 12 / this.mdWidth;
@@ -22345,6 +22351,7 @@ class ListBase extends ComponentBaseWithButton {
         this._workflowPermissionDetailService = this._injector.get(WorkflowPermissionDetailService);
         this._stateMachinesService = this._injector.get(StateMachinesService);
         this._congViecServiceInBase = this._injector.get(CongViecService);
+        this._permissionService = this._injector.get(PermissionService);
         this._loggerService = this._injector.get(LoggerService);
         this.setting.key = this._commonService.guid();
     }
@@ -22707,6 +22714,37 @@ class ListBase extends ComponentBaseWithButton {
             }
         });
     }
+    getMenuButtonCustomAuthorized(menuButtons) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buttonSetting = JSON.parse(sessionStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.BUTTON_AUTHORIZE) || '{}');
+            let authorizeButtonKey = window.location.pathname.substring(1).toUpperCase().replace(/\//g, '_');
+            const serviceCode = this.setting.baseService.serviceCode.toUpperCase();
+            if (isDevMode()) {
+                authorizeButtonKey = `${serviceCode}_${window.location.pathname.substring(1).toUpperCase()}`;
+            }
+            const lstButtonAuthorize = buttonSetting[authorizeButtonKey];
+            if (!(lstButtonAuthorize === null || lstButtonAuthorize === void 0 ? void 0 : lstButtonAuthorize.length)) {
+                return menuButtons;
+            }
+            const promises = [];
+            const authorizedButtons = [];
+            for (const item of menuButtons) {
+                const permission = lstButtonAuthorize.find(p => p.code == item.authorizationPermission);
+                if (!item.authorizationPermission || !permission) {
+                    authorizedButtons.push(item);
+                    continue;
+                }
+                promises.push(this._permissionService.isAuthorized(item.authorizationServiceCode || serviceCode, permission ? permission.code : item.authorizationPermission, true).then(authorized => {
+                    if (authorized !== true) {
+                        return;
+                    }
+                    authorizedButtons.push(item);
+                }));
+            }
+            yield Promise.all(promises);
+            return authorizedButtons;
+        });
+    }
     beforeRenderDataSource(datasource) {
         return datasource;
     }
@@ -23601,7 +23639,7 @@ SplashComponentComponent.decorators = [
                 selector: 'common-splash-component',
                 template: "<ng-template viewContainerRef></ng-template>\n",
                 providers: [ComponentContextService],
-                styles: [".modules{background-color:#fff;font-family:monospace;background:url(/assets/images/splash-bg.png);background-repeat:no-repeat;background-position:50%;background-size:cover;position:fixed;top:0;left:0;z-index:100;display:flex;justify-content:center;align-items:center;width:100vw;height:100vh;flex-direction:column}.modules div>span{min-width:100px;height:100px;width:100px;margin:10px;box-shadow:1px 2px 9px 1px #bbb;white-space:normal}.modules div>span,.modules div>span>a{display:inline-block;border-radius:5px}.modules div>span>a{height:100%;width:100%;color:#fff;text-decoration:unset;text-align:center;position:relative;font-weight:700;text-shadow:2px 3px 3px hsla(0,0%,42.7%,.4392156862745098);cursor:pointer}.modules div>span>a i{animation:in 1s}.modules div>span>a:hover i{animation:out 1s}@media (max-width:1370px){.modules{justify-content:flex-start;overflow:auto}.module-icons.module-icons{margin-bottom:20px}.welcome-user.welcome-user{margin-top:30px;margin-bottom:30px}.welcome-user.welcome-user img{width:100px;height:100px}.clock{margin:0 20px;font-size:1.5em}.data-time{margin:10px 0 20px;font-size:1em}}.modules div>span>a>span{display:inline-block;color:#fff;text-decoration:unset;text-align:center;position:absolute;bottom:10px;width:100%;left:0}.modules div>span.implementing{background-color:#fff;box-shadow:none}.modules div>span>a>i{font-size:3em;position:absolute;top:10px;width:100%;left:0}.div22{width:240px}.div33{width:360px}.div44{width:480px}.div55{width:600px}.div88{width:960px}::ng-deep .flexcolumn{max-width:calc(100vh - 20px)}.div1111-wrapper{width:100%;overflow:auto}.div1111{white-space:nowrap}.module-icons{color:#666;width:100%}.module-icons,.welcome-user{margin-bottom:80px;text-align:center}.welcome-user a{background:#c2f3c3;padding:6px;border-radius:3px;cursor:pointer}.welcome-user a i{margin-right:6px}.welcome-user img{border-radius:50%;border:2px dashed rgba(0,144,162,.5019607843137255);height:200px;width:200px;-o-object-fit:contain;object-fit:contain}.welcome-user h2{color:#0090a2}.clock-wrapper{color:rgba(0,144,162,.6666666666666666);font-size:2em;text-align:center}.loader{color:#607d8b;font-size:8px;width:1em;height:1em;border-radius:50%;position:absolute;text-indent:-9999em;animation:load4 1.3s linear infinite;transform:translate(-50%,-50%);top:50%;left:50%}@keyframes load4{0%,to{box-shadow:0 -3em 0 .2em,2em -2em 0 0,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 0}12.5%{box-shadow:0 -3em 0 0,2em -2em 0 .2em,3em 0 0 0,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}25%{box-shadow:0 -3em 0 -.5em,2em -2em 0 0,3em 0 0 .2em,2em 2em 0 0,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}37.5%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 0,2em 2em 0 .2em,0 3em 0 0,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}50%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 0,0 3em 0 .2em,-2em 2em 0 0,-3em 0 0 -1em,-2em -2em 0 -1em}62.5%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 0,-2em 2em 0 .2em,-3em 0 0 0,-2em -2em 0 -1em}75%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 0,-3em 0 0 .2em,-2em -2em 0 0}87.5%{box-shadow:0 -3em 0 0,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 0,-3em 0 0 0,-2em -2em 0 .2em}}"]
+                styles: [".modules{font-family:monospace;background:url(/assets/images/splash-bg.png);background-repeat:no-repeat;background-position:50%;background-size:cover;position:fixed;top:0;left:0;z-index:100;display:flex;justify-content:center;align-items:center;width:100vw;height:100vh;flex-direction:column;background-color:#fff}.modules div>span{min-width:100px;height:100px;width:100px;margin:10px;box-shadow:1px 2px 9px 1px #bbb;white-space:normal}.modules div>span,.modules div>span>a{display:inline-block;border-radius:5px}.modules div>span>a{height:100%;width:100%;color:#fff;text-decoration:unset;text-align:center;position:relative;font-weight:700;text-shadow:2px 3px 3px hsla(0,0%,42.7%,.4392156862745098);cursor:pointer}.modules div>span>a i{animation:in 1s}.modules div>span>a:hover i{animation:out 1s}@media (max-width:1370px){.modules{justify-content:flex-start;overflow:auto}.module-icons.module-icons{margin-bottom:20px}.welcome-user.welcome-user{margin-top:30px;margin-bottom:30px}.welcome-user.welcome-user img{width:100px;height:100px}.clock{margin:0 20px;font-size:1.5em}.data-time{margin:10px 0 20px;font-size:1em}}.modules div>span>a>span{display:inline-block;color:#fff;text-decoration:unset;text-align:center;position:absolute;bottom:10px;width:100%;left:0}.modules div>span.implementing{box-shadow:none;background-color:#fff}.modules div>span>a>i{font-size:3em;position:absolute;top:10px;width:100%;left:0}.div22{width:240px}.div33{width:360px}.div44{width:480px}.div55{width:600px}.div88{width:960px}::ng-deep .flexcolumn{max-width:calc(100vh - 20px)}.div1111-wrapper{width:100%;overflow:auto}.div1111{white-space:nowrap}.module-icons{color:#666;width:100%}.module-icons,.welcome-user{margin-bottom:80px;text-align:center}.welcome-user a{background:#c2f3c3;padding:6px;border-radius:3px;cursor:pointer}.welcome-user a i{margin-right:6px}.welcome-user img{border-radius:50%;border:2px dashed rgba(0,144,162,.5019607843137255);height:200px;width:200px;-o-object-fit:contain;object-fit:contain}.welcome-user h2{color:#0090a2}.clock-wrapper{color:rgba(0,144,162,.6666666666666666);font-size:2em;text-align:center}.loader{color:#607d8b;font-size:8px;width:1em;height:1em;border-radius:50%;position:absolute;text-indent:-9999em;animation:load4 1.3s linear infinite;transform:translate(-50%,-50%);top:50%;left:50%}@keyframes load4{0%,to{box-shadow:0 -3em 0 .2em,2em -2em 0 0,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 0}12.5%{box-shadow:0 -3em 0 0,2em -2em 0 .2em,3em 0 0 0,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}25%{box-shadow:0 -3em 0 -.5em,2em -2em 0 0,3em 0 0 .2em,2em 2em 0 0,0 3em 0 -1em,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}37.5%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 0,2em 2em 0 .2em,0 3em 0 0,-2em 2em 0 -1em,-3em 0 0 -1em,-2em -2em 0 -1em}50%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 0,0 3em 0 .2em,-2em 2em 0 0,-3em 0 0 -1em,-2em -2em 0 -1em}62.5%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 0,-2em 2em 0 .2em,-3em 0 0 0,-2em -2em 0 -1em}75%{box-shadow:0 -3em 0 -1em,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 0,-3em 0 0 .2em,-2em -2em 0 0}87.5%{box-shadow:0 -3em 0 0,2em -2em 0 -1em,3em 0 0 -1em,2em 2em 0 -1em,0 3em 0 -1em,-2em 2em 0 0,-3em 0 0 0,-2em -2em 0 .2em}}"]
             },] }
 ];
 SplashComponentComponent.ctorParameters = () => [
@@ -24220,7 +24258,7 @@ AccessDeniedComponent.decorators = [
                 selector: 'common-access-denied',
                 template: "<ng-template viewContainerRef></ng-template>\n",
                 providers: [ComponentContextService],
-                styles: [".modules{background-color:#fff;font-family:monospace;background:url(/assets/images/splash-bg.png);background-repeat:no-repeat;background-position:50%;background-size:cover;position:fixed;top:0;left:0;z-index:100;display:flex;justify-content:center;align-items:center;width:100vw;height:100vh;flex-direction:column}.welcome-user{text-align:center;margin-bottom:80px}.welcome-user a{background:#c2f3c3;padding:6px;border-radius:3px;cursor:pointer}.welcome-user a i{margin-right:6px}.welcome-user img{border-radius:50%;border:2px dashed rgba(0,144,162,.5019607843137255);height:250px;width:250px;-o-object-fit:contain;object-fit:contain}.welcome-user h2{color:#0090a2}.welcome-user h1{color:#666;max-width:75vw;font-size:2rem}"]
+                styles: [".modules{font-family:monospace;background:url(/assets/images/splash-bg.png);background-repeat:no-repeat;background-position:50%;background-size:cover;position:fixed;top:0;left:0;z-index:100;display:flex;justify-content:center;align-items:center;width:100vw;height:100vh;flex-direction:column;background-color:#fff}.welcome-user{text-align:center;margin-bottom:80px}.welcome-user a{background:#c2f3c3;padding:6px;border-radius:3px;cursor:pointer}.welcome-user a i{margin-right:6px}.welcome-user img{border-radius:50%;border:2px dashed rgba(0,144,162,.5019607843137255);height:250px;width:250px;-o-object-fit:contain;object-fit:contain}.welcome-user h2{color:#0090a2}.welcome-user h1{color:#666;max-width:75vw;font-size:2rem}"]
             },] }
 ];
 AccessDeniedComponent.ctorParameters = () => [
@@ -27549,7 +27587,7 @@ class DropdownComponent extends ComponentBase {
         this.handleScroll = (evt) => {
             if (evt.srcElement.scrollTop > 0
                 && !this.firstScroll
-                && evt.srcElement.offsetHeight + evt.srcElement.scrollTop == evt.srcElement.scrollHeight) {
+                && evt.srcElement.offsetHeight + evt.srcElement.scrollTop >= evt.srcElement.scrollHeight - 1) {
                 this.firstScroll = true;
                 if (this.timeoutScroll)
                     clearTimeout(this.timeoutScroll);
@@ -27604,12 +27642,7 @@ class DropdownComponent extends ComponentBase {
         }
     }
     set itemSelectedStyleClass(value) {
-        if (value) {
-            this._itemSelectedStyleClass = `${this.defaultSelectedStyleClass} ${value}`;
-        }
-        else {
-            this._itemSelectedStyleClass = `${this.defaultSelectedStyleClass} ${value}`;
-        }
+        this._itemSelectedStyleClass = `${this.defaultSelectedStyleClass} ${value}`;
     }
     ngOnInit() {
         if (this.control.quickAdd) {
@@ -28040,7 +28073,7 @@ class DropdownComponent extends ComponentBase {
     }
     _getDataSource(page) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.page = page;
+            this.page = page || 1;
             this.loading = true;
             const filters = yield this.filterProcess(this.filterFromParents);
             if (filters == null) {
@@ -33753,7 +33786,7 @@ class AuthorizeDirective {
         });
     }
     setAuthorizeButton() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         let key = window.location.pathname.substring(1).toUpperCase().replace(/\//g, '_');
         if (isDevMode()) {
             key = `${this.appCode}_${window.location.pathname.substring(1).toUpperCase()}`;
@@ -33762,14 +33795,14 @@ class AuthorizeDirective {
         // if (componentName && !key.endsWith(componentName)) {
         //     key += `_${componentName}`;
         // }
-        const buttonText = (_c = (_b = (_a = this._element.getAttribute(EnumProperties.LABEL)) !== null && _a !== void 0 ? _a : this._element.getAttribute(EnumProperties.TOOLTIP)) !== null && _b !== void 0 ? _b : this._element.getAttribute(EnumProperties.NG_REFLECT_TEXT)) !== null && _c !== void 0 ? _c : this._element.getAttribute(EnumProperties.NG_REFLECT_LABEL);
+        const buttonText = (_d = (_c = (_b = (_a = this._element.getAttribute(EnumProperties.LABEL)) !== null && _a !== void 0 ? _a : this._element.getAttribute(EnumProperties.TOOLTIP)) !== null && _b !== void 0 ? _b : this._element.getAttribute(EnumProperties.NG_REFLECT_TEXT)) !== null && _c !== void 0 ? _c : this._element.getAttribute(EnumProperties.NG_REFLECT_LABEL)) !== null && _d !== void 0 ? _d : this._element.innerText;
         if (!buttonText) {
             this.enableAuthorize = false;
             return;
         }
         this.buttonSetting = JSON.parse(sessionStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.BUTTON_AUTHORIZE) || '{}');
         const permissionCode = `[${key}]_[${this._commonService.convertStringToUnSign(buttonText).replace(/ /g, '_').toUpperCase()}]`;
-        const isSetAuthorize = (_d = this.buttonSetting[key]) === null || _d === void 0 ? void 0 : _d.find(p => p.code == permissionCode);
+        const isSetAuthorize = (_e = this.buttonSetting[key]) === null || _e === void 0 ? void 0 : _e.find(p => p.code == permissionCode);
         if (isSetAuthorize) {
             this.permission = permissionCode;
         }
@@ -34912,6 +34945,7 @@ class BaseMenuService {
     }
 }
 
+//1/1/1/
 class AnnouncementReadsService extends BaseService {
     constructor(http, injector, _moduleConfigService) {
         super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.thongbaoEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/AnnouncementReads`);
@@ -41124,7 +41158,7 @@ EquationEditorComponent.decorators = [
                 selector: 'equation-editor',
                 template: "<div class=\"ui-fluid\">\n    <textarea #textarea class=\"latexContent\" placeholder=\"G\u00F5 c\u00F4ng th\u1EE9c to\u00E1n h\u1ECDc t\u1EA1i \u0111\u00E2y...\" rows=\"6\" pInputTextarea\n        (ngModelChange)=\"onModelChange($event)\" [(ngModel)]=\"equationLatex\"></textarea>\n</div>\n<div class=\"preview\">\n    <img #preview latex=\"true\" *ngIf=\"imageSrc\" [attr.height]=\"data.height != 0 ? data.height : null\"\n        class=\"latex\" [style]=\"data.style | safeStyle\" [src]=\"imageSrc\" [alt]=\"equationLatex\" />\n</div>",
                 providers: [ComponentContextService],
-                styles: [".btn-equation{width:30xp;height:30px;cursor:pointer}.preview{text-align:center;margin-top:10px;padding:0 10px}.latexContent{resize:none;border-radius:0}"]
+                styles: [".btn-equation{width:30px;height:30px;cursor:pointer}.preview{text-align:center;margin-top:10px;padding:0 10px}.latexContent{resize:none;border-radius:0}"]
             },] }
 ];
 EquationEditorComponent.ctorParameters = () => [
@@ -43299,7 +43333,7 @@ class SettingAuthorizeButtonComponent extends DataListBase {
         ];
         this.setting.cols = [
             new ColumnSchemaBase({ field: 'permissionCode', sort: false, showEditLink: false }),
-            new ColumnSchemaBase({ field: 'rawText', width: '230px', sort: false }),
+            new ColumnSchemaBase({ field: 'rawText', width: '300px', sort: false }),
             new ColumnSchemaBase({ field: 'isAuthorize', dataType: DataType.boolean, width: '100px', sort: false }),
         ];
         super.ngOnInit();