tnx-shared 5.1.77 → 5.1.81

package/bundles/tnx-shared.umd.js

@@ -395,7 +395,8 @@
         MENU_CHANGED: 'MENU_CHANGED',
         ADVANCE_SEARCH_INIT_WITHOUT_UPDATE_ROUTER: 'ADVANCE_SEARCH_INIT_WITHOUT_UPDATE_ROUTER',
         SHOW_WAIT_BOX: 'SHOW_WAIT_BOX',
-        SHOW_REJECT_CONFIRM: 'SHOW_REJECT_CONFIRM'
+        SHOW_REJECT_CONFIRM: 'SHOW_REJECT_CONFIRM',
+        GAN_ENTITY_SANG_CONG_VIEC: 'GAN_ENTITY_SANG_CONG_VIEC'
     };
     ComCtxConstants.ROOT_USMART = {
         SHOW_CONFIG_DATA_DEFAULT: 'SHOW_CONFIG_DATA_DEFAULT',
@@ -6952,6 +6953,9 @@
         BaseService.prototype.processWorkflow = function (id, actionCode, data) {
             return this.defaultPost(this.serviceUri + "/ProcessWorkflow/" + id + "/" + actionCode, data);
         };
+        BaseService.prototype.getUserInProcessForm = function (workflowCode, stateCode, actionCode, itemId) {
+            return this.defaultPost(this.serviceUri + "/GetUserInProcessFormBase/" + workflowCode + "/" + stateCode + "/" + actionCode + "/" + itemId, {});
+        };
         BaseService.prototype.handleError = function (error, injector) {
             var commonService = injector.get(CommonService);
             return commonService.handleError(error, injector);
@@ -10304,10 +10308,10 @@
     var CongViecService = /** @class */ (function (_super) {
         __extends(CongViecService, _super);
         function CongViecService(http, injector, _moduleConfigService) {
-            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/CongViec") || this;
+            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/CongViec_Chinh") || this;
             _this._moduleConfigService = _moduleConfigService;
             _this.serviceCode = 'congviec';
-            _this.entityName = 'CongViec';
+            _this.entityName = 'CongViec_Chinh';
             _this.objectName = 'công việc';
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
             return _this;
@@ -14107,6 +14111,7 @@
             }
             if (schema instanceof TitleSchema
                 || schema instanceof LabelSchema) {
+                schema.showLabel = false;
                 if (!schema.field) {
                     schema.field = this._commonService.guid();
                 }
@@ -16770,7 +16775,8 @@
                         defaultValue: defaultValue,
                         valueField: 'code',
                         displayField: 'title',
-                        mdWidth: 12,
+                        mdWidth: this.mdWidthWorkflow || 12,
+                        enableCaching: false,
                         hiddenCheck: function (rootModel) { return !rootModel || rootModel.createTaskInstead; }
                     }));
                     if (this.parentSetting.workflowSettingNew
@@ -17260,10 +17266,13 @@
                             if (resultValidateFormTask) {
                                 this.model.data.itemCongViec = taskForm.model.data;
                             }
-                            // reset field _WorkflowCode để backend biết được chạy quy trình theo kiểu nào
-                            this.model.data._WorkflowCode = null;
                             _a.label = 2;
-                        case 2: return [4 /*yield*/, this.createConfirmIfRequire()];
+                        case 2:
+                            if (this.model.data.createTaskInstead) {
+                                // reset field _WorkflowCode để backend không chạy quy trình bản ghi
+                                this.model.data._WorkflowCode = null;
+                            }
+                            return [4 /*yield*/, this.createConfirmIfRequire()];
                         case 3:
                             confirmed = _a.sent();
                             if (!confirmed)
@@ -18725,6 +18734,7 @@
             _this.onProcessedWorkflow = new i0.EventEmitter();
             _this.onRollbackedWorkflow = new i0.EventEmitter();
             _this.onChangedStatusWorkflow = new i0.EventEmitter();
+            _this.onShowFormStartWorkflow = new i0.EventEmitter();
             _this.tableReady = new rxjs.Subject();
             _this.tableReadySource$ = _this.tableReady.asObservable();
             _this.checkedAll = null;
@@ -19694,6 +19704,7 @@
                                 }
                             };
                             this.congViecModel.showEditForm = true;
+                            this.onShowFormStartWorkflow.emit(rowData);
                             return [3 /*break*/, 4];
                         case 3:
                             if (workflowSetting.workflows.length == 1) {
@@ -19738,16 +19749,16 @@
                         case 2:
                             this.buttonContexts = [
                                 {
-                                    label: "Xem l\u1ECBch s\u1EED",
-                                    icon: 'pi pi-calendar',
-                                    command: function () { return _this.viewTaskHistory(rowData); }
+                                    label: "Xem chi ti\u1EBFt c\u00F4ng vi\u1EC7c",
+                                    icon: 'pi pi-list',
+                                    command: function () { return _this.viewTaskDetail(rowData); }
                                 }
                             ];
                             if (rowData.__workflowCode != DummyWorkflowCode) {
                                 this.buttonContexts.unshift({
-                                    label: "Xem chi ti\u1EBFt c\u00F4ng vi\u1EC7c",
-                                    icon: 'pi pi-list',
-                                    command: function () { return _this.viewTaskDetail(rowData); }
+                                    label: "Xem l\u1ECBch s\u1EED",
+                                    icon: 'pi pi-calendar',
+                                    command: function () { return _this.viewTaskHistory(rowData); }
                                 });
                             }
                             this._showContextMenu(evt);
@@ -20320,6 +20331,9 @@
             return __awaiter(this, void 0, void 0, function () {
                 var rowData;
                 return __generator(this, function (_b) {
+                    if (!this.setting.checkReadyToTrinhKy()) {
+                        return [2 /*return*/, this._notifierService.showWarning('Đang tải dữ liệu danh sách, chờ một lúc rồi thử lại')];
+                    }
                     rowData = this.rowDataCurrent;
                     this.showShareLinkForm([rowData]);
                     return [2 /*return*/];
@@ -21740,18 +21754,22 @@
         onStartedWorkflow: [{ type: i0.Output }],
         onProcessedWorkflow: [{ type: i0.Output }],
         onRollbackedWorkflow: [{ type: i0.Output }],
-        onChangedStatusWorkflow: [{ type: i0.Output }]
+        onChangedStatusWorkflow: [{ type: i0.Output }],
+        onShowFormStartWorkflow: [{ type: i0.Output }]
     };
 
     var EntityPermissionService = /** @class */ (function (_super) {
         __extends(EntityPermissionService, _super);
         function EntityPermissionService(http, injector, _moduleConfigService) {
-            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint + "/EntityPermission") || this;
+            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/EntityPermission") || this;
             _this.serviceManagers = {};
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint;
             _this._moduleConfig = _moduleConfigService.getConfig();
             return _this;
         }
+        EntityPermissionService.prototype.getEndpointByService = function (service) {
+            return service.endPoint + "/" + this._moduleConfig.environment.apiVersion;
+        };
         EntityPermissionService.prototype.registerService = function (entityName, service) {
             this.serviceManagers[entityName] = service;
         };
@@ -21760,15 +21778,15 @@
             if (service == undefined) {
                 (this._injector.get(NotifierService)).showWarning('Bạn chưa đăng ký base service cho entity permission service');
             }
-            return this.defaultPost(service.endPoint + "/EntityPermission/GetPermission/" + service.entityName, {});
+            return this.defaultPost(this.getEndpointByService(service) + "/EntityPermission/GetPermission/" + service.entityName, {});
         };
         EntityPermissionService.prototype.savePermission = function (tableName, data) {
             var service = this.serviceManagers[tableName];
-            return this.defaultPost(service.endPoint + "/EntityPermission/SavePermission/" + service.entityName, data);
+            return this.defaultPost(this.getEndpointByService(service) + "/EntityPermission/SavePermission/" + service.entityName, data);
         };
         EntityPermissionService.prototype.removePermission = function (tableName) {
             var service = this.serviceManagers[tableName];
-            return this.defaultPost(service.endPoint + "/EntityPermission/RemovePermission/" + service.entityName, {});
+            return this.defaultPost(this.getEndpointByService(service) + "/EntityPermission/RemovePermission/" + service.entityName, {});
         };
         return EntityPermissionService;
     }(BaseService));
@@ -22443,7 +22461,8 @@
                 });
             });
         };
-        DataListBase.prototype._copyLink = function (rowData) {
+        DataListBase.prototype._copyLink = function (rowData, showNoti) {
+            if (showNoti === void 0) { showNoti = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var path;
                 return __generator(this, function (_a) {
@@ -22452,12 +22471,26 @@
                         case 1:
                             path = _a.sent();
                             this._commonService.copyByStorage(path);
-                            this._notifierService.showSuccess('Đã sao chép liên kết');
+                            if (showNoti) {
+                                this._notifierService.showSuccess('Đã sao chép liên kết');
+                            }
                             return [2 /*return*/];
                     }
                 });
             });
         };
