tnx-shared 5.1.74 → 5.1.78

package/bundles/tnx-shared.umd.js

@@ -11137,6 +11137,12 @@
         return SearchInfo;
     }());
 
+    var DummyWorkflowCode = 'DummyWorkflowCode';
+    var MaActionBatDauQuyTrinh = '_START_';
+    var ActionThuHoiBase = '__THU_HOI';
+    var ActionChoYKienBase = '__CHO_Y_KIEN';
+    var ActionUpdateModel = '__UPDATE_MODEL';
+
     var CanBo_HoSoService = /** @class */ (function (_super) {
         __extends(CanBo_HoSoService, _super);
         function CanBo_HoSoService(http, injector, _moduleConfigService) {
@@ -16766,10 +16772,14 @@
                         displayField: 'title',
                         mdWidth: 12,
                         hiddenCheck: function (rootModel) { return !rootModel || rootModel.createTaskInstead; }
-                    }), new TitleSchema({
-                        text: 'Công việc',
-                        hiddenCheck: function (rootModel) { return !rootModel || !rootModel.createTaskInstead; }
-                    }), this.dynamicControl[FieldDefineIsTaskFormControl]);
+                    }));
+                    if (this.parentSetting.workflowSettingNew
+                        && this.parentSetting.workflowSettingNew.taskInsideBusinessForm) {
+                        this.setting.schema.push(new TitleSchema({
+                            text: 'Công việc',
+                            hiddenCheck: function (rootModel) { return !rootModel || !rootModel.createTaskInstead; }
+                        }), this.dynamicControl[FieldDefineIsTaskFormControl]);
+                    }
                 }
             }
         };
@@ -17192,7 +17202,7 @@
         };
         DataFormBase.prototype.validateFormBase = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var resultValidateBase, resultValidate, taskForm, resultValidateFormTask;
+                var resultValidateBase, resultValidate;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.crudForm.validateForm()];
@@ -17201,15 +17211,15 @@
                             return [4 /*yield*/, this.validateForm(resultValidateBase)];
                         case 2:
                             resultValidate = _a.sent();
-                            if (!(this.dynamicControl[FieldDefineIsTaskFormControl]
-                                && this.dynamicControl[FieldDefineIsTaskFormControl]._component)) return [3 /*break*/, 4];
-                            taskForm = this.dynamicControl[FieldDefineIsTaskFormControl]._component;
-                            return [4 /*yield*/, taskForm._getResultValidate()];
-                        case 3:
-                            resultValidateFormTask = _a.sent();
-                            resultValidate = resultValidateFormTask && resultValidate;
-                            _a.label = 4;
-                        case 4: return [2 /*return*/, resultValidate && resultValidateBase];
+                            // Bỏ check valid form công việc. nếu như form công việc không valid thì không tự động tạo công việc
+                            // if (this.dynamicControl[FieldDefineIsTaskFormControl]
+                            //     && this.dynamicControl[FieldDefineIsTaskFormControl]._component
+                            // ) {
+                            //     const taskForm = this.dynamicControl[FieldDefineIsTaskFormControl]._component;
+                            //     const resultValidateFormTask = await taskForm._getResultValidate();
+                            //     resultValidate = resultValidateFormTask && resultValidate;
+                            // }
+                            return [2 /*return*/, resultValidate && resultValidateBase];
                     }
                 });
             });
@@ -17236,24 +17246,30 @@
         };
         DataFormBase.prototype.onInsert = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var confirmed;
+                var taskForm, resultValidateFormTask, confirmed;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             this.setDefaultValue(this.model.data);
-                            if (this.dynamicControl[FieldDefineIsTaskFormControl]
-                                && this.dynamicControl[FieldDefineIsTaskFormControl]._component) {
-                                this.model.data.itemCongViec = this.dynamicControl[FieldDefineIsTaskFormControl]._component.model.data;
-                                // reset field _WorkflowCode để backend biết được chạy quy trình theo kiểu nào
-                                this.model.data._WorkflowCode = null;
-                            }
-                            return [4 /*yield*/, this.createConfirmIfRequire()];
+                            if (!(this.dynamicControl[FieldDefineIsTaskFormControl]
+                                && this.dynamicControl[FieldDefineIsTaskFormControl]._component)) return [3 /*break*/, 2];
+                            taskForm = this.dynamicControl[FieldDefineIsTaskFormControl]._component;
+                            return [4 /*yield*/, taskForm._getResultValidate()];
                         case 1:
