tnx-shared 5.1.404 → 5.1.405

package/bundles/tnx-shared.umd.js

@@ -1271,6 +1271,9 @@
             _this.minDate = null;
             _this.maxDate = null;
             _this.timeOnly = false;
+            _this.dateFormat = 'dd/mm/yy';
+            _this.view = 'date';
+            _this.yearRange = '1950:2050';
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -2137,6 +2140,7 @@
         Operator["greaterThanEqual"] = "gte";
         Operator["lower"] = "lt";
         Operator["lowerThanEqual"] = "lte";
+        Operator["relationalData"] = "relationaldata";
         Operator["contain"] = "contains";
         Operator["notContain"] = "ncontains";
         Operator["startWith"] = "startswith";
@@ -17081,7 +17085,11 @@
                             enableVersion = this._entityMetadataService.getByCode('enableVersion');
                             if (enableVersion == '1') {
                                 this.setting.filterCheckExistByVersion = [
-                                    new Filter({ field: 'code', operator: exports.Operator.notEqual, value: JSON.stringify(this.model.data.code) })
+                                    new Filter({
+                                        field: 'code',
+                                        operator: exports.Operator.notEqual,
+                                        value: JSON.stringify(this.model.data.code)
+                                    })
                                 ];
                             }
                             _a.label = 2;
@@ -17249,10 +17257,10 @@
                         case 1:
                             validated = _a.sent();
                             if (!validated) return [3 /*break*/, 9];
-                            this.triggerSaveFileUpload();
                             return [4 /*yield*/, this.onBeforeSave()];
                         case 2:
                             _a.sent();
+                            this.triggerSaveFileUpload();
                             if (!this.autoSave) return [3 /*break*/, 7];
                             if (!(this._isFormEdit() || this._isFormView())) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.onUpdate()];
@@ -22349,11 +22357,10 @@
                     case exports.DataType.date:
                     case exports.DataType.datetime:
                         templateFilter.push.apply(templateFilter, __spread(_this.getRangeFilter(col, function (item) {
-                            var date = new Date(item);
+                            var date = new Date(item[0]);
                             return new Date(date.getFullYear(), date.getMonth(), date.getDate());
-                            // return addDay(item, 1, -1);
                         }, function (item) {
-                            var date = new Date(item);
+                            var date = new Date(item[1]);
                             return new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1, 0, 0, -1);
                         })));
                         break;
@@ -22376,7 +22383,7 @@
                     operator: exports.Operator.greaterThanEqual,
                     sourceField: col.field,
                     subField: 0,
-                    funcGetValue: funcGetValueFrom ? funcGetValueTo : function (item) { return item[0]; },
+                    funcGetValue: funcGetValueFrom ? funcGetValueFrom : function (item) { return item[0]; },
                 }),
                 new Filter({
                     field: this.getFieldFilter(col),
@@ -47858,7 +47865,7 @@
     DatetimePickerComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'datetime-picker',
-                    template: "<p-calendar #calendar [disabled]=\"control.disabled || disabled\" [selectOtherMonths]=\"true\"\r\n    [inputStyleClass]=\"'input-calendar'\" [autoZIndex]=\"true\" [minDate]=\"control.minDate\" [maxDate]=\"control.maxDate\"\r\n    [dateFormat]=\"'dd/mm/yy'\" [hourFormat]=\"24\" [placeholder]=\"control.placeholder\" [showIcon]=\"control.showIcon\"\r\n    [locale]=\"vi\" [monthNavigator]=\"true\" [yearNavigator]=\"true\" yearRange=\"1900:2050\" [showTime]=\"control.showTime\"\r\n    [timeOnly]=\"control.timeOnly\" [showOnFocus]=\"control.showOnFocus\" [keepInvalid]=\"true\" [appendTo]=\"control.appendTo\"\r\n    [panelStyleClass]=\"getPanelClass()\" [showTransitionOptions]=\"showTransitionOptions\"\r\n    [hideTransitionOptions]=\"hideTransitionOptions\" [(ngModel)]=\"_controlModelData\" (onFocus)=\"onFocusCalendar($event)\"\r\n    (onBlur)=\"onBlurCalendar($event)\" (onSelect)=\"onSelectDateTime($event)\" (onShow)=\"onShowCalendar($event)\"\r\n    (onClose)=\"onCloseCalendar($event)\">\r\n</p-calendar>",
+                    template: "<p-calendar #calendar [disabled]=\"control.disabled || disabled\" [selectOtherMonths]=\"true\"\r\n        [inputStyleClass]=\"'input-calendar'\" [autoZIndex]=\"true\" [minDate]=\"control.minDate\" [maxDate]=\"control.maxDate\"\r\n        [dateFormat]=\"control.dateFormat\" [hourFormat]=\"24\" [placeholder]=\"control.placeholder\" [showIcon]=\"control.showIcon\"\r\n        [locale]=\"vi\" [monthNavigator]=\"true\" [yearNavigator]=\"true\" [yearRange]=\"control.yearRange\" [showTime]=\"control.showTime\"\r\n        [timeOnly]=\"control.timeOnly\" [showOnFocus]=\"control.showOnFocus\" [keepInvalid]=\"true\" [appendTo]=\"control.appendTo\"\r\n        [panelStyleClass]=\"getPanelClass()\" [showTransitionOptions]=\"showTransitionOptions\"\r\n        [hideTransitionOptions]=\"hideTransitionOptions\"\r\n        [view]=\"control.view\"\r\n        [(ngModel)]=\"_controlModelData\"\r\n        (onFocus)=\"onFocusCalendar($event)\" (onBlur)=\"onBlurCalendar($event)\"\r\n        (onSelect)=\"onSelectDateTime($event)\" (onShow)=\"onShowCalendar($event)\"\r\n        (onClose)=\"onCloseCalendar($event)\"\r\n>\r\n</p-calendar>\r\n",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,