tnx-shared 5.1.298 → 5.1.301

package/bundles/tnx-shared.umd.js

@@ -720,7 +720,7 @@
             this.hiddenTrinhKy = true;
             this.useBaseTrinhKy = true;
             this.disableShare = false;
-            this.disableViewWorkflowAttach = true;
+            this.disableViewWorkflowAttach = false;
             this.hiddenWorkflowCoreStatus = true;
             this.requiredVanBanDiAfterTrinhKy = false;
             this.showExportAll = false;
@@ -13599,7 +13599,8 @@
      * Kiểm tra giá trị một cột đã tồn tại trong db.
      */
     var CheckDuplicateValidator = /** @class */ (function () {
-        function CheckDuplicateValidator() {
+        function CheckDuplicateValidator(defaultFilters) {
+            this._defaultFilters = defaultFilters;
         }
         CheckDuplicateValidator.prototype.setBaseService = function (baseService) {
             this._baseService = baseService;
@@ -13617,13 +13618,11 @@
                                 this._label = event.currentNode.control.label;
                             }
                             this._value = event.currentNode.value.toString();
-                            filters = [
-                                {
+                            filters = [{
                                     field: event.currentNode.control.field,
                                     operator: exports.Operator.equal,
                                     value: JSON.stringify(event.currentNode.value)
-                                }
-                            ];
+                                }];
                             if (event.rootModel.id) {
                                 filters.unshift({
                                     field: 'id',
@@ -13631,6 +13630,9 @@
                                     value: JSON.stringify(event.rootModel.id)
                                 });
                             }
+                            if (this._defaultFilters) {
+                                filters.push.apply(filters, __spread(this._defaultFilters));
+                            }
                             return [4 /*yield*/, this._baseService.checkExistByFilter(filters)];
                         case 1:
                             resultCheckExist = _b.sent();
@@ -13651,12 +13653,13 @@
      * Kiểm tra bộ gái trị của nhiều cột đã tồn tại trong db.
      */
     var CheckDuplicateFieldsValidator = /** @class */ (function () {
-        function CheckDuplicateFieldsValidator(duplicateFields, message) {
+        function CheckDuplicateFieldsValidator(duplicateFields, message, defaultFilters) {
             this._dicValue = {};
             this._duplicateFields = duplicateFields;
             if (this._duplicateFields.length == 0)
                 alert('Cấu hình CheckDuplicateFieldsValidator sai');
             this._message = message;
+            this._defaultFilters = defaultFilters;
         }
         CheckDuplicateFieldsValidator.prototype.setBaseService = function (baseService) {
             this._baseService = baseService;
@@ -13664,6 +13667,9 @@
         CheckDuplicateFieldsValidator.prototype.getDuplicateFields = function () {
             return this._duplicateFields;
         };
+        CheckDuplicateFieldsValidator.prototype.getDefaultFilters = function () {
+            return this._defaultFilters;
+        };
         CheckDuplicateFieldsValidator.prototype.getMessage = function () {
             var reg = new RegExp('(?<={{)[^}]+(?=})', 'g');
             var result = this._message.match(reg);
@@ -13733,6 +13739,9 @@
                                     value: JSON.stringify(event.rootModel.id)
                                 });
                             }
+                            if (this._defaultFilters) {
+                                filters.push.apply(filters, __spread(this._defaultFilters));
+                            }
                             return [4 /*yield*/, this._baseService.checkExistByFilter(filters)];
                         case 1:
                             resultCheckExist = _c.sent();
@@ -15083,7 +15092,7 @@
                 }
                 else if (validator instanceof CheckDuplicateFieldsValidator) {
                     validator.setBaseService(_this.setting.baseService);
-                    _this.createValidatorCheckDuplicate(schema, validator.getDuplicateFields(), validator.getMessage());
+                    _this.createValidatorCheckDuplicate(schema, validator.getDuplicateFields(), validator.getMessage(), validator.getDefaultFilters());
                 }
                 else if (validator instanceof RequiredFieldsValidator) {
                     _this.createValidatorRequireds(schema, validator.getRequiredFields(), validator.getMessage());
@@ -15120,7 +15129,7 @@
                 }
             }
         };
-        CrudFormComponent.prototype.createValidatorCheckDuplicate = function (schema, fieldOther, message) {
+        CrudFormComponent.prototype.createValidatorCheckDuplicate = function (schema, fieldOther, message, defaultFilters) {
             var _this = this;
             if (fieldOther.indexOf(schema.uniqueField) > -1) {
                 this._notifierService.showWarning('Schema cấu hình bị lỗi');
@@ -15132,7 +15141,7 @@
                     var tmpFields = fields_1.filter(function (p) { return p != schemaOther.field; });
                     if (!schemaOther.validators.some(function (p) { return p instanceof CheckDuplicateFieldsValidator
                         && _this._commonService.isSameArray(tmpFields, p.getDuplicateFields()); })) {
-                        var _validator = new CheckDuplicateFieldsValidator(tmpFields, message);
+                        var _validator = new CheckDuplicateFieldsValidator(tmpFields, message, defaultFilters);
                         _validator.setBaseService(_this.setting.baseService);
                         schemaOther.validators.push(_validator);
                     }
@@ -20986,7 +20995,7 @@
         };
         CrudListComponent.prototype.showContextMenu = function (evt, rowData) {
             return __awaiter(this, void 0, void 0, function () {
-                var _b;
+                var _b, showWorkflowAttach;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -20998,7 +21007,8 @@
                             if (!this.setting.disableShare) {
                                 this.buttonContexts.push({ label: 'Chia sẻ', icon: 'pi pi-link', command: this.createShareLink.bind(this) }, { label: 'Danh sách chia sẻ', icon: 'pi pi-list', command: this.showLinkSharing.bind(this) });
                             }
-                            if (!this.setting.disableViewWorkflowAttach) {
+                            showWorkflowAttach = localStorage.getItem('__showWorkflowAttach');
+                            if (showWorkflowAttach == 'true') {
                                 this.buttonContexts.push({ label: 'Danh sách công việc', icon: 'pi pi-list', command: this.showAttachedTask.bind(this) });
                             }
                             if (this.buttonContexts.length > 0) {