+                            resultValidateFormTask = _a.sent();
+                            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 3:
                             confirmed = _a.sent();
                             if (!confirmed)
                                 return [2 /*return*/];
                             return [4 /*yield*/, this._insert()];
-                        case 2:
+                        case 4:
                             _a.sent();
                             return [2 /*return*/];
                     }
@@ -19643,7 +19659,7 @@
         };
         CrudListComponent.prototype.showFormStartWorkflow = function (rowData) {
             return __awaiter(this, void 0, void 0, function () {
-                var workflowSetting;
+                var workflowSetting, resultCheckExist;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, this.getItemWorkflowSetting(rowData)];
@@ -19651,31 +19667,44 @@
                             workflowSetting = _b.sent();
                             if (!workflowSetting)
                                 return [2 /*return*/];
-                            // Nếu create task thay vì chạy quy trình với đối tượng chính thì mở form thêm công việc
-                            if (workflowSetting.createTaskInstead) {
-                                this.congViecModel.data.congViecSetting.isWorkflowTree = true;
-                                this.congViecModel.data.model = {
-                                    formState: exports.FormState.ADD,
-                                    data: {
-                                        idLoaiCongViec: workflowSetting.idLoaiCongViecDefault,
-                                        serviceCode: this.setting.baseService.serviceCode,
-                                        entity: this.setting.baseService.entityName,
-                                        entityKey: rowData.id,
-                                        ten: this.getTenCongViec(workflowSetting.templateTaskName, rowData)
-                                    }
-                                };
-                                this.congViecModel.showEditForm = true;
+                            if (!workflowSetting.createTaskInstead) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this._congViecService.checkExistByFilter([
+                                    this.newFilter('serviceCode', exports.Operator.equal, this.setting.baseService.serviceCode),
+                                    this.newFilter('entity', exports.Operator.equal, this.setting.baseService.entityName),
+                                    this.newFilter('entityKey', exports.Operator.equal, rowData.id)
+                                ])];
+                        case 2:
+                            resultCheckExist = (_b.sent());
+                            if (!resultCheckExist.success) {
+                                return [2 /*return*/, this._notifierService.showWarning('Có lỗi xảy ra khi kiểm tra trạng thái đã tạo công việc hay chưa')];
                             }
-                            else {
-                                if (workflowSetting.workflows.length == 1) {
-                                    return [2 /*return*/, this.startWorkflow(rowData, workflowSetting.workflows[0])];
+                            if (resultCheckExist.data) {
+                                return [2 /*return*/, this._notifierService.showWarning('Bản ghi đã được tạo công việc')];
+                            }
+                            this.congViecModel.data.congViecSetting.isWorkflowTree = true;
+                            this.congViecModel.data.model = {
+                                formState: exports.FormState.ADD,
+                                data: {
+                                    checkUniqueTaskForEntity: true,
+                                    idLoaiCongViec: workflowSetting.idLoaiCongViecDefault,
+                                    serviceCode: this.setting.baseService.serviceCode,
+                                    entity: this.setting.baseService.entityName,
+                                    entityKey: rowData.id,
+                                    ten: this.getTenCongViec(workflowSetting.templateTaskName, rowData)
                                 }
-                                this.startWorkflowModel.data.workflows = workflowSetting.workflows;
-                                this.startWorkflowModel.data.defaultWorkflow = workflowSetting.workflowCode;
-                                this.startWorkflowModel.data.item = rowData;
-                                this.startWorkflowModel.showEditForm = true;
+                            };
+                            this.congViecModel.showEditForm = true;
+                            return [3 /*break*/, 4];
+                        case 3:
+                            if (workflowSetting.workflows.length == 1) {
+                                return [2 /*return*/, this.startWorkflow(rowData, workflowSetting.workflows[0])];
                             }
-                            return [2 /*return*/];
+                            this.startWorkflowModel.data.workflows = workflowSetting.workflows;
+                            this.startWorkflowModel.data.defaultWorkflow = workflowSetting.workflowCode;
+                            this.startWorkflowModel.data.item = rowData;
+                            this.startWorkflowModel.showEditForm = true;
+                            _b.label = 4;
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -19712,13 +19741,15 @@
                                     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 l\u1ECBch s\u1EED",
                                     icon: 'pi pi-calendar',
                                     command: function () { return _this.viewTaskHistory(rowData); }
-                                }
-                            ];
+                                });
+                            }
                             this._showContextMenu(evt);
                             _c.label = 3;
                         case 3: return [2 /*return*/];
