tnx-shared 5.3.187 → 5.3.189

package/bundles/tnx-shared.umd.js

@@ -1128,6 +1128,7 @@
             this.showHistory = false;
             this.colorFilterField = '';
             this.colorFilterTable = [];
+            this.buttonsPermissionCustom = [];
             this.entityMetadataSetting = new CrudFormSetting();
             this.fieldSearchText = [];
             this.function = new CrudListCustomFunction();
@@ -4133,6 +4134,20 @@
         CommonService.prototype.getCurrentMonth = function () {
             return new Date().getMonth();
         };
+        CommonService.prototype.getRangeYearBetween = function (previousYear, nextYear) {
+            var dataSourceYear = [];
+            if (nextYear >= previousYear) {
+                var tmp = __spreadArray([], __read(Array(nextYear - previousYear + 1).keys())).map(function (x) {
+                    var year = x + previousYear;
+                    return {
+                        id: year,
+                        ten: year
+                    };
+                });
+                dataSourceYear = tmp;
+            }
+            return dataSourceYear.reverse();
+        };
         CommonService.prototype.getDynamicFormId = function (service, entity, action) {
             return (service + "_" + entity + "_" + action).toUpperCase();
         };
@@ -5784,28 +5799,13 @@
             this.flushGroupWarning(category);
         };
         LoggerService.prototype.flushGroupInfo = function (category) {
-            if (this.logGroups.info[category]) {
-                this.logGroups.info[category] = [];
-            }
-            else {
-                this.logGroups.info[category] = [];
-            }
+            this.logGroups.info[category] = [];
         };
         LoggerService.prototype.flushGroupError = function (category) {
-            if (this.logGroups.error[category]) {
-                this.logGroups.error[category] = [];
-            }
-            else {
-                this.logGroups.error[category] = [];
-            }
+            this.logGroups.error[category] = [];
         };
         LoggerService.prototype.flushGroupWarning = function (category) {
-            if (this.logGroups.warning[category]) {
-                this.logGroups.warning[category] = [];
-            }
-            else {
-                this.logGroups.warning[category] = [];
-            }
+            this.logGroups.warning[category] = [];
         };
         return LoggerService;
     }());
@@ -13697,7 +13697,7 @@
             var value = event.value;
             if (value == null || value === '')
                 return true;
