tnx-shared 5.1.236 → 5.1.237

package/bundles/tnx-shared.umd.js

@@ -43832,7 +43832,7 @@
                     mdWidth: 5
                 }),
                 new CheckBoxListControlSchema({
-                    label: 'Cho sửa gợi ý',
+                    label: 'Cho sửa gợi ý nhóm theo dõi (dữ liệu lấy từ bước trước)',
                     field: 'targetsAllowModify',
                     mdWidth: 12,
                     dataSource: DataSourceTargetType
@@ -49879,6 +49879,9 @@
                             this.initValueForTargetForm.lstGroupViewId = dataUserInProcessForm.lstGroupViewId;
                             this.initValueForTargetForm.lstRoleId = dataUserInProcessForm.lstRoleId;
                             this.initValueForTargetForm.lstRoleViewId = dataUserInProcessForm.lstRoleViewId;
+                            this.initValueForTargetForm.lstUserIdInWorkflow = dataUserInProcessForm.lstUserIdInWorkflow;
+                            this.initValueForTargetForm.lstDonViIdInWorkflow = dataUserInProcessForm.lstDonViIdInWorkflow;
+                            this.initValueForTargetForm.lstGroupIdInWorkflow = dataUserInProcessForm.lstGroupIdInWorkflow;
                             return [2 /*return*/, true];
                     }
                 });
@@ -50015,7 +50018,7 @@
     ProcessWorkflowFormComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'process-workflow-form',
-                    template: "<crud-form *ngIf=\"formReady\" #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\"\r\n    [disableCaching]=\"true\" (onFormReady)=\"_handleFormReady($event)\">\r\n    <ng-template #separator>\r\n        <div style=\"height: 3px; width: 100%; background: #2196f3;\"></div>\r\n    </ng-template>\r\n</crud-form>\r\n<tn-tabview *ngIf=\"formReady\" [data]=\"mainTabData\" [allowViewAll]=\"true\" [isDynamicHeight]=\"true\">\r\n    <ng-template #allowEdit>\r\n        <process-workflow-target #targetAllowEdit [data]=\"dataAllowEdit\" [initValue]=\"initValueForTargetForm\"\r\n            [action]=\"action\">\r\n        </process-workflow-target>\r\n    </ng-template>\r\n    <ng-template #onlyView>\r\n        <process-workflow-target #targetOnlyView [data]=\"dataOnlyView\" [initValue]=\"initValueForTargetForm\"\r\n            [action]=\"action\">\r\n        </process-workflow-target>\r\n    </ng-template>\r\n</tn-tabview>\r\n<ng-template #buttonTemplate>\r\n    <button *ngIf=\"!model.data.__disableEdit && !__isFormView\" [disabled]=\"model.submitting\" type=\"button\" pButton\r\n        icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\"\r\n        (click)=\"_handleSave($event)\"></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)=\"_handleCancel($event)\"></button>\r\n</ng-template>",
+                    template: "<crud-form *ngIf=\"formReady\" #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\"\r\n    [disableCaching]=\"true\" (onFormReady)=\"_handleFormReady($event)\">\r\n    <ng-template #separator>\r\n        <div style=\"height: 3px; width: 100%; background: #2196f3;\"></div>\r\n    </ng-template>\r\n</crud-form>\r\n<tn-tabview *ngIf=\"formReady\" [data]=\"mainTabData\" [allowViewAll]=\"true\" [isDynamicHeight]=\"true\">\r\n    <ng-template #allowEdit>\r\n        <process-workflow-target #targetAllowEdit [data]=\"dataAllowEdit\" [initValue]=\"initValueForTargetForm\">\r\n        </process-workflow-target>\r\n    </ng-template>\r\n    <ng-template #onlyView>\r\n        <process-workflow-target #targetOnlyView [data]=\"dataOnlyView\" [initValue]=\"initValueForTargetForm\"\r\n            [action]=\"action\">\r\n        </process-workflow-target>\r\n    </ng-template>\r\n</tn-tabview>\r\n<ng-template #buttonTemplate>\r\n    <button *ngIf=\"!model.data.__disableEdit && !__isFormView\" [disabled]=\"model.submitting\" type=\"button\" pButton\r\n        icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\"\r\n        (click)=\"_handleSave($event)\"></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)=\"_handleCancel($event)\"></button>\r\n</ng-template>",
                     styles: [""]
                 },] }
     ];
@@ -50100,20 +50103,21 @@
         };
         ProcessWorkflowTargetComponent.prototype.onFormInitialized = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
                     evt.model.userIds = this.data.userIds;
                     evt.model.departmentIds = this.data.departmentIds;
                     evt.model.groupIds = this.data.groupIds;
                     // evt.model.roleIds = this.data.roleIds;
-                    if (this.action.targetsAllowModify) {
+                    if (this.action && this.action.targetsAllowModify) {
                         if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.USER; })) {
-                            evt.model.userIds_readOnly = evt.model.userIds;
+                            evt.model.userIds_readOnly = evt.model.userIds.filter(function (q) { return _this.initValue.lstUserIdInWorkflow.some(function (x) { return x == q; }); });
                         }
                         if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.DEPARTMENT; })) {
-                            evt.model.departmentIds_readOnly = evt.model.departmentIds;
+                            evt.model.departmentIds_readOnly = evt.model.departmentIds.filter(function (q) { return _this.initValue.lstDonViIdInWorkflow.some(function (x) { return x == q; }); });
                         }
                         if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.GROUP; })) {
-                            evt.model.groupIds_readOnly = evt.model.groupIds;
+                            evt.model.groupIds_readOnly = evt.model.groupIds.filter(function (q) { return _this.initValue.lstGroupIdInWorkflow.some(function (x) { return x == q; }); });
                         }
                     }
                     return [2 /*return*/];