+        DataListBase.prototype._onShowFormStartWorkflow = function (rowData) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    // Fire event gắn link công việc
+                    this._copyLink(rowData, false).then(function (x) {
+                        _this.rootContext.fireReplayEvent(ComCtxConstants.ROOT.GAN_ENTITY_SANG_CONG_VIEC);
+                    });
+                    return [2 /*return*/];
+                });
+            });
+        };
         DataListBase.prototype.getCopyPath = function (rowData) {
             return __awaiter(this, void 0, void 0, function () {
                 var locationStrategy, state, baseHref, path, displayField, linkColumn;
@@ -33104,10 +33137,14 @@
                 && (this.value == null || this.value == '')) {
                 return null;
             }
+            var value = this.value;
+            if (this.funcGetValue) {
+                value = this.funcGetValue(this);
+            }
             return new Filter({
                 field: this.field,
                 operator: this.compareType,
-                value: JSON.stringify(this.value)
+                value: JSON.stringify(value)
             });
         };
         QueryRule.prototype.isGroup = function () {
@@ -33362,14 +33399,26 @@
                         itemSourceField.controlType = 'datetime';
                     }
                     else if (schema instanceof NumberRangeControlSchema) {
-                        itemSourceField.operators = operatorDateAndNumber;
+                        var operators = itemSourceField.control['operators'];
+                        if (!operators || !operators.length) {
+                            itemSourceField.operators = operatorDateAndNumber;
+                        }
+                        else {
+                            itemSourceField.operators = operators;
+                        }
                         itemSourceField.controlType = 'number';
                     }
                     else if (schema instanceof DropdownControlSchema || schema instanceof CheckBoxListControlSchema) {
-                        itemSourceField.operators = [
-                            { id: exports.Operator.in, ten: 'Nằm trong' },
-                            { id: exports.Operator.notIn, ten: 'Không nằm trong' }
-                        ];
+                        var operators = itemSourceField.control['operators'];
+                        if (!operators || !operators.length) {
+                            itemSourceField.operators = [
+                                { id: exports.Operator.in, ten: 'Nằm trong' },
+                                { id: exports.Operator.notIn, ten: 'Không nằm trong' }
+                            ];
+                        }
+                        else {
+                            itemSourceField.operators = __spread(operators);
+                        }
                         if (schema.hasOperatorCanBo) {
                             itemSourceField.operators.push({
                                 id: exports.Operator.isCurrentCanBo, ten: 'Là cán bộ hiện tại', _disabled: true
@@ -33399,6 +33448,11 @@
                         ];
                         itemSourceField.controlType = 'autocomplete-picker';
                     }
+                    else if (schema instanceof CustomControlSchema) {
+                        var operators = itemSourceField.control['operators'];
+                        itemSourceField.operators = operators ? operators : [];
+                        itemSourceField.controlType = 'custom';
+                    }
                     else { // Là textbox
                         itemSourceField.operators = [
                             { id: exports.Operator.equal, ten: 'Bằng' },
@@ -34892,6 +34946,10 @@
             this.data.breadcrumbs = [];
             this._dataSource = [];
         };
+        FileManagerComponent.prototype.setRootFolderId = function (rootFolderId) {
+            this.rootFolderId = rootFolderId;
+            this.data.currentFolderId = this.rootFolderId;
+        };
         FileManagerComponent.prototype.setDatasource = function (dataSource) {
             if (dataSource === void 0) { dataSource = []; }
             this._dataSource = dataSource;
@@ -35068,7 +35126,7 @@
                         command: function (event) {
                             _this.openObject(item);
                         },
-                        visible: this._deviceDetectorService.isDesktop()
+                        visible: (this._deviceDetectorService.isDesktop() && !(this.layout === exports.EnumFileLayout.SIMPLE && this.readonly))
                     },
                     {
                         label: 'Ký số cá nhân (SIM)',
@@ -35076,33 +35134,35 @@
                         command: function () {
                             _this.signKySimFile(item);
                         },
-                        visible: (this._fileObjectService.isTypeFileKySo(item.name) && !this.readonly)
+                        visible: this._fileObjectService.isTypeFileKySo(item.name)
                     },
                     {
                         label: 'Ký số cá nhân (USB)', icon: 'fas fa-signature',
                         command: function () {
                             _this.signFile(item);
                         },
-                        visible: (this._fileObjectService.isTypeFileKySo(item.name) && !this.readonly)
+                        visible: this._fileObjectService.isTypeFileKySo(item.name)
                     },
                     {
                         label: 'Ký số đơn vị (USB)', icon: 'fas fa-signature',
                         command: function () {
                             _this.signFileDonVi(item);
                         },
-                        visible: (this._fileObjectService.isTypeFileKySo(item.name) && !this.readonly)
+                        visible: this._fileObjectService.isTypeFileKySo(item.name)
                     },
                     {
                         label: 'Tải về', icon: 'fas fa-download',
                         command: function () {
                             _this.download(item);
-                        }
+                        },
+                        visible: !(this.layout === exports.EnumFileLayout.SIMPLE && this.readonly)
                     },
                     {
                         label: 'Sao chép đường dẫn', icon: 'fas fa-link',
                         command: function () {
                             _this.copyDownloadLink(item);
-                        }
+                        },
+                        visible: !(this.layout === exports.EnumFileLayout.SIMPLE && this.readonly)
                     },
                     {
                         label: 'Đổi tên', icon: 'fas fa-eraser',
@@ -35115,7 +35175,8 @@
                         label: 'Xem các phiên bản khác', icon: 'fas fa-history',
                         command: function () {
                             _this.openFileVersions(item);
-                        }
+                        },
+                        visible: !(this.layout === exports.EnumFileLayout.SIMPLE && this.readonly)
                     },
                     {
                         label: 'Xóa tệp tin', icon: 'far fa-trash-alt',
@@ -35852,7 +35913,7 @@
         { type: i0.Component, args: [{
                     // tslint:disable-next-line: component-selector
                     selector: 'file-manager',
-                    template: "<div *ngIf=\"layout == _layout.LIST\" class=\"full-layout\">\r\n    <div class=\"fm-toolbar\">\r\n        <div class=\"fm-toolbar-buttons\">\r\n            <ng-container *ngIf=\"!readonly\">\r\n                <button *ngIf=\"!hiddenCreateFolder\" pButton pRipple type=\"button\" pTooltip=\"T\u1EA1o th\u01B0 m\u1EE5c m\u1EDBi\"\r\n                    tooltipPosition=\"top\" icon=\"pi pi-folder\" class=\"p-button-text\" label=\"T\u1EA1o th\u01B0 m\u1EE5c\" iconPos=\"left\"\r\n                    (click)=\"createFolder()\">\r\n                </button>\r\n\r\n                <button pButton icon=\"pi pi-cloud-upload\" pTooltip=\"T\u1EA3i t\u1EC7p tin t\u1EEB m\u00E1y t\u00EDnh c\u1EE7a b\u1EA1n\"\r\n                    tooltipPosition=\"top\" type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i l\u00EAn\"\r\n                    (click)=\"selectFile()\"></button>\r\n\r\n                <button pButton icon=\"pi pi-link\" pTooltip=\"T\u1EA3i t\u1EEB li\u00EAn k\u1EBFt trong h\u1EC7 th\u1ED1ng\" tooltipPosition=\"top\"\r\n                    type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i li\u00EAn k\u1EBFt\"\r\n                    (click)=\"showAttachLinkBox = true\"></button>\r\n\r\n                <button *ngIf=\"canSelect()\" class=\"p-button-text p-button-success\" pButton type=\"button\"\r\n                    pTooltip=\"Di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\" icon=\"fas fa-arrows-alt\"\r\n                    iconPos=\"left\" label=\"Di chuy\u1EC3n\" (click)=\"moveExplorerItems()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"canSetMove()\" class=\"p-button-text p-button-success\" pButton type=\"button\"\r\n                    pTooltip=\"Di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn t\u1EDBi \u0111\u00E2y\" tooltipPosition=\"top\" icon=\"far fa-hand-paper\"\r\n                    iconPos=\"left\" label=\"\u0110\u1EB7t t\u1EA1i \u0111\u00E2y\" (click)=\"setMoveExplorerItems()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"canSetMove()\" icon=\"pi pi-undo\" pButton class=\"p-button-text p-button-secondary\"\r\n                    type=\"button\" pTooltip=\"B\u1ECF di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\" label=\"B\u1ECF qua\"\r\n                    (click)=\"cancelMove()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"hasSelect()\" pButton type=\"button\"\r\n                    pTooltip=\"{{ 'X\u00F3a th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn' | translate }}\" tooltipPosition=\"top\" icon=\"pi pi-trash\"\r\n                    iconPos=\"left\" class=\"p-button-text p-button-danger\" label=\"X\u00F3a\"\r\n                    (click)=\"deleteMutiple(model.selectedItems)\"></button>\r\n            </ng-container>\r\n            <button *ngIf=\"readonly && hasSelect()\" class=\"p-button-text p-button-secondary\" pButton type=\"button\"\r\n                pTooltip=\"N\u00E9n & t\u1EA3i v\u1EC1\" tooltipPosition=\"top\" icon=\"fas fa-file-archive\" iconPos=\"left\" label=\"T\u1EA3i v\u1EC1\"\r\n                (click)=\"downloadMultiple()\">\r\n            </button>\r\n        </div>\r\n        <ng-container *ngTemplateOutlet=\"breadCrumb\"></ng-container>\r\n    </div>\r\n\r\n    <div class=\"fm-grid\">\r\n        <crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"_dataSource\"\r\n            [disableKeypressControl]=\"true\" [showScrollBar]=\"false\" class=\"--auto-height-content --no-wrapper-padding\"\r\n            [widthFunctionColumn]=\"'8.2rem'\" (onReload)=\"_triggerProcessData($event)\"\r\n            (onRowSelect)=\"onRowSelect($event)\">\r\n\r\n            <ng-template #explorerItem let-rowData='rowData' let-col='col'>\r\n                <span (click)=\"openObject(rowData)\" class=\"pull-left file-ex-icon\"\r\n                    [innerHTML]=\"rowData.name | fileIcon : !rowData.isFile\">\r\n                </span>\r\n\r\n                <span (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    {{rowData.name}}\r\n                </span>\r\n                <span *ngIf=\"rowData.signatures\" class=\"pull-right signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                    tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                    <i class=\"fas fa-signature\"></i>\r\n                </span>\r\n            </ng-template>\r\n\r\n            <ng-template #fileSize let-rowData='rowData'>\r\n                <div *ngIf=\"rowData.isFile\">{{rowData.fileSize | fileSize}}</div>\r\n            </ng-template>\r\n\r\n            <ng-template #function let-rowData=\"rowData\" let-crudList=\"crudList\">\r\n                <div class=\"function-list\">\r\n                    <ng-container *ngIf=\"!readonly\">\r\n                        <button class=\"p-button-rounded p-button-text link-or-action\" pButton type=\"button\"\r\n                            tooltipPosition=\"top\" pTooltip=\"{{getButtonTooltip(rowData)}}\"\r\n                            icon=\"{{getButtonIcon(rowData)}}\" (click)=\"onButtonClick(rowData)\"></button>\r\n\r\n                        <button class=\"p-button-danger p-button-rounded p-button-text link-or-action\" pButton\r\n                            type=\"button\" pTooltip=\"X\u00F3a\" tooltipPosition=\"top\" icon=\"pi pi-trash\"\r\n                            (click)=\"deleteFile(rowData)\"></button>\r\n\r\n\r\n                        <button type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n                            class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n                            (click)=\"showContextMenu($event, rowData)\"></button>\r\n                    </ng-container>\r\n                    <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                        pButton type=\"button\" pTooltip=\"T\u1EA3i v\u1EC1\" tooltipPosition=\"top\" icon=\"pi pi-cloud-download\"\r\n                        (click)=\"download(rowData)\"></button>\r\n                    <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                        pButton type=\"button\" pTooltip=\"Sao ch\u00E9p \u0111\u01B0\u1EDDng d\u1EABn\" tooltipPosition=\"top\" icon=\"pi pi-link\"\r\n                        (click)=\"copyDownloadLink(rowData)\"></button>\r\n                </div>\r\n            </ng-template>\r\n        </crud-list>\r\n    </div>\r\n</div>\r\n\r\n<div *ngIf=\"layout == _layout.SIMPLE\" class=\"not-full-layout\" [class.readonly]=\"readonly\">\r\n    <div *ngIf=\"!readonly || data.breadcrumbs.length > 0\" class=\"fm-toolbar\">\r\n        <div class=\"fm-toolbar-buttons\">\r\n            <ng-container *ngIf=\"!readonly\">\r\n                <button *ngIf=\"!hiddenCreateFolder\" (click)=\"createFolder()\" pButton pRipple type=\"button\"\r\n                    pTooltip=\"T\u1EA1o th\u01B0 m\u1EE5c m\u1EDBi\" tooltipPosition=\"top\" icon=\"pi pi-folder\" class=\"p-button-text\"\r\n                    label=\"T\u1EA1o th\u01B0 m\u1EE5c\" iconPos=\"left\">\r\n                </button>\r\n                <button type=\"button\" pButton class=\"p-button-text p-button-info link-or-action\"\r\n                    icon=\"pi pi-cloud-upload\" (click)=\"selectFile()\" label=\"T\u1EA3i l\u00EAn\"></button>\r\n                <button pButton icon=\"pi pi-link\" pTooltip=\"T\u1EA3i t\u1EEB li\u00EAn k\u1EBFt trong h\u1EC7 th\u1ED1ng\" tooltipPosition=\"top\"\r\n                    type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i li\u00EAn k\u1EBFt\"\r\n                    (click)=\"showAttachLinkBox = true\"></button>\r\n            </ng-container>\r\n        </div>\r\n        <ng-container *ngTemplateOutlet=\"breadCrumb\"></ng-container>\r\n    </div>\r\n\r\n    <div class=\"nfl-grid\">\r\n        <div *ngFor=\"let rowData of _dataSource; index as i\" class=\"nfl-item\">\r\n            <div class=\"nfl-no\">\r\n                {{i + 1}}.\r\n            </div>\r\n\r\n            <div class=\"nfl-name\">\r\n                <span class=\"pull-left file-ex-icon\" [innerHTML]=\"rowData.name | fileIcon : !rowData.isFile\">\r\n                </span>\r\n                <!-- <a (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    <span>{{rowData.nameWithoutExtension}}</span>\r\n                    <div *ngIf=\"rowData.signatures\" class=\"signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                        tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                        <i class=\"fas fa-signature\"></i>\r\n                    </div>\r\n                </a>\r\n                <a (click)=\"openObject(rowData)\" class=\"file-ex-extension\">{{rowData.extension}}</a> -->\r\n\r\n                <a (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    <span>\r\n                        <span>{{rowData.nameWithoutExtension}}</span>\r\n                        <div *ngIf=\"rowData.signatures\" class=\"signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                            tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                            <i class=\"fas fa-signature\"></i>\r\n                        </div>\r\n                    </span>\r\n                    <span class=\"file-ex-extension\">{{rowData.extension}}</span>\r\n                </a>\r\n            </div>\r\n\r\n            <div *ngIf=\"rowData.isFile\" class=\"nfl-version\">\r\n                v{{rowData.currentFileVersion}}\r\n            </div>\r\n\r\n            <div class=\"nfl-function\">\r\n                <ng-container *ngIf=\"!readonly\">\r\n                    <button class=\"p-button-rounded p-button-text link-or-action\" (click)=\"onButtonClick(rowData)\"\r\n                        pButton type=\"button\" tooltipPosition=\"top\" pTooltip=\"{{getButtonTooltip(rowData)}}\"\r\n                        icon=\"{{getButtonIcon(rowData)}}\"></button>\r\n\r\n                    <button class=\"p-button-danger p-button-rounded p-button-text link-or-action\"\r\n                        (click)=\"deleteFile(rowData)\" pButton type=\"button\" pTooltip=\"X\u00F3a\" tooltipPosition=\"top\"\r\n                        icon=\"pi pi-trash\"></button>\r\n\r\n                    <button type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n                        class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n                        (click)=\"showContextMenu($event, rowData)\"></button>\r\n                </ng-container>\r\n\r\n                <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                    (click)=\"download(rowData)\" pButton type=\"button\" pTooltip=\"T\u1EA3i v\u1EC1\" tooltipPosition=\"top\"\r\n                    icon=\"pi pi-cloud-download\"></button>\r\n                <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                    pButton type=\"button\" pTooltip=\"Sao ch\u00E9p \u0111\u01B0\u1EDDng d\u1EABn\" tooltipPosition=\"top\" icon=\"pi pi-link\"\r\n                    (click)=\"copyDownloadLink(rowData)\"></button>\r\n            </div>\r\n        </div>\r\n        <div *ngIf=\"!_dataSource || !_dataSource.length\" class=\"nfl-no-item\">\r\n            Ch\u01B0a c\u00F3 t\u00E0i li\u1EC7u \u0111\u01B0\u1EE3c t\u1EA3i l\u00EAn\r\n        </div>\r\n    </div>\r\n</div>\r\n\r\n<ng-template #breadCrumb>\r\n    <div *ngIf=\"data.breadcrumbs.length > 0\" class=\"fm-toolbar-path\">\r\n        <p-breadcrumb class=\"customBreadCrumb\" [model]=\"data.breadcrumbs\"></p-breadcrumb>\r\n    </div>\r\n</ng-template>\r\n\r\n<p-fileUpload #fileControl [ngStyle]=\"{'display': 'none'}\" mode=\"basic\" [chooseLabel]=\"chooseLabel\" name=\"file\"\r\n    [url]=\"apiUploadUrl\" [maxFileSize]=\"maxFileSize\" auto=\"true\"\r\n    [invalidFileSizeMessageSummary]=\"invalidFileSizeMessageSummary\"\r\n    [invalidFileSizeMessageDetail]=\"invalidFileSizeMessageDetail\"\r\n    [invalidFileTypeMessageSummary]=\"invalidFileTypeMessageSummary\"\r\n    [invalidFileTypeMessageDetail]=\"invalidFileTypeMessageDetail\"\r\n    [invalidFileLimitMessageSummary]=\"invalidFileLimitMessageSummary\"\r\n    [invalidFileLimitMessageDetail]=\"invalidFileLimitMessageDetail\" (onProgress)=\"onUploadProgress($event)\"\r\n    (onBeforeUpload)=\"onBeforeUpload($event)\" (onSelect)=\"handleSelectFile($event)\" (onUpload)=\"onUploaded($event)\">\r\n</p-fileUpload>\r\n<p-contextMenu #contextMenu [appendTo]=\"'body'\" [model]=\"data.itemsMenuFile\" styleClass=\"fm-contextMenu-panel\">\r\n</p-contextMenu>\r\n\r\n<!-- T\u1EA1o m\u1EDBi/ \u0111\u1ED5i t\u00EAn th\u01B0 m\u1EE5c -->\r\n<tn-dialog *ngIf=\"forms.createFolder.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.createFolder.header | translate\" [popupSize]=\"forms[formIds.createFolder].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.createFolder)\">\r\n    <folder-form #formBase [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [model]=\"forms[formIds.createFolder].formData\" (onSaved)=\"onSavedForm(formIds.createFolder)\"\r\n        (onCancel)=\"onCancelForm(formIds.createFolder)\">\r\n    </folder-form>\r\n</tn-dialog>\r\n\r\n<!-- \u0110\u1ED5i t\u00EAn file -->\r\n<tn-dialog *ngIf=\"forms.renameFile.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.renameFile.header | translate\" [popupSize]=\"forms[formIds.renameFile].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.renameFile)\">\r\n    <file-form #formBase [parentModel]=\"model\" [parentContext]=\"context\" [model]=\"forms[formIds.renameFile].formData\"\r\n        (onSaved)=\"onSavedForm(formIds.renameFile)\" (onCancel)=\"onCancelForm(formIds.renameFile)\">\r\n    </file-form>\r\n</tn-dialog>\r\n\r\n<!-- Xem file tr\u1EF1c tuy\u1EBFn -->\r\n<file-viewer *ngIf=\"forms.fileViewer.show\" [parentModel]=\"model\" [parentContext]=\"context\" [readonly]=\"readonly\"\r\n    [model]=\"forms.fileViewer.formData\" (onClose)=\"closeFileViewer()\">\r\n</file-viewer>\r\n\r\n<!-- Xem phi\u00EAn b\u1EA3n -->\r\n<tn-dialog *ngIf=\"forms.fileVersionList.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.fileVersionList.header | translate\" [popupSize]=\"forms[formIds.fileVersionList].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.fileVersionList)\">\r\n    <file-version-list *ngIf=\"forms.fileVersionList.show\" [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [fileId]=\"forms[formIds.fileVersionList].fileId\" [readonly]=\"readonly\">\r\n    </file-version-list>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showAttachLinkBox\" #dialog2 [maximizable]=\"false\" [header]=\"'Nh\u1EADp li\u00EAn k\u1EBFt' | translate\"\r\n    [popupSize]=\"{ width: 600, height: 50}\" (onHide)=\"showAttachLinkBox = false; typedLink=''\">\r\n    <div class=\"p-col-12\">\r\n        <div class=\"p-grid\">\r\n            <div class=\"p-md-10\">\r\n                <input #input type=\"text\" placeholder=\"Nh\u1EADp li\u00EAn k\u1EBFt sao ch\u00E9p t\u1EEB t\u1EC7p tin kh\u00E1c...\"\r\n                    (keyup.enter)=\"addAttachLink()\" pInputText [(ngModel)]=\"typedLink\" class=\"p-col-12\" />\r\n            </div>\r\n            <div class=\"p-md-2\">\r\n                <button type=\"button\" (click)=\"addAttachLink()\" [disabled]=\"typedLink != ''? null : true\" pButton\r\n                    class=\"p-button-primary p-col-12\" label=\"Ok\"></button>\r\n            </div>\r\n        </div>\r\n    </div>\r\n    <after-view-checked (loaded)=\"focusInput(input)\"></after-view-checked>\r\n</tn-dialog>\r\n<!--\r\n\r\n<share-file *ngIf=\"forms.shareFile.show\" [parentDataModel]=\"model\" [parentDataContext]=\"context\"\r\n    [model]=\"forms.shareFile.formData\">\r\n</share-file>\r\n\r\n<share-folder *ngIf=\"forms.shareFolder.show\" [parentDataModel]=\"model\" [parentDataContext]=\"context\"\r\n    [model]=\"forms.shareFolder.formData\">\r\n</share-folder>\r\n -->\r\n\r\n<!-- Xem ch\u1EEF k\u00FD s\u1ED1 -->\r\n<tn-dialog *ngIf=\"forms.signatureDetail.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.signatureDetail.header | translate\" [popupSize]=\"forms[formIds.signatureDetail].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.signatureDetail)\">\r\n    <signature-detail [parentModel]=\"model\" [parentContext]=\"context\">\r\n    </signature-detail>\r\n</tn-dialog>\r\n<!--K\u00FD s\u1ED1 sim-->\r\n<tn-dialog *ngIf=\"forms.kySoSim.show\" #dialog [styleClass]=\"'address-form'\" [header]=\"forms.kySoSim.header | translate\"\r\n    [popupSize]=\"forms.kySoSim.popupSize\" [showFooter]=\"true\" (onHide)=\"onCancelForm(formIds.kySoSim)\">\r\n    <app-file-ky-so-sim #fileKySoSim [parentModel]=\"model\" [parentContext]=\"context\">\r\n    </app-file-ky-so-sim>\r\n    <ng-template #footer>\r\n        <button type=\"button\" pButton icon=\"fas fa-images\" [disabled]=\"model.submitting\" class=\"p-button-text\"\r\n            [label]=\"'Ch\u1ECDn ch\u1EEF k\u00FD' | translate\" (click)=\"chonChuKy()\"></button>\r\n        <button type=\"button\" pButton icon=\"fas fa-signature\" class=\"p-button-text ui-button-success\"\r\n            [disabled]=\"model.submitting\" [label]=\"'Th\u1EF1c hi\u1EC7n k\u00FD' | translate\" (click)=\"kySo()\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n            [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"forms.kySoSim.show=false\"></button>\r\n    </ng-template>\r\n</tn-dialog>",
+                    template: "<div *ngIf=\"layout == _layout.LIST\" class=\"full-layout\">\r\n    <div class=\"fm-toolbar\">\r\n        <div class=\"fm-toolbar-buttons\">\r\n            <ng-container *ngIf=\"!readonly\">\r\n                <button *ngIf=\"!hiddenCreateFolder\" pButton pRipple type=\"button\" pTooltip=\"T\u1EA1o th\u01B0 m\u1EE5c m\u1EDBi\"\r\n                    tooltipPosition=\"top\" icon=\"pi pi-folder\" class=\"p-button-text\" label=\"T\u1EA1o th\u01B0 m\u1EE5c\" iconPos=\"left\"\r\n                    (click)=\"createFolder()\">\r\n                </button>\r\n\r\n                <button pButton icon=\"pi pi-cloud-upload\" pTooltip=\"T\u1EA3i t\u1EC7p tin t\u1EEB m\u00E1y t\u00EDnh c\u1EE7a b\u1EA1n\"\r\n                    tooltipPosition=\"top\" type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i l\u00EAn\"\r\n                    (click)=\"selectFile()\"></button>\r\n\r\n                <button pButton icon=\"pi pi-link\" pTooltip=\"T\u1EA3i t\u1EEB li\u00EAn k\u1EBFt trong h\u1EC7 th\u1ED1ng\" tooltipPosition=\"top\"\r\n                    type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i li\u00EAn k\u1EBFt\"\r\n                    (click)=\"showAttachLinkBox = true\"></button>\r\n\r\n                <button *ngIf=\"canSelect()\" class=\"p-button-text p-button-success\" pButton type=\"button\"\r\n                    pTooltip=\"Di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\" icon=\"fas fa-arrows-alt\"\r\n                    iconPos=\"left\" label=\"Di chuy\u1EC3n\" (click)=\"moveExplorerItems()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"canSetMove()\" class=\"p-button-text p-button-success\" pButton type=\"button\"\r\n                    pTooltip=\"Di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn t\u1EDBi \u0111\u00E2y\" tooltipPosition=\"top\" icon=\"far fa-hand-paper\"\r\n                    iconPos=\"left\" label=\"\u0110\u1EB7t t\u1EA1i \u0111\u00E2y\" (click)=\"setMoveExplorerItems()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"canSetMove()\" icon=\"pi pi-undo\" pButton class=\"p-button-text p-button-secondary\"\r\n                    type=\"button\" pTooltip=\"B\u1ECF di chuy\u1EC3n th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\" label=\"B\u1ECF qua\"\r\n                    (click)=\"cancelMove()\">\r\n                </button>\r\n\r\n                <button *ngIf=\"hasSelect()\" pButton type=\"button\"\r\n                    pTooltip=\"{{ 'X\u00F3a th\u01B0 m\u1EE5c/t\u1EC7p tin \u0111\u00E3 ch\u1ECDn' | translate }}\" tooltipPosition=\"top\" icon=\"pi pi-trash\"\r\n                    iconPos=\"left\" class=\"p-button-text p-button-danger\" label=\"X\u00F3a\"\r\n                    (click)=\"deleteMutiple(model.selectedItems)\"></button>\r\n            </ng-container>\r\n            <button *ngIf=\"readonly && hasSelect()\" class=\"p-button-text p-button-secondary\" pButton type=\"button\"\r\n                pTooltip=\"N\u00E9n & t\u1EA3i v\u1EC1\" tooltipPosition=\"top\" icon=\"fas fa-file-archive\" iconPos=\"left\" label=\"T\u1EA3i v\u1EC1\"\r\n                (click)=\"downloadMultiple()\">\r\n            </button>\r\n        </div>\r\n        <ng-container *ngTemplateOutlet=\"breadCrumb\"></ng-container>\r\n    </div>\r\n\r\n    <div class=\"fm-grid\">\r\n        <crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"_dataSource\"\r\n            [disableKeypressControl]=\"true\" [showScrollBar]=\"false\" class=\"--auto-height-content --no-wrapper-padding\"\r\n            [widthFunctionColumn]=\"'8.2rem'\" (onReload)=\"_triggerProcessData($event)\"\r\n            (onRowSelect)=\"onRowSelect($event)\">\r\n\r\n            <ng-template #explorerItem let-rowData='rowData' let-col='col'>\r\n                <span (click)=\"openObject(rowData)\" class=\"pull-left file-ex-icon\"\r\n                    [innerHTML]=\"rowData.name | fileIcon : !rowData.isFile\">\r\n                </span>\r\n\r\n                <span (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    {{rowData.name}}\r\n                </span>\r\n                <span *ngIf=\"rowData.signatures\" class=\"pull-right signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                    tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                    <i class=\"fas fa-signature\"></i>\r\n                </span>\r\n            </ng-template>\r\n\r\n            <ng-template #fileSize let-rowData='rowData'>\r\n                <div *ngIf=\"rowData.isFile\">{{rowData.fileSize | fileSize}}</div>\r\n            </ng-template>\r\n\r\n            <ng-template #function let-rowData=\"rowData\" let-crudList=\"crudList\">\r\n                <div class=\"function-list\">\r\n                    <ng-container *ngIf=\"!readonly\">\r\n                        <button class=\"p-button-rounded p-button-text link-or-action\" pButton type=\"button\"\r\n                            tooltipPosition=\"top\" pTooltip=\"{{getButtonTooltip(rowData)}}\"\r\n                            icon=\"{{getButtonIcon(rowData)}}\" (click)=\"onButtonClick(rowData)\"></button>\r\n\r\n                        <button class=\"p-button-danger p-button-rounded p-button-text link-or-action\" pButton\r\n                            type=\"button\" pTooltip=\"X\u00F3a\" tooltipPosition=\"top\" icon=\"pi pi-trash\"\r\n                            (click)=\"deleteFile(rowData)\"></button>\r\n\r\n\r\n                        <button type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n                            class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n                            (click)=\"showContextMenu($event, rowData)\"></button>\r\n                    </ng-container>\r\n                    <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                        pButton type=\"button\" pTooltip=\"T\u1EA3i v\u1EC1\" tooltipPosition=\"top\" icon=\"pi pi-cloud-download\"\r\n                        (click)=\"download(rowData)\"></button>\r\n                    <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                        pButton type=\"button\" pTooltip=\"Sao ch\u00E9p \u0111\u01B0\u1EDDng d\u1EABn\" tooltipPosition=\"top\" icon=\"pi pi-link\"\r\n                        (click)=\"copyDownloadLink(rowData)\"></button>\r\n                </div>\r\n            </ng-template>\r\n        </crud-list>\r\n    </div>\r\n</div>\r\n\r\n<div *ngIf=\"layout == _layout.SIMPLE\" class=\"not-full-layout\" [class.readonly]=\"readonly\">\r\n    <div *ngIf=\"!readonly || data.breadcrumbs.length > 0\" class=\"fm-toolbar\">\r\n        <div class=\"fm-toolbar-buttons\">\r\n            <ng-container *ngIf=\"!readonly\">\r\n                <button *ngIf=\"!hiddenCreateFolder\" (click)=\"createFolder()\" pButton pRipple type=\"button\"\r\n                    pTooltip=\"T\u1EA1o th\u01B0 m\u1EE5c m\u1EDBi\" tooltipPosition=\"top\" icon=\"pi pi-folder\" class=\"p-button-text\"\r\n                    label=\"T\u1EA1o th\u01B0 m\u1EE5c\" iconPos=\"left\">\r\n                </button>\r\n                <button type=\"button\" pButton class=\"p-button-text p-button-info link-or-action\"\r\n                    icon=\"pi pi-cloud-upload\" (click)=\"selectFile()\" label=\"T\u1EA3i l\u00EAn\"></button>\r\n                <button pButton icon=\"pi pi-link\" pTooltip=\"T\u1EA3i t\u1EEB li\u00EAn k\u1EBFt trong h\u1EC7 th\u1ED1ng\" tooltipPosition=\"top\"\r\n                    type=\"button\" class=\"p-button-text p-button-primary\" label=\"T\u1EA3i li\u00EAn k\u1EBFt\"\r\n                    (click)=\"showAttachLinkBox = true\"></button>\r\n            </ng-container>\r\n        </div>\r\n        <ng-container *ngTemplateOutlet=\"breadCrumb\"></ng-container>\r\n    </div>\r\n\r\n    <div class=\"nfl-grid\">\r\n        <div *ngFor=\"let rowData of _dataSource; index as i\" class=\"nfl-item\">\r\n            <div class=\"nfl-no\">\r\n                {{i + 1}}.\r\n            </div>\r\n\r\n            <div class=\"nfl-name\">\r\n                <span class=\"pull-left file-ex-icon\" [innerHTML]=\"rowData.name | fileIcon : !rowData.isFile\">\r\n                </span>\r\n                <!-- <a (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    <span>{{rowData.nameWithoutExtension}}</span>\r\n                    <div *ngIf=\"rowData.signatures\" class=\"signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                        tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                        <i class=\"fas fa-signature\"></i>\r\n                    </div>\r\n                </a>\r\n                <a (click)=\"openObject(rowData)\" class=\"file-ex-extension\">{{rowData.extension}}</a> -->\r\n\r\n                <a (click)=\"openObject(rowData)\" class=\"{{rowData.class}} file-ex-name\">\r\n                    <span>\r\n                        <span>{{rowData.name}}</span>\r\n                        <div *ngIf=\"rowData.signatures\" class=\"signature\" pTooltip=\"Xem chi ti\u1EBFt k\u00FD s\u1ED1\"\r\n                            tooltipPosition=\"top\" (click)=\"viewListSign($event, rowData.signatures)\">\r\n                            <i class=\"fas fa-signature\"></i>\r\n                        </div>\r\n                    </span>\r\n                    <!-- <span class=\"file-ex-extension\">{{rowData.extension}}</span> -->\r\n                </a>\r\n            </div>\r\n\r\n            <div *ngIf=\"rowData.isFile\" class=\"nfl-version\">\r\n                v{{rowData.currentFileVersion}}\r\n            </div>\r\n\r\n            <div class=\"nfl-function\">\r\n                <ng-container *ngIf=\"!readonly\">\r\n                    <button class=\"p-button-rounded p-button-text link-or-action\" (click)=\"onButtonClick(rowData)\"\r\n                        pButton type=\"button\" tooltipPosition=\"top\" pTooltip=\"{{getButtonTooltip(rowData)}}\"\r\n                        icon=\"{{getButtonIcon(rowData)}}\"></button>\r\n\r\n                    <button class=\"p-button-danger p-button-rounded p-button-text link-or-action\"\r\n                        (click)=\"deleteFile(rowData)\" pButton type=\"button\" pTooltip=\"X\u00F3a\" tooltipPosition=\"top\"\r\n                        icon=\"pi pi-trash\"></button>\r\n                </ng-container>\r\n\r\n                <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                    (click)=\"download(rowData)\" pButton type=\"button\" pTooltip=\"T\u1EA3i v\u1EC1\" tooltipPosition=\"top\"\r\n                    icon=\"pi pi-cloud-download\"></button>\r\n                <button *ngIf=\"readonly\" class=\"p-button-secondary p-button-rounded p-button-text link-or-action\"\r\n                    pButton type=\"button\" pTooltip=\"Sao ch\u00E9p \u0111\u01B0\u1EDDng d\u1EABn\" tooltipPosition=\"top\" icon=\"pi pi-link\"\r\n                    (click)=\"copyDownloadLink(rowData)\"></button>\r\n                <button type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n                    class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n                    (click)=\"showContextMenu($event, rowData)\"></button>\r\n            </div>\r\n        </div>\r\n        <div *ngIf=\"!_dataSource || !_dataSource.length\" class=\"nfl-no-item\">\r\n            Ch\u01B0a c\u00F3 t\u00E0i li\u1EC7u \u0111\u01B0\u1EE3c t\u1EA3i l\u00EAn\r\n        </div>\r\n    </div>\r\n</div>\r\n\r\n<ng-template #breadCrumb>\r\n    <div *ngIf=\"data.breadcrumbs.length > 0\" class=\"fm-toolbar-path\">\r\n        <p-breadcrumb class=\"customBreadCrumb\" [model]=\"data.breadcrumbs\"></p-breadcrumb>\r\n    </div>\r\n</ng-template>\r\n\r\n<p-fileUpload #fileControl [ngStyle]=\"{'display': 'none'}\" mode=\"basic\" [chooseLabel]=\"chooseLabel\" name=\"file\"\r\n    [url]=\"apiUploadUrl\" [maxFileSize]=\"maxFileSize\" auto=\"true\"\r\n    [invalidFileSizeMessageSummary]=\"invalidFileSizeMessageSummary\"\r\n    [invalidFileSizeMessageDetail]=\"invalidFileSizeMessageDetail\"\r\n    [invalidFileTypeMessageSummary]=\"invalidFileTypeMessageSummary\"\r\n    [invalidFileTypeMessageDetail]=\"invalidFileTypeMessageDetail\"\r\n    [invalidFileLimitMessageSummary]=\"invalidFileLimitMessageSummary\"\r\n    [invalidFileLimitMessageDetail]=\"invalidFileLimitMessageDetail\" (onProgress)=\"onUploadProgress($event)\"\r\n    (onBeforeUpload)=\"onBeforeUpload($event)\" (onSelect)=\"handleSelectFile($event)\" (onUpload)=\"onUploaded($event)\">\r\n</p-fileUpload>\r\n<p-contextMenu #contextMenu [appendTo]=\"'body'\" [model]=\"data.itemsMenuFile\" styleClass=\"fm-contextMenu-panel\">\r\n</p-contextMenu>\r\n\r\n<!-- T\u1EA1o m\u1EDBi/ \u0111\u1ED5i t\u00EAn th\u01B0 m\u1EE5c -->\r\n<tn-dialog *ngIf=\"forms.createFolder.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.createFolder.header | translate\" [popupSize]=\"forms[formIds.createFolder].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.createFolder)\">\r\n    <folder-form #formBase [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [model]=\"forms[formIds.createFolder].formData\" (onSaved)=\"onSavedForm(formIds.createFolder)\"\r\n        (onCancel)=\"onCancelForm(formIds.createFolder)\">\r\n    </folder-form>\r\n</tn-dialog>\r\n\r\n<!-- \u0110\u1ED5i t\u00EAn file -->\r\n<tn-dialog *ngIf=\"forms.renameFile.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.renameFile.header | translate\" [popupSize]=\"forms[formIds.renameFile].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.renameFile)\">\r\n    <file-form #formBase [parentModel]=\"model\" [parentContext]=\"context\" [model]=\"forms[formIds.renameFile].formData\"\r\n        (onSaved)=\"onSavedForm(formIds.renameFile)\" (onCancel)=\"onCancelForm(formIds.renameFile)\">\r\n    </file-form>\r\n</tn-dialog>\r\n\r\n<!-- Xem file tr\u1EF1c tuy\u1EBFn -->\r\n<file-viewer *ngIf=\"forms.fileViewer.show\" [parentModel]=\"model\" [parentContext]=\"context\" [readonly]=\"readonly\"\r\n    [model]=\"forms.fileViewer.formData\" (onClose)=\"closeFileViewer()\">\r\n</file-viewer>\r\n\r\n<!-- Xem phi\u00EAn b\u1EA3n -->\r\n<tn-dialog *ngIf=\"forms.fileVersionList.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.fileVersionList.header | translate\" [popupSize]=\"forms[formIds.fileVersionList].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.fileVersionList)\">\r\n    <file-version-list *ngIf=\"forms.fileVersionList.show\" [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [fileId]=\"forms[formIds.fileVersionList].fileId\" [readonly]=\"readonly\">\r\n    </file-version-list>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showAttachLinkBox\" #dialog2 [maximizable]=\"false\" [header]=\"'Nh\u1EADp li\u00EAn k\u1EBFt' | translate\"\r\n    [popupSize]=\"{ width: 600, height: 50}\" (onHide)=\"showAttachLinkBox = false; typedLink=''\">\r\n    <div class=\"p-col-12\">\r\n        <div class=\"p-grid\">\r\n            <div class=\"p-md-10\">\r\n                <input #input type=\"text\" placeholder=\"Nh\u1EADp li\u00EAn k\u1EBFt sao ch\u00E9p t\u1EEB t\u1EC7p tin kh\u00E1c...\"\r\n                    (keyup.enter)=\"addAttachLink()\" pInputText [(ngModel)]=\"typedLink\" class=\"p-col-12\" />\r\n            </div>\r\n            <div class=\"p-md-2\">\r\n                <button type=\"button\" (click)=\"addAttachLink()\" [disabled]=\"typedLink != ''? null : true\" pButton\r\n                    class=\"p-button-primary p-col-12\" label=\"Ok\"></button>\r\n            </div>\r\n        </div>\r\n    </div>\r\n    <after-view-checked (loaded)=\"focusInput(input)\"></after-view-checked>\r\n</tn-dialog>\r\n<!--\r\n\r\n<share-file *ngIf=\"forms.shareFile.show\" [parentDataModel]=\"model\" [parentDataContext]=\"context\"\r\n    [model]=\"forms.shareFile.formData\">\r\n</share-file>\r\n\r\n<share-folder *ngIf=\"forms.shareFolder.show\" [parentDataModel]=\"model\" [parentDataContext]=\"context\"\r\n    [model]=\"forms.shareFolder.formData\">\r\n</share-folder>\r\n -->\r\n\r\n<!-- Xem ch\u1EEF k\u00FD s\u1ED1 -->\r\n<tn-dialog *ngIf=\"forms.signatureDetail.show\" #dialog [styleClass]=\"'address-form'\"\r\n    [header]=\"forms.signatureDetail.header | translate\" [popupSize]=\"forms[formIds.signatureDetail].popupSize\"\r\n    (onHide)=\"onCancelForm(formIds.signatureDetail)\">\r\n    <signature-detail [parentModel]=\"model\" [parentContext]=\"context\">\r\n    </signature-detail>\r\n</tn-dialog>\r\n<!--K\u00FD s\u1ED1 sim-->\r\n<tn-dialog *ngIf=\"forms.kySoSim.show\" #dialog [styleClass]=\"'address-form'\" [header]=\"forms.kySoSim.header | translate\"\r\n    [popupSize]=\"forms.kySoSim.popupSize\" [showFooter]=\"true\" (onHide)=\"onCancelForm(formIds.kySoSim)\">\r\n    <app-file-ky-so-sim #fileKySoSim [parentModel]=\"model\" [parentContext]=\"context\">\r\n    </app-file-ky-so-sim>\r\n    <ng-template #footer>\r\n        <button type=\"button\" pButton icon=\"fas fa-images\" [disabled]=\"model.submitting\" class=\"p-button-text\"\r\n            [label]=\"'Ch\u1ECDn ch\u1EEF k\u00FD' | translate\" (click)=\"chonChuKy()\"></button>\r\n        <button type=\"button\" pButton icon=\"fas fa-signature\" class=\"p-button-text ui-button-success\"\r\n            [disabled]=\"model.submitting\" [label]=\"'Th\u1EF1c hi\u1EC7n k\u00FD' | translate\" (click)=\"kySo()\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n            [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"forms.kySoSim.show=false\"></button>\r\n    </ng-template>\r\n</tn-dialog>",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,
@@ -35861,7 +35922,7 @@
                         },
                         ComponentContextService
                     ],
-                    styles: [".file-header-tab a{color:#000!important}.file-ex-name:hover{cursor:pointer}.file-ex-name .signature{margin-left:3px}.file-ex-row:hover{background:#e8e8e8}.function-list{text-align:center}.function-list a{margin:5px}.function-list a:hover{color:#6aa3d4}.file-btn{color:#337ab7;cursor:pointer;display:inline-block;font-size:1.1em;line-height:45px;margin-left:10px;padding:5px;vertical-align:middle}.file-btn:hover{color:#3ea8ff}.file-btn i{font-size:1.2em;margin-right:10px}.file-action{text-align:right}.file-row-action i{margin-right:5px}.file-row-action{line-height:34px}.function-list .topbar-items{margin-top:0}.function-list .topbar-items>li .topbar-icon{color:#909090}.function-list .topbar-items>li .topbar-icon:hover{color:#444}.function-list .topbar-items>li>ul{border-top:0;right:15px;top:30px}.function-list .topbar-items>li>ul:before{display:none}.function-list .topbar-items>li.active-top-menu>ul{z-index:1}.function-list .layout-menu li a{border:none;margin:0;text-align:left}.function-list .layout-menu li a i:first-child{color:#666f77;font-size:1.2em}.group-link-share{height:34px}.txt-link-share{max-width:335px!important}.btn-copy-link-share{font-size:small!important}.tbl-checkbox-header{width:3em}.tbl-checkbox{text-align:center;width:3em}.my-drive-checkbox{background-color:#fff;border:1px solid #ccc;box-shadow:inset 0 1px 1px rgba(0,0,0,.075);height:20px;text-align:center;transition:border-color .3s,background-color .3s,box-shadow .3s;width:20px}.get-link-share{cursor:pointer;float:right}.file-toolbar{text-align:right}.function-topbar button:last-child{margin-right:0!important}::ng-deep body>.fm-contextMenu-panel{min-width:210px}.folderUnClickable{pointer-events:none}::ng-deep file-manager .file-menu.ui-menu ul li a{text-align:left!important}::ng-deep file-manager .item-inline-name .ui-tooltip-text{white-space:normal;word-break:break-word}::ng-deep file-manager .full-layout .fm-grid a{display:flex;padding-top:5px}::ng-deep file-manager .full-layout .fm-grid a .file-ex-icon{margin-right:5px}::ng-deep file-manager .full-layout .fm-grid a .file-ex-icon:hover{cursor:pointer}::ng-deep file-manager .fm-toolbar{align-items:center;display:flex;padding-bottom:.5em;padding-left:0;padding-top:.5em}::ng-deep file-manager .fm-toolbar .fm-toolbar-buttons{align-items:center;display:flex;padding-left:3px}::ng-deep file-manager .fm-toolbar .fm-toolbar-path{flex:1 1;margin-left:2em;position:relative}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb .p-breadcrumb{background:transparent}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb>div{border:none;padding:0}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:not(:last-child)>a{cursor:pointer}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:not(:last-child)>a .p-menuitem-text{color:#2196f3}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:last-child .p-menuitem-text{color:rgba(255,102,0,.685)}::ng-deep file-manager .fm-toolbar .fm-toolbar-path:after{background:#b8b8b8;content:\"\";height:100%;left:-1.4em;position:absolute;top:0;width:2px}::ng-deep file-manager .not-full-layout{border-radius:5px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item{display:flex}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-function,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-no,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-version{align-items:center;display:flex;justify-content:center}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-no{flex:0 0 30px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name{flex:1 1;justify-content:left;margin-right:1em}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name .file-ex-name{display:flex;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name .file-ex-name>span:not(.file-ex-extension){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-version{flex:0 0 auto;font-size:.85rem;font-weight:700;margin-right:5px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-no-item{align-items:center;display:flex;justify-content:left;padding:1em}::ng-deep td file-manager .not-full-layout .nfl-grid .nfl-no-item{align-items:center;display:flex;justify-content:center;padding:8px}"]
+                    styles: [".file-header-tab a{color:#000!important}.file-ex-name:hover{cursor:pointer}.file-ex-name .signature{margin-left:3px}.file-ex-row:hover{background:#e8e8e8}.function-list{text-align:center}.function-list a{margin:5px}.function-list a:hover{color:#6aa3d4}.file-btn{color:#337ab7;cursor:pointer;display:inline-block;font-size:1.1em;line-height:45px;margin-left:10px;padding:5px;vertical-align:middle}.file-btn:hover{color:#3ea8ff}.file-btn i{font-size:1.2em;margin-right:10px}.file-action{text-align:right}.file-row-action i{margin-right:5px}.file-row-action{line-height:34px}.function-list .topbar-items{margin-top:0}.function-list .topbar-items>li .topbar-icon{color:#909090}.function-list .topbar-items>li .topbar-icon:hover{color:#444}.function-list .topbar-items>li>ul{border-top:0;right:15px;top:30px}.function-list .topbar-items>li>ul:before{display:none}.function-list .topbar-items>li.active-top-menu>ul{z-index:1}.function-list .layout-menu li a{border:none;margin:0;text-align:left}.function-list .layout-menu li a i:first-child{color:#666f77;font-size:1.2em}.group-link-share{height:34px}.txt-link-share{max-width:335px!important}.btn-copy-link-share{font-size:small!important}.tbl-checkbox-header{width:3em}.tbl-checkbox{text-align:center;width:3em}.my-drive-checkbox{background-color:#fff;border:1px solid #ccc;box-shadow:inset 0 1px 1px rgba(0,0,0,.075);height:20px;text-align:center;transition:border-color .3s,background-color .3s,box-shadow .3s;width:20px}.get-link-share{cursor:pointer;float:right}.file-toolbar{text-align:right}.function-topbar button:last-child{margin-right:0!important}::ng-deep body>.fm-contextMenu-panel{min-width:210px}.folderUnClickable{pointer-events:none}::ng-deep file-manager .file-menu.ui-menu ul li a{text-align:left!important}::ng-deep file-manager .item-inline-name .ui-tooltip-text{white-space:normal;word-break:break-word}::ng-deep file-manager .full-layout .fm-grid a{display:flex;padding-top:5px}::ng-deep file-manager .full-layout .fm-grid a .file-ex-icon{margin-right:5px}::ng-deep file-manager .full-layout .fm-grid a .file-ex-icon:hover{cursor:pointer}::ng-deep file-manager .fm-toolbar{align-items:center;display:flex;padding-bottom:.5em;padding-left:0;padding-top:.5em}::ng-deep file-manager .fm-toolbar .fm-toolbar-buttons{align-items:center;display:flex;padding-left:3px}::ng-deep file-manager .fm-toolbar .fm-toolbar-path{flex:1 1;margin-left:2em;position:relative}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb .p-breadcrumb{background:transparent}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb>div{border:none;padding:0}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:not(:last-child)>a{cursor:pointer}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:not(:last-child)>a .p-menuitem-text{color:#2196f3}::ng-deep file-manager .fm-toolbar .fm-toolbar-path>p-breadcrumb ul li:last-child .p-menuitem-text{color:rgba(255,102,0,.685)}::ng-deep file-manager .fm-toolbar .fm-toolbar-path:after{background:#b8b8b8;content:\"\";height:100%;left:-1.4em;position:absolute;top:0;width:2px}::ng-deep file-manager .not-full-layout{border-radius:5px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item{display:flex}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-function,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-no,::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-version{align-items:center;display:flex;justify-content:center}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-no{flex:0 0 30px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name{display:flex;flex:1 1;justify-content:left;margin-right:1em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name .file-ex-name{display:flex;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-name .file-ex-name>span:not(.file-ex-extension){display:flex;justify-content:space-between;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-item .nfl-version{flex:0 0 auto;font-size:.85rem;font-weight:700;margin-right:5px}::ng-deep file-manager .not-full-layout .nfl-grid .nfl-no-item{align-items:center;display:flex;justify-content:left;padding:1em}::ng-deep td file-manager .not-full-layout .nfl-grid .nfl-no-item{align-items:center;display:flex;justify-content:center;padding:8px}"]
                 },] }
     ];
     FileManagerComponent.ctorParameters = function () { return [
@@ -37687,6 +37748,8 @@
             this.onRemove = new i0.EventEmitter();
             this.disabled = null;
             this.custom = false;
+            this.customTypeFieldName = 'fieldValue';
+            this.customTypeSeparator = '____';
         }
         Object.defineProperty(QueryBuilderRuleComponent.prototype, "controlValue", {
             // control value cố định, dùng trong trường hợp custom form
@@ -37711,6 +37774,22 @@
                 }
                 this.handleChangeOperator();
             }
+            if (this.controlType == 'custom') {
+                this.setFuncGetValue();
+                if (this.query.value) {
+                    try {
+                        this.query[this.customTypeFieldName] = this.query.value['field'];
+                        this.query.value = this.query.value['value'];
+                    }
+                    catch (ex) {
+                    }
+                    // const arrInfo = this.query.value.split(this.customTypeSeparator);
+                    // if (arrInfo.length > 1) {
+                    //     this.query[this.customTypeFieldName] = arrInfo[0];
+                    //     this.query.value = arrInfo[1];
+                    // }
+                }
+            }
             if (this.itemField != null && this.itemField.controlType == 'datetime' && this.query.value) {
                 if (!isValidDate(new Date(this.query.value))) {
                     this.custom = true;
@@ -37720,6 +37799,18 @@
                 }
             }
         };
+        QueryBuilderRuleComponent.prototype.setFuncGetValue = function () {
+            var _this = this;
+            if (this.controlType == 'custom') {
+                this.query.funcGetValue = function (item) { return ({
+                    field: item[_this.customTypeFieldName],
+                    value: item.value
+                }); };
+            }
+            else {
+                this.query.funcGetValue = null;
+            }
+        };
         QueryBuilderRuleComponent.prototype.removeGroup = function () {
             this.onRemove.emit(this.query);
         };
@@ -37735,7 +37826,13 @@
                     this.resetControl(this.itemField);
                     var itemOperator = this.operators.find(function (q) { return q.id == _this.query.compareType; });
                     if (!itemOperator) {
-                        this.query.compareType = null;
+                        if (this.operators.length == 1) {
+                            this.query.compareType = this.operators[0].id;
+                            this.handleChangeOperator();
+                        }
+                        else {
+                            this.query.compareType = null;
+                        }
                     }
                     else if (itemOperator.controlType) {
                         this.resetControl(itemOperator);
@@ -37757,6 +37854,7 @@
                 if (this.control) {
                     this.control.disabled = this.disabled;
                 }
+                this.setFuncGetValue();
             }
         };
         QueryBuilderRuleComponent.prototype.handleChangeOperator = function () {
@@ -37796,7 +37894,7 @@
     QueryBuilderRuleComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'query-builder-rule',
-                    template: "<div class=\"tn__group-or-rule-container rule-container\">\r\n    <div class=\"tn__group-or-rule rule\">\r\n        <div class=\"tn__rule-body\">\r\n            <ng-container *ngIf=\"templateFieldPicker\">\r\n                <div class=\"tn__rule-field\">\r\n                    <ng-container\r\n                        *ngTemplateOutlet=\"templateFieldPicker; context: {$implicit: query, handleChangedField: setDatasourceOperators}\">\r\n                    </ng-container>\r\n                </div>\r\n            </ng-container>\r\n            <ng-container *ngIf=\"!templateFieldPicker\">\r\n                <ng-container *ngTemplateOutlet=\"fieldPicker; context: {$implicit: query}\"></ng-container>\r\n            </ng-container>\r\n            <div class=\"tn__rule-operator\">\r\n                <p-dropdown appendTo=\"body\" [options]=\"operators\" optionLabel=\"ten\" optionValue=\"id\"\r\n                    placeholder=\"Ch\u1ECDn to\u00E1n t\u1EED\" [(ngModel)]=\"query.compareType\" (onChange)=\"handleChangeOperator()\">\r\n                </p-dropdown>\r\n            </div>\r\n            <div class=\"tn__rule-value\">\r\n                <ng-container *ngIf=\"control\">\r\n                    <ng-container [ngSwitch]=\"controlType\">\r\n                        <input *ngSwitchCase=\"'textbox'\" [disabled]=\"disabled\" type=\"text\" pInputText\r\n                            placeholder=\"Gi\u00E1 tr\u1ECB\" [(ngModel)]=\"query.value\" />\r\n                        <!-- <p-multiSelect *ngSwitchCase=\"'dropdown'\" [placeholder]=\"control.placeholder\"\r\n                            [appendTo]=\"'body'\" [options]=\"control.dataSource\" [disabled]=\"disabled\" optionLabel=\"ten\"\r\n                            optionValue=\"id\" [(ngModel)]=\"query.value\">\r\n                        </p-multiSelect> -->\r\n                        <dropdown *ngSwitchCase=\"'dropdown'\" [control]=\"control\" [dataSource]=\"control.dataSource\"\r\n                            [itemSelectedStyleClass]=\"'min'\" [(value)]=\"query.value\">\r\n                        </dropdown>\r\n                        <div *ngSwitchCase=\"'datetime'\" class=\"datetime-value-container\">\r\n                            <p-checkbox [binary]=\"true\" [label]=\"'T\u00F9y bi\u1EBFn'\" [(ngModel)]=\"custom\"></p-checkbox>\r\n                            <datetime-picker *ngIf=\"!custom\" [disabled]=\"disabled\" [(ngModel)]=\"query.value\">\r\n                            </datetime-picker>\r\n                            <input *ngIf=\"custom\" pInputText placeholder=\"VD: [now] + 1d - 2h + 3m - 4s\"\r\n                                [(ngModel)]=\"query.value\" />\r\n                        </div>\r\n\r\n                        <tn-mask *ngSwitchCase=\"'number'\" [disabled]=\"disabled\" [maskType]=\"control.maskType\"\r\n                            [placeholder]=\"control.placeholder\" [(ngModel)]=\"query.value\">\r\n                        </tn-mask>\r\n                        <user-picker *ngSwitchCase=\"'user'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\" [multiple]=\"control.multiple\">\r\n                        </user-picker>\r\n                        <cocautochuc-picker-list *ngSwitchCase=\"'cocautochuc'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </cocautochuc-picker-list>\r\n                        <autocomplete-picker *ngSwitchCase=\"'role'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'groupuser'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'chucVu'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'autocomplete-picker'\" [control]=\"control\"\r\n                            [disabled]=\"disabled\" [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <app-autocomplete-datasource *ngSwitchCase=\"'autocomplete'\" [control]=\"control\"\r\n                            [disabled]=\"disabled\" [(ngModel)]=\"query.value\" [suggestions]=\"control.dataSource\">\r\n                        </app-autocomplete-datasource>\r\n                        <ng-container *ngSwitchDefault>\r\n                            <input type=\"text\" pInputText placeholder=\"Gi\u00E1 tr\u1ECB\" [disabled]=\"true\" />\r\n                        </ng-container>\r\n                    </ng-container>\r\n                </ng-container>\r\n                <ng-container *ngIf=\"!control\">\r\n                    <input type=\"text\" pInputText placeholder=\"Gi\u00E1 tr\u1ECB\" [disabled]=\"true\" />\r\n                </ng-container>\r\n            </div>\r\n        </div>\r\n        <div class=\"tn__rule-action\">\r\n            <button type=\"button\" pButton icon=\"pi pi-trash\" class=\"p-button-text p-button-rounded p-button-danger\"\r\n                pTooltip=\"X\u00F3a\" tooltipPosition=\"top\" (click)=\"removeGroup()\"></button>\r\n        </div>\r\n    </div>\r\n</div>\r\n<ng-template #fieldPicker let-query>\r\n    <p-dropdown [appendTo]=\"'body'\" [options]=\"dataSourceFields\" [class]=\"'tn__rule-field'\" optionLabel=\"ten\"\r\n        optionValue=\"id\" placeholder=\"Ch\u1ECDn tr\u01B0\u1EDDng d\u1EEF li\u1EC7u\" [(ngModel)]=\"query.field\"\r\n        (onChange)=\"handleChangeField($event)\">\r\n    </p-dropdown>\r\n</ng-template>",
+                    template: "<div class=\"tn__group-or-rule-container rule-container\">\r\n    <div class=\"tn__group-or-rule rule\">\r\n        <div class=\"tn__rule-body\">\r\n            <ng-container *ngIf=\"templateFieldPicker\">\r\n                <div class=\"tn__rule-field\">\r\n                    <ng-container\r\n                        *ngTemplateOutlet=\"templateFieldPicker; context: {$implicit: query, handleChangedField: setDatasourceOperators}\">\r\n                    </ng-container>\r\n                </div>\r\n            </ng-container>\r\n            <ng-container *ngIf=\"!templateFieldPicker\">\r\n                <ng-container *ngTemplateOutlet=\"fieldPicker; context: {$implicit: query}\"></ng-container>\r\n            </ng-container>\r\n            <div class=\"tn__rule-operator\">\r\n                <p-dropdown appendTo=\"body\" [options]=\"operators\" optionLabel=\"ten\" optionValue=\"id\"\r\n                    placeholder=\"Ch\u1ECDn to\u00E1n t\u1EED\" [(ngModel)]=\"query.compareType\" (onChange)=\"handleChangeOperator()\">\r\n                </p-dropdown>\r\n            </div>\r\n            <div class=\"tn__rule-value\">\r\n                <ng-container *ngIf=\"control\">\r\n                    <ng-container [ngSwitch]=\"controlType\">\r\n                        <ng-container *ngSwitchCase=\"'textbox'\">\r\n                            <ng-template *ngTemplateOutlet=\"textBoxValue; context: {$implicit: query}\"></ng-template>\r\n                        </ng-container>\r\n                        <ng-container *ngSwitchCase=\"'custom'\">\r\n                            <ng-template *ngTemplateOutlet=\"textBoxValue; context: {$implicit: query}\"></ng-template>\r\n                        </ng-container>\r\n                        <!-- <p-multiSelect *ngSwitchCase=\"'dropdown'\" [placeholder]=\"control.placeholder\"\r\n                            [appendTo]=\"'body'\" [options]=\"control.dataSource\" [disabled]=\"disabled\" optionLabel=\"ten\"\r\n                            optionValue=\"id\" [(ngModel)]=\"query.value\">\r\n                        </p-multiSelect> -->\r\n                        <dropdown *ngSwitchCase=\"'dropdown'\" [control]=\"control\" [dataSource]=\"control.dataSource\"\r\n                            [itemSelectedStyleClass]=\"'min'\" [(value)]=\"query.value\">\r\n                        </dropdown>\r\n                        <div *ngSwitchCase=\"'datetime'\" class=\"datetime-value-container\">\r\n                            <p-checkbox [binary]=\"true\" [label]=\"'T\u00F9y bi\u1EBFn'\" [(ngModel)]=\"custom\"></p-checkbox>\r\n                            <datetime-picker *ngIf=\"!custom\" [disabled]=\"disabled\" [(ngModel)]=\"query.value\">\r\n                            </datetime-picker>\r\n                            <input *ngIf=\"custom\" pInputText placeholder=\"VD: [now] + 1d - 2h + 3m - 4s\"\r\n                                [(ngModel)]=\"query.value\" />\r\n                        </div>\r\n\r\n                        <tn-mask *ngSwitchCase=\"'number'\" [disabled]=\"disabled\" [maskType]=\"control.maskType\"\r\n                            [placeholder]=\"control.placeholder\" [(ngModel)]=\"query.value\">\r\n                        </tn-mask>\r\n                        <user-picker *ngSwitchCase=\"'user'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\" [multiple]=\"control.multiple\">\r\n                        </user-picker>\r\n                        <cocautochuc-picker-list *ngSwitchCase=\"'cocautochuc'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </cocautochuc-picker-list>\r\n                        <autocomplete-picker *ngSwitchCase=\"'role'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'groupuser'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'chucVu'\" [control]=\"control\" [disabled]=\"disabled\"\r\n                            [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <autocomplete-picker *ngSwitchCase=\"'autocomplete-picker'\" [control]=\"control\"\r\n                            [disabled]=\"disabled\" [(ngModel)]=\"query.value\">\r\n                        </autocomplete-picker>\r\n                        <app-autocomplete-datasource *ngSwitchCase=\"'autocomplete'\" [control]=\"control\"\r\n                            [disabled]=\"disabled\" [(ngModel)]=\"query.value\" [suggestions]=\"control.dataSource\">\r\n                        </app-autocomplete-datasource>\r\n                        <ng-container *ngSwitchDefault>\r\n                            <input type=\"text\" pInputText placeholder=\"Gi\u00E1 tr\u1ECB\" [disabled]=\"true\" />\r\n                        </ng-container>\r\n                    </ng-container>\r\n                </ng-container>\r\n                <ng-container *ngIf=\"!control\">\r\n                    <input type=\"text\" pInputText placeholder=\"Gi\u00E1 tr\u1ECB\" [disabled]=\"true\" />\r\n                </ng-container>\r\n            </div>\r\n        </div>\r\n        <div class=\"tn__rule-action\">\r\n            <button type=\"button\" pButton icon=\"pi pi-trash\" class=\"p-button-text p-button-rounded p-button-danger\"\r\n                pTooltip=\"X\u00F3a\" tooltipPosition=\"top\" (click)=\"removeGroup()\"></button>\r\n        </div>\r\n    </div>\r\n</div>\r\n<ng-template #fieldPicker let-query>\r\n    <ng-container *ngIf=\"controlType == 'custom'\">\r\n        <input [disabled]=\"disabled\" type=\"text\" [class]=\"'tn__rule-field'\" pInputText placeholder=\"Tr\u01B0\u1EDDng d\u1EEF li\u1EC7u\"\r\n            [(ngModel)]=\"query.fieldValue\" />\r\n    </ng-container>\r\n    <ng-container *ngIf=\"controlType != 'custom'\">\r\n        <p-dropdown [appendTo]=\"'body'\" [options]=\"dataSourceFields\" [class]=\"'tn__rule-field'\" optionLabel=\"ten\"\r\n            optionValue=\"id\" placeholder=\"Ch\u1ECDn tr\u01B0\u1EDDng d\u1EEF li\u1EC7u\" [(ngModel)]=\"query.field\"\r\n            (onChange)=\"handleChangeField($event)\">\r\n        </p-dropdown>\r\n    </ng-container>\r\n</ng-template>\r\n<ng-template #textBoxValue let-query>\r\n    <input [disabled]=\"disabled\" type=\"text\" pInputText placeholder=\"Gi\u00E1 tr\u1ECB\" [(ngModel)]=\"query.value\" />\r\n</ng-template>",
                     styles: ["::ng-deep query-builder-rule .tn__rule-body{display:flex;width:calc(100% - 34px)}::ng-deep query-builder-rule .tn__rule-body>*{margin-right:5px}::ng-deep query-builder-rule .tn__rule-body>:last-child{margin-right:0}::ng-deep query-builder-rule .tn__rule-field{height:26px}::ng-deep query-builder-rule .tn__rule-value{min-height:26px}::ng-deep query-builder-rule .tn__rule-field,::ng-deep query-builder-rule .tn__rule-value{flex:0 0 calc(50% - 80px);width:calc(50% - 80px)}::ng-deep query-builder-rule .tn__rule-field .p-autocomplete,::ng-deep query-builder-rule .tn__rule-field .p-calendar,::ng-deep query-builder-rule .tn__rule-field.p-dropdown,::ng-deep query-builder-rule .tn__rule-field .p-dropdown,::ng-deep query-builder-rule .tn__rule-field .p-inputtext,::ng-deep query-builder-rule .tn__rule-field .p-multiselect,::ng-deep query-builder-rule .tn__rule-field tn-mask .p-inputgroup,::ng-deep query-builder-rule .tn__rule-value .p-autocomplete,::ng-deep query-builder-rule .tn__rule-value .p-calendar,::ng-deep query-builder-rule .tn__rule-value.p-dropdown,::ng-deep query-builder-rule .tn__rule-value .p-dropdown,::ng-deep query-builder-rule .tn__rule-value .p-inputtext,::ng-deep query-builder-rule .tn__rule-value .p-multiselect,::ng-deep query-builder-rule .tn__rule-value tn-mask .p-inputgroup{height:100%;width:100%}::ng-deep query-builder-rule .tn__rule-field .custom-autocomplete-button,::ng-deep query-builder-rule .tn__rule-field .p-inputtext,::ng-deep query-builder-rule .tn__rule-value .custom-autocomplete-button,::ng-deep query-builder-rule .tn__rule-value .p-inputtext{min-height:26px;padding:2px 12px}::ng-deep query-builder-rule .tn__rule-field .tn-dropdown,::ng-deep query-builder-rule .tn__rule-field .tn-dropdown.p-multiselect.p-component,::ng-deep query-builder-rule .tn__rule-value .tn-dropdown,::ng-deep query-builder-rule .tn__rule-value .tn-dropdown.p-multiselect.p-component{min-height:26px}::ng-deep query-builder-rule .tn__rule-field .tn-autocomplete .p-autocomplete-dropdown,::ng-deep query-builder-rule .tn__rule-value .tn-autocomplete .p-autocomplete-dropdown{height:26px;width:26px}::ng-deep query-builder-rule .tn__rule-field .p-calendar .p-button.p-button-icon-only,::ng-deep query-builder-rule .tn__rule-value .p-calendar .p-button.p-button-icon-only{padding:2px 12px}::ng-deep query-builder-rule .tn__rule-field .p-autocomplete.p-autocomplete-multiple .p-autocomplete-multiple-container .p-autocomplete-input-token,::ng-deep query-builder-rule .tn__rule-field .p-autocomplete.p-autocomplete-multiple .p-autocomplete-multiple-container .p-autocomplete-token,::ng-deep query-builder-rule .tn__rule-value .p-autocomplete.p-autocomplete-multiple .p-autocomplete-multiple-container .p-autocomplete-input-token,::ng-deep query-builder-rule .tn__rule-value .p-autocomplete.p-autocomplete-multiple .p-autocomplete-multiple-container .p-autocomplete-token{font-size:.9rem;margin:1px 2px;padding:0 .5rem}::ng-deep query-builder-rule .tn__rule-operator{flex:0 0 145px;height:26px;width:145px}::ng-deep query-builder-rule .tn__rule-operator .p-dropdown{height:100%;width:100%}::ng-deep query-builder-rule .tn__rule-operator .p-dropdown .p-inputtext{padding:2px 12px}::ng-deep query-builder-rule .tn__rule-action{flex:0 0 auto;white-space:nowrap}::ng-deep query-builder-rule .tn__rule-action button{height:26px!important;margin-left:2px!important;margin-right:6px!important;width:26px!important}::ng-deep query-builder-rule .datetime-value-container{align-items:center;display:flex}::ng-deep query-builder-rule .datetime-value-container p-checkbox{flex:0 0 auto;margin-right:5px}@media (max-width:640px){::ng-deep query-builder-rule .tn__rule-body{flex-direction:column;padding-right:5px}::ng-deep query-builder-rule .tn__rule-body>*{margin-bottom:5px;margin-right:0}::ng-deep query-builder-rule .tn__rule-field,::ng-deep query-builder-rule .tn__rule-operator,::ng-deep query-builder-rule .tn__rule-value{flex:1 1 auto;width:100%}}"]
                 },] }
     ];
