tnx-shared 5.3.313 → 5.3.315

package/bundles/tnx-shared.umd.js

@@ -2567,13 +2567,19 @@
     var LogColumn = /** @class */ (function () {
         function LogColumn(init) {
             this.visible = true;
-            this.isHtml = false;
+            this.enumLogType = 1;
             for (var key in init) {
                 this[key] = init[key];
             }
         }
         return LogColumn;
     }());
+    exports.EnumLogType = void 0;
+    (function (EnumLogType) {
+        EnumLogType[EnumLogType["Normal"] = 1] = "Normal";
+        EnumLogType[EnumLogType["Html"] = 2] = "Html";
+        EnumLogType[EnumLogType["Table"] = 3] = "Table";
+    })(exports.EnumLogType || (exports.EnumLogType = {}));
     exports.DataType = void 0;
     (function (DataType) {
         DataType["date"] = "date";
@@ -19088,7 +19094,7 @@
                         _this.logSetting.arrValueAfterUpdate.push(new LogColumn({
                             field: control.field,
                             label: control.label,
-                            valueBefore: control._component.dataSource.map(function (p) { return p.label; }).join(', '),
+                            valueBefore: control._component.dataSource.map(function (p) { return p.label; }).join(', ') || _this.logSetting.emptyValue,
                             visible: false,
                             valueAfter: ''
                         }));
@@ -19259,7 +19265,7 @@
             });
         };
         DataFormBase.prototype.getSingleLabel = function (control, dataSource, valueParam) {
-            var result = dataSource.find(function (p) { return p.value[control.valueField] == valueParam; });
+            var result = dataSource.find(function (p) { return (p === null || p === void 0 ? void 0 : p.value[control.valueField]) == valueParam; });
             if (!!result) {
                 var funcGetLabel = control.funcGetLabel;
                 if (funcGetLabel) {
@@ -19355,8 +19361,18 @@
                         var oldValue = this.logSetting.valueBeforeUpdate[control.field];
                         var newValue = cloneModel[control.field];
                         var isMultiple = Array.isArray(oldValue);
-                        if (!this.isNullOrEmpty(oldValue) || !this.isNullOrEmpty(newValue)) {
-                            if (control instanceof DropdownControlSchema || control instanceof AutoCompletePickerControlSchema) {
+                        if ((!this.isNullOrEmpty(oldValue) || !this.isNullOrEmpty(newValue))
+                            && !(control instanceof FileManagerControlSchema)) {
+                            if (control instanceof TableSchema) {
+                                if (JSON.stringify(oldValue) != JSON.stringify(newValue)) {
+                                    this.logSetting.arrValueAfterUpdate.push(new LogColumn({
+                                        field: control.field,
+                                        label: control.label,
+                                        enumLogType: exports.EnumLogType.Table
+                                    }));
+                                }
+                            }
+                            else if (control instanceof DropdownControlSchema || control instanceof AutoCompletePickerControlSchema) {
                                 if (!isMultiple && oldValue != newValue) {
                                     this.addSinglePropertyLog(control, oldValue, newValue);
                                 }
@@ -19372,7 +19388,9 @@
                                         label: control.label,
                                         valueBefore: valueBefore,
                                         valueAfter: valueAfter,
-                                        isHtml: (control instanceof EditorControlSchema || control instanceof TextAreaControlSchema)
+                                        enumLogType: (control instanceof EditorControlSchema || control instanceof TextAreaControlSchema)
+                                            ? exports.EnumLogType.Table
+                                            : exports.EnumLogType.Normal
                                     }));
                                 }
                             }
@@ -19423,7 +19441,9 @@
                         case 4:
                             // cấu hình thêm
                             _e.sent();
-                            this.model.data.logMetaData = JSON.stringify(this.logSetting.arrValueAfterUpdate.filter(function (p) { return p.visible; }));
+                            this.model.data.logMetaData = this.logSetting.arrValueAfterUpdate.filter(function (p) { return p.visible; }).length
+                                ? JSON.stringify(this.logSetting.arrValueAfterUpdate.filter(function (p) { return p.visible; }))
+                                : null;
                             _e.label = 5;
                         case 5: return [4 /*yield*/, this.onBeforeSave()];
                         case 6:
@@ -20893,11 +20913,8 @@
                                     finally { if (e_4) throw e_4.error; }
                                 }
                             }
-                            if (item.ngaySinh) {
-                                item.strNgaySinh = this._crudService.renderDate(item.ngaySinh, 'normal');
-                            }
-                            else {
-                                item.strNgaySinh = item.ngaySinh2;
+                            if (!item.ngaySinh && item.ngaySinh2) {
+                                item.ngaySinh = new Date(item.ngaySinh2);
                             }
                             item.hocHamHocVi
                                 = item.idHocHam && item.idHocVi
@@ -20989,7 +21006,8 @@
                 }),
                 new EntityPickerColumn({
                     label: 'Ngày sinh',
-                    code: 'strNgaySinh',
+                    code: 'ngaySinh',
+                    dataType: exports.DataType.date,
                     isSearchable: true,
                     width: '120px',
                     notInFields: true,
@@ -21068,8 +21086,9 @@
                 }),
                 new EntityPickerColumn({
                     label: 'Ngày sinh',
-                    code: 'strNgaySinh',
+                    code: 'ngaySinh',
                     isSearchable: true,
+                    dataType: exports.DataType.date,
                     width: '120px',
                     notInFields: true,
                     textAlign: 1,
@@ -53151,8 +53170,8 @@
         TnAppNotificationComponent.prototype.afterGetNotication = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var idsUserCreated, userRes, lstUserInfo;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             idsUserCreated = [];
                             this.notifications.forEach(function (element) {
@@ -53166,7 +53185,7 @@
                             }
                             return [4 /*yield*/, this._userV5Service.getAll([this.newFilter('id', exports.Operator.in, idsUserCreated)], 'avatar,id')];
                         case 1:
-                            userRes = _a.sent();
+                            userRes = _b.sent();
                             if (!userRes.success || !userRes.data || userRes.data.length === 0) {
                                 return [2 /*return*/];
                             }
@@ -53218,15 +53237,15 @@
         TnAppNotificationComponent.prototype.goToLink = function (item) {
             return __awaiter(this, void 0, void 0, function () {
                 var link;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!!this.isReaded(item)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.readById(item)];
                         case 1:
-                            _a.sent();
+                            _b.sent();
                             this.totalUnRead--;
-                            _a.label = 2;
+                            _b.label = 2;
                         case 2:
                             // Save current path to go back
                             localStorage.setItem('currentUrl', top.location.href);
@@ -53262,8 +53281,9 @@
             this.bounceNoti = false;
         };
         TnAppNotificationComponent.prototype.handleClicked = function () {
-            var thongBaoDomain = "/thong-bao";
-            window.open(thongBaoDomain);
+            var _a;
+            var appCode = (_a = window['appCode']) !== null && _a !== void 0 ? _a : '';
+            this._router.navigateByUrl("/" + appCode.toLowerCase() + "/thong-bao");
         };
         return TnAppNotificationComponent;
     }(ComponentBase));