-            var re = /^[ ]|[+(]*[0-9]{1,4}[)]{0,1}[-\s\./0-9]*$/g;
+            var re = /^([ ]|[+(]*[0-9]{1,4}[)]{0,1}[-\s\./0-9]*)$/g;
             return re.test(String(value).toLowerCase());
         };
         PhoneNumberValidator.prototype.getError = function () {
@@ -25232,7 +25232,7 @@
                                 if (!buttonText || lstBtnAction.some(function (p) { return p.rawText === buttonText; })) {
                                     return "continue";
                                 }
-                                this_5.addButtonAction(lstBtnAction, this_5.authorizeButtonKey, buttonText);
+                                this_5.addButtonAction(lstBtnAction, buttonText);
                             };
                             this_5 = this;
                             try {
@@ -25252,7 +25252,10 @@
                         case 1:
                             lstMenuButtons = (_e = _h.sent()) !== null && _e !== void 0 ? _e : [];
                             if (lstMenuButtons.length) {
-                                lstMenuButtons.forEach(function (item) { return _this.addButtonAction(lstBtnAction, _this.authorizeButtonKey, item.label); });
+                                lstMenuButtons.forEach(function (item) { return _this.addButtonAction(lstBtnAction, item.label); });
+                            }
+                            if (this.setting.buttonsPermissionCustom.length) {
+                                lstBtnAction.push.apply(lstBtnAction, __spreadArray([], __read(this.setting.buttonsPermissionCustom)));
                             }
                             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(function (item) {
@@ -25285,13 +25288,13 @@
         ListComponentBase.prototype.setBtnReady = function (isReady) {
             this.isBtnReady = isReady;
         };
-        ListComponentBase.prototype.addButtonAction = function (lstBtnAction, key, rawText, id) {
+        ListComponentBase.prototype.addButtonAction = function (lstBtnAction, rawText, id) {
             id !== null && id !== void 0 ? id : (id = this._commonService.guid());
             var permissionCode = this._commonService.convertStringToUnSign(rawText).replace(/ /g, '_').toUpperCase();
             lstBtnAction.push(new ButtonAction({
                 id: id,
                 rawText: rawText,
-                permissionCode: "[" + key + "]_[" + permissionCode + "]"
+                permissionCode: "[" + this.authorizeButtonKey + "]_[" + permissionCode + "]"
             }));
         };
         ListComponentBase.prototype.setAuthorizeButton = function (lstButtonTemplate) {
@@ -25326,7 +25329,7 @@
                                 this.isBtnReady = true;
                                 return [2 /*return*/];
                             }
-                            lstMenuButtons.forEach(function (item) { return _this.addButtonAction(lstMenuButton, _this.authorizeButtonKey, item.label); });
+                            lstMenuButtons.forEach(function (item) { return _this.addButtonAction(lstMenuButton, item.label); });
                             buttonSetting[this.authorizeButtonKey].forEach(function (item) {
                                 var itemBtnMenu = lstMenuButton.find(function (p) { return p.permissionCode == item.code; });
                                 if (itemBtnMenu) {
@@ -25965,6 +25968,7 @@
             _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();
             return _this;
@@ -26419,11 +26423,65 @@
                 });
             });
         };
+        ListBase.prototype.getMenuButtonCustomAuthorized = function (menuButtons) {
+            return __awaiter(this, void 0, void 0, function () {
+                var buttonSetting, authorizeButtonKey, serviceCode, lstButtonAuthorize, promises, authorizedButtons, _loop_1, this_1, menuButtons_1, menuButtons_1_1, item;
+                var e_2, _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            buttonSetting = JSON.parse(sessionStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.BUTTON_AUTHORIZE) || '{}');
+                            authorizeButtonKey = window.location.pathname.substring(1).toUpperCase().replace(/\//g, '_');
+                            serviceCode = this.setting.baseService.serviceCode.toUpperCase();
+                            if (i0.isDevMode()) {
+                                authorizeButtonKey = serviceCode + "_" + window.location.pathname.substring(1).toUpperCase();
+                            }
+                            lstButtonAuthorize = buttonSetting[authorizeButtonKey];
+                            if (!(lstButtonAuthorize === null || lstButtonAuthorize === void 0 ? void 0 : lstButtonAuthorize.length)) {
+                                return [2 /*return*/, menuButtons];
+                            }
+                            promises = [];
+                            authorizedButtons = [];
+                            _loop_1 = function (item) {
+                                var permission = lstButtonAuthorize.find(function (p) { return p.code == item.authorizationPermission; });
+                                if (!item.authorizationPermission || !permission) {
+                                    authorizedButtons.push(item);
+                                    return "continue";
+                                }
+                                promises.push(this_1._permissionService.isAuthorized(item.authorizationServiceCode || serviceCode, permission ? permission.code : item.authorizationPermission, true).then(function (authorized) {
+                                    if (authorized !== true) {
+                                        return;
+                                    }
+                                    authorizedButtons.push(item);
+                                }));
+                            };
+                            this_1 = this;
+                            try {
+                                for (menuButtons_1 = __values(menuButtons), menuButtons_1_1 = menuButtons_1.next(); !menuButtons_1_1.done; menuButtons_1_1 = menuButtons_1.next()) {
+                                    item = menuButtons_1_1.value;
+                                    _loop_1(item);
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (menuButtons_1_1 && !menuButtons_1_1.done && (_a = menuButtons_1.return)) _a.call(menuButtons_1);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                            return [4 /*yield*/, Promise.all(promises)];
+                        case 1:
+                            _b.sent();
+                            return [2 /*return*/, authorizedButtons];
+                    }
+                });
+            });
+        };
         ListBase.prototype.beforeRenderDataSource = function (datasource) {
             return datasource;
         };
         ListBase.prototype.mergeRefFields = function (dataSource) {
-            var e_2, _a, e_3, _b;
+            var e_3, _a, e_4, _b;
             var schemas = this.setting.cols.filter(function (p) { return p.isForeignField && !!p.displayFieldInGrid && !p.field.startsWith('str'); });
             if (!schemas.length)
                 return;
@@ -26431,35 +26489,35 @@
                 for (var dataSource_1 = __values(dataSource), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
                     var rowData = dataSource_1_1.value;
                     try {
-                        for (var schemas_1 = (e_3 = void 0, __values(schemas)), schemas_1_1 = schemas_1.next(); !schemas_1_1.done; schemas_1_1 = schemas_1.next()) {
+                        for (var schemas_1 = (e_4 = void 0, __values(schemas)), schemas_1_1 = schemas_1.next(); !schemas_1_1.done; schemas_1_1 = schemas_1.next()) {
                             var schema = schemas_1_1.value;
                             rowData['str' + schema.field] = rowData[schema.displayFieldInGrid];
                         }
                     }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
                             if (schemas_1_1 && !schemas_1_1.done && (_b = schemas_1.return)) _b.call(schemas_1);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_4) throw e_4.error; }
                     }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (dataSource_1_1 && !dataSource_1_1.done && (_a = dataSource_1.return)) _a.call(dataSource_1);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
         };
         ListBase.prototype.calculateRowSpan = function (dataSource, fields, funcNext) {
-            var e_4, _a;
+            var e_5, _a;
             for (var i = 0; i < dataSource.length - 1; i++) {
                 if (funcNext && funcNext(dataSource[i]) != funcNext(dataSource[i + 1]))
                     continue;
                 try {
-                    for (var fields_1 = (e_4 = void 0, __values(fields)), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
+                    for (var fields_1 = (e_5 = void 0, __values(fields)), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
                         var element = fields_1_1.value;
                         var field = element.field;
                         var fieldRootIndex = "rootIndex_" + field;
@@ -26488,12 +26546,12 @@
                         }
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
                         if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
             }
         };
@@ -26518,32 +26576,32 @@
          * @param refFields
          */
         ListBase.prototype.addRefFields = function (refFields) {
-            var e_5, _a;
+            var e_6, _a;
             if (this.setting.fieldNeedGetRef == null || this.setting.fieldNeedGetRef.length === 0) {
                 this.setting.fieldNeedGetRef = __spreadArray([], __read(refFields));
                 return;
             }
-            var _loop_1 = function (refField) {
-                var oldRefIndex = this_1.setting.fieldNeedGetRef.findIndex(function (x) { return x.field == refField.field; });
+            var _loop_2 = function (refField) {
+                var oldRefIndex = this_2.setting.fieldNeedGetRef.findIndex(function (x) { return x.field == refField.field; });
                 if (oldRefIndex === -1) {
-                    this_1.setting.fieldNeedGetRef.push(refField);
+                    this_2.setting.fieldNeedGetRef.push(refField);
                     return "continue";
                 }
-                this_1.setting.fieldNeedGetRef[oldRefIndex] = refField;
+                this_2.setting.fieldNeedGetRef[oldRefIndex] = refField;
             };
-            var this_1 = this;
+            var this_2 = this;
             try {
                 for (var refFields_1 = __values(refFields), refFields_1_1 = refFields_1.next(); !refFields_1_1.done; refFields_1_1 = refFields_1.next()) {
                     var refField = refFields_1_1.value;
-                    _loop_1(refField);
+                    _loop_2(refField);
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (refFields_1_1 && !refFields_1_1.done && (_a = refFields_1.return)) _a.call(refFields_1);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
             }
         };
         ListBase.prototype.groupInClient = function (dataSource) {
@@ -26939,8 +26997,8 @@
         };
         ListBase.prototype._copyLinkMultiple = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var paths, _a, _b, item, _c, _d, e_6_1;
-                var e_6, _e;
+                var paths, _a, _b, item, _c, _d, e_7_1;
+                var e_7, _e;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -26963,14 +27021,14 @@
                             return [3 /*break*/, 2];
                         case 5: return [3 /*break*/, 8];
                         case 6:
-                            e_6_1 = _f.sent();
-                            e_6 = { error: e_6_1 };
+                            e_7_1 = _f.sent();
+                            e_7 = { error: e_7_1 };
                             return [3 /*break*/, 8];
                         case 7:
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_7) throw e_7.error; }
                             return [7 /*endfinally*/];
                         case 8:
                             this._commonService.copyByStorage(paths.join('\r\n'));
@@ -27567,7 +27625,7 @@
                     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 = function () { return [
@@ -28283,7 +28341,7 @@
                     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 = function () { return [
@@ -31656,7 +31714,6 @@
             return _this;
         }
         CommonSearchFormComponent.prototype.ngOnInit = function () {
-            var _this = this;
             this.mdWidth = this.parentSetting.mdWidthCommonSearch;
             this.setting.baseService = this.parentSetting.baseService;
             this.isCustomGenerateSearch = this.parentSetting.commonSchemas.length > 0;
@@ -31675,34 +31732,8 @@
                 this.searchBoxTooltip += "" + (lstTextSearchControl.map(function (x) { return x.label; })).join(', ');
                 this._index = 2;
             }
-            var totalControlPerRow = 12 / this.mdWidth;
             if (this.isCustomGenerateSearch) {
-                this.parentSetting.commonSchemas.forEach(function (column) {
-                    column.showLabel = false;
-                    column.mdWidth = _this.mdWidth;
-                    column['placeholder'] = column.label;
-                    if (!(column instanceof TextControlSchema) || column instanceof NumberRangeControlSchema || column instanceof DropdownControlSchema) {
-                        column.onAfterChanged = function (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(function (prev, next) { return prev.order - next.order; }));
+                this.getFormSchemaCustom();
             }
             else {
                 this.setting.schema = this.genFormSchema(columnFilters);
@@ -31713,6 +31744,36 @@
                 this.handleSearch();
             }
         };
+        CommonSearchFormComponent.prototype.getFormSchemaCustom = function () {
+            var _this = this;
+            var totalControlPerRow = 12 / this.mdWidth;
+            this.parentSetting.commonSchemas.forEach(function (column) {
+                column.showLabel = false;
+                column.mdWidth = _this.mdWidth;
+                column['placeholder'] = column.label;
+                if (!(column instanceof TextControlSchema) || column instanceof NumberRangeControlSchema || column instanceof DropdownControlSchema) {
+                    column.onAfterChanged = function (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(function (prev, next) { return prev.order - next.order; }));
+        };
         CommonSearchFormComponent.prototype.genFormSchema = function (columns) {
             var _this = this;
             var result = [];
@@ -32056,7 +32117,7 @@
             _this.handleScroll = function (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);
@@ -32140,12 +32201,7 @@
         });
         Object.defineProperty(DropdownComponent.prototype, "itemSelectedStyleClass", {
             set: function (value) {
-                if (value) {
-                    this._itemSelectedStyleClass = this.defaultSelectedStyleClass + " " + value;
-                }
-                else {
-                    this._itemSelectedStyleClass = this.defaultSelectedStyleClass + " " + value;
-                }
+                this._itemSelectedStyleClass = this.defaultSelectedStyleClass + " " + value;
             },
             enumerable: false,
             configurable: true
@@ -32640,7 +32696,7 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            this.page = page;
+                            this.page = page || 1;
                             this.loading = true;
                             return [4 /*yield*/, this.filterProcess(this.filterFromParents)];
                         case 1:
@@ -38746,7 +38802,7 @@
             });
         };
         AuthorizeDirective.prototype.setAuthorizeButton = function () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             var key = window.location.pathname.substring(1).toUpperCase().replace(/\//g, '_');
             if (i0.isDevMode()) {
                 key = this.appCode + "_" + window.location.pathname.substring(1).toUpperCase();
@@ -38755,14 +38811,14 @@
             // if (componentName && !key.endsWith(componentName)) {
             //     key += `_${componentName}`;
             // }
-            var buttonText = (_c = (_b = (_a = this._element.getAttribute(exports.EnumProperties.LABEL)) !== null && _a !== void 0 ? _a : this._element.getAttribute(exports.EnumProperties.TOOLTIP)) !== null && _b !== void 0 ? _b : this._element.getAttribute(exports.EnumProperties.NG_REFLECT_TEXT)) !== null && _c !== void 0 ? _c : this._element.getAttribute(exports.EnumProperties.NG_REFLECT_LABEL);
+            var buttonText = (_d = (_c = (_b = (_a = this._element.getAttribute(exports.EnumProperties.LABEL)) !== null && _a !== void 0 ? _a : this._element.getAttribute(exports.EnumProperties.TOOLTIP)) !== null && _b !== void 0 ? _b : this._element.getAttribute(exports.EnumProperties.NG_REFLECT_TEXT)) !== null && _c !== void 0 ? _c : this._element.getAttribute(exports.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) || '{}');
             var permissionCode = "[" + key + "]_[" + this._commonService.convertStringToUnSign(buttonText).replace(/ /g, '_').toUpperCase() + "]";
-            var isSetAuthorize = (_d = this.buttonSetting[key]) === null || _d === void 0 ? void 0 : _d.find(function (p) { return p.code == permissionCode; });
+            var isSetAuthorize = (_e = this.buttonSetting[key]) === null || _e === void 0 ? void 0 : _e.find(function (p) { return p.code == permissionCode; });
             if (isSetAuthorize) {
                 this.permission = permissionCode;
             }
@@ -40041,6 +40097,7 @@
         return BaseMenuService;
     }());
 
+    //1/1/1/
     var AnnouncementReadsService = /** @class */ (function (_super) {
         __extends(AnnouncementReadsService, _super);
         function AnnouncementReadsService(http, injector, _moduleConfigService) {
@@ -46964,7 +47021,7 @@
                     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 = function () { return [
@@ -50155,7 +50212,7 @@
             ];
             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: exports.DataType.boolean, width: '100px', sort: false }),
             ];
             _super.prototype.ngOnInit.call(this);