@@ -39367,7 +39465,7 @@
         { id: ɵ3, ten: 'Người dùng' },
         { id: ɵ4, ten: 'Đơn vị' },
         { id: ɵ5, ten: 'Nhóm người dùng' },
-        { id: ɵ6, ten: 'Vai trò' }
+        { id: ɵ6, ten: 'Chức vụ' }
     ];
     var ɵ7 = exports.EnumUserRule.CAP_TREN, ɵ8 = exports.EnumUserRule.NGUOI_THAM_GIA_QUY_TRINH, ɵ9 = exports.EnumUserRule.NGUOI_NHAN, ɵ10 = exports.EnumUserRule.NGUOI_THEO_DOI;
     var DataSourceUserRule = [
@@ -39717,11 +39815,11 @@
         return new AutoCompletePickerControlSchema({
             field: field,
             label: label,
-            title: 'Chọn vai trò',
-            placeholder: 'Chọn vai trò',
+            title: 'Chọn chức vụ',
+            placeholder: 'Chọn chức vụ',
             mdWidth: 12,
             baseService: _roleService,
-            displayField: 'name',
+            displayField: 'ten',
             fieldPlus: 'code',
             fieldSearchText: ['code'],
             multiple: true,
@@ -39734,8 +39832,8 @@
                     fullTextSearch: true
                 }),
                 new EntityPickerColumn({
-                    label: 'Tên vai trò',
-                    code: 'name',
+                    label: 'Tên chức vụ',
+                    code: 'ten',
                     dataType: 'string',
                     operator: exports.Operator.contain,
                     notInFields: true
@@ -39828,17 +39926,21 @@
                     required: true,
                 })
             ];
+            if (this.data && this.data.editing) {
+                this.isFormAdd = false;
+            }
+            else {
+                this.isFormAdd = true;
+            }
         };
         StateMachinesConnectionMetadataComponent.prototype.onFormInitialized = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    if (this.data) {
-                        this.isFormAdd = false;
+                    if (!this.isFormAdd) {
                         setMetadataConnection(evt.model, this.data);
                         this.source = this.data.source;
                     }
                     else {
-                        this.isFormAdd = true;
                         evt.model.id = this._commonService.guid();
                         evt.model.data = {};
                     }
@@ -39919,7 +40021,7 @@
     StateMachinesConnectionMetadataComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'statemachines-connection-metadata',
-                    template: "<div class=\"flex flex-column\" style=\"height: 100%\">\r\n    <crud-form #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\"\r\n        (onFormReady)=\"_handleFormReady($event)\">\r\n    </crud-form>\r\n    <div class=\"fit\" style=\"overflow: hidden;\">\r\n        <tn-tabview [data]=\"mainTabData\" [allowViewAll]=\"true\">\r\n            <ng-template #sender>\r\n                <statemachines-connection-sender #senderForm [data]=\"data\" [machines]=\"machinesData.machines\"\r\n                    [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-sender>\r\n            </ng-template>\r\n            <ng-template #receiver>\r\n                <statemachines-connection-receiver #receiverForm [designerContext]=\"designerContext\" [data]=\"data\"\r\n                    [workflowData]=\"machinesData\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver>\r\n            </ng-template>\r\n        </tn-tabview>\r\n    </div>\r\n</div>\r\n<ng-template #buttonTemplate>\r\n    <ng-container *ngIf=\"!viewOnly\">\r\n        <button *ngIf=\"!model.data.__disableEdit && !__isFormView\" type=\"button\" pButton icon=\"pi pi-save\"\r\n            class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\" (click)=\"_handleSave($event)\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-trash\" class=\"p-button-text p-button-danger\"\r\n            [label]=\"'X\u00F3a' | translate\" (click)=\"remove($event)\"></button>\r\n    </ng-container>\r\n    <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n        [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"_handleCancel($event)\"></button>\r\n</ng-template>\r\n\r\n<ng-template #templateDropdownIconSelected let-item let-selectedValue=\"selectedValue\">\r\n    <span [class]=\"item.label\"></span>\r\n</ng-template>\r\n<ng-template #templateDropdownIcon let-item>\r\n    <div class=\"__workflow-setting-icon-item\">\r\n        <span [class]=\"item.label\"></span>\r\n    </div>\r\n</ng-template>",
+                    template: "<div class=\"flex flex-column\" style=\"height: 100%\">\r\n    <crud-form #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\"\r\n        (onFormReady)=\"_handleFormReady($event)\">\r\n    </crud-form>\r\n    <div class=\"fit\" style=\"overflow: hidden;\">\r\n        <tn-tabview [data]=\"mainTabData\" [allowViewAll]=\"true\">\r\n            <ng-template #sender>\r\n                <statemachines-connection-sender #senderForm [data]=\"data\" [machines]=\"machinesData.machines\"\r\n                    [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-sender>\r\n            </ng-template>\r\n            <ng-template #receiver>\r\n                <statemachines-connection-receiver #receiverForm [designerContext]=\"designerContext\" [data]=\"data\"\r\n                    [isFormAdd]=\"isFormAdd\" [workflowData]=\"machinesData\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver>\r\n            </ng-template>\r\n        </tn-tabview>\r\n    </div>\r\n</div>\r\n<ng-template #buttonTemplate>\r\n    <ng-container *ngIf=\"!viewOnly\">\r\n        <button *ngIf=\"!model.data.__disableEdit && !__isFormView\" type=\"button\" pButton icon=\"pi pi-save\"\r\n            class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\" (click)=\"_handleSave($event)\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-trash\" class=\"p-button-text p-button-danger\"\r\n            [label]=\"'X\u00F3a' | translate\" (click)=\"remove($event)\"></button>\r\n    </ng-container>\r\n    <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n        [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"_handleCancel($event)\"></button>\r\n</ng-template>\r\n\r\n<ng-template #templateDropdownIconSelected let-item let-selectedValue=\"selectedValue\">\r\n    <span [class]=\"item.label\"></span>\r\n</ng-template>\r\n<ng-template #templateDropdownIcon let-item>\r\n    <div class=\"__workflow-setting-icon-item\">\r\n        <span [class]=\"item.label\"></span>\r\n    </div>\r\n</ng-template>",
                     providers: [ComponentContextService],
                     styles: [""]
                 },] }
@@ -39953,9 +40055,35 @@
             _super.prototype.ngOnInit.call(this);
             this.doNotCheckBaseService = true;
             this.setting.schema = [
+                this.createCheckboxRule('departmentRules'),
                 this.createOrgPickerControlReceiver('departmentIds', 'Đơn vị nhận'),
+                this.createCheckboxRule('departmentViewRules'),
                 this.createOrgPickerControlReceiver('departmentViewIds', 'Đơn vị theo dõi'),
             ];
+            if (this.isFormAdd) {
+                if (!this.data.data) {
+                    this.data.data = {};
+                }
+                if (this.data.data.departmentRules == null) {
+                    this.data.data.departmentRules = [exports.EnumUserRule.NGUOI_NHAN];
+                }
+                if (this.data.data.departmentViewRules == null) {
+                    this.data.data.departmentViewRules = [exports.EnumUserRule.NGUOI_THEO_DOI];
+                }
+            }
+        };
+        StateMachinesConnectionReceiverDepartmentComponent.prototype.createCheckboxRule = function (field) {
+            return new CheckBoxListControlSchema({
+                field: field,
+                label: 'Cán bộ đặc biệt',
+                class: 'rules',
+                dataSource: [
+                    { id: exports.EnumUserRule.NGUOI_NHAN, ten: 'Đơn vị nhận bước trước' },
+                    { id: exports.EnumUserRule.NGUOI_THEO_DOI, ten: 'Đơn vị theo dõi bước trước' }
+                ],
+                showLabel: false,
+                mdWidth: 12
+            });
         };
         StateMachinesConnectionReceiverDepartmentComponent.prototype.createOrgPickerControlReceiver = function (field, label) {
             var control = createOrgPickerControl(field, label);
@@ -39991,7 +40119,9 @@
             });
         };
         StateMachinesConnectionReceiverDepartmentComponent.prototype.assignFieldPlus = function (dest, source) {
+            dest.departmentRules = source.departmentRules;
             dest.departmentIds = source.departmentIds;
+            dest.departmentViewRules = source.departmentViewRules;
             dest.departmentViewIds = source.departmentViewIds;
         };
         return StateMachinesConnectionReceiverDepartmentComponent;
@@ -40009,6 +40139,7 @@
     ]; };
     StateMachinesConnectionReceiverDepartmentComponent.propDecorators = {
         data: [{ type: i0.Input }],
+        isFormAdd: [{ type: i0.Input }],
         viewOnly: [{ type: i0.Input }]
     };
 
@@ -40026,9 +40157,35 @@
             _super.prototype.ngOnInit.call(this);
             this.doNotCheckBaseService = true;
             this.setting.schema = [
+                this.createCheckboxRule('groupRules'),
                 this.createUserGroupPickerControlReceiver('groupIds', 'Nhóm người dùng nhận'),
+                this.createCheckboxRule('groupViewRules'),
                 this.createUserGroupPickerControlReceiver('groupViewIds', 'Nhóm người dùng theo dõi'),
             ];
+            if (this.isFormAdd) {
+                if (!this.data.data) {
+                    this.data.data = {};
+                }
+                if (this.data.data.groupRules == null) {
+                    this.data.data.groupRules = [exports.EnumUserRule.NGUOI_NHAN];
+                }
+                if (this.data.data.groupViewRules == null) {
+                    this.data.data.groupViewRules = [exports.EnumUserRule.NGUOI_THEO_DOI];
+                }
+            }
+        };
+        StateMachinesConnectionReceiverGroupComponent.prototype.createCheckboxRule = function (field) {
+            return new CheckBoxListControlSchema({
+                field: field,
+                label: 'Cán bộ đặc biệt',
+                class: 'rules',
+                dataSource: [
+                    { id: exports.EnumUserRule.NGUOI_NHAN, ten: 'Nhóm người dùng nhận bước trước' },
+                    { id: exports.EnumUserRule.NGUOI_THEO_DOI, ten: 'Nhóm người dùng theo dõi bước trước' }
+                ],
+                showLabel: false,
+                mdWidth: 12
+            });
         };
         StateMachinesConnectionReceiverGroupComponent.prototype.createUserGroupPickerControlReceiver = function (field, label) {
             var control = createUserGroupPickerControl(this._userGroupService, field, label);
@@ -40064,7 +40221,9 @@
             });
         };
         StateMachinesConnectionReceiverGroupComponent.prototype.assignFieldPlus = function (dest, source) {
+            dest.groupRules = source.groupRules;
             dest.groupIds = source.groupIds;
+            dest.groupViewRules = source.groupViewRules;
             dest.groupViewIds = source.groupViewIds;
         };
         return StateMachinesConnectionReceiverGroupComponent;
@@ -40083,14 +40242,39 @@
     ]; };
     StateMachinesConnectionReceiverGroupComponent.propDecorators = {
         data: [{ type: i0.Input }],
+        isFormAdd: [{ type: i0.Input }],
         viewOnly: [{ type: i0.Input }]
     };
 
+    var DmChucVuService = /** @class */ (function (_super) {
+        __extends(DmChucVuService, _super);
+        function DmChucVuService(http, injector, _moduleConfigService) {
+            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/DM_ChucVu") || this;
+            _this.serviceCode = 'canbo';
+            _this.entityName = 'DM_ChucVu';
+            _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
+            _this._moduleConfig = _moduleConfigService.getConfig();
+            return _this;
+        }
+        return DmChucVuService;
+    }(BaseService));
+    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" });
+    DmChucVuService.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    DmChucVuService.ctorParameters = function () { return [
+        { type: i1$1.HttpClient },
+        { type: i0.Injector },
+        { type: ModuleConfigService }
+    ]; };
+
     var StateMachinesConnectionReceiverRoleComponent = /** @class */ (function (_super) {
         __extends(StateMachinesConnectionReceiverRoleComponent, _super);
-        function StateMachinesConnectionReceiverRoleComponent(injector, _roleService) {
+        function StateMachinesConnectionReceiverRoleComponent(injector, _dmChucVuService) {
             var _this = _super.call(this, injector) || this;
-            _this._roleService = _roleService;
+            _this._dmChucVuService = _dmChucVuService;
             _this.dataSourceAction = [];
             _this.autoGetDetail = false;
             _this.autoSave = false;
@@ -40100,12 +40284,38 @@
             _super.prototype.ngOnInit.call(this);
             this.doNotCheckBaseService = true;
             this.setting.schema = [
-                this.createRolePickerControlReceiver('roleIds', 'Vai trò nhận'),
-                this.createRolePickerControlReceiver('roleViewIds', 'Vai trò theo dõi'),
+                this.createCheckboxRule('roleRules'),
+                this.createRolePickerControlReceiver('roleIds', 'Chức vụ nhận'),
+                this.createCheckboxRule('roleViewRules'),
+                this.createRolePickerControlReceiver('roleViewIds', 'Chức vụ theo dõi'),
             ];
+            if (this.isFormAdd) {
+                if (!this.data.data) {
+                    this.data.data = {};
+                }
+                if (this.data.data.roleRules == null) {
+                    this.data.data.roleRules = [exports.EnumUserRule.NGUOI_NHAN];
+                }
+                if (this.data.data.roleViewRules == null) {
+                    this.data.data.roleViewRules = [exports.EnumUserRule.NGUOI_THEO_DOI];
+                }
+            }
+        };
+        StateMachinesConnectionReceiverRoleComponent.prototype.createCheckboxRule = function (field) {
+            return new CheckBoxListControlSchema({
+                field: field,
+                label: 'Cán bộ đặc biệt',
+                class: 'rules',
+                dataSource: [
+                    { id: exports.EnumUserRule.NGUOI_NHAN, ten: 'Chức vụ nhận bước trước' },
+                    { id: exports.EnumUserRule.NGUOI_THEO_DOI, ten: 'Chức vụ theo dõi bước trước' }
+                ],
+                showLabel: false,
+                mdWidth: 12
+            });
         };
         StateMachinesConnectionReceiverRoleComponent.prototype.createRolePickerControlReceiver = function (field, label) {
-            var control = createRolePickerControl(this._roleService, field, label);
+            var control = createRolePickerControl(this._dmChucVuService, field, label);
             return control;
         };
         StateMachinesConnectionReceiverRoleComponent.prototype.onFormInitialized = function (evt) {
@@ -40138,7 +40348,9 @@
             });
         };
         StateMachinesConnectionReceiverRoleComponent.prototype.assignFieldPlus = function (dest, source) {
+            dest.roleRules = source.roleRules;
             dest.roleIds = source.roleIds;
+            dest.roleViewRules = source.roleViewRules;
             dest.roleViewIds = source.roleViewIds;
         };
         return StateMachinesConnectionReceiverRoleComponent;
@@ -40153,10 +40365,11 @@
     ];
     StateMachinesConnectionReceiverRoleComponent.ctorParameters = function () { return [
         { type: i0.Injector },
-        { type: RoleService }
+        { type: DmChucVuService }
     ]; };
     StateMachinesConnectionReceiverRoleComponent.propDecorators = {
         data: [{ type: i0.Input }],
+        isFormAdd: [{ type: i0.Input }],
         viewOnly: [{ type: i0.Input }]
     };
 
@@ -40342,13 +40555,194 @@
         viewOnly: [{ type: i0.Input }]
     };
 
+    var StateMachinesConnectionReceiverConditionComponent = /** @class */ (function (_super) {
+        __extends(StateMachinesConnectionReceiverConditionComponent, _super);
+        function StateMachinesConnectionReceiverConditionComponent(injector, _dmChucVuService, _userGroupService) {
+            var _this = _super.call(this, injector) || this;
+            _this._dmChucVuService = _dmChucVuService;
+            _this._userGroupService = _userGroupService;
+            _this.receiverDynamicRules = [];
+            _this.receiverDynamicViewRules = [];
+            _this.dataSourceAction = [];
+            _this.autoGetDetail = false;
+            _this.autoSave = false;
+            return _this;
+        }
+        StateMachinesConnectionReceiverConditionComponent.prototype.ngOnInit = function () {
+            _super.prototype.ngOnInit.call(this);
+            this.doNotCheckBaseService = true;
+            this.renderDataSourceAction();
+            this.setting.schema = [
+                new CustomControlSchema({
+                    field: 'receiverRules',
+                    label: 'Người nhận xử lý',
+                    mdWidth: 12
+                }),
+                new CustomControlSchema({
+                    field: 'receiverViewRules',
+                    label: 'Người nhận chỉ xem',
+                    mdWidth: 12
+                })
+            ];
+            this.dynamicSchema = [
+                new DropdownControlSchema({
+                    field: 'ruleType',
+                    label: 'Người dùng',
+                    dataSource: DataSourceUserRule,
+                    operators: [
+                        { id: exports.Operator.in, ten: 'Là' }
+                    ]
+                }),
+                new DropdownControlSchema({
+                    field: 'userMade',
+                    label: 'Người dùng thao tác',
+                    valueField: 'code',
+                    dataSource: this.dataSourceAction,
+                    operators: [
+                        { id: exports.Operator.in, ten: 'Thao tác' }
+                    ]
+                }),
+                new UserPickerControlSchema({
+                    field: 'userIds',
+                    label: 'Người dùng đích danh',
+                    placeholder: 'Chọn người dùng',
+                    mdWidth: 12
+                }),
+                createOrgPickerControl('donViId', 'Đơn vị'),
+                new DropdownControlSchema({
+                    field: 'donViCap',
+                    label: 'Đơn vị cấp',
+                    multiple: true,
+                    dataSource: [
+                        { id: 1, ten: '1' },
+                        { id: 2, ten: '2' },
+                        { id: 3, ten: '3' }
+                    ]
+                }),
+                createRolePickerControl(this._dmChucVuService, 'roleId', 'Chức vụ'),
+                createUserGroupPickerControl(this._userGroupService, 'groupId', 'Nhóm người dùng'),
+                new NumberRangeControlSchema({
+                    field: 'lanThu',
+                    label: 'Lần thứ'
+                }),
+                new CustomControlSchema({
+                    field: 'customField',
+                    label: 'Trường dữ liệu',
+                    operators: [
+                        { id: exports.Operator.equal, ten: 'Bằng' },
+                        { id: exports.Operator.notEqual, ten: 'Không bằng' },
+                        { id: exports.Operator.greater, ten: 'Lớn hơn' },
+                        { id: exports.Operator.greaterThanEqual, ten: 'Lớn hơn hoặc bằng' },
+                        { id: exports.Operator.lower, ten: 'Nhỏ hơn' },
+                        { id: exports.Operator.lowerThanEqual, ten: 'Nhỏ hơn hoặc bằng' }
+                    ]
+                })
+            ];
+            if (this.data && this.data.data) {
+                this.receiverDynamicRules = this.data.data.receiverRules;
+                this.receiverDynamicViewRules = this.data.data.receiverViewRules;
+            }
+            if (this.isFormAdd) {
+                this.receiverDynamicViewRules = [
+                    this.newFilter('ruleType', exports.Operator.in, [
+                        exports.EnumUserRule.NGUOI_THAM_GIA_QUY_TRINH,
+                        exports.EnumUserRule.NGUOI_NHAN,
+                        exports.EnumUserRule.NGUOI_THEO_DOI
+                    ])
+                ];
+            }
+        };
+        StateMachinesConnectionReceiverConditionComponent.prototype.renderDataSourceAction = function () {
+            var _this = this;
+            var dataSourceAction = [];
+            if (this.workflowData) {
+                this.workflowData.connections.sort(multipleSort('soThuTu')).forEach(function (action) {
+                    var source = _this.workflowData.machines.find(function (q) { return q.id == action.source; });
+                    if (source) {
+                        var itemAdd_1 = {
+                            code: source.code + "___" + action.code,
+                            name: action.name,
+                            nameLower: action.name.toLowerCase(),
+                            ten: action.name,
+                            sourceName: source.name
+                        };
+                        var itemExist = dataSourceAction.find(function (q) { return q.nameLower == itemAdd_1.nameLower; });
+                        if (itemExist) {
+                            itemExist.ten = itemExist.name + " (" + itemExist.sourceName + ")";
+                            itemAdd_1.ten = itemAdd_1.name + " (" + itemAdd_1.sourceName + ")";
+                        }
+                        dataSourceAction.push(itemAdd_1);
+                    }
+                });
+            }
+            this.dataSourceAction = dataSourceAction;
+        };
+        StateMachinesConnectionReceiverConditionComponent.prototype.onFormInitialized = function (evt) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    if (this.data) {
+                        this.assignFieldPlus(evt.model, (_a = this.data.data) !== null && _a !== void 0 ? _a : {});
+                    }
+                    else {
+                        evt.model.data = {};
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        };
+        StateMachinesConnectionReceiverConditionComponent.prototype.assignFieldPlus = function (dest, source) {
+            dest.receiverRules = source.receiverRules;
+            dest.receiverViewRules = source.receiverViewRules;
+        };
+        StateMachinesConnectionReceiverConditionComponent.prototype.getModelData = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var dataPlus;
+                return __generator(this, function (_b) {
+                    dataPlus = {};
+                    this.model.data.receiverRules = this.queryBuilder.getQuery();
+                    this.model.data.receiverViewRules = this.queryBuilderView.getQuery();
+                    this.assignFieldPlus(dataPlus, this.model.data);
+                    return [2 /*return*/, dataPlus];
+                });
+            });
+        };
+        return StateMachinesConnectionReceiverConditionComponent;
+    }(DataFormBase));
+    StateMachinesConnectionReceiverConditionComponent.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'statemachines-connection-receiver-condition',
+                    template: "<crud-form #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\"\r\n    (onFormReady)=\"_handleFormReady($event)\">\r\n    <ng-template #receiverRules>\r\n        <query-builder #queryBuilder [searchSchema]=\"dynamicSchema\" [filters]=\"receiverDynamicRules\"\r\n            [hiddenButtons]=\"true\" [useScrollBar]=\"false\"></query-builder>\r\n    </ng-template>\r\n    <ng-template #receiverViewRules>\r\n        <query-builder #queryBuilderView [searchSchema]=\"dynamicSchema\" [filters]=\"receiverDynamicViewRules\"\r\n            [hiddenButtons]=\"true\" [useScrollBar]=\"false\"></query-builder>\r\n    </ng-template>\r\n</crud-form>",
+                    providers: [ComponentContextService],
+                    styles: ["::ng-deep statemachines-connection-receiver-condition query-builder-rule .tn__rule-field{flex:0 0 180px;width:180px}::ng-deep statemachines-connection-receiver-condition query-builder-rule .tn__rule-value{flex:0 0 calc(100% - 340px);width:calc(100% - 340px)}"]
+                },] }
+    ];
+    StateMachinesConnectionReceiverConditionComponent.ctorParameters = function () { return [
+        { type: i0.Injector },
+        { type: DmChucVuService },
+        { type: UserGroupRealService }
+    ]; };
+    StateMachinesConnectionReceiverConditionComponent.propDecorators = {
+        queryBuilder: [{ type: i0.ViewChild, args: ['queryBuilder', { static: false },] }],
+        queryBuilderView: [{ type: i0.ViewChild, args: ['queryBuilderView', { static: false },] }],
+        workflowData: [{ type: i0.Input }],
+        data: [{ type: i0.Input }],
+        isFormAdd: [{ type: i0.Input }],
+        viewOnly: [{ type: i0.Input }]
+    };
+
     var StateMachinesConnectionReceiverComponent = /** @class */ (function (_super) {
         __extends(StateMachinesConnectionReceiverComponent, _super);
         function StateMachinesConnectionReceiverComponent(injector) {
             var _this = _super.call(this, injector) || this;
             _this.tabDataReceiver = [
+                // {
+                //     code: 'user',
+                //     icon: 'fa fa-user',
+                //     label: ''
+                // },
                 {
-                    code: 'user',
+                    code: 'condition',
                     icon: 'fa fa-user',
                     label: ''
                 },
@@ -40374,18 +40768,18 @@
         };
         StateMachinesConnectionReceiverComponent.prototype.getModelData = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var dataPlus, modelUser, modelDepartment, modelGroup, roleGroup;
+                var dataPlus, modelCondition, modelDepartment, modelGroup, roleGroup;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             dataPlus = {};
-                            return [4 /*yield*/, this.userForm.getModelData()];
+                            return [4 /*yield*/, this.conditionForm.getModelData()];
                         case 1:
-                            modelUser = _a.sent();
-                            if (modelUser == null) {
+                            modelCondition = _a.sent();
+                            if (modelCondition == null) {
                                 return [2 /*return*/, null];
                             }
-                            this.userForm.assignFieldPlus(dataPlus, modelUser);
+                            this.conditionForm.assignFieldPlus(dataPlus, modelCondition);
                             return [4 /*yield*/, this.departmentForm.getModelData()];
                         case 2:
                             modelDepartment = _a.sent();
@@ -40417,7 +40811,7 @@
     StateMachinesConnectionReceiverComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'statemachines-connection-receiver',
-                    template: "<div style=\"height: 100%\">\r\n    <tn-tabview [data]=\"tabDataReceiver\" [allowViewAll]=\"true\" [vertical]=\"true\">\r\n        <ng-template #user>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-user #user [designerContext]=\"designerContext\" [data]=\"data\"\r\n                    [workflowData]=\"workflowData\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-user>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #department>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-department #user [data]=\"data\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-department>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #group>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-group #user [data]=\"data\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-group>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #role>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-role #user [data]=\"data\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-role>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n    </tn-tabview>\r\n</div>",
+                    template: "<div style=\"height: 100%\">\r\n    <tn-tabview [data]=\"tabDataReceiver\" [allowViewAll]=\"true\" [vertical]=\"true\">\r\n        <!-- <ng-template #user>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-user #user [designerContext]=\"designerContext\" [data]=\"data\"\r\n                    [workflowData]=\"workflowData\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-user>\r\n            </tn-custom-scrollbar>\r\n        </ng-template> -->\r\n        <ng-template #condition>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-condition #condition [workflowData]=\"workflowData\" [data]=\"data\"\r\n                    [isFormAdd]=\"isFormAdd\" [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-condition>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #department>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-department #user [data]=\"data\" [isFormAdd]=\"isFormAdd\"\r\n                    [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-department>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #group>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-group #user [data]=\"data\" [isFormAdd]=\"isFormAdd\"\r\n                    [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-group>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n        <ng-template #role>\r\n            <tn-custom-scrollbar>\r\n                <statemachines-connection-receiver-role #user [data]=\"data\" [isFormAdd]=\"isFormAdd\"\r\n                    [viewOnly]=\"viewOnly\">\r\n                </statemachines-connection-receiver-role>\r\n            </tn-custom-scrollbar>\r\n        </ng-template>\r\n    </tn-tabview>\r\n</div>",
                     providers: [ComponentContextService],
                     styles: ["::ng-deep statemachines-connection-metadata .userRules .tn-check-box-list,::ng-deep statemachines-connection-metadata .userViewRules .tn-check-box-list{margin-bottom:.5em!important;margin-top:-.5em}::ng-deep statemachines-connection-metadata .userIds .label,::ng-deep statemachines-connection-metadata .userViewIds .label{font-weight:700}"]
                 },] }
@@ -40427,22 +40821,24 @@
     ]; };
     StateMachinesConnectionReceiverComponent.propDecorators = {
         userForm: [{ type: i0.ViewChild, args: [StateMachinesConnectionReceiverUserComponent, { static: false },] }],
+        conditionForm: [{ type: i0.ViewChild, args: [StateMachinesConnectionReceiverConditionComponent, { static: false },] }],
         departmentForm: [{ type: i0.ViewChild, args: [StateMachinesConnectionReceiverDepartmentComponent, { static: false },] }],
         groupForm: [{ type: i0.ViewChild, args: [StateMachinesConnectionReceiverGroupComponent, { static: false },] }],
         roleForm: [{ type: i0.ViewChild, args: [StateMachinesConnectionReceiverRoleComponent, { static: false },] }],
         designerContext: [{ type: i0.Input }],
         data: [{ type: i0.Input }],
+        isFormAdd: [{ type: i0.Input }],
         workflowData: [{ type: i0.Input }],
         viewOnly: [{ type: i0.Input }]
     };
 
     var StateMachinesConnectionSenderComponent = /** @class */ (function (_super) {
         __extends(StateMachinesConnectionSenderComponent, _super);
-        function StateMachinesConnectionSenderComponent(injector, notifierService, _userGroupService, _roleService) {
+        function StateMachinesConnectionSenderComponent(injector, notifierService, _userGroupService, _dmChucVuService) {
             var _this = _super.call(this, injector) || this;
             _this.notifierService = notifierService;
             _this._userGroupService = _userGroupService;
-            _this._roleService = _roleService;
+            _this._dmChucVuService = _dmChucVuService;
             _this.dynamicRules = [];
             _this.autoGetDetail = false;
             _this.autoSave = false;
@@ -40472,7 +40868,7 @@
                         { id: 3, ten: '3' }
                     ]
                 }),
-                createRolePickerControl(this._roleService, 'roleId', 'Vai trò'),
+                createRolePickerControl(this._dmChucVuService, 'roleId', 'Chức vụ'),
                 userGroupPickerControl,
                 new DropdownControlSchema({
                     field: 'lastStateCode',
@@ -40482,6 +40878,18 @@
                     displayField: 'name',
                     showLabel: false,
                     mdWidth: 12
+                }),
+                new CustomControlSchema({
+                    field: 'customField',
+                    label: 'Trường dữ liệu',
+                    operators: [
+                        { id: exports.Operator.equal, ten: 'Bằng' },
+                        { id: exports.Operator.notEqual, ten: 'Không bằng' },
+                        { id: exports.Operator.greater, ten: 'Lớn hơn' },
+                        { id: exports.Operator.greaterThanEqual, ten: 'Lớn hơn hoặc bằng' },
+                        { id: exports.Operator.lower, ten: 'Nhỏ hơn' },
+                        { id: exports.Operator.lowerThanEqual, ten: 'Nhỏ hơn hoặc bằng' }
+                    ]
                 })
             ];
             if (this.data && this.data.data) {
@@ -40536,7 +40944,7 @@
         { type: i0.Injector },
         { type: NotifierService },
         { type: UserGroupRealService },
-        { type: RoleService }
+        { type: DmChucVuService }
     ]; };
     StateMachinesConnectionSenderComponent.propDecorators = {
         queryBuilder: [{ type: i0.ViewChild, args: ['queryBuilder', { static: false },] }],
@@ -41398,7 +41806,7 @@
     TnAppHelpComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'li[tn-app-help]',
-                    template: "<a href=\"javascript:;\" tabindex=\"9\" (click)=\"showHelper()\" style=\"height: 30px;\" pTooltip=\"Tr\u1EE3 gi\u00FAp\"\r\n    tooltipPosition=\"bottom\">\r\n    <span class=\"topbar-icon-left\">\r\n        <!-- <svg focusable=\"false\" role=\"img\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"\r\n            class=\"topbar-icon animated swing svgmodule\">\r\n            <path fill=\"currentColor\"\r\n                d=\"M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z\"\r\n                class=\"\"></path>\r\n        </svg> -->\r\n        <i class=\"topbar-icon animated swing pi pi-question-circle\"></i>\r\n    </span>\r\n    <span class=\"topbar-item-name\">{{ \"Tr\u1EE3 gi\u00FAp\" | translate }}</span>\r\n</a>\r\n\r\n<p-sidebar [styleClass]=\"'HelperSlideBar tn-l-sidebar-wrapper'\" [(visible)]=\"display\" position=\"right\"\r\n    [appendTo]=\"'body'\" [style]=\"{ width: '30em', border: 0, 'max-width': '100vw' }\">\r\n    <div style=\"background-color: #fff; box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.35);\">\r\n        <h1 style=\"font-size: 16px; color: #212529;\">Trung t\u00E2m tr\u1EE3 gi\u00FAp</h1>\r\n    </div>\r\n\r\n    <div class=\"tn-l-help-wrapper\">\r\n        <tn-custom-scrollbar #scrollbar [style]=\"{'max-height':'calc(100vh - 50px)'}\">\r\n            <div class=\"HelpCenter\">\r\n                <div class=\"p-grid\" style=\"margin-top:10px; margin-bottom: 50px;\">\r\n                    <div class=\"p-col-8\">\r\n                        <p style=\"font-weight:bold;font-size: 16px;margin-bottom: 8px; margin-top:20px\">\r\n                            {{environment.helpConfig?.expertName}}\r\n                        </p>\r\n                        <p style=\"margin: 0px;\">\r\n                            <a [href]=\"hrefTelephone\"><i class=\"fas fa-phone\"\r\n                                    style=\"margin-right: 8px; width: 15px\"></i>{{phoneNumber}}</a>\r\n                        </p>\r\n                        <p style=\"margin-top: 8px;\">\r\n                            <a [href]=\"hrefMail\"><i class=\"fas fa-envelope\"\r\n                                    style=\"margin-right: 8px; width: 15px\"></i>{{mail}}</a>\r\n                        </p>\r\n                    </div>\r\n                    <div class=\"p-col-4\">\r\n                        <img src=\"/assets/images/tri-nam-group-logo.png\"\r\n                            style=\"width: 100%; float: right; margin-top: 25px; opacity: 0.7;\" />\r\n                    </div>\r\n                </div>\r\n\r\n                <div class=\"p-grid p-m-0 HelpCenter-video\" style=\"margin-top: 0px\">\r\n                    <div class=\"p-col-12 help-title\">\r\n                        <span class=\"tit-name\">Xem h\u01B0\u1EDBng d\u1EABn</span>\r\n                    </div>\r\n                    <div class=\"p-col-12 help-content\">\r\n                        <h2 *ngIf=\"showHelperCurrentPageState\" style=\"margin-top: 0px\">\r\n                            <a href=\"javascript:;\" (click)=\"showHelperCurrentPage(null)\"\r\n                                style=\"display:inline-block; position: relative; border-top: 1px solid #52abf5;\">\r\n                                <img src=\"/assets/images/bgvideo.png\" alt=\"screen shot\"\r\n                                    style=\"width:100%; filter: brightness(0.88);\" />\r\n                                <i class=\"fab fa-youtube fa-2x\"></i>\r\n                            </a>\r\n                        </h2>\r\n                    </div>\r\n                </div>\r\n\r\n                <div class=\"p-grid p-m-0 HelpCenter-download\" style=\"margin-top: 0px; margin-bottom: 40px;\">\r\n                    <div class=\"p-col-12 help-title\">\r\n                        <span class=\"tit-name\">Ph\u1EA7n m\u1EC1m ti\u1EC7n \u00EDch</span>\r\n                    </div>\r\n                    <div class=\"tn-l-pmti\" style=\"border: 1px solid #ccc; width: 100%\">\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"{{environment.signalr.linkDownloadClientApp}}\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/icon-appTN64x64.png\" />\r\n                                    <br />TN Client\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"https://ultraviewer.net/vi/UltraViewer_setup_6.2_vi.exe\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/ultraviewer.ico\" />\r\n                                    <br />Ultraviewer\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"https://www.teamviewer.com/vi/tai-xuong-tu-dong-teamviewer/\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/icon-teamviewer.png\" />\r\n                                    <br />Teamviewer\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n        </tn-custom-scrollbar>\r\n    </div>\r\n</p-sidebar>",
+                    template: "<a href=\"javascript:;\" tabindex=\"9\" (click)=\"showHelper()\" style=\"height: 30px;\" pTooltip=\"Tr\u1EE3 gi\u00FAp\"\r\n    tooltipPosition=\"bottom\">\r\n    <span class=\"topbar-icon-left\">\r\n        <!-- <svg focusable=\"false\" role=\"img\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"\r\n            class=\"topbar-icon animated swing svgmodule\">\r\n            <path fill=\"currentColor\"\r\n                d=\"M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z\"\r\n                class=\"\"></path>\r\n        </svg> -->\r\n        <i class=\"topbar-icon animated swing pi pi-question-circle\"></i>\r\n    </span>\r\n    <span class=\"topbar-item-name\">{{ \"Tr\u1EE3 gi\u00FAp\" | translate }}</span>\r\n</a>\r\n\r\n<p-sidebar [styleClass]=\"'HelperSlideBar tn-l-sidebar-wrapper'\" [(visible)]=\"display\" position=\"right\"\r\n    [appendTo]=\"'body'\" [style]=\"{ width: '30em', border: 0, 'max-width': '100vw' }\">\r\n    <div style=\"background-color: #fff; box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.35);\">\r\n        <h1 style=\"font-size: 16px; color: #212529;\">Trung t\u00E2m tr\u1EE3 gi\u00FAp</h1>\r\n    </div>\r\n\r\n    <div class=\"tn-l-help-wrapper\">\r\n        <tn-custom-scrollbar #scrollbar [style]=\"{'max-height':'calc(100vh - 50px)'}\">\r\n            <div class=\"HelpCenter\">\r\n                <div class=\"p-grid\" style=\"margin-top:10px; margin-bottom: 25px;\">\r\n                    <div class=\"p-col-8\">\r\n                        <p style=\"font-weight:bold;font-size: 16px;margin-bottom: 8px; margin-top:20px\">\r\n                            {{environment.helpConfig?.expertName}}\r\n                        </p>\r\n                        <p style=\"margin: 0px;\">\r\n                            <a [href]=\"hrefTelephone\"><i class=\"fas fa-phone\"\r\n                                    style=\"margin-right: 8px; width: 15px\"></i>{{phoneNumber}}</a>\r\n                        </p>\r\n                        <p style=\"margin-top: 8px;\">\r\n                            <a [href]=\"hrefMail\"><i class=\"fas fa-envelope\"\r\n                                    style=\"margin-right: 8px; width: 15px\"></i>{{mail}}</a>\r\n                        </p>\r\n                    </div>\r\n                    <div class=\"p-col-4\">\r\n                        <img src=\"/assets/images/tri-nam-group-logo.png\"\r\n                            style=\"width: 100%; float: right; margin-top: 15px; opacity: 0.7;\" />\r\n                    </div>\r\n                </div>\r\n\r\n                <div class=\"p-grid p-m-0 HelpCenter-video\" style=\"margin-top: 0px\">\r\n                    <div class=\"p-col-12 help-title\">\r\n                        <span class=\"tit-name\">Xem h\u01B0\u1EDBng d\u1EABn</span>\r\n                    </div>\r\n                    <div class=\"p-col-12 help-content\">\r\n                        <h2 *ngIf=\"showHelperCurrentPageState\" style=\"margin-top: 0px\">\r\n                            <a href=\"javascript:;\" (click)=\"showHelperCurrentPage(null)\"\r\n                                style=\"display:inline-block; position: relative; border-top: 1px solid #52abf5;\">\r\n                                <img src=\"/assets/images/bgvideo.png\" alt=\"screen shot\"\r\n                                    style=\"width:100%; filter: brightness(0.88);\" />\r\n                                <i class=\"fab fa-youtube fa-2x\"></i>\r\n                            </a>\r\n                        </h2>\r\n                    </div>\r\n                </div>\r\n\r\n                <div class=\"p-grid p-m-0 HelpCenter-download\" style=\"margin-top: 0px; margin-bottom: 40px;\">\r\n                    <div class=\"p-col-12 help-title\">\r\n                        <span class=\"tit-name\">Ph\u1EA7n m\u1EC1m ti\u1EC7n \u00EDch</span>\r\n                    </div>\r\n                    <div class=\"tn-l-pmti\" style=\"border: 1px solid #ccc; width: 100%\">\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"{{environment.signalr.linkDownloadClientApp}}\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/icon-appTN64x64.png\" />\r\n                                    <br />TN Client\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"https://ultraviewer.net/vi/UltraViewer_setup_6.2_vi.exe\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/ultraviewer.ico\" />\r\n                                    <br />Ultraviewer\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                        <div class=\"p-col-4 help-content\">\r\n                            <p style=\"margin-top: 18px; text-align: center;\">\r\n                                <a target=\"_blank\" href=\"https://www.teamviewer.com/vi/tai-xuong-tu-dong-teamviewer/\"\r\n                                    style=\"display: inline-block; text-align: center;\">\r\n                                    <img src=\"/assets/images/icon-teamviewer.png\" />\r\n                                    <br />Teamviewer\r\n                                </a>\r\n                            </p>\r\n                        </div>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n        </tn-custom-scrollbar>\r\n    </div>\r\n</p-sidebar>",
                     providers: [ComponentContextService],
                     styles: [".HelpCenter{color:#555;padding:0 20px}::ng-deep .tn-l-sidebar-wrapper{padding:0}.tn-l-pmti{display:flex}.HelpCenter p:first-child img{margin-bottom:10px}::ng-deep .HelperSlideBar .p-sidebar-content>button{color:#212529;cursor:pointer;font-size:20px;margin-right:14px;margin-top:10px}::ng-deep .ui-sidebar{padding:0}::ng-deep .HelperSlideBar h1{height:50px;line-height:50px;margin:0;padding-left:20px;text-transform:uppercase}.HelpCenter-video{position:relative}.HelpCenter-video i{color:#454545;cursor:pointer;left:50%;opacity:.5;position:absolute;top:calc(50% - 10px);transform:translateX(-50%) translateY(-50%);transition:.5s}.HelpCenter-video video{opacity:1}.HelpCenter-video:hover video{cursor:pointer;opacity:.5}.HelpCenter-video:hover i{opacity:1}.HelpCenter-download img{height:45px;width:45px}.HelpCenter .help-title{background-color:rgba(49,146,225,.8784313725490196);color:#fff}.HelpCenter .help-title .tit-name{font-size:14px;font-weight:700}.HelpCenter .help-content{padding:0}.HelpCenter .HelpCenter-comment .help-content{padding:0;text-align:center}.HelpCenter-comment,.HelpCenter-download,.HelpCenter-video{margin-bottom:15px}.tn-l-help-wrapper{display:flex;max-height:calc(100vh - 60px);overflow:auto}"]
                 },] }
@@ -42213,7 +42621,7 @@
         };
         TnAppNotificationComponent.prototype.handleClicked = function () {
             var domain = this.environment.clientDomain.thongbaoDomain;
-            this._router.navigate([domain + "/thongbao-chuadoc"]);
+            window.open(domain + "/thongbao-chuadoc");
         };
         return TnAppNotificationComponent;
     }(ComponentBase));
@@ -43499,10 +43907,11 @@
 
     var UserPickerComponent = /** @class */ (function (_super) {
         __extends(UserPickerComponent, _super);
-        function UserPickerComponent(_injector, _userV5Service, _translateService) {
+        function UserPickerComponent(_injector, _userV5Service, _translateService, _dm_ChucVuService) {
             var _this = _super.call(this, _injector) || this;
             _this._userV5Service = _userV5Service;
             _this._translateService = _translateService;
+            _this._dm_ChucVuService = _dm_ChucVuService;
             _this.popupSize = new PopupSize({
                 width: 1100,
                 height: 900,
@@ -43526,6 +43935,8 @@
             _this.dirty = false;
             _this.tooltip = '';
             _this.hasValue = false;
+            _this.searchSchema = {};
+            _this.searchData = {};
             return _this;
         }
         UserPickerComponent.prototype.ngOnInit = function () {
@@ -43557,6 +43968,21 @@
                         code: 'email',
                         dataType: 'string',
                         fullTextSearch: true
+                    }),
+                    new EntityPickerColumn({
+                        label: 'Chức vụ',
+                        code: 'lstTenChucVu',
+                        templateFilter: this.filterChucVuRef,
+                    }),
+                    new EntityPickerColumn({
+                        label: 'Giảng viên',
+                        code: 'isGiangVien',
+                        dataType: 'boolean'
+                    }),
+                    new EntityPickerColumn({
+                        label: 'Chuyên viên',
+                        code: 'isChuyenVien',
+                        dataType: 'boolean'
                     })
                 ], mdWidth: 12 }));
             this.fieldSearchText = __spread(this.controlPicker.fieldSearchText);
@@ -43577,8 +44003,24 @@
                 this.funcReturnValue = function (value) { return value; };
             this.buildFilterKeyword();
             this.buildSettingEntityPicker();
+            this.createSchemaSearch();
             this.onReady.emit();
         };
+        UserPickerComponent.prototype.createSchemaSearch = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    this.searchSchema.idChucVus = new DropdownControlSchema({
+                        field: 'idChucVus',
+                        multiple: true,
+                        placeholder: 'Chọn chức vụ',
+                        baseService: this._dm_ChucVuService,
+                        sortField: 'soThuTu',
+                        loadOnInit: true
+                    });
+                    return [2 /*return*/];
+                });
+            });
+        };
         UserPickerComponent.prototype.buildFilterKeyword = function () {
             var _this = this;
             if (this.fieldSearchText.length == 1) {
@@ -43679,7 +44121,8 @@
         };
         UserPickerComponent.prototype.getData = function (keyWord) {
             return __awaiter(this, void 0, void 0, function () {
-                var filters, dataSource;
+                var filters, filterOrs_1, dataSource;
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -43694,6 +44137,13 @@
                                     filters.push(this.newFilter(this.controlPicker.valueField, exports.Operator.notEqual, this.value));
                                 }
                             }
+                            if (this.searchData.idChucVus && this.searchData.idChucVus.length > 0) {
+                                filterOrs_1 = [];
+                                this.searchData.idChucVus.forEach(function (idChucVu) {
+                                    filterOrs_1.push(_this.newFilter('IdsChucVu', exports.Operator.contain, idChucVu));
+                                });
+                                filters.push(this.newFilterContainer.apply(this, __spread(['or'], filterOrs_1)));
+                            }
                             return [4 /*yield*/, appendDefaultFilter(filters, this.control.defaultFilters)];
                         case 1:
                             _a.sent();
@@ -44004,7 +44454,7 @@
     UserPickerComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'user-picker',
-                    template: "<div class=\"p-inputgroup user-picker\" [class.multiple]=\"multiple\" [class.hasValue]=\"hasValue\">\r\n    <div style=\"width: calc(100% - 28px)\" [pTooltip]=\"tooltip\" tooltipPosition=\"top\">\r\n        <p-autoComplete emptyMessage=\"Kh\u00F4ng c\u00F3 k\u1EBFt qu\u1EA3 n\u00E0o\" [ngClass]=\"'custom-autocomplete'\" [disabled]=\"disabled\"\r\n            [placeholder]=\"control.placeholder\" [appendTo]=\"control.appendTo\" [suggestions]=\"results\" field=\"label\"\r\n            [styleClass]=\"control.validators && control.required ? 'rq' : ''\" [multiple]=\"control.multiple\"\r\n            [minLength]=\"2\" [(ngModel)]=\"selectedValueObject\" (onFocus)=\"handleFocus($event)\"\r\n            (onBlur)=\"handleBlur($event)\" (completeMethod)=\"search($event)\" (onKeyUp)=\"handleKeyUp($event)\"\r\n            (onSelect)=\"handleSelect($event)\" (onUnselect)=\"handleUnSelect($event)\">\r\n        </p-autoComplete>\r\n    </div>\r\n    <span *ngIf=\"!control.multiple && !disabled && hasValue\" class=\"icon-clear\" (click)=\"clearValue()\"><i\r\n            class=\"fas fa-times\"></i></span>\r\n    <button class=\"custom-autocomplete-button\" [disabled]=\"disabled\" tabindex=\"-1\" (click)=\"showPickForm()\" pButton\r\n        [pTooltip]=\"control.title\" icon=\"fas fa-external-link-alt\" type=\"button\"></button>\r\n</div>\r\n<tn-dialog #dialog *ngIf=\"showFormPicker\" styleClass=\"user-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\r\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\r\n    <user-picker-box #userPickerBox [controlSetting]=\"control\" [control]=\"controlPicker\" [parentSetting]=\"settingPicker\"\r\n        [advanceData]=\"advanceDataPicker\" [selectedValue]=\"selectedValue\" (onChanged)=\"handleChangeEntity($event)\"\r\n        (onSelect)=\"handleSelectEntity($event)\" (onUnSelect)=\"handleUnSelectEntity($event)\"\r\n        (onDone)=\"handleHide($event)\" (onRowSelect)=\"handleRowSelect($event)\">\r\n    </user-picker-box>\r\n    <ng-template #footer>\r\n        <button type=\" button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, userPickerBox)\"\r\n            [label]=\"'Ho\u00E0n th\u00E0nh'\" icon=\"pi pi-check\"></button>\r\n    </ng-template>\r\n</tn-dialog>",
+                    template: "<div class=\"p-inputgroup user-picker\" [class.multiple]=\"multiple\" [class.hasValue]=\"hasValue\">\r\n    <div style=\"width: calc(100% - 28px)\" [pTooltip]=\"tooltip\" tooltipPosition=\"top\">\r\n        <p-autoComplete emptyMessage=\"Kh\u00F4ng c\u00F3 k\u1EBFt qu\u1EA3 n\u00E0o\" [ngClass]=\"'custom-autocomplete'\" [disabled]=\"disabled\"\r\n            [placeholder]=\"control.placeholder\" [appendTo]=\"control.appendTo\" [suggestions]=\"results\" field=\"label\"\r\n            [styleClass]=\"control.validators && control.required ? 'rq' : ''\" [multiple]=\"control.multiple\"\r\n            [minLength]=\"2\" [(ngModel)]=\"selectedValueObject\" (onFocus)=\"handleFocus($event)\"\r\n            (onBlur)=\"handleBlur($event)\" (completeMethod)=\"search($event)\" (onKeyUp)=\"handleKeyUp($event)\"\r\n            (onSelect)=\"handleSelect($event)\" (onUnselect)=\"handleUnSelect($event)\">\r\n        </p-autoComplete>\r\n    </div>\r\n    <span *ngIf=\"!control.multiple && !disabled && hasValue\" class=\"icon-clear\" (click)=\"clearValue()\"><i\r\n            class=\"fas fa-times\"></i></span>\r\n    <button class=\"custom-autocomplete-button\" [disabled]=\"disabled\" tabindex=\"-1\" (click)=\"showPickForm()\" pButton\r\n        [pTooltip]=\"control.title\" icon=\"fas fa-external-link-alt\" type=\"button\"></button>\r\n</div>\r\n<tn-dialog #dialog *ngIf=\"showFormPicker\" styleClass=\"user-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\r\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\r\n    <user-picker-box #userPickerBox [controlSetting]=\"control\" [control]=\"controlPicker\" [parentSetting]=\"settingPicker\"\r\n        [advanceData]=\"advanceDataPicker\" [selectedValue]=\"selectedValue\" (onChanged)=\"handleChangeEntity($event)\"\r\n        (onSelect)=\"handleSelectEntity($event)\" (onUnSelect)=\"handleUnSelectEntity($event)\"\r\n        (onDone)=\"handleHide($event)\" (onRowSelect)=\"handleRowSelect($event)\">\r\n    </user-picker-box>\r\n    <ng-template #footer>\r\n        <button type=\" button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, userPickerBox)\"\r\n            [label]=\"'Ho\u00E0n th\u00E0nh'\" icon=\"pi pi-check\"></button>\r\n    </ng-template>\r\n</tn-dialog>\r\n\r\n<ng-template #filterChucVuRef let-col=\"col\" let-filterData=\"filterData\" let-onSearch=\"onSearch\"\r\n    let-onShowFilterDropdownPanel=\"onShowFilterDropdownPanel\" let-onHideFilterDropdownPanel=\"onHideFilterDropdownPanel\">\r\n    <dropdown [control]=\"searchSchema.idChucVus\" [(value)]=\"searchData.idChucVus\" (onHideSmartEvent)=\"onSearch()\"\r\n        (onShow)=\"onShowFilterDropdownPanel($event)\" (onHideSmartEvent)=\"onHideFilterDropdownPanel($event)\">\r\n    </dropdown>\r\n</ng-template>",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,
@@ -44019,9 +44469,11 @@
     UserPickerComponent.ctorParameters = function () { return [
         { type: i0.Injector },
         { type: UserV5Service },
-        { type: i2.TranslateService }
+        { type: i2.TranslateService },
+        { type: DmChucVuService }
     ]; };
     UserPickerComponent.propDecorators = {
+        filterChucVuRef: [{ type: i0.ViewChild, args: ['filterChucVuRef', { static: true },] }],
         control: [{ type: i0.Input }],
         popupSize: [{ type: i0.Input }],
         multiple: [{ type: i0.Input }],
@@ -45042,10 +45494,6 @@
     }());
     var WorkflowTargetDefaultValue = /** @class */ (function () {
         function WorkflowTargetDefaultValue() {
-            this.dicDefaultValue = {};
-            this.dicDefaultValueByWorkflow = {};
-            this.dicByTargetCanEdit = {};
-            this.dicByTargetOnlyView = {};
         }
         return WorkflowTargetDefaultValue;
     }());
@@ -45107,22 +45555,21 @@
             return __awaiter(this, void 0, void 0, function () {
                 var nextMachine;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             nextMachine = this.workflow.data.machines.find(function (q) { return q.id == _this.action.target; });
                             this.isActionKetThuc = nextMachine.type == exports.EnumStateType.STOP;
                             if (this.isActionKetThuc) {
                                 this.mainTabData[1].active = true;
                             }
-                            if (!this.checkNeedGetUser()) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.getUserForProcessWorkflow()];
                         case 1:
-                            if (!(_a.sent())) {
+                            // if (this.checkNeedGetUser()) {
+                            if (!(_g.sent())) {
                                 return [2 /*return*/];
                             }
-                            _a.label = 2;
-                        case 2:
+                            // }
                             this.setDataAndTriggerReady();
                             return [2 /*return*/];
                     }
@@ -45130,7 +45577,7 @@
             });
         };
         ProcessWorkflowFormComponent.prototype.checkNeedGetUser = function () {
-            var e_1, _a;
+            var e_1, _g;
             this.ruleUsers = [];
             if (!this.action.data.infoReceiver || !this.action.data.infoReceiver.length)
                 return false;
@@ -45138,8 +45585,8 @@
                 this.action.data.infoReceiver[0].lanThu = 1;
             }
             try {
-                for (var _b = __values(this.action.data.infoReceiver), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var infoReceiver = _c.value;
+                for (var _h = __values(this.action.data.infoReceiver), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var infoReceiver = _j.value;
                     if (this.checkNeedGetUserByUserData(infoReceiver.user)) {
                         return true;
                     }
@@ -45151,7 +45598,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -45161,35 +45608,26 @@
             return __awaiter(this, void 0, void 0, function () {
                 var sourceMachine, resultGetUserInProcessForm, dataUserInProcessForm;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             sourceMachine = this.workflow.data.machines.find(function (q) { return q.id == _this.action.source; });
-                            return [4 /*yield*/, this._stateMachinesService.getUserInProcessForm(this.workflow.code, sourceMachine.code, this.action.code, this.item.id)];
+                            return [4 /*yield*/, this.businessSetting.baseService.getUserInProcessForm(this.workflow.code, sourceMachine.code, this.action.code, this.item.id)];
                         case 1:
-                            resultGetUserInProcessForm = _a.sent();
+                            resultGetUserInProcessForm = _g.sent();
                             if (!resultGetUserInProcessForm.success) {
                                 this.handleResponse(resultGetUserInProcessForm);
                                 return [2 /*return*/, false];
                             }
                             dataUserInProcessForm = resultGetUserInProcessForm.data;
-                            if (dataUserInProcessForm.dicByRuleType) {
-                                Object.keys(dataUserInProcessForm.dicByRuleType).forEach(function (key) {
-                                    _this.initValueForTargetForm.dicDefaultValue[key] = dataUserInProcessForm.dicByRuleType[key];
-                                });
-                            }
-                            if (dataUserInProcessForm.dicByAction) {
-                                Object.keys(dataUserInProcessForm.dicByAction).forEach(function (key) {
-                                    _this.initValueForTargetForm.dicDefaultValueByWorkflow[key.toUpperCase()] = dataUserInProcessForm.dicByAction[key];
-                                });
-                            }
-                            if (dataUserInProcessForm.dicByTargetCanEdit) {
-                                this.initValueForTargetForm.dicByTargetCanEdit = dataUserInProcessForm.dicByTargetCanEdit;
-                            }
-                            if (dataUserInProcessForm.dicByTargetOnlyView) {
-                                this.initValueForTargetForm.dicByTargetOnlyView = dataUserInProcessForm.dicByTargetOnlyView;
-                            }
-                            this.infoReceiver = dataUserInProcessForm.infoReceiver;
+                            this.initValueForTargetForm.lstUserId = dataUserInProcessForm.lstUserId;
+                            this.initValueForTargetForm.lstUserViewId = dataUserInProcessForm.lstUserViewId;
+                            this.initValueForTargetForm.lstDonViId = dataUserInProcessForm.lstDonViId;
+                            this.initValueForTargetForm.lstDonViViewId = dataUserInProcessForm.lstDonViViewId;
+                            this.initValueForTargetForm.lstGroupId = dataUserInProcessForm.lstGroupId;
+                            this.initValueForTargetForm.lstGroupViewId = dataUserInProcessForm.lstGroupViewId;
+                            this.initValueForTargetForm.lstRoleId = dataUserInProcessForm.lstRoleId;
+                            this.initValueForTargetForm.lstRoleViewId = dataUserInProcessForm.lstRoleViewId;
                             return [2 /*return*/, true];
                     }
                 });
@@ -45204,39 +45642,45 @@
             return false;
         };
         ProcessWorkflowFormComponent.prototype.setDataAndTriggerReady = function () {
+            var _a, _b, _c, _d, _e, _f;
             this.dataAllowEdit = {
                 rules: [],
                 userIds: [],
                 ruleInWorkflows: [],
-                departmentIds: this.action.data.departmentIds,
-                groupIds: this.action.data.groupIds,
-                roleIds: this.action.data.roleIds
+                departmentIds: (_a = this.action.data.departmentIds) !== null && _a !== void 0 ? _a : [],
+                groupIds: (_b = this.action.data.groupIds) !== null && _b !== void 0 ? _b : [],
+                roleIds: (_c = this.action.data.roleIds) !== null && _c !== void 0 ? _c : []
             };
             this.dataOnlyView = {
                 rules: [],
                 userIds: [],
                 ruleInWorkflows: [],
-                departmentIds: this.action.data.departmentViewIds,
-                groupIds: this.action.data.groupViewIds,
-                roleIds: this.action.data.roleViewIds
+                departmentIds: (_d = this.action.data.departmentViewIds) !== null && _d !== void 0 ? _d : [],
+                groupIds: (_e = this.action.data.groupViewIds) !== null && _e !== void 0 ? _e : [],
+                roleIds: (_f = this.action.data.roleViewIds) !== null && _f !== void 0 ? _f : []
             };
-            if (this.infoReceiver) {
-                if (this.infoReceiver.user) {
-                    this.dataAllowEdit.userIds = this.infoReceiver.user.ids;
-                    this.dataAllowEdit.rules = this.infoReceiver.user.rules;
-                    this.dataAllowEdit.ruleInWorkflows = this.infoReceiver.user.ruleInWorkflows;
-                }
-                if (this.infoReceiver.userView) {
-                    this.dataOnlyView.userIds = this.infoReceiver.userView.ids;
-                    this.dataOnlyView.rules = this.infoReceiver.userView.rules;
-                    this.dataOnlyView.ruleInWorkflows = this.infoReceiver.userView.ruleInWorkflows;
-                }
-            }
+            this.addDistinct(this.dataAllowEdit.userIds, this.initValueForTargetForm.lstUserId);
+            this.addDistinct(this.dataAllowEdit.departmentIds, this.initValueForTargetForm.lstDonViId);
+            this.addDistinct(this.dataAllowEdit.groupIds, this.initValueForTargetForm.lstGroupId);
+            this.addDistinct(this.dataAllowEdit.roleIds, this.initValueForTargetForm.lstRoleId);
+            this.addDistinct(this.dataOnlyView.userIds, this.initValueForTargetForm.lstUserViewId);
+            this.addDistinct(this.dataOnlyView.departmentIds, this.initValueForTargetForm.lstDonViViewId);
+            this.addDistinct(this.dataOnlyView.groupIds, this.initValueForTargetForm.lstGroupViewId);
+            this.addDistinct(this.dataOnlyView.roleIds, this.initValueForTargetForm.lstRoleViewId);
             this.formReady = true;
         };
+        ProcessWorkflowFormComponent.prototype.addDistinct = function (dest, source) {
+            if (!source || !source.length)
+                return;
+            source.forEach(function (item) {
+                if (dest.indexOf(item) == -1) {
+                    dest.push(item);
+                }
+            });
+        };
         ProcessWorkflowFormComponent.prototype.onFormInitialized = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_g) {
                     evt.model.id = this._commonService.guid();
                     return [2 /*return*/];
                 });
@@ -45244,7 +45688,7 @@
         };
         ProcessWorkflowFormComponent.prototype.validateForm = function () {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_g) {
                     this.model.data.userIds = this.formTargetAllowEdit.model.data.userIds;
                     this.model.data.departmentIds = this.formTargetAllowEdit.model.data.departmentIds;
                     this.model.data.groupIds = this.formTargetAllowEdit.model.data.groupIds;
@@ -45258,7 +45702,7 @@
                             && this.isEmptyArray(this.model.data.departmentIds)
                             && this.isEmptyArray(this.model.data.groupIds)
                             && this.isEmptyArray(this.model.data.roleIds)) {
-                            this._notifierService.showWarning('Phải chọn ít nhất 1 nhóm đối tượng nhận (Cán bộ | Đơn vị | Nhóm người dùng | Vai trò)');
+                            this._notifierService.showWarning('Phải chọn ít nhất 1 nhóm đối tượng nhận (Cán bộ | Đơn vị | Nhóm người dùng | Chức vụ)');
                             return [2 /*return*/, false];
                         }
                     }
@@ -45338,13 +45782,13 @@
 
     var ProcessWorkflowTargetComponent = /** @class */ (function (_super) {
         __extends(ProcessWorkflowTargetComponent, _super);
-        function ProcessWorkflowTargetComponent(_injector, _stateMachinesService, _coCauToChucService, _userGroupService, _roleService) {
+        function ProcessWorkflowTargetComponent(_injector, _stateMachinesService, _coCauToChucService, _userGroupService, _dmChucVuService) {
             var _this = _super.call(this, _injector) || this;
             _this._injector = _injector;
             _this._stateMachinesService = _stateMachinesService;
             _this._coCauToChucService = _coCauToChucService;
             _this._userGroupService = _userGroupService;
-            _this._roleService = _roleService;
+            _this._dmChucVuService = _dmChucVuService;
             return _this;
         }
         ProcessWorkflowTargetComponent.prototype.ngOnInit = function () {
@@ -45370,41 +45814,8 @@
                 // this.createUserPickerControl('idCapTrenGanNhats', 'Cán bộ cấp trên gần nhất'),
                 this._createCoCauToChucControl('departmentIds', 'Đơn vị'),
                 this._createUserGroupPickerControl('groupIds', 'Nhóm người dùng'),
-                this._createRolePickerControl('roleIds', 'Vai trò')
+                this._createRolePickerControl('roleIds', 'Chức vụ')
             ];
-            // Ghép thêm các user theo rule vào userIds
-            this.addUserIdFromDicByRule(this.initValue.dicDefaultValue, this.data.rules);
-            // Ghép thêm các user theo rule in workflow vào userIds
-            this.addUserIdFromDicByRule(this.initValue.dicDefaultValueByWorkflow, this.data.ruleInWorkflows);
-            // Ghép thêm các value từ dicByTargetType vào các control
-            if (this.data.rules.some(function (q) { return q == exports.EnumUserRule.NGUOI_NHAN; })) {
-                this.addValueFromDicByTarget(this.initValue.dicByTargetCanEdit);
-            }
-            // Ghép thêm các value từ dicByTargetType vào các control
-            if (this.data.rules.some(function (q) { return q == exports.EnumUserRule.NGUOI_THEO_DOI; })) {
-                this.addValueFromDicByTarget(this.initValue.dicByTargetOnlyView);
-            }
-        };
-        ProcessWorkflowTargetComponent.prototype.addUserIdFromDicByRule = function (dicSource, rules) {
-            var _this = this;
-            Object.keys(dicSource)
-                .filter(function (x) { return rules.some(function (q) { return q == x; }); })
-                .forEach(function (rule) {
-                _this.addDistinctToList(_this.data.userIds, dicSource[rule]);
-            });
-        };
-        ProcessWorkflowTargetComponent.prototype.addValueFromDicByTarget = function (dicByTargetType) {
-            this.addDistinctToList(this.data.userIds, dicByTargetType[exports.EnumTargetType.USER]);
-            this.addDistinctToList(this.data.departmentIds, dicByTargetType[exports.EnumTargetType.DEPARTMENT]);
-            this.addDistinctToList(this.data.groupIds, dicByTargetType[exports.EnumTargetType.GROUP]);
-            this.addDistinctToList(this.data.roleIds, dicByTargetType[exports.EnumTargetType.ROLE]);
-        };
-        ProcessWorkflowTargetComponent.prototype.addDistinctToList = function (lstDest, lstSource) {
-            lstSource.forEach(function (item) {
-                if (!lstDest.some(function (q) { return q == item; })) {
-                    lstDest.push(item);
-                }
-            });
         };
         ProcessWorkflowTargetComponent.prototype._createUserPickerControl = function (field, label, multiple) {
             if (multiple === void 0) { multiple = true; }
@@ -45420,7 +45831,7 @@
             return createUserGroupPickerControl(this._userGroupService, field, label);
         };
         ProcessWorkflowTargetComponent.prototype._createRolePickerControl = function (field, label) {
-            return createRolePickerControl(this._roleService, field, label);
+            return createRolePickerControl(this._dmChucVuService, field, label);
         };
         ProcessWorkflowTargetComponent.prototype.onFormInitialized = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
@@ -45447,7 +45858,7 @@
         { type: StateMachinesService },
         { type: CoCauToChucService },
         { type: UserGroupRealService },
-        { type: RoleService }
+        { type: DmChucVuService }
     ]; };
     ProcessWorkflowTargetComponent.propDecorators = {
         data: [{ type: i0.Input }],
@@ -45811,29 +46222,30 @@
                 _this._fileControls.forEach(function (control) {
                     key = control.serviceCode + "/" + control.entity + "/" + control._entityKey;
                     if (dataFile[key]) {
-                        control.setDatasource(dataFile[key]);
+                        control.setRootFolderId(dataFile[key].folderId);
+                        control.setDatasource(dataFile[key].lstFile);
                     }
                 });
             }); });
         };
         FileDataService.prototype.processDatasourceFile = function (fileData) {
+            var _this = this;
             if (fileData === void 0) { fileData = []; }
-            var dic = {};
-            var key = '';
-            fileData.forEach(function (file) {
-                key = file.serviceCode + "/" + file.entity + "/" + file.entityKey;
-                // Nếu hết file của 1 control
-                if (!dic[key]) {
-                    dic[key] = [];
-                }
-                dic[key].push(file);
-            });
-            Object.keys(dic).forEach(function (key) {
-                dic[key].sort(multipleSort({ name: 'fileExplorerItemType', reverse: true }, // Sắp xếp folder lên trên file
+            var result = {};
+            Object.keys(fileData).forEach(function (key) {
+                fileData[key].lstFile.sort(multipleSort({ name: 'fileExplorerItemType', reverse: true }, // Sắp xếp folder lên trên file
                 { name: 'name', primer: function (a) { return a.toLowerCase(); } } // Order theo tên (nhưng phải toLower vì T < b < t)
                 ));
+                var data = fileData[key];
+                result[_this.generateKey(data.serviceCode, data.entity, data.entityKey)] = {
+                    folderId: key,
+                    lstFile: fileData[key].lstFile
+                };
             });
-            return dic;
+            return result;
+        };
+        FileDataService.prototype.generateKey = function (serviceCode, entity, entityKey) {
+            return serviceCode + "/" + entity + "/" + entityKey;
         };
         return FileDataService;
     }());
@@ -45849,13 +46261,13 @@
 
     var WorkflowHistoryNewComponent = /** @class */ (function (_super) {
         __extends(WorkflowHistoryNewComponent, _super);
-        function WorkflowHistoryNewComponent(_injector, _workflowHistoryService, _coCauToChucService, _userGroupService, _roleService, _fileDataService) {
+        function WorkflowHistoryNewComponent(_injector, _workflowHistoryService, _coCauToChucService, _userGroupService, _dmChucVuService, _fileDataService) {
             var _this = _super.call(this, _injector) || this;
             _this._injector = _injector;
             _this._workflowHistoryService = _workflowHistoryService;
             _this._coCauToChucService = _coCauToChucService;
             _this._userGroupService = _userGroupService;
-            _this._roleService = _roleService;
+            _this._dmChucVuService = _dmChucVuService;
             // Là form lịch sử của task nhưng mở từ giao diện của đối tượng mà task gắn vào
             // Ở form này thì chỉ xem lịch sử chứ k dc làm gì hết
             _this.isRelativeForm = false;
@@ -45918,8 +46330,8 @@
                 new ModelSchema({ field: 'donViViewIds', name: 'Đơn vị theo dõi', fullName: 'Đơn vị theo dõi', description: '' }),
                 new ModelSchema({ field: 'groupIds', name: 'Nhóm người dùng nhận', fullName: 'Nhóm người dùng nhận', description: '' }),
                 new ModelSchema({ field: 'groupViewIds', name: 'Nhóm người dùng theo dõi', fullName: 'Nhóm người dùng theo dõi', description: '' }),
-                new ModelSchema({ field: 'roleIds', name: 'Vai trò nhận', fullName: 'Vai trò nhận', description: '' }),
-                new ModelSchema({ field: 'roleViewIds', name: 'Vai trò theo dõi', fullName: 'Vai trò theo dõi', description: '' }),
+                new ModelSchema({ field: 'roleIds', name: 'Chức vụ nhận', fullName: 'Chức vụ nhận', description: '' }),
+                new ModelSchema({ field: 'roleViewIds', name: 'Chức vụ theo dõi', fullName: 'Chức vụ theo dõi', description: '' }),
                 new ModelSchema({ field: 'note', name: 'Ý kiến', fullName: 'Ý kiến', description: '' })
             ];
             this.setting.cols = [
@@ -45991,8 +46403,7 @@
                 new ColumnSchemaBase({
                     field: 'roleIds',
                     width: '15%',
-                    baseService: this._roleService,
-                    displayField: 'name',
+                    baseService: this._dmChucVuService,
                     multiple: true,
                     visible: false,
                     forceGetData: true
@@ -46000,8 +46411,7 @@
                 new ColumnSchemaBase({
                     field: 'roleViewIds',
                     width: '15%',
-                    baseService: this._roleService,
-                    displayField: 'name',
+                    baseService: this._dmChucVuService,
                     multiple: true,
                     visible: false,
                     forceGetData: true
@@ -46218,7 +46628,7 @@
     WorkflowHistoryNewComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'workflow-history-new',
-                    template: "<div style=\"height: 100%\">\r\n    <as-split direction=\"vertical\">\r\n        <as-split-area [size]=\"40\">\r\n            <div class=\"state-designer-container\">\r\n                <div>\r\n                    S\u01A1 \u0111\u1ED3 quy tr\u00ECnh\r\n                </div>\r\n                <div>\r\n                    <tn-custom-scrollbar>\r\n                        <statemachines-designer [data]=\"machinesData\" [currentConnection]=\"currentConnection\"\r\n                            [viewOnly]=\"true\" [useScrollBar]=\"false\">\r\n                        </statemachines-designer>\r\n                        <after-view-checked (loaded)=\"setMachinesAndConnection()\"></after-view-checked>\r\n                    </tn-custom-scrollbar>\r\n                </div>\r\n            </div>\r\n        </as-split-area>\r\n        <as-split-area [size]=\"60\">\r\n            <div style=\"height: 100%\">\r\n                <crud-list *ngIf=\"model.ready\" #crudList [model]=\"model\" [setting]=\"setting\"\r\n                    [dataSource]=\"model.dataSource\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\"\r\n                    (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\"\r\n                    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_handleReloaded($event)\"\r\n                    (onRowSelect)=\"handleRowSelect($event)\">\r\n                    <ng-template #note let-rowData=\"rowData\">\r\n                        <div *ngIf=\"rowData.note==null?'':rowData.note\" [innerHTML]=\"rowData.note | safeHtml\"></div>\r\n                    </ng-template>\r\n                    <ng-template #receiver let-rowData=\"rowData\">\r\n                        <div *ngIf=\"!rowData.notInMainThread\" class=\"container-receiver\">\r\n                            <div *ngIf=\"rowData.struserIds\"><b>C\u00E1n b\u1ED9: </b>{{rowData.struserIds}}</div>\r\n                            <div *ngIf=\"rowData.strdonViIds\"><b>\u0110\u01A1n v\u1ECB: </b>{{rowData.strdonViIds}}</div>\r\n                            <div *ngIf=\"rowData.strgroupIds\"><b>Nh\u00F3m: </b>{{rowData.strgroupIds}}</div>\r\n                            <div *ngIf=\"rowData.strroleIds\"><b>Vai tr\u00F2: </b>{{rowData.strroleIds}}</div>\r\n                        </div>\r\n                        <div *ngIf=\"rowData.notInMainThread\">\r\n                            <div *ngFor=\"let changedField of rowData.jsonModelChange\">\r\n                                {{changedField.field}},\r\n                                {{changedField.valueOld}} => {{changedField.valueNew}}\r\n                            </div>\r\n                        </div>\r\n                    </ng-template>\r\n                    <ng-template #receiverView let-rowData=\"rowData\">\r\n                        <div class=\"container-receiver\">\r\n                            <div *ngIf=\"rowData.struserViewIds\"><b>C\u00E1n b\u1ED9: </b>{{rowData.struserViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strdonViViewIds\"><b>\u0110\u01A1n v\u1ECB: </b>{{rowData.strdonViViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strgroupViewIds\"><b>Nh\u00F3m: </b>{{rowData.strgroupViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strroleViewIds\"><b>Vai tr\u00F2: </b>{{rowData.strroleViewIds}}</div>\r\n                        </div>\r\n                    </ng-template>\r\n                    <ng-template #fileDinhKem let-rowData=\"rowData\">\r\n                        <file-manager [serviceCode]=\"_workflowHistoryService.serviceCode\"\r\n                            [entity]=\"_workflowHistoryService.entityName\" [entityKey]=\"rowData.id\"\r\n                            [fileDataService]=\"fileDataService\" [layout]=\"layoutFile.SIMPLE\" [readonly]=\"true\">\r\n                        </file-manager>\r\n                    </ng-template>\r\n                    <ng-template #function let-rowData=\"rowData\">\r\n                        <button *ngIf=\"rowData.status == enumWorkflowHistoryStatus.IN_MAIN_THREAD\" pButton\r\n                            icon=\"pi pi-replay\" class=\"p-button-text p-button-rounded link-or-action\"\r\n                            pTooltip=\"Thu h\u1ED3i v\u1EC1 b\u01B0\u1EDBc n\u00E0y\" tooltipPosition=\"top\"\r\n                            (click)=\"rollbackByHistory(rowData)\"></button>\r\n                    </ng-template>\r\n                </crud-list>\r\n            </div>\r\n        </as-split-area>\r\n    </as-split>\r\n</div>",
+                    template: "<div style=\"height: 100%\">\r\n    <as-split direction=\"vertical\">\r\n        <as-split-area [size]=\"40\">\r\n            <div class=\"state-designer-container\">\r\n                <div>\r\n                    S\u01A1 \u0111\u1ED3 quy tr\u00ECnh\r\n                </div>\r\n                <div>\r\n                    <tn-custom-scrollbar>\r\n                        <statemachines-designer [data]=\"machinesData\" [currentConnection]=\"currentConnection\"\r\n                            [viewOnly]=\"true\" [useScrollBar]=\"false\">\r\n                        </statemachines-designer>\r\n                        <after-view-checked (loaded)=\"setMachinesAndConnection()\"></after-view-checked>\r\n                    </tn-custom-scrollbar>\r\n                </div>\r\n            </div>\r\n        </as-split-area>\r\n        <as-split-area [size]=\"60\">\r\n            <div style=\"height: 100%\">\r\n                <crud-list *ngIf=\"model.ready\" #crudList [model]=\"model\" [setting]=\"setting\"\r\n                    [dataSource]=\"model.dataSource\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\"\r\n                    (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\"\r\n                    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_handleReloaded($event)\"\r\n                    (onRowSelect)=\"handleRowSelect($event)\">\r\n                    <ng-template #note let-rowData=\"rowData\">\r\n                        <div *ngIf=\"rowData.note==null?'':rowData.note\" [innerHTML]=\"rowData.note | safeHtml\"></div>\r\n                    </ng-template>\r\n                    <ng-template #receiver let-rowData=\"rowData\">\r\n                        <div *ngIf=\"!rowData.notInMainThread\" class=\"container-receiver\">\r\n                            <div *ngIf=\"rowData.struserIds\"><b>C\u00E1n b\u1ED9: </b>{{rowData.struserIds}}</div>\r\n                            <div *ngIf=\"rowData.strdonViIds\"><b>\u0110\u01A1n v\u1ECB: </b>{{rowData.strdonViIds}}</div>\r\n                            <div *ngIf=\"rowData.strgroupIds\"><b>Nh\u00F3m: </b>{{rowData.strgroupIds}}</div>\r\n                            <div *ngIf=\"rowData.strroleIds\"><b>Ch\u1EE9c v\u1EE5: </b>{{rowData.strroleIds}}</div>\r\n                        </div>\r\n                        <div *ngIf=\"rowData.notInMainThread\">\r\n                            <div *ngFor=\"let changedField of rowData.jsonModelChange\">\r\n                                {{changedField.field}},\r\n                                {{changedField.valueOld}} => {{changedField.valueNew}}\r\n                            </div>\r\n                        </div>\r\n                    </ng-template>\r\n                    <ng-template #receiverView let-rowData=\"rowData\">\r\n                        <div class=\"container-receiver\">\r\n                            <div *ngIf=\"rowData.struserViewIds\"><b>C\u00E1n b\u1ED9: </b>{{rowData.struserViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strdonViViewIds\"><b>\u0110\u01A1n v\u1ECB: </b>{{rowData.strdonViViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strgroupViewIds\"><b>Nh\u00F3m: </b>{{rowData.strgroupViewIds}}</div>\r\n                            <div *ngIf=\"rowData.strroleViewIds\"><b>Ch\u1EE9c v\u1EE5: </b>{{rowData.strroleViewIds}}</div>\r\n                        </div>\r\n                    </ng-template>\r\n                    <ng-template #fileDinhKem let-rowData=\"rowData\">\r\n                        <file-manager [serviceCode]=\"_workflowHistoryService.serviceCode\"\r\n                            [entity]=\"_workflowHistoryService.entityName\" [entityKey]=\"rowData.id\"\r\n                            [fileDataService]=\"fileDataService\" [layout]=\"layoutFile.SIMPLE\" [readonly]=\"true\">\r\n                        </file-manager>\r\n                    </ng-template>\r\n                    <ng-template #function let-rowData=\"rowData\">\r\n                        <button *ngIf=\"rowData.status == enumWorkflowHistoryStatus.IN_MAIN_THREAD\" pButton\r\n                            icon=\"pi pi-replay\" class=\"p-button-text p-button-rounded link-or-action\"\r\n                            pTooltip=\"Thu h\u1ED3i v\u1EC1 b\u01B0\u1EDBc n\u00E0y\" tooltipPosition=\"top\"\r\n                            (click)=\"rollbackByHistory(rowData)\"></button>\r\n                    </ng-template>\r\n                </crud-list>\r\n            </div>\r\n        </as-split-area>\r\n    </as-split>\r\n</div>",
                     providers: [ComponentContextService],
                     styles: [".state-designer-container{display:flex;flex-direction:column;height:100%}.state-designer-container>div:first-child{font-size:.9em;font-weight:700;padding:.5em 0}.state-designer-container>div:last-child{flex:1 1;overflow:auto}.container-receiver div{margin-bottom:10px}.container-receiver div:last-child{margin-bottom:0}::ng-deep workflow-history-new tr.recalled{opacity:.5}"]
                 },] }
@@ -46228,7 +46638,7 @@
         { type: WorkflowHistoryService },
         { type: CoCauToChucService },
         { type: UserGroupRealService },
-        { type: RoleService },
+        { type: DmChucVuService },
         { type: FileDataService }
     ]; };
     WorkflowHistoryNewComponent.propDecorators = {
@@ -47034,6 +47444,11 @@
         };
         CongviecDinhkemService.prototype.getDetailItem = function (serviceCode, entity, entityKey, fieldDisplay) {
             var serviceCodeEndpoint = this.env.apiDomain[serviceCode + "Endpoint"];
+            if (!serviceCodeEndpoint) {
+                var notifierService = this._injector.get(NotifierService);
+                notifierService.showWarning("Kh\u00F4ng l\u1EA5y \u0111\u01B0\u1EE3c th\u00F4ng tin endpoint c\u1EE7a d\u1ECBch v\u1EE5 " + serviceCode);
+                return new Promise(function (res, rej) { return res({ success: true, data: [] }); });
+            }
             var uri = serviceCodeEndpoint + "/" + this._moduleConfigService.getConfig().environment.apiVersion + "/" + entity + "/GetData";
             var gridInfo = new GridInfo({
                 fields: fieldDisplay,
@@ -47043,6 +47458,150 @@
             });
             return this._http.post(uri, gridInfo).toPromise();
         };
+        CongviecDinhkemService.prototype.getDetailItems = function (dicGrouped) {
+            return __awaiter(this, void 0, void 0, function () {
+                var result, serviceCodes, _loop_1, this_1, serviceCodes_1, serviceCodes_1_1, serviceCode, state_1, e_1_1;
+                var e_1, _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            result = {};
+                            serviceCodes = Object.keys(dicGrouped);
+                            _loop_1 = function (serviceCode) {
+                                var entitys, _loop_2, entitys_1, entitys_1_1, entity, serviceCodeEndpoint, _loop_3, entitys_2, entitys_2_1, entity, e_2_1;
+                                var e_3, _a, e_2, _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
+                                        case 0:
+                                            result[serviceCode] = {};
+                                            entitys = Object.keys(dicGrouped[serviceCode]);
+                                            _loop_2 = function (entity) {
+                                                result[serviceCode][entity] = {};
+                                                dicGrouped[serviceCode][entity].lstId.forEach(function (entityKey) {
+                                                    result[serviceCode][entity][entityKey] = 'Không tìm thấy bản ghi';
+                                                });
+                                            };
+                                            try {
+                                                for (entitys_1 = (e_3 = void 0, __values(entitys)), entitys_1_1 = entitys_1.next(); !entitys_1_1.done; entitys_1_1 = entitys_1.next()) {
+                                                    entity = entitys_1_1.value;
+                                                    _loop_2(entity);
+                                                }
+                                            }
+                                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                                            finally {
+                                                try {
+                                                    if (entitys_1_1 && !entitys_1_1.done && (_a = entitys_1.return)) _a.call(entitys_1);
+                                                }
+                                                finally { if (e_3) throw e_3.error; }
+                                            }
+                                            serviceCodeEndpoint = this_1.env.apiDomain[serviceCode + "Endpoint"];
+                                            if (!serviceCodeEndpoint) {
+                                                return [2 /*return*/, { value: void 0 }];
+                                            }
+                                            _loop_3 = function (entity) {
+                                                var dataByEntity, uri, filters, gridInfo, data, err_1;
+                                                return __generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0:
+                                                            dataByEntity = dicGrouped[serviceCode][entity];
+                                                            uri = serviceCodeEndpoint + "/" + this_1._moduleConfigService.getConfig().environment.apiVersion + "/" + entity + "/GetAllByFilter";
+                                                            filters = [];
+                                                            if (dataByEntity.lstId.length == 1) {
+                                                                filters.push(this_1.newFilter('id', exports.Operator.equal, dataByEntity.lstId[0]));
+                                                            }
+                                                            else {
+                                                                filters.push(this_1.newFilter('id', exports.Operator.in, dataByEntity.lstId));
+                                                            }
+                                                            gridInfo = new GridInfo({
+                                                                fields: "id," + dataByEntity.fieldHienThi,
+                                                                pageInfo: { page: 1, pageSize: dataByEntity.lstId.length },
+                                                                filters: filters,
+                                                                sorts: []
+                                                            });
+                                                            _a.label = 1;
+                                                        case 1:
+                                                            _a.trys.push([1, 3, , 4]);
+                                                            return [4 /*yield*/, (this_1._http.post(uri, gridInfo).toPromise())];
+                                                        case 2:
+                                                            data = _a.sent();
+                                                            if (data.success && data.data && data.data.length) {
+                                                                data.data.forEach(function (itemDetail) {
+                                                                    result[serviceCode][entity][itemDetail.id] = itemDetail[dataByEntity.fieldHienThi];
+                                                                });
+                                                            }
+                                                            return [3 /*break*/, 4];
+                                                        case 3:
+                                                            err_1 = _a.sent();
+                                                            console.log(err_1);
+                                                            return [3 /*break*/, 4];
+                                                        case 4: return [2 /*return*/];
+                                                    }
+                                                });
+                                            };
+                                            _c.label = 1;
+                                        case 1:
+                                            _c.trys.push([1, 6, 7, 8]);
+                                            entitys_2 = (e_2 = void 0, __values(entitys)), entitys_2_1 = entitys_2.next();
+                                            _c.label = 2;
+                                        case 2:
+                                            if (!!entitys_2_1.done) return [3 /*break*/, 5];
+                                            entity = entitys_2_1.value;
+                                            return [5 /*yield**/, _loop_3(entity)];
+                                        case 3:
+                                            _c.sent();
+                                            _c.label = 4;
+                                        case 4:
+                                            entitys_2_1 = entitys_2.next();
+                                            return [3 /*break*/, 2];
+                                        case 5: return [3 /*break*/, 8];
+                                        case 6:
+                                            e_2_1 = _c.sent();
+                                            e_2 = { error: e_2_1 };
+                                            return [3 /*break*/, 8];
+                                        case 7:
+                                            try {
+                                                if (entitys_2_1 && !entitys_2_1.done && (_b = entitys_2.return)) _b.call(entitys_2);
+                                            }
+                                            finally { if (e_2) throw e_2.error; }
+                                            return [7 /*endfinally*/];
+                                        case 8: return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            this_1 = this;
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 6, 7, 8]);
+                            serviceCodes_1 = __values(serviceCodes), serviceCodes_1_1 = serviceCodes_1.next();
+                            _b.label = 2;
+                        case 2:
+                            if (!!serviceCodes_1_1.done) return [3 /*break*/, 5];
+                            serviceCode = serviceCodes_1_1.value;
+                            return [5 /*yield**/, _loop_1(serviceCode)];
+                        case 3:
+                            state_1 = _b.sent();
+                            if (typeof state_1 === "object")
+                                return [2 /*return*/, state_1.value];
+                            _b.label = 4;
+                        case 4:
+                            serviceCodes_1_1 = serviceCodes_1.next();
+                            return [3 /*break*/, 2];
+                        case 5: return [3 /*break*/, 8];
+                        case 6:
+                            e_1_1 = _b.sent();
+                            e_1 = { error: e_1_1 };
+                            return [3 /*break*/, 8];
+                        case 7:
+                            try {
+                                if (serviceCodes_1_1 && !serviceCodes_1_1.done && (_a = serviceCodes_1.return)) _a.call(serviceCodes_1);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                            return [7 /*endfinally*/];
+                        case 8: return [2 /*return*/, result];
+                    }
+                });
+            });
+        };
         return CongviecDinhkemService;
     }(BaseService));
     CongviecDinhkemService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CongviecDinhkemService_Factory() { return new CongviecDinhkemService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CongviecDinhkemService, providedIn: "root" });
@@ -47064,7 +47623,7 @@
             _this._virtualBaseService = _virtualBaseService;
             _this._congViecDinhKemService = _congViecDinhKemService;
             _this.fileDataService = fileDataService;
-            _this.formState = exports.FormState.VIEW;
+            _this._formState = exports.FormState.VIEW;
             _this.layoutFile = exports.EnumFileLayout;
             _this.enumFormState = exports.FormState;
             _this.formModel = {};
@@ -47072,7 +47631,22 @@
             _this.typedLink = '';
             return _this;
         }
+        Object.defineProperty(BaseCongviecDinhkemComponent.prototype, "formState", {
+            get: function () {
+                return this._formState;
+            },
+            set: function (value) {
+                this._formState = value;
+                if (this.setting) {
+                    this.settingIfIsFormView();
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
+        ;
         BaseCongviecDinhkemComponent.prototype.ngOnInit = function () {
+            var _this = this;
             this.setting.objectName = 'mục đính kèm';
             this.setting.baseService = this._congViecDinhKemService;
             this.setting.hiddenSetting = true;
@@ -47082,11 +47656,10 @@
             this.setting.hiddenPageSetting = true;
             this.setting.hiddenAdvanceSearch = true;
             this.setting.hiddenFilterRow = true;
-            this.setting.hiddenCheckbox = this.formState == exports.FormState.VIEW;
-            this.setting.hiddenFunctionColumn = this.formState == exports.FormState.VIEW;
             this.setting.fixHeightTypeInDialog = false;
             this.setting.heightType = exports.HeightType.dynamic;
             this.setting.showExportSelectedItems = false;
+            this.settingIfIsFormView();
             this.setting.modelSchemas = [
                 new ModelSchema({ field: 'tenHienThiDoiTuong', name: 'Đối tượng', fullName: 'Đối tượng', description: 'Đối tượng' }),
                 new ModelSchema({ field: 'tieuDe', name: 'Tiêu đề', fullName: 'Tiêu đề', description: 'Tiêu đề' }),
@@ -47104,6 +47677,17 @@
                     dataType: 'fileDinhKem'
                 })
             ];
+            this.rootContext.replaySubscribe(ComCtxConstants.ROOT.GAN_ENTITY_SANG_CONG_VIEC, function (rowData) {
+                _this.themDinhKem(false);
+            });
+        };
+        BaseCongviecDinhkemComponent.prototype.ngOnDestroy = function () {
+            this.rootContext.unSubscribleReplay(ComCtxConstants.ROOT.GAN_ENTITY_SANG_CONG_VIEC);
+            _super.prototype.ngOnDestroy.call(this);
+        };
+        BaseCongviecDinhkemComponent.prototype.settingIfIsFormView = function () {
+            this.setting.hiddenCheckbox = this.formState == exports.FormState.VIEW;
+            this.setting.hiddenFunctionColumn = this.setting.hiddenCheckbox;
         };
         BaseCongviecDinhkemComponent.prototype.modifyGridInfo = function (gridInfo) {
             return __awaiter(this, void 0, void 0, function () {
@@ -47115,50 +47699,57 @@
         };
         BaseCongviecDinhkemComponent.prototype.afterGetData = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, _b, item, detail, e_1_1;
+                var dicGrouped, dataDisplayName, _a, _b, item;
                 var e_1, _c;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            _d.trys.push([0, 5, 6, 7]);
-                            _a = __values(this.model.dataSource), _b = _a.next();
-                            _d.label = 1;
+                            dicGrouped = {};
+                            this.model.dataSource.forEach(function (item) {
+                                if (!dicGrouped[item.serviceCode]) {
+                                    dicGrouped[item.serviceCode] = {};
+                                }
+                                if (!dicGrouped[item.serviceCode][item.entity]) {
+                                    dicGrouped[item.serviceCode][item.entity] = {
+                                        fieldHienThi: item.fieldHienThi,
+                                        lstId: []
+                                    };
+                                }
+                                dicGrouped[item.serviceCode][item.entity].lstId.push(item.entityKey);
+                            });
+                            return [4 /*yield*/, this._congViecDinhKemService.getDetailItems(dicGrouped)];
                         case 1:
-                            if (!!_b.done) return [3 /*break*/, 4];
-                            item = _b.value;
-                            return [4 /*yield*/, this._congViecDinhKemService.getDetailItem(item.serviceCode, item.entity, item.entityKey, item.fieldHienThi)];
-                        case 2:
-                            detail = (_d.sent()).data;
-                            if (detail.length > 0) {
-                                item.tieuDe = detail[0][item.fieldHienThi];
-                            }
-                            else {
-                                item.tieuDe = 'Không tìm thấy bản ghi';
-                            }
-                            if (item.tenHienThiDoiTuong != null) {
-                                item.tenHienThiDoiTuong = item.tenHienThiDoiTuong.trim();
-                                item.tenHienThiDoiTuong = item.tenHienThiDoiTuong.substring(0, 1).toUpperCase() + item.tenHienThiDoiTuong.substring(1);
-                            }
-                            _d.label = 3;
-                        case 3:
-                            _b = _a.next();
-                            return [3 /*break*/, 1];
-                        case 4: return [3 /*break*/, 7];
-                        case 5:
-                            e_1_1 = _d.sent();
-                            e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 7];
-                        case 6:
+                            dataDisplayName = _d.sent();
                             try {
-                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                for (_a = __values(this.model.dataSource), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                    item = _b.value;
+                                    item.tieuDe = dataDisplayName[item.serviceCode][item.entity][item.entityKey];
+                                    if (item.tenHienThiDoiTuong != null) {
+                                        item.tenHienThiDoiTuong = item.tenHienThiDoiTuong.trim();
+                                        item.tenHienThiDoiTuong = item.tenHienThiDoiTuong.substring(0, 1).toUpperCase() + item.tenHienThiDoiTuong.substring(1);
+                                    }
+                                }
                             }
-                            finally { if (e_1) throw e_1.error; }
-                            return [7 /*endfinally*/];
-                        case 7: return [2 /*return*/];
+                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                            finally {
+                                try {
+                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                }
+                                finally { if (e_1) throw e_1.error; }
+                            }
+                            return [2 /*return*/];
                     }
                 });
             });
         };
+        BaseCongviecDinhkemComponent.prototype.afterReloaded = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    this.fileDataService.getData();
+                    return [2 /*return*/];
+                });
+            });
+        };
         BaseCongviecDinhkemComponent.prototype.viewLinkItem = function (evt) {
             this.viewRawLink(evt);
         };
@@ -47196,7 +47787,8 @@
                 });
             }); });
         };
-        BaseCongviecDinhkemComponent.prototype.themDinhKem = function () {
+        BaseCongviecDinhkemComponent.prototype.themDinhKem = function (showNoti) {
+            if (showNoti === void 0) { showNoti = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var content, obj;
                 var _this = this;
@@ -47207,7 +47799,9 @@
                         if (obj.length > 0) {
                             this._congViecDinhKemService.themDinhKemNghiepVu(this.taskId, obj).then(function (rs) {
                                 if (rs.success) {
-                                    _this._notifierService.showSuccess('Thêm mục đính kèm thành công!');
+                                    if (showNoti) {
+                                        _this._notifierService.showSuccess('Thêm mục đính kèm thành công!');
+                                    }
                                     _this.reload();
                                     _this._commonService.clearClipboardStorage();
                                 }
@@ -47328,7 +47922,7 @@
     BaseCongviecDinhkemComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'base-congviec-dinhkem',
-                    template: "<crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\" [hiddenAdd]=\"true\"\r\n    [hiddenEdit]=\"true\" [hiddenDelete]=\"true\" [hiddenCopyLink]=\"true\" (onReload)=\"_triggerProcessData($event)\"\r\n    (onView)=\"viewLinkItem($event)\" (onDelete)=\"deleteLinkItem($event)\"\r\n    (onDeleteMultiple)=\"deleteLinkItemMultiple($event)\" (onReloaded)=\"_unmarkLoading()\">\r\n    <ng-template #tieuDe let-rowData=\"rowData\">\r\n        {{rowData.tenHienThiDoiTuong}}: [{{rowData.tieuDe}}]\r\n    </ng-template>\r\n    <ng-template #buttonAfterToolbar>\r\n        <button *ngIf=\"formState == enumFormState.EDIT || formState == enumFormState.ADD\" type=\"button\" pButton pRipple\r\n            label=\"Th\u00EAm m\u1EDBi\" icon=\"pi pi-plus\" class=\"p-button-text p-button-primary\" (click)=\"themDinhKem()\"></button>\r\n        <button type=\"button\"\r\n            *ngIf=\"(formState == enumFormState.EDIT  || formState == enumFormState.ADD) && model.selectedItems.length > 0\"\r\n            pButton pRipple label=\"X\u00F3a\" icon=\"pi pi-trash\" class=\"p-button-rounded p-button-text p-button-danger\"\r\n            (click)=\"deleteLinkItemMultiple($event)\"></button>\r\n    </ng-template>\r\n    <ng-template #function let-rowData=\"rowData\">\r\n        <button *ngIf=\"formState == enumFormState.EDIT || formState == enumFormState.ADD\" type=\"button\" pButton pRipple\r\n            icon=\"pi pi-trash\" class=\"p-button-rounded p-button-text p-button-danger\" pTooltip=\"H\u1EE7y \u0111\u00EDnh k\u00E8m\"\r\n            tooltipPosition=\"top\" (click)=\"deleteLinkItem(rowData)\"></button>\r\n    </ng-template>\r\n    <ng-template #fileDinhKem let-rowData=\"rowData\">\r\n        <file-manager [readonly]=\"true\" [serviceCode]=\"rowData.serviceCode\" [entity]=\"rowData.entity\"\r\n            [entityKey]=\"rowData.entityKey\" [layout]=\"layoutFile.SIMPLE\" [fileDataService]=\"fileDataService\">\r\n        </file-manager>\r\n    </ng-template>\r\n</crud-list>\r\n\r\n<tn-dialog *ngIf=\"showDetailForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"setting.popupHeader | translate\" [popupSize]=\"setting.popupSize\" (onHide)=\"showDetailForm = false\">\r\n    <base-congviec-dinhkem-form #formBase [taskId]=\"taskId\" [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [model]=\"formModel\" (onSaved)=\"showDetailForm = false;crudList.reload()\" (onCancel)=\"_handleCancel($event)\"\r\n        (onAfterSaved)=\"onAfterSaved($event)\">\r\n    </base-congviec-dinhkem-form>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showAttachLinkBox\" #dialog2 [maximizable]=\"false\" [header]=\"'Nh\u1EADp li\u00EAn k\u1EBFt' | translate\"\r\n    [popupSize]=\"{ width: 600, height: 50}\" (onHide)=\"showAttachLinkBox = false; typedLink=''\">\r\n    <div class=\"p-col-12\">\r\n        <div class=\"p-grid\">\r\n            <div class=\"p-md-10\">\r\n                <input #input type=\"text\" placeholder=\"Nh\u1EADp li\u00EAn k\u1EBFt sao ch\u00E9p t\u1EEB ph\u00E2n h\u1EC7 kh\u00E1c...\" pInputText\r\n                    class=\"p-col-12\" [(ngModel)]=\"typedLink\" (keyup.enter)=\"addAttachLink()\" />\r\n            </div>\r\n            <div class=\"p-md-2\">\r\n                <button type=\"button\" pButton class=\"p-button-primary p-col-12\" label=\"Ok\"\r\n                    [disabled]=\"typedLink != ''? null : true\" (click)=\"addAttachLink()\"></button>\r\n            </div>\r\n        </div>\r\n    </div>\r\n    <after-view-checked (loaded)=\"focusInput(input)\"></after-view-checked>\r\n</tn-dialog>\r\n",
+                    template: "<crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\" [hiddenAdd]=\"true\"\r\n    [hiddenEdit]=\"true\" [hiddenDelete]=\"true\" [hiddenCopyLink]=\"true\" (onReload)=\"_triggerProcessData($event)\"\r\n    (onView)=\"viewLinkItem($event)\" (onDelete)=\"deleteLinkItem($event)\"\r\n    (onDeleteMultiple)=\"deleteLinkItemMultiple($event)\" (onReloaded)=\"_handleReloaded($event)\">\r\n    <ng-template #tieuDe let-rowData=\"rowData\">\r\n        [{{rowData.tenHienThiDoiTuong}}] {{rowData.tieuDe}}\r\n    </ng-template>\r\n    <ng-template #buttonAfterToolbar>\r\n        <button *ngIf=\"formState == enumFormState.EDIT || formState == enumFormState.ADD\" type=\"button\" pButton pRipple\r\n            label=\"Th\u00EAm m\u1EDBi\" icon=\"pi pi-plus\" class=\"p-button-text p-button-primary\" (click)=\"themDinhKem()\"></button>\r\n        <button type=\"button\"\r\n            *ngIf=\"(formState == enumFormState.EDIT  || formState == enumFormState.ADD) && model.selectedItems.length > 0\"\r\n            pButton pRipple label=\"X\u00F3a\" icon=\"pi pi-trash\" class=\"p-button-rounded p-button-text p-button-danger\"\r\n            (click)=\"deleteLinkItemMultiple($event)\"></button>\r\n    </ng-template>\r\n    <ng-template #function let-rowData=\"rowData\">\r\n        <button *ngIf=\"formState == enumFormState.EDIT || formState == enumFormState.ADD\" type=\"button\" pButton pRipple\r\n            icon=\"pi pi-trash\" class=\"p-button-rounded p-button-text p-button-danger\" pTooltip=\"H\u1EE7y \u0111\u00EDnh k\u00E8m\"\r\n            tooltipPosition=\"top\" (click)=\"deleteLinkItem(rowData)\"></button>\r\n    </ng-template>\r\n    <ng-template #fileDinhKem let-rowData=\"rowData\">\r\n        <file-manager [readonly]=\"true\" [serviceCode]=\"rowData.serviceCode\" [entity]=\"rowData.entity\"\r\n            [entityKey]=\"rowData.entityKey\" [layout]=\"layoutFile.SIMPLE\">\r\n        </file-manager>\r\n    </ng-template>\r\n</crud-list>\r\n\r\n<tn-dialog *ngIf=\"showDetailForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"setting.popupHeader | translate\" [popupSize]=\"setting.popupSize\" (onHide)=\"showDetailForm = false\">\r\n    <base-congviec-dinhkem-form #formBase [taskId]=\"taskId\" [parentModel]=\"model\" [parentContext]=\"context\"\r\n        [model]=\"formModel\" (onSaved)=\"showDetailForm = false;crudList.reload()\" (onCancel)=\"_handleCancel($event)\"\r\n        (onAfterSaved)=\"onAfterSaved($event)\">\r\n    </base-congviec-dinhkem-form>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showAttachLinkBox\" #dialog2 [maximizable]=\"false\" [header]=\"'Nh\u1EADp li\u00EAn k\u1EBFt' | translate\"\r\n    [popupSize]=\"{ width: 600, height: 50}\" (onHide)=\"showAttachLinkBox = false; typedLink=''\">\r\n    <div class=\"p-col-12\">\r\n        <div class=\"p-grid\">\r\n            <div class=\"p-md-10\">\r\n                <input #input type=\"text\" placeholder=\"Nh\u1EADp li\u00EAn k\u1EBFt sao ch\u00E9p t\u1EEB ph\u00E2n h\u1EC7 kh\u00E1c...\" pInputText\r\n                    class=\"p-col-12\" [(ngModel)]=\"typedLink\" (keyup.enter)=\"addAttachLink()\" />\r\n            </div>\r\n            <div class=\"p-md-2\">\r\n                <button type=\"button\" pButton class=\"p-button-primary p-col-12\" label=\"Ok\"\r\n                    [disabled]=\"typedLink != ''? null : true\" (click)=\"addAttachLink()\"></button>\r\n            </div>\r\n        </div>\r\n    </div>\r\n    <after-view-checked (loaded)=\"focusInput(input)\"></after-view-checked>\r\n</tn-dialog>",
                     providers: [ComponentContextService],
                     styles: [""]
                 },] }
@@ -47442,6 +48036,7 @@
                 },
             ];
             _this.buttons = [];
+            _this.mdWidthWorkflow = 6;
             _this.handleChangeLoaiCongViecWhenAdd = function (evt) { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -47494,15 +48089,6 @@
                     label: 'Mô tả nội dung',
                     mdWidth: 12
                 }),
