tnx-shared 5.3.428 → 5.3.430

package/fesm2015/tnx-shared.js

@@ -9651,6 +9651,11 @@ ComponentBase.propDecorators = {
 class ComponentBaseWithButton extends ComponentBase {
     constructor(_injector) {
         super(_injector);
+        // Danh sách nút hành động quy trình. Được render TỰ ĐỘNG ở footer của tn-dialog,
+        // nên form không cần tự khai báo *ngFor trong #buttonTemplate.
+        this.buttons = [];
+        // Tiền tố nhãn cho các nút quy trình tự động (vd 'Lưu và'); để rỗng nếu không cần.
+        this.workflowButtonLabelPrefix = 'Lưu và ';
     }
 }
 ComponentBaseWithButton.decorators = [
@@ -15941,6 +15946,164 @@ EntityMetadataService.ctorParameters = () => [
     { type: StorageUpdatedService }
 ];
 
+class WorkflowPermissionDetailService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/WorkflowPermissionDetail`);
+        this.serviceManagers = {};
+        this.entityName = 'WorkflowPermissionDetail';
+        this.tableName = '';
+        this.guidEmpty = '00000000-0000-0000-0000-000000000000';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
+        this._moduleConfig = _moduleConfigService.getConfig();
+    }
+    registerService(settingKey, service) {
+        this.serviceManagers[settingKey] = service;
+    }
+    getEndpointByService(service) {
+        return `${service.endPoint}/${this._moduleConfig.environment.apiVersion}`;
+    }
+    changeEndpoint(baseService) {
+        this.serviceUri = `${this.getEndpointByService(baseService)}/WorkflowPermissionDetail`;
+        this.tableName = baseService.entityName;
+        return this;
+    }
+    appendInfoForWorkflowSingle(userIdCurrent, data, fieldKey = 'id', ignoreWorkflow = false, callBackWhenNotHaveStatus = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (callBackWhenNotHaveStatus == null) {
+                callBackWhenNotHaveStatus = (itemStatus, rowItem) => {
+                    if (rowItem[fieldKey]
+                        && rowItem.workflowCode
+                        && rowItem.currentStateCode) {
+                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                        itemStatus.trangThai = rowItem.currentStateCode;
+                        itemStatus.workflowCode = rowItem.workflowCode;
+                        itemStatus.permission = PermissionBase.READ;
+                    }
+                };
+            }
+            const itemId = data[fieldKey];
+            const filters = [
+                this.newFilter('itemId', Operator.equal, itemId),
+                this.newFilter('notInWorkflow', Operator.equal, false),
+            ];
+            const sorts = [];
+            if (!ignoreWorkflow) {
+                filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
+            }
+            else {
+                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
+            }
+            const dataStatus = (yield this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')).data;
+            if (dataStatus == null) {
+                const notifierService = this._injector.get(NotifierService);
+                return notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi');
+            }
+            this.appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
+            return true;
+        });
+    }
+    appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus = null) {
+        let itemStatus = {
+            textTrangThai: 'Chưa chạy quy trình'
+        };
+        if (itemId) {
+            // const lstItemStatus = dataStatus.filter(q => q.itemId == itemId && q.userId == userIdCurrent);
+            // if (ignoreWorkflow === true && lstItemStatus.length === 0) {
+            //     lstItemStatus.push(...dataStatus.filter(q => q.itemId === itemId));
+            // }
+            const lstItemStatus = dataStatus.filter(q => q.itemId === itemId);
+            // let itemStatus = null;
+            if (lstItemStatus.length) {
+                itemStatus = lstItemStatus.find(q => (q.permission & PermissionBase.EDIT) == PermissionBase.EDIT);
+                if (itemStatus == null) {
+                    itemStatus = lstItemStatus[0];
+                }
+            }
+        }
+        // Nếu không có bản ghi trạng thái
+        // Nhưng đã tạo task rồi thì hiển thị trạng thái "đã tạo công việc" để tránh trường hợp hiển thị nút bắt đầu thừa trên giao diện
+        if (!itemStatus.trangThai) {
+            callBackWhenNotHaveStatus(itemStatus, data);
+        }
+        data.__isCoEdit = dataStatus.some(x => x.itemId === itemId && x.userId != this.guidEmpty && x.isCOEdit);
+        data.__trangThai = itemStatus.trangThai;
+        data.__textTrangThai = itemStatus.textTrangThai;
+        if (itemStatus.workflowCode == DummyWorkflowCode) {
+            data.hiddenWorkflowAction = true;
+        }
+        data.__workflowCode = itemStatus.workflowCode;
+        data.__permission = itemStatus.permission;
+        data.__disableEdit = true;
+        data.__disableDelete = true;
+        if (data.basePermission & PermissionBase.EDIT
+            || data.__permission & PermissionBase.EDIT) {
+            data.__disableEdit = false;
+        }
+        else {
+            data.__disablePermissionEdit = true;
+        }
+        if (data.basePermission & PermissionBase.DELETE
+            || data.__permission & PermissionBase.DELETE) {
+            data.__disableDelete = false;
+        }
+        else {
+            data.__disablePermissionDelete = true;
+        }
+    }
+    /**
+     * Lấy thêm các thông tin cần cho quy trình nghiệp vụ cho các bản ghi trong data
+     */
+    appendInfoForWorkflow(userIdCurrent, data, fieldKey = 'id', ignoreWorkflow = false, callBackWhenNotHaveStatus = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (callBackWhenNotHaveStatus == null) {
+                callBackWhenNotHaveStatus = (itemStatus, rowItem) => {
+                    if (rowItem[fieldKey]
+                        && rowItem.workflowCode
+                        && rowItem.currentStateCode) {
+                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                        itemStatus.trangThai = rowItem.currentStateCode;
+                        itemStatus.workflowCode = rowItem.workflowCode;
+                        itemStatus.permission = PermissionBase.READ;
+                    }
+                };
+            }
+            const lstItemId = data.filter(q => q[fieldKey]).map(q => q[fieldKey]);
+            let filters = [
+                this.newFilter('itemId', Operator.in, lstItemId),
+                this.newFilter('notInWorkflow', Operator.equal, false),
+            ];
+            if (this.tableName) {
+                filters.push(this.newFilter('tableName', Operator.equal, this.tableName));
+            }
+            const sorts = [];
+            // if (!ignoreWorkflow) {
+            //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
+            // }
+            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
+            const dataStatus = (yield this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')).data;
+            if (dataStatus == null) {
+                const notifierService = this._injector.get(NotifierService);
+                return notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi');
+            }
+            data.forEach(rowItem => {
+                this.appendWorkflowInfoToItem(rowItem, rowItem[fieldKey], userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
+            });
+            return true;
+        });
+    }
+}
+WorkflowPermissionDetailService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WorkflowPermissionDetailService_Factory() { return new WorkflowPermissionDetailService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: WorkflowPermissionDetailService, providedIn: "root" });
+WorkflowPermissionDetailService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+WorkflowPermissionDetailService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
 class DataFormBase extends ComponentBaseWithButton {
     constructor(_injector) {
         super(_injector);
@@ -15964,6 +16127,8 @@ class DataFormBase extends ComponentBaseWithButton {
         this.autoGetDetail = true;
         this.autoSave = true;
         this.isCloseForm = true;
+        // Khi lưu bằng workflow action: tạm chặn đóng form lúc lưu, chỉ đóng sau khi action chạy xong
+        this._suppressOnSaved = false;
         this.saving = false;
         this.getDetailPlusUrl = null;
         this.insertPlusUrl = null;
@@ -15988,6 +16153,7 @@ class DataFormBase extends ComponentBaseWithButton {
         this._entityMetadataService = this._injector.get(EntityMetadataService);
         this._userService = this._injector.get(UserService);
         this._commonService = this._injector.get(CommonService);
+        this._workflowPermissionDetailService = this._injector.get(WorkflowPermissionDetailService);
     }
     ngOnInit() {
         // this.checkPermission(this.model.data.basePermission);
@@ -16102,6 +16268,110 @@ class DataFormBase extends ComponentBaseWithButton {
             evt.rootModel[FieldWorkflowCodeInCrudForm] = workflowSetting.workflowCode;
         }
     }
+    /**
+     * Lấy trạng thái quy trình hiện tại của bản ghi, gắn các field __trangThai/__textTrangThai/__workflowCode/__permission
+     * vào data và sinh danh sách nút hành động quy trình (this.buttons) khi bản ghi đã chạy quy trình.
+     * Yêu cầu: this.setting.baseService đã được cấu hình và this.crudList được truyền từ crud-list cha.
+     */
+    generateWorkflowButton(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Lấy ra trạng thái quy trình
+            const lstItemStatus = (yield this._workflowPermissionDetailService.changeEndpoint(this.setting.baseService).getAll([
+                this.newFilter('itemId', Operator.equal, data.id),
+            ], 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', [], 'ForCrudList')).data;
+            if (lstItemStatus == null) {
+                return this._notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi');
+            }
+            let itemStatus = null;
+            if (!lstItemStatus.length) {
+                itemStatus = {
+                    textTrangThai: 'Chưa chạy quy trình'
+                };
+            }
+            else {
+                data.startedWorkflow = true;
+                itemStatus = lstItemStatus.find(q => (q.permission & PermissionBase.EDIT) == PermissionBase.EDIT);
+                if (itemStatus == null) {
+                    itemStatus = lstItemStatus[0];
+                }
+            }
+            data.__trangThai = itemStatus.trangThai;
+            data.__textTrangThai = itemStatus.textTrangThai;
+            data.__workflowCode = itemStatus.workflowCode;
+            data.__permission = itemStatus.permission;
+            if (data.startedWorkflow && this.crudList) {
+                const actions = yield this.crudList.getActionWorkflow(data);
+                if (!Array.isArray(actions))
+                    return;
+                // Chỉ bọc các action lấy từ getActionAllow; các nút phụ (Thu hồi, Cho ý kiến,
+                // Xem lịch sử, Chuyển xử lý) giữ nguyên hành vi gốc
+                actions.filter(b => b.isActionAllow).forEach(b => this._decorateWorkflowActionButton(b));
+                this.buttons = actions;
+            }
+        });
+    }
+    /**
+     * Gắn hành vi cho 1 nút action quy trình (lấy từ getActionAllow):
+     * - Khi form đang sửa: thêm tiền tố nhãn; nếu dữ liệu thay đổi thì lưu trước (không đóng form), lưu lỗi thì dừng.
+     * - Chạy action gốc, và đóng form sau khi action thực sự hoàn tất.
+     */
+    _decorateWorkflowActionButton(button) {
+        const isEdit = this._isFormEdit();
+        const runAction = button.command;
+        if (isEdit) {
+            button.label = this.workflowButtonLabelPrefix + button.label;
+        }
+        button.command = () => __awaiter(this, void 0, void 0, function* () {
+            if (this.model.submitting)
+                return;
+            if (isEdit && this._isWorkflowDataChanged()) {
+                this.model.submitting = true;
+                this._suppressOnSaved = true; // không đóng form khi lưu
+                const saved = yield this.save();
+                this._suppressOnSaved = false;
+                if (!saved)
+                    return;
+            }
+            if (!runAction)
+                return;
+            this._closeFormWhenWorkflowProcessed();
+            yield runAction();
+        });
+    }
+    /**
+     * Đóng form (phát onSaved) đúng một lần khi crudList báo action quy trình đã xử lý xong.
+     */
+    _closeFormWhenWorkflowProcessed() {
+        var _a;
+        const processed = (_a = this.crudList) === null || _a === void 0 ? void 0 : _a.onProcessedWorkflow;
+        if (!processed)
+            return;
+        const sub = processed.subscribe(() => {
+            sub.unsubscribe();
+            this.onSaved.emit({ id: this.model.data.id, insert: false, isCloseForm: true });
+        });
+    }
+    /**
+     * So sánh dữ liệu hiện tại với snapshot lúc tải (logSetting.valueBeforeUpdate) để biết form có thay đổi không.
+     * Chuẩn hoá cả 2 qua crudForm.getMinimizeData (bỏ _status/_errors/_source, resolve dropdown object về giá trị thô)
+     * để so sánh ổn định. Nếu không có snapshot thì coi như có thay đổi (luôn lưu) cho an toàn.
+     */
+    /**
+     * Form có tham gia quy trình hay không (dựa trên cấu hình parentSetting) - cùng điều kiện với biến hasWorkflow trong addSchemaBase.
+     */
+    _hasWorkflow() {
+        var _a;
+        return !!(this.parentSetting
+            && ((this.parentSetting.workflowSettingNew && ((_a = this.parentSetting.workflowSettingNew.workflows) === null || _a === void 0 ? void 0 : _a.length) > 0)
+                || this.parentSetting.isWorkflowTree));
+    }
+    _isWorkflowDataChanged() {
+        if (!this.logSetting.valueBeforeUpdate || !this.crudForm)
+            return true;
+        const current = JSON.stringify(this.crudForm.getMinimizeData(this.model.data));
+        const before = JSON.stringify(this.crudForm.getMinimizeData(this.logSetting.valueBeforeUpdate));
+        return current !== before;
+    }
     _handleFormReady(formEvent) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.__handleFormReady(formEvent);
@@ -16163,7 +16433,9 @@ class DataFormBase extends ComponentBaseWithButton {
                     }
                     yield this._processAfterGetData(response.data);
                     yield this.onAfterGetDetail(response.data);
-                    if (this.logSetting.isEnableLog) {
+                    // Lưu snapshot dữ liệu trước khi sửa khi: bật log HOẶC form có quy trình
+                    // (để so sánh thay đổi, quyết định có cần lưu trước khi chạy action quy trình hay không)
+                    if (this.logSetting.isEnableLog || this._hasWorkflow()) {
                         this.logSetting.valueBeforeUpdate = this._commonService.cloneObject(response.data);
                     }
                 }
@@ -16274,6 +16546,11 @@ class DataFormBase extends ComponentBaseWithButton {
             if (this.logSetting.isEnableLog) {
                 this.getLogValueAfterLoadDetail();
             }
+            // Sinh nút hành động quy trình tập trung: form chỉ cần được truyền [crudList] và có cấu hình workflow,
+            // không cần tự gọi generateWorkflowButton trong modifyDetailData.
+            if (this._hasWorkflow() && this.crudList) {
+                yield this.generateWorkflowButton(data);
+            }
         });
     }
     getLogValueAfterLoadDetail() {
@@ -16582,21 +16859,24 @@ class DataFormBase extends ComponentBaseWithButton {
                 this.triggerSaveFileUpload();
                 if (this.autoSave) {
                     if (this._isFormEdit() || this._isFormView()) {
-                        yield this.onUpdate();
+                        return yield this.onUpdate();
                     }
                     else if (this._isFormAddNew()) {
-                        yield this.onInsert();
+                        return yield this.onInsert();
                     }
                     else {
                         // form view, do nothing
+                        return false;
                     }
                 }
                 else {
                     this.handleManualSave();
+                    return true;
                 }
             }
             else {
                 this.model.submitting = false;
+                return false;
             }
         });
     }
@@ -16668,8 +16948,8 @@ class DataFormBase extends ComponentBaseWithButton {
             }
             const confirmed = yield this.createConfirmIfRequire();
             if (!confirmed)
-                return;
-            yield this._insert();
+                return false;
+            return yield this._insert();
         });
     }
     createConfirmIfRequire() {
@@ -16691,29 +16971,34 @@ class DataFormBase extends ComponentBaseWithButton {
     }
     _insert() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.getPromiseActionInsert()
+            return this.getPromiseActionInsert()
                 .then((response) => __awaiter(this, void 0, void 0, function* () {
                 this.model.submitting = false;
                 this.showMessageAfterInsert(response.success, response);
                 if (response.success) {
                     this.model.data.id = response.data;
                     yield this.onAfterSave(response);
-                    this.onSaved.emit({
-                        id: this.model.data.id,
-                        insert: true,
-                        isCloseForm: this.isCloseForm
-                    });
+                    if (!this._suppressOnSaved) {
+                        this.onSaved.emit({
+                            id: this.model.data.id,
+                            insert: true,
+                            isCloseForm: this.isCloseForm
+                        });
+                    }
+                    return true;
                 }
                 else {
                     this.handleInsertError(response);
+                    return false;
                 }
             }), error => {
                 if (!error.error.success && error.error.errorCheckExist) {
                     this.model.submitting = false;
-                    return;
+                    return false;
                 }
                 this.model.submitting = false;
                 this.showMessageAfterInsert(false, error);
+                return false;
             });
         });
     }
@@ -16725,32 +17010,38 @@ class DataFormBase extends ComponentBaseWithButton {
     onUpdate() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setDefaultValue(this.model.data);
-            this.getPromiseActionUpdate()
+            const updatePromise = this.getPromiseActionUpdate()
                 .then((response) => __awaiter(this, void 0, void 0, function* () {
                 this.model.submitting = false;
                 this.showMessageAfterUpdate(response.success, response);
                 if (response.success) {
                     yield this.onAfterSave(response);
-                    this.onSaved.emit({
-                        id: this.model.data.id,
-                        insert: false,
-                        isCloseForm: this.isCloseForm
-                    });
+                    if (!this._suppressOnSaved) {
+                        this.onSaved.emit({
+                            id: this.model.data.id,
+                            insert: false,
+                            isCloseForm: this.isCloseForm
+                        });
+                    }
+                    return true;
                 }
                 else {
                     this.handleUpdateError(response);
+                    return false;
                 }
             }), error => {
                 if (!error.error.success && error.error.errorCheckExist) {
                     this.model.submitting = false;
-                    return;
+                    return false;
                 }
                 this.model.submitting = false;
                 this.showMessageAfterUpdate(false, error);
+                return false;
             });
             if (this.logSetting.isEnableLog) {
                 this.logSetting.arrValueAfterUpdate = [];
             }
+            return updatePromise;
         });
     }
     handleUpdateError(response) {
@@ -16861,6 +17152,7 @@ DataFormBase.propDecorators = {
     parentSetting: [{ type: Input }],
     model: [{ type: Input }],
     forceOnlyView: [{ type: Input }],
+    crudList: [{ type: Input }],
     onSave: [{ type: Output }],
     onSaved: [{ type: Output }],
     onCancel: [{ type: Output }],
@@ -18964,164 +19256,6 @@ WorkflowHistoryService.ctorParameters = () => [
     { type: ModuleConfigService }
 ];
 
-class WorkflowPermissionDetailService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/WorkflowPermissionDetail`);
-        this.serviceManagers = {};
-        this.entityName = 'WorkflowPermissionDetail';
-        this.tableName = '';
-        this.guidEmpty = '00000000-0000-0000-0000-000000000000';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
-        this._moduleConfig = _moduleConfigService.getConfig();
-    }
-    registerService(settingKey, service) {
-        this.serviceManagers[settingKey] = service;
-    }
-    getEndpointByService(service) {
-        return `${service.endPoint}/${this._moduleConfig.environment.apiVersion}`;
-    }
-    changeEndpoint(baseService) {
-        this.serviceUri = `${this.getEndpointByService(baseService)}/WorkflowPermissionDetail`;
-        this.tableName = baseService.entityName;
-        return this;
-    }
-    appendInfoForWorkflowSingle(userIdCurrent, data, fieldKey = 'id', ignoreWorkflow = false, callBackWhenNotHaveStatus = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (callBackWhenNotHaveStatus == null) {
-                callBackWhenNotHaveStatus = (itemStatus, rowItem) => {
-                    if (rowItem[fieldKey]
-                        && rowItem.workflowCode
-                        && rowItem.currentStateCode) {
-                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
-                        itemStatus.trangThai = rowItem.currentStateCode;
-                        itemStatus.workflowCode = rowItem.workflowCode;
-                        itemStatus.permission = PermissionBase.READ;
-                    }
-                };
-            }
-            const itemId = data[fieldKey];
-            const filters = [
-                this.newFilter('itemId', Operator.equal, itemId),
-                this.newFilter('notInWorkflow', Operator.equal, false),
-            ];
-            const sorts = [];
-            if (!ignoreWorkflow) {
-                filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
-            }
-            else {
-                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
-            }
-            const dataStatus = (yield this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')).data;
-            if (dataStatus == null) {
-                const notifierService = this._injector.get(NotifierService);
-                return notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi');
-            }
-            this.appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
-            return true;
-        });
-    }
-    appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus = null) {
-        let itemStatus = {
-            textTrangThai: 'Chưa chạy quy trình'
-        };
-        if (itemId) {
-            // const lstItemStatus = dataStatus.filter(q => q.itemId == itemId && q.userId == userIdCurrent);
-            // if (ignoreWorkflow === true && lstItemStatus.length === 0) {
-            //     lstItemStatus.push(...dataStatus.filter(q => q.itemId === itemId));
-            // }
-            const lstItemStatus = dataStatus.filter(q => q.itemId === itemId);
-            // let itemStatus = null;
-            if (lstItemStatus.length) {
-                itemStatus = lstItemStatus.find(q => (q.permission & PermissionBase.EDIT) == PermissionBase.EDIT);
-                if (itemStatus == null) {
-                    itemStatus = lstItemStatus[0];
-                }
-            }
-        }
-        // Nếu không có bản ghi trạng thái
-        // Nhưng đã tạo task rồi thì hiển thị trạng thái "đã tạo công việc" để tránh trường hợp hiển thị nút bắt đầu thừa trên giao diện
-        if (!itemStatus.trangThai) {
-            callBackWhenNotHaveStatus(itemStatus, data);
-        }
-        data.__isCoEdit = dataStatus.some(x => x.itemId === itemId && x.userId != this.guidEmpty && x.isCOEdit);
-        data.__trangThai = itemStatus.trangThai;
-        data.__textTrangThai = itemStatus.textTrangThai;
-        if (itemStatus.workflowCode == DummyWorkflowCode) {
-            data.hiddenWorkflowAction = true;
-        }
-        data.__workflowCode = itemStatus.workflowCode;
-        data.__permission = itemStatus.permission;
-        data.__disableEdit = true;
-        data.__disableDelete = true;
-        if (data.basePermission & PermissionBase.EDIT
-            || data.__permission & PermissionBase.EDIT) {
-            data.__disableEdit = false;
-        }
-        else {
-            data.__disablePermissionEdit = true;
-        }
-        if (data.basePermission & PermissionBase.DELETE
-            || data.__permission & PermissionBase.DELETE) {
-            data.__disableDelete = false;
-        }
-        else {
-            data.__disablePermissionDelete = true;
-        }
-    }
-    /**
-     * Lấy thêm các thông tin cần cho quy trình nghiệp vụ cho các bản ghi trong data
-     */
-    appendInfoForWorkflow(userIdCurrent, data, fieldKey = 'id', ignoreWorkflow = false, callBackWhenNotHaveStatus = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (callBackWhenNotHaveStatus == null) {
-                callBackWhenNotHaveStatus = (itemStatus, rowItem) => {
-                    if (rowItem[fieldKey]
-                        && rowItem.workflowCode
-                        && rowItem.currentStateCode) {
-                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
-                        itemStatus.trangThai = rowItem.currentStateCode;
-                        itemStatus.workflowCode = rowItem.workflowCode;
-                        itemStatus.permission = PermissionBase.READ;
-                    }
-                };
-            }
-            const lstItemId = data.filter(q => q[fieldKey]).map(q => q[fieldKey]);
-            let filters = [
-                this.newFilter('itemId', Operator.in, lstItemId),
-                this.newFilter('notInWorkflow', Operator.equal, false),
-            ];
-            if (this.tableName) {
-                filters.push(this.newFilter('tableName', Operator.equal, this.tableName));
-            }
-            const sorts = [];
-            // if (!ignoreWorkflow) {
-            //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
-            // }
-            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
-            const dataStatus = (yield this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')).data;
-            if (dataStatus == null) {
-                const notifierService = this._injector.get(NotifierService);
-                return notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi');
-            }
-            data.forEach(rowItem => {
-                this.appendWorkflowInfoToItem(rowItem, rowItem[fieldKey], userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
-            });
-            return true;
-        });
-    }
-}
-WorkflowPermissionDetailService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WorkflowPermissionDetailService_Factory() { return new WorkflowPermissionDetailService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: WorkflowPermissionDetailService, providedIn: "root" });
-WorkflowPermissionDetailService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-WorkflowPermissionDetailService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
-
 var sort_by;
 (function () {
     const defaultCompareFunc = function (a, b) {
@@ -22153,6 +22287,7 @@ class ListComponentBase extends ComponentBase {
                             buttonContexts.push({
                                 soThuTu: action.soThuTu,
                                 actionCode: action.code,
+                                isActionAllow: true,
                                 icon: this.sourceIcon[action.icon],
                                 label: action.name,
                                 command: () => this.processWorkflow(crudListSetting, itemWorkflowSetting, action)
@@ -28624,7 +28759,6 @@ class FileUploadComponent extends ComponentBase {
             if (!dataKySo) {
                 this._notifierService.showWarning('Người dùng chưa cấu hình thông tin ký số');
             }
-            debugger;
             this.forms.fileViewer.formData.data = {
                 fileId: sourceFileId,
                 isFileVersion: false,
@@ -35547,7 +35681,6 @@ class ServiceFileUploadComponent extends ComponentBase {
             if (!dataKySo) {
                 this._notifierService.showWarning('Người dùng chưa cấu hình thông tin ký số');
             }
-            debugger;
             this.forms.fileViewer.formData.data = {
                 fileId: sourceFileId,
                 isFileVersion: false,
@@ -40742,8 +40875,16 @@ class EntityPickerDataComponent extends DataListBase {
         this.onPick = new EventEmitter();
         this.onPickAll = new EventEmitter();
         this.onPickSelected = new EventEmitter();
+        this.template = {};
+        // Context truyền vào templateFilterHeader để template gọi ngược lại (onChange/reload)
+        this.filterHeaderContext = {
+            $implicit: this,
+            onChange: (value) => this.handleFilterHeaderChange(value),
+            reload: () => this._triggerProcessData(),
+        };
         this.showFormAdvancedSearch = false;
         this.popupSizeSearchForm = new PopupSize({ width: 1000, height: 700 });
+        this.schemaData = {};
         this.lstDataNotExist = [];
     }
     set selectedValue(value) {
@@ -40935,13 +41076,34 @@ class EntityPickerDataComponent extends DataListBase {
         this.searchData = model;
         this._triggerProcessData();
     }
+    handleFilterHeaderChange(value) {
+        console.log(value);
+        // Nhận sự kiện onChange từ templateFilterHeader, mặc định lọc lại lưới
+        this._triggerProcessData();
+    }
+    findTemplate(templateName) {
+        var _a;
+        return (_a = this._commonService.findTemplateFromList(this.children, templateName)) !== null && _a !== void 0 ? _a : this._commonService.findTemplateFromList(this.templates, templateName);
+    }
+    hasTemplate(templateName) {
+        if (this.template[templateName] === undefined) {
+            this.template[templateName] = this.findTemplate(templateName);
+        }
+        return this.template[templateName] != null;
+    }
+    getTemplate(templateName) {
+        if (this.template[templateName] === undefined) {
+            this.template[templateName] = this.findTemplate(templateName);
+        }
+        return this.template[templateName];
+    }
 }
 EntityPickerDataComponent.decorators = [
     { type: Component, args: [{
                 selector: 'app-entity-picker-data',
-                template: "<crud-list #crudList [templates]=\"templates\" [menuButtons]=\"getMenuButtons\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [showScrollHorizontal]=\"true\" (onContentInit)=\"onContentInit.emit($event)\" (onReload)=\"_triggerProcessData($event)\"\n    (onAdd)=\"_add($event)\" (onRowSelect)=\"handleRowSelect($event)\" (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\"\n    (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\">\n    <ng-template #customTitle>\n        <h1 [innerHTML]=\"dom.bypassSecurityTrustHtml(control.titleUnPicked)\"></h1>\n    </ng-template>\n    <ng-template #toolbar let-crudList=\"crudList\" let-selectedItems=\"selectedItems\">\n        <button *ngIf=\"(isSingleSelection || model.total <= 0) && !model.dataSource.length && setting.hiddenAdvanceSearch\" pButton\n            style=\"visibility: hidden\"></button>\n        <button *ngIf=\"!isSingleSelection && model.total > 0\" type=\"button\" pButton pRipple\n            label=\"L\u1EA5y t\u1EA5t c\u1EA3 ({{model.total}})\" icon=\"pi pi-angle-double-right\" class=\"p-button-text p-button-success\"\n            [disabled]=\"model.loading\" (click)=\"pickAll()\"></button>\n        <button *ngIf=\"!isSingleSelection && selectedItems.length > 0\" type=\"button\" pButton pRipple\n            label=\"L\u1EA5y m\u1EE5c \u0111\u00E3 ch\u1ECDn ({{selectedItems.length}})\" icon=\"pi pi-angle-right\"\n            class=\"p-button-text p-button-success\" [disabled]=\"model.loading\"\n            (click)=\"pickSelected(selectedItems)\"></button>\n        <button *ngIf=\"datasourceFieldFilter.length\" type=\"button\" pButton pRipple label=\"T\u00ECm ki\u1EBFm nhi\u1EC1u ng\u01B0\u1EDDi d\u00F9ng\"\n            icon=\"pi pi-search\" class=\"p-button-text p-button-primary\" [disabled]=\"model.loading\"\n            (click)=\"handleAdvansearch()\"></button>\n        <button *ngIf=\"datasourceFieldFilter.length && searchData\" type=\"button\" pButton pRipple\n            label=\"X\u00F3a danh s\u00E1ch t\u00ECm ki\u1EBFm\" pTooltip=\"X\u00F3a t\u1EA5t c\u1EA3 ng\u01B0\u1EDDi d\u00F9ng \u1EDF Danh s\u00E1ch t\u00ECm ki\u1EBFm\" icon=\"pi pi-times\"\n            class=\"p-button-text p-button-primary\" [disabled]=\"model.loading\" (click)=\"handleSearch(null)\"></button>\n    </ng-template>\n    <ng-template let-crudList=\"crudList\" #function let-rowData=\"rowData\">\n        <button pButton type=\"button\" class=\"link-or-action p-button-success p-button-text p-button-rounded\"\n            icon=\"pi pi-check\" pTooltip=\"Ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\" [disabled]=\"rowData.disabled\"\n            (click)=\"pickEntity(rowData)\"></button>\n    </ng-template>\n</crud-list>\n\n\n<tn-dialog *ngIf=\"showFormAdvancedSearch\" #dialog [styleClass]=\"'address-form'\" [header]=\"'T\u00ECm ki\u1EBFm nhi\u1EC1u ng\u01B0\u1EDDi d\u00F9ng'\"\n    [popupSize]=\"popupSizeSearchForm\" [maskClass]=\"setting.maskClass\" (onHide)=\"showFormAdvancedSearch = false\">\n    <entity-picker-search-form #formBase [parentModel]=\"model\" [parentContext]=\"context\" [parentSetting]=\"setting\"\n        [datasourceFieldFilter]=\"datasourceFieldFilter\" [lstDataNotExist]=\"lstDataNotExist\" [model]=\"formModel\"\n        (onSearch)=\"handleSearch($event)\" (onCancel)=\"showFormAdvancedSearch = false;\">\n    </entity-picker-search-form>\n</tn-dialog>",
+                template: "<crud-list #crudList [templates]=\"templates\" [menuButtons]=\"getMenuButtons\" [model]=\"model\" [setting]=\"setting\"\n    [dataSource]=\"model.dataSource\" [showScrollHorizontal]=\"true\" (onContentInit)=\"onContentInit.emit($event)\"\n    (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onRowSelect)=\"handleRowSelect($event)\"\n    (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\"\n    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\">\n    <ng-template #customTitle>\n        <h1 [innerHTML]=\"dom.bypassSecurityTrustHtml(control.titleUnPicked)\"></h1>\n        <div class=\"header-search-box\" *ngIf=\"control.templateFilterHeader\">\n            <ng-container *ngTemplateOutlet=\"control.templateFilterHeader; context: filterHeaderContext\">\n            </ng-container>\n        </div>\n    </ng-template>\n\n    <ng-template #toolbar let-crudList=\"crudList\" let-selectedItems=\"selectedItems\">\n        <button\n            *ngIf=\"(isSingleSelection || model.total <= 0) && !model.dataSource.length && setting.hiddenAdvanceSearch\"\n            pButton style=\"visibility: hidden\"></button>\n        <button *ngIf=\"!isSingleSelection && model.total > 0\" type=\"button\" pButton pRipple\n            label=\"L\u1EA5y t\u1EA5t c\u1EA3 ({{model.total}})\" icon=\"pi pi-angle-double-right\" class=\"p-button-text p-button-success\"\n            [disabled]=\"model.loading\" (click)=\"pickAll()\"></button>\n        <button *ngIf=\"!isSingleSelection && selectedItems.length > 0\" type=\"button\" pButton pRipple\n            label=\"L\u1EA5y m\u1EE5c \u0111\u00E3 ch\u1ECDn ({{selectedItems.length}})\" icon=\"pi pi-angle-right\"\n            class=\"p-button-text p-button-success\" [disabled]=\"model.loading\"\n            (click)=\"pickSelected(selectedItems)\"></button>\n        <button *ngIf=\"datasourceFieldFilter.length\" type=\"button\" pButton pRipple label=\"T\u00ECm ki\u1EBFm nhi\u1EC1u ng\u01B0\u1EDDi d\u00F9ng\"\n            icon=\"pi pi-search\" class=\"p-button-text p-button-primary\" [disabled]=\"model.loading\"\n            (click)=\"handleAdvansearch()\"></button>\n        <button *ngIf=\"datasourceFieldFilter.length && searchData\" type=\"button\" pButton pRipple\n            label=\"X\u00F3a danh s\u00E1ch t\u00ECm ki\u1EBFm\" pTooltip=\"X\u00F3a t\u1EA5t c\u1EA3 ng\u01B0\u1EDDi d\u00F9ng \u1EDF Danh s\u00E1ch t\u00ECm ki\u1EBFm\" icon=\"pi pi-times\"\n            class=\"p-button-text p-button-primary\" [disabled]=\"model.loading\" (click)=\"handleSearch(null)\"></button>\n    </ng-template>\n    <ng-template let-crudList=\"crudList\" #function let-rowData=\"rowData\">\n        <button pButton type=\"button\" class=\"link-or-action p-button-success p-button-text p-button-rounded\"\n            icon=\"pi pi-check\" pTooltip=\"Ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\" [disabled]=\"rowData.disabled\"\n            (click)=\"pickEntity(rowData)\"></button>\n    </ng-template>\n</crud-list>\n\n\n<tn-dialog *ngIf=\"showFormAdvancedSearch\" #dialog [styleClass]=\"'address-form'\" [header]=\"'T\u00ECm ki\u1EBFm nhi\u1EC1u ng\u01B0\u1EDDi d\u00F9ng'\"\n    [popupSize]=\"popupSizeSearchForm\" [maskClass]=\"setting.maskClass\" (onHide)=\"showFormAdvancedSearch = false\">\n    <entity-picker-search-form #formBase [parentModel]=\"model\" [parentContext]=\"context\" [parentSetting]=\"setting\"\n        [datasourceFieldFilter]=\"datasourceFieldFilter\" [lstDataNotExist]=\"lstDataNotExist\" [model]=\"formModel\"\n        (onSearch)=\"handleSearch($event)\" (onCancel)=\"showFormAdvancedSearch = false;\">\n    </entity-picker-search-form>\n</tn-dialog>",
                 providers: [ComponentContextService],
-                styles: ["::ng-deep app-entity-picker-data .custom-card{padding:.5em!important}"]
+                styles: ["::ng-deep app-entity-picker-data .custom-card{padding:.5em!important}::ng-deep app-entity-picker-data .header-search-box{padding:1rem 0}::ng-deep app-entity-picker-data .header-search-box p-dropdown .p-dropdown{min-width:300px}"]
             },] }
 ];
 EntityPickerDataComponent.ctorParameters = () => [
@@ -40963,7 +41125,8 @@ EntityPickerDataComponent.propDecorators = {
     onRowSelect: [{ type: Output }],
     onPick: [{ type: Output }],
     onPickAll: [{ type: Output }],
-    onPickSelected: [{ type: Output }]
+    onPickSelected: [{ type: Output }],
+    children: [{ type: ContentChildren, args: [TemplateRef,] }]
 };
 
 class EntityPickerSelectedComponent extends DataListBase {
@@ -49031,7 +49194,7 @@ class TnDialogComponent {
 TnDialogComponent.decorators = [
     { type: Component, args: [{
                 selector: 'tn-dialog',
-                template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\" [autoZIndex]=\"true\"\n    [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\" [showHeader]=\"showHeader\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-header *ngIf=\"showHeader\">\n        <ng-container *ngIf=\"header && !headerTemplate\">\n            <div>{{header | translate}}</div>\n        </ng-container>\n        <ng-container *ngIf=\"headerTemplate\">\n            <ng-container *ngTemplateOutlet=\"headerTemplate\"></ng-container>\n        </ng-container>\n    </p-header>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
+                template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\" [autoZIndex]=\"true\"\n    [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\" [showHeader]=\"showHeader\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-header *ngIf=\"showHeader\">\n        <ng-container *ngIf=\"header && !headerTemplate\">\n            <div>{{header | translate}}</div>\n        </ng-container>\n        <ng-container *ngIf=\"headerTemplate\">\n            <ng-container *ngTemplateOutlet=\"headerTemplate\"></ng-container>\n        </ng-container>\n    </p-header>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <button *ngFor=\"let butt of formBase.buttons\" pButton [icon]=\"butt.icon\" class=\"p-button-text\"\n                [label]=\"butt.label\" (click)=\"butt.command()\"></button>\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
                 styles: [""]
             },] }
 ];
@@ -49806,6 +49969,9 @@ class UserPickerBoxComponent extends ComponentBase {
         }
     }
     ngOnInit() {
+        if (this.controlSetting.templateFilterHeader) {
+            this.control.templateFilterHeader = this.controlSetting.templateFilterHeader;
+        }
         this.control.plusUrl = 'ForUserPicker';
         this.control.filterWhileProcess = [
             this.newFilter('userType', Operator.equal, this.controlSetting.userType)