tnx-shared 5.3.247 → 5.3.249

package/bundles/tnx-shared.umd.js

@@ -20758,6 +20758,11 @@
         CanBoHoSoService.prototype.generatePickerControlSchema = function (control, enumCanBo) {
             var _this = this;
             if (enumCanBo === void 0) { enumCanBo = exports.EnumCanBo.TRONG_DON_VI; }
+            var _a;
+            var columns = __spreadArray([], __read(this.lstEntityPickerColumn));
+            if (((_a = control.columns) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                columns.push.apply(columns, __spreadArray([], __read(control.columns)));
+            }
             var result = new AutoCompletePickerControlSchema(Object.assign(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, plusUrl: 'WithChucDanhChucVu', displayField: 'hoVaTen', fieldPlus: 'code', fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
                     var result = item.hoVaTen;
                     if (item.code) {
@@ -20803,7 +20808,7 @@
                             break;
                     }
                     return filters;
-                } }, control), { columns: __spreadArray(__spreadArray([], __read(this.lstEntityPickerColumn)), __read(control.columns)) }));
+                } }, control), { columns: columns }));
             if (control.dataType == exports.EnumControlPickerType.DOITAC && !this.lstEntityPickerColumn.some(function (item) { return item.code == 'idDoiTac'; })) {
                 this.lstEntityPickerColumn.push(new EntityPickerColumn({
                     label: 'Đối tác',
@@ -21739,6 +21744,9 @@
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint;
             return _this;
         }
+        BasePermissionService.prototype.getPermissionByCode = function (code) {
+            return this.defaultGet(this.serviceUri + "/GetPermissionByCode?code=" + code);
+        };
         return BasePermissionService;
     }(BaseService));
     BasePermissionService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function BasePermissionService_Factory() { return new BasePermissionService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(ModuleConfigService)); }, token: BasePermissionService, providedIn: "root" });
@@ -25687,7 +25695,7 @@
         ListComponentBase.prototype.setAuthorizeButton = function (lstButtonTemplate) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var filterPermission, lstPermissionCode, buttonSetting, lstMenuButton, lstMenuButtons, _c_1;
+                var lstPermissionCode, buttonSetting, lstMenuButton, lstMenuButtons, _c_1;
                 var _this = this;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
@@ -25696,8 +25704,7 @@
                             if (i0.isDevMode()) {
                                 this.authorizeButtonKey = (this.serviceCode.toUpperCase() || this._moduleConfigService.getConfig().appCode.toUpperCase()) + "_" + window.location.pathname.substring(1).toUpperCase();
                             }
-                            filterPermission = [this.newFilter('code', exports.Operator.contain, "[" + this.authorizeButtonKey + "]")];
-                            return [4 /*yield*/, this._basePermissionService.getAllWithIgnore(filterPermission, 'code,id')];
+                            return [4 /*yield*/, this._basePermissionService.getPermissionByCode("[" + this.authorizeButtonKey + "]")];
                         case 1:
                             lstPermissionCode = (_a = (_h.sent()).data) !== null && _a !== void 0 ? _a : [];
                             buttonSetting = JSON.parse(sessionStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.BUTTON_AUTHORIZE) || '{}');