-                new DropdownControlSchema({
-                    field: 'idLoaiCongViec',
-                    label: 'Phân loại',
-                    baseService: this._dmLoaiCongViecService,
-                    isTree: true,
-                    fieldTree: 'idParent',
-                    valueParentRoot: null,
-                    onChanged: onChangeLoaiCongViec
-                }),
                 new DropdownControlSchema({
                     field: 'idPriority',
                     label: 'Độ ưu tiên',
@@ -47528,9 +48114,19 @@
                 }),
                 new PercentControlSchema({
                     field: 'phanTram',
-                    mdWidth: 12,
+                    mdWidth: 6,
                     label: 'Tiến độ'
                 }),
+                new DropdownControlSchema({
+                    field: 'idLoaiCongViec',
+                    label: 'Phân loại công việc',
+                    baseService: this._dmLoaiCongViecService,
+                    isTree: true,
+                    fieldTree: 'idParent',
+                    valueParentRoot: null,
+                    sorts: [{ field: 'maPhanCap', dir: 1 }],
+                    onChanged: onChangeLoaiCongViec
+                }),
             ];
             this.addSchemaBase();
         };
@@ -47789,7 +48385,8 @@
             this.setting.cols = [
                 new ColumnSchemaBase({
                     field: 'ten',
-                    dataType: 'congViecInfo'
+                    dataType: 'congViecInfo',
+                    width: '18rem'
                 }),
                 new ColumnSchemaBase({
                     field: 'ngayBatDau',
@@ -47801,7 +48398,7 @@
                 }),
                 new ColumnSchemaBase({
                     field: 'idLoaiCongViec',
-                    width: '10%',
+                    width: '100px',
                     baseService: this._dmLoaiCongViecService,
                     isTree: true,
                     fieldTree: 'idParent',
@@ -47809,14 +48406,14 @@
                 }),
                 new ColumnSchemaBase({
                     field: 'idLinhVuc',
-                    width: '10%',
+                    width: '100px',
                     baseService: this._dmLinhVucCongViecService
                 }),
                 new ColumnSchemaBase({
                     field: 'idPriority',
                     dataType: 'idPriority',
                     dataTypeRefField: 'idPriority',
-                    width: '10%',
+                    width: '80px',
                     baseService: this._dmPriorityService,
                     fieldPlus: 'background,color',
                     funcSetValueRow: function (rowItem, data) {
@@ -48092,7 +48689,7 @@
     BaseCongViecComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'base-congviec',
-                    template: "<crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\" [hiddenAdd]=\"hiddenAdd\"\r\n    [hiddenEdit]=\"hiddenEdit\" [hiddenDelete]=\"hiddenDelete\" [hiddenCopyLink]=\"true\" [hiddenAdd]=\"isFromDashboard\"\r\n    (onCopyLink)=\"_copyLink($event)\" (onCopyLinkMultiple)=\"_copyLinkMultiple()\" (onReload)=\"_triggerProcessData($event)\"\r\n    (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\" (onView)=\"_edit($event)\" (onDelete)=\"_delete($event)\"\r\n    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\"\r\n    (onChangedStatusWorkflow)=\"handleChangedStatusWorkflow($event)\">\r\n    <ng-template #buttonAfterToolbar>\r\n        <button *ngIf=\"loaiDanhSach > 0 && !isPicker\" type=\"button\" pButton pRipple label=\"Ch\u1ECDn c\u00F4ng vi\u1EC7c\"\r\n            icon=\"pi pi-plus\" class=\"p-button-text p-button-success\" (click)=\"onChonCongViec()\"></button>\r\n    </ng-template>\r\n    <ng-template #congViecInfo let-rowData=\"rowData\">\r\n        <div class=\"container-task-info\">\r\n            <div class=\"cell-task-info\">\r\n                {{rowData.ten}}\r\n            </div>\r\n            <div class=\"percent-done\">\r\n                <div class=\"detail transition-width\" [ngStyle]=\"{\r\n                    width: rowData.percentWidth\r\n                }\">\r\n                </div>\r\n            </div>\r\n        </div>\r\n    </ng-template>\r\n    <ng-template #idPriority let-rowData=\"rowData\">\r\n        <div class=\"priority\">\r\n            <span [ngStyle]=\"{\r\n                color: rowData.priorityColor,\r\n                background: rowData.priorityBackground\r\n            }\">{{rowData.stridPriority}}</span>\r\n        </div>\r\n    </ng-template>\r\n</crud-list>\r\n<tn-dialog *ngIf=\"showDetailForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"setting.popupHeader | translate\" [popupSize]=\"setting.popupSize\" (onHide)=\"showDetailForm = false\">\r\n    <base-congviec-form #formBase [parentModel]=\"model\" [parentSetting]=\"setting\" [parentContext]=\"context\"\r\n        [model]=\"formModel\" [crudList]=\"crudList\" (onSaved)=\"showDetailForm = false;crudList.reload()\"\r\n        (onCancel)=\"_handleCancel($event)\" (onAfterSaved)=\"onAfterSaved($event)\">\r\n    </base-congviec-form>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showPickerForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"'Ch\u1ECDn c\u00F4ng vi\u1EC7c' | translate\" [popupSize]=\"setting.popupSize\" [showFooter]=\"true\"\r\n    [useDefaultScrollBar]=\"true\" (onHide)=\"showPickerForm = false\">\r\n    <base-congviec #congViecPicker [isPicker]=\"true\" [loaiDanhSach]=\"loaiDanhSach\" [idCongViec]=\"idCongViec\">\r\n    </base-congviec>\r\n    <ng-template #footer>\r\n        <button type=\"button\" pButton icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'Ch\u1ECDn' | translate\"\r\n            (click)=\"onSelectCongViec()\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n            [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"showPickerForm=false\"></button>\r\n    </ng-template>\r\n</tn-dialog>",
+                    template: "<crud-list #crudList [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\" [hiddenAdd]=\"hiddenAdd\"\r\n    [hiddenEdit]=\"hiddenEdit\" [hiddenDelete]=\"hiddenDelete\" [hiddenCopyLink]=\"true\" [hiddenAdd]=\"isFromDashboard\"\r\n    [showScrollHorizontal]=\"true\" (onCopyLink)=\"_copyLink($event)\" (onCopyLinkMultiple)=\"_copyLinkMultiple()\"\r\n    (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\" (onView)=\"_edit($event)\"\r\n    (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\"\r\n    (onChangedStatusWorkflow)=\"handleChangedStatusWorkflow($event)\">\r\n    <ng-template #buttonAfterToolbar>\r\n        <button *ngIf=\"loaiDanhSach > 0 && !isPicker\" type=\"button\" pButton pRipple label=\"Ch\u1ECDn c\u00F4ng vi\u1EC7c\"\r\n            icon=\"pi pi-plus\" class=\"p-button-text p-button-success\" (click)=\"onChonCongViec()\"></button>\r\n    </ng-template>\r\n    <ng-template #congViecInfo let-rowData=\"rowData\">\r\n        <div class=\"container-task-info\">\r\n            <div class=\"cell-task-info\">\r\n                {{rowData.ten}}\r\n            </div>\r\n            <div class=\"percent-done\">\r\n                <div class=\"detail transition-width\" [ngStyle]=\"{\r\n                    width: rowData.percentWidth\r\n                }\">\r\n                </div>\r\n            </div>\r\n        </div>\r\n    </ng-template>\r\n    <ng-template #idPriority let-rowData=\"rowData\">\r\n        <div class=\"priority\">\r\n            <span [ngStyle]=\"{\r\n                color: rowData.priorityColor,\r\n                background: rowData.priorityBackground\r\n            }\">{{rowData.stridPriority}}</span>\r\n        </div>\r\n    </ng-template>\r\n</crud-list>\r\n<tn-dialog *ngIf=\"showDetailForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"setting.popupHeader | translate\" [popupSize]=\"setting.popupSize\" (onHide)=\"showDetailForm = false\">\r\n    <base-congviec-form #formBase [parentModel]=\"model\" [parentSetting]=\"setting\" [parentContext]=\"context\"\r\n        [model]=\"formModel\" [crudList]=\"crudList\" (onSaved)=\"showDetailForm = false;crudList.reload()\"\r\n        (onCancel)=\"_handleCancel($event)\" (onAfterSaved)=\"onAfterSaved($event)\">\r\n    </base-congviec-form>\r\n</tn-dialog>\r\n\r\n<tn-dialog *ngIf=\"showPickerForm\" #dialog [styleClass]=\"'congviec-form tn-form-dialog'\"\r\n    [header]=\"'Ch\u1ECDn c\u00F4ng vi\u1EC7c' | translate\" [popupSize]=\"setting.popupSize\" [showFooter]=\"true\"\r\n    [useDefaultScrollBar]=\"true\" (onHide)=\"showPickerForm = false\">\r\n    <base-congviec #congViecPicker [isPicker]=\"true\" [loaiDanhSach]=\"loaiDanhSach\" [idCongViec]=\"idCongViec\">\r\n    </base-congviec>\r\n    <ng-template #footer>\r\n        <button type=\"button\" pButton icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'Ch\u1ECDn' | translate\"\r\n            (click)=\"onSelectCongViec()\"></button>\r\n        <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n            [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"showPickerForm=false\"></button>\r\n    </ng-template>\r\n</tn-dialog>",
                     providers: [ComponentContextService],
                     styles: [".container-task-info .percent-done{background-color:#f0f0f0;border-radius:2px;height:5px;margin-top:5px;overflow:hidden;position:relative}.container-task-info .percent-done .detail{background:#3eb839;border-radius:2px;font-size:13px;height:5px;left:0;position:absolute;text-align:center;top:0}.priority{text-align:center}.priority>span{border-radius:3px;font-size:.8em;padding:3px 7px}"]
                 },] }
@@ -50668,7 +51265,8 @@
         };
         ShareLinkByPermissionComponent.prototype.createShareLink = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var permission, dicState, itemShares, dicPermissionId, content;
+                var permission, dicState, itemShares, firstItem, colShowEditLink, fieldHienThi, value, dicPermissionId, content;
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -50696,6 +51294,27 @@
                             dicState = _a.sent();
                             itemShares = new ModelShareLinkByPermission();
                             itemShares.linkToMenu = "" + top.location.origin + top.location.pathname;
+                            itemShares.sourcePath = "" + encodeURIComponent(top.location.href);
+                            itemShares.objectDisplayName = "" + encodeURIComponent(this.setting.objectName);
+                            if (typeof this.setting.displayField == 'string') {
+                                itemShares.displayField = "" + this.setting.displayField;
+                            }
+                            else {
+                                firstItem = this.lstItem[0];
+                                colShowEditLink = this.setting.cols.find(function (q) { return q.showEditLink; });
+                                fieldHienThi = null;
+                                if (colShowEditLink) {
+                                    value = firstItem[colShowEditLink.field];
+                                    // Nếu có value của `str${colShowEditLink.field}` thì là trường reference
+                                    // => Chỉ lấy trường hợp trường gốc có dữ liệu và trường reference k có dữ liệu
+                                    if (value && !firstItem["str" + colShowEditLink.field]) {
+                                        fieldHienThi = colShowEditLink.field;
+                                    }
+                                }
+                                if (fieldHienThi) {
+                                    itemShares.displayField = "" + fieldHienThi;
+                                }
+                            }
                             itemShares.lstItemData = [];
                             this.lstItem.forEach(function (item) {
                                 itemShares.lstItemData.push({
@@ -50703,6 +51322,13 @@
                                     permission: permission,
                                     state: encodeURIComponent(JSON.stringify(dicState[item.id]))
                                 });
+                                if (!itemShares.displayField) {
+                                    var rowItem = _this.lstItem.find(function (q) { return q.id == item.id; });
+                                    if (typeof _this.setting.displayField != 'string') {
+                                        var tenDayDu = _this.setting.displayField(rowItem);
+                                        content += "&displayField=&tenDayDu=" + encodeURIComponent(tenDayDu);
+                                    }
+                                }
                             });
                             return [4 /*yield*/, this.setting.baseService.getSharedKey(itemShares)];
                         case 2:
@@ -50723,7 +51349,7 @@
         ShareLinkByPermissionComponent.prototype.copyLinkToClipboard = function () {
             if (this.links) {
                 this.copyToClipboard(this.links);
-                this._notifierService.showWarning('Copy link vào clipboard thành công');
+                this._notifierService.showSuccess('Copy link vào clipboard thành công');
             }
         };
         return ShareLinkByPermissionComponent;
@@ -50817,6 +51443,7 @@
             StateMachinesConnectionReceiverDepartmentComponent,
             StateMachinesConnectionReceiverGroupComponent,
             StateMachinesConnectionReceiverRoleComponent,
+            StateMachinesConnectionReceiverConditionComponent,
             StateMachinesConnectionSenderComponent,
             StateMachinesDesignerComponent,
             StartWorkflowComponent,
@@ -53219,74 +53846,76 @@
     exports.ɵcd = SimpleWorkflowFormComponent;
     exports.ɵce = ProcessWorkflowFormComponent;
     exports.ɵcf = ProcessWorkflowTargetComponent;
-    exports.ɵcg = ChoYKienFormComponent;
-    exports.ɵch = SplashComponentV1Component;
-    exports.ɵci = StateMachinesConnectionReceiverComponent;
-    exports.ɵcj = StateMachinesConnectionReceiverUserComponent;
-    exports.ɵck = StateMachinesConnectionReceiverDepartmentComponent;
-    exports.ɵcl = StateMachinesConnectionReceiverGroupComponent;
-    exports.ɵcm = StateMachinesConnectionReceiverRoleComponent;
-    exports.ɵcn = StateMachinesConnectionSenderComponent;
-    exports.ɵco = StartWorkflowComponent;
-    exports.ɵcp = WorkflowSettingsService;
-    exports.ɵcq = ShareLinkByPermissionComponent;
-    exports.ɵcr = WorkflowSettingNewComponent;
-    exports.ɵcs = PermissionSharingComponent;
-    exports.ɵct = WorkflowPermissionService;
-    exports.ɵcu = TnDialogComponent;
-    exports.ɵcv = TnColorPickerComponent;
-    exports.ɵcw = TnTinymceComponent;
-    exports.ɵcx = TnTabViewComponent;
-    exports.ɵcy = TableDetailFormComponent;
-    exports.ɵcz = FileIconPipe;
+    exports.ɵcg = DmChucVuService;
+    exports.ɵch = ChoYKienFormComponent;
+    exports.ɵci = SplashComponentV1Component;
+    exports.ɵcj = StateMachinesConnectionReceiverComponent;
+    exports.ɵck = StateMachinesConnectionReceiverUserComponent;
+    exports.ɵcl = StateMachinesConnectionReceiverConditionComponent;
+    exports.ɵcm = StateMachinesConnectionReceiverDepartmentComponent;
+    exports.ɵcn = StateMachinesConnectionReceiverGroupComponent;
+    exports.ɵco = StateMachinesConnectionReceiverRoleComponent;
+    exports.ɵcp = StateMachinesConnectionSenderComponent;
+    exports.ɵcq = StartWorkflowComponent;
+    exports.ɵcr = WorkflowSettingsService;
+    exports.ɵcs = ShareLinkByPermissionComponent;
+    exports.ɵct = WorkflowSettingNewComponent;
+    exports.ɵcu = PermissionSharingComponent;
+    exports.ɵcv = WorkflowPermissionService;
+    exports.ɵcw = TnDialogComponent;
+    exports.ɵcx = TnColorPickerComponent;
+    exports.ɵcy = TnTinymceComponent;
+    exports.ɵcz = TnTabViewComponent;
     exports.ɵd = ExceptionHandlerService;
-    exports.ɵda = FileSizePipe;
-    exports.ɵdb = QuickAddFormComponent;
-    exports.ɵdc = PreventShiftTabDirective;
-    exports.ɵdd = TnTemplateDirective;
-    exports.ɵde = UserPickerComponent;
-    exports.ɵdf = UserPickerBoxComponent;
-    exports.ɵdg = CoCauToChucTestService;
-    exports.ɵdh = TnAppHelpComponent;
-    exports.ɵdi = PathNameService;
-    exports.ɵdj = HelperCurrentPageComponent;
-    exports.ɵdk = TnAppNotificationListComponent;
-    exports.ɵdl = TnAppNotificationComponent;
-    exports.ɵdm = MyDriveService;
-    exports.ɵdn = FileVersionService;
-    exports.ɵdo = FileExplorerNewService;
-    exports.ɵdp = FolderFormComponent;
-    exports.ɵdq = FileFormComponent;
-    exports.ɵdr = FileViewerComponent;
-    exports.ɵds = FileVersionListComponent;
-    exports.ɵdt = WorkflowHistoryComponent;
-    exports.ɵdu = EntityWorkflowHistoryService;
-    exports.ɵdv = WorkflowHistoryDialogComponent;
-    exports.ɵdw = WorkflowHistoryNewComponent;
-    exports.ɵdx = WorkflowSettingComponent;
-    exports.ɵdy = EntityWorkflowSettingService;
-    exports.ɵdz = WorkflowSettingDialogComponent;
+    exports.ɵda = TableDetailFormComponent;
+    exports.ɵdb = FileIconPipe;
+    exports.ɵdc = FileSizePipe;
+    exports.ɵdd = QuickAddFormComponent;
+    exports.ɵde = PreventShiftTabDirective;
+    exports.ɵdf = TnTemplateDirective;
+    exports.ɵdg = UserPickerComponent;
+    exports.ɵdh = UserPickerBoxComponent;
+    exports.ɵdi = CoCauToChucTestService;
+    exports.ɵdj = TnAppHelpComponent;
+    exports.ɵdk = PathNameService;
+    exports.ɵdl = HelperCurrentPageComponent;
+    exports.ɵdm = TnAppNotificationListComponent;
+    exports.ɵdn = TnAppNotificationComponent;
+    exports.ɵdo = MyDriveService;
+    exports.ɵdp = FileVersionService;
+    exports.ɵdq = FileExplorerNewService;
+    exports.ɵdr = FolderFormComponent;
+    exports.ɵds = FileFormComponent;
+    exports.ɵdt = FileViewerComponent;
+    exports.ɵdu = FileVersionListComponent;
+    exports.ɵdv = WorkflowHistoryComponent;
+    exports.ɵdw = EntityWorkflowHistoryService;
+    exports.ɵdx = WorkflowHistoryDialogComponent;
+    exports.ɵdy = WorkflowHistoryNewComponent;
+    exports.ɵdz = WorkflowSettingComponent;
     exports.ɵe = CanBo_HoSoService;
-    exports.ɵea = QrCodeGeneratorComponent;
-    exports.ɵeb = AccessDeniedV1Component;
-    exports.ɵec = AddNewsComponent;
-    exports.ɵed = ArticleService;
-    exports.ɵee = NewsCategoryService;
-    exports.ɵef = NotFoundComponent;
-    exports.ɵeg = UniversalLinkProcessorComponent;
-    exports.ɵeh = SignatureDetailComponent;
-    exports.ɵei = ChatService;
-    exports.ɵej = ContentsService;
-    exports.ɵek = StatusExtendsService;
-    exports.ɵel = MessageBoardService;
-    exports.ɵem = KySoSimDanhSachChuKyComponent;
-    exports.ɵen = KySoSimChuKyUserService;
-    exports.ɵeo = FileKySoSimComponent;
-    exports.ɵep = KySoSimSignPDFService;
-    exports.ɵeq = CheckReadyComponent;
-    exports.ɵer = SendAccessTokenInterceptor;
-    exports.ɵes = LogInterceptor;
-    exports.ɵet = PermissionUtilsInterceptor;
+    exports.ɵea = EntityWorkflowSettingService;
+    exports.ɵeb = WorkflowSettingDialogComponent;
+    exports.ɵec = QrCodeGeneratorComponent;
+    exports.ɵed = AccessDeniedV1Component;
+    exports.ɵee = AddNewsComponent;
+    exports.ɵef = ArticleService;
+    exports.ɵeg = NewsCategoryService;
+    exports.ɵeh = NotFoundComponent;
+    exports.ɵei = UniversalLinkProcessorComponent;
+    exports.ɵej = SignatureDetailComponent;
+    exports.ɵek = ChatService;
+    exports.ɵel = ContentsService;
+    exports.ɵem = StatusExtendsService;
+    exports.ɵen = MessageBoardService;
+    exports.ɵeo = KySoSimDanhSachChuKyComponent;
+    exports.ɵep = KySoSimChuKyUserService;
+    exports.ɵeq = FileKySoSimComponent;
+    exports.ɵer = KySoSimSignPDFService;
+    exports.ɵes = CheckReadyComponent;
+    exports.ɵet = SendAccessTokenInterceptor;
+    exports.ɵeu = LogInterceptor;
+    exports.ɵev = PermissionUtilsInterceptor;
     exports.ɵf = AfterViewCheckedComponent;
     exports.ɵg = AdvanceSearchComponent;
     exports.ɵh = AppRootMenuComponent;