@@ -20289,6 +20320,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*/];
@@ -22864,8 +22898,9 @@
                                     textTrangThai: 'Chưa chạy quy trình'
                                 };
                                 var itemId = rowItem.id;
+                                var itemTask = null;
                                 if (!_this.setting.isWorkflowTree && _this.setting.workflowSettingNew.createTaskInstead) {
-                                    var itemTask = dataTask_1.find(function (q) { return q.entityKey == rowItem.id; });
+                                    itemTask = dataTask_1.find(function (q) { return q.entityKey == rowItem.id; });
                                     if (itemTask) {
                                         itemId = itemTask.id;
                                     }
@@ -22880,6 +22915,12 @@
                                         }
                                     }
                                 }
+                                // 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 && itemTask) {
+                                    itemStatus.workflowCode = DummyWorkflowCode;
+                                    itemStatus.textTrangThai = 'Đã tạo công việc';
+                                }
                                 rowItem.__trangThai = itemStatus.trangThai;
                                 rowItem.__textTrangThai = itemStatus.textTrangThai;
                                 rowItem.__workflowCode = itemStatus.workflowCode;
@@ -45809,11 +45850,6 @@
         { type: i0.Injector }
     ]; };
 
-    var MaActionBatDauQuyTrinh = '_START_';
-    var ActionThuHoiBase = '__THU_HOI';
-    var ActionChoYKienBase = '__CHO_Y_KIEN';
-    var ActionUpdateModel = '__UPDATE_MODEL';
-
     var WorkflowHistoryNewComponent = /** @class */ (function (_super) {
         __extends(WorkflowHistoryNewComponent, _super);
         function WorkflowHistoryNewComponent(_injector, _workflowHistoryService, _coCauToChucService, _userGroupService, _roleService, _fileDataService) {
@@ -46611,7 +46647,11 @@
                     field: 'createTaskInstead',
                     label: 'Tạo công việc',
                     showLabel: false,
-                    mdWidth: 12
+                    mdWidth: 2
+                }),
+                new LabelSchema({
+                    mdWidth: 10,
+                    hiddenCheck: function (rootModel) { return _this.checkIfCreateTaskInstead(rootModel, true); }
                 }),
                 new CustomControlSchema({
                     field: 'workflowPicker',
@@ -46619,6 +46659,13 @@
                     hiddenCheck: function (rootModel) { return _this.checkIfCreateTaskInstead(rootModel, true); },
                     mdWidth: 12
                 }),
+                new CheckboxControlSchema({
+                    field: 'taskInsideBusinessForm',
+                    label: 'Hiển thị giao diện tạo công việc trên giao diện thêm mới',
+                    showLabel: false,
+                    mdWidth: 10,
+                    hiddenCheck: function (rootModel) { return _this.checkIfCreateTaskInstead(rootModel, false); }
+                }),
                 new TextControlSchema({
                     field: 'templateTaskName',
                     label: 'Template tên công việc',
@@ -46682,6 +46729,9 @@
             if (this.model.data.createTaskInstead === undefined) {
                 this.model.data.createTaskInstead = false;
             }
+            if (this.model.data.taskInsideBusinessForm === undefined) {
+                this.model.data.taskInsideBusinessForm = false;
+            }
             this.readyCrudForm = true;
         };
         WorkflowSettingNewComponent.prototype.handleCancelWorkflow = function (event) {
@@ -47035,8 +47085,8 @@
             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.hiddenCheckbox = this.formState == FormState.VIEW;
+            // this.setting.hiddenFunctionColumn = this.formState == FormState.VIEW;
             this.setting.fixHeightTypeInDialog = false;
             this.setting.heightType = exports.HeightType.dynamic;
             this.setting.showExportSelectedItems = false;
@@ -50621,7 +50671,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:
@@ -50649,6 +50700,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({
@@ -50656,6 +50728,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: