tnx-shared 5.3.314 → 5.3.316

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";
@@ -5967,6 +5973,7 @@
             this.maxRetryTimes = 10;
             this.isInited = false;
             this.isInitedFull = false;
+            this.isSingleSignalR = false;
             this.wait = function (ms) { return new Promise(function (r) { return setTimeout(r, ms); }); };
             this._moduleConfig = this._moduleConfigService.getConfig();
             this.hubsSetting = this._moduleConfig.environment.signalrConfig.hubs;
@@ -6013,7 +6020,7 @@
                             _a.label = 8;
                         case 8:
                             while (this.delayStarters.length > 0) {
-                                this.delayStarters.pop()();
+                                this.delayStarters.pop();
                             }
                             this.connected = true;
                             return [2 /*return*/];
@@ -6026,6 +6033,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.isSingleSignalR = true;
                             if (this.isInitedFull) {
                                 return [2 /*return*/];
                             }
@@ -6051,7 +6059,7 @@
                             _a.sent();
                             this.autoReconnect(this.hubs['PublicHub']);
                             while (this.delayStarters.length > 0) {
-                                this.delayStarters.pop()();
+                                this.delayStarters.pop();
                             }
                             this.connected = true;
                             return [2 /*return*/];
@@ -6079,7 +6087,8 @@
             return (topic === 'CommonHub' && this.hubsSetting && this.hubsSetting.enableCommonHub)
                 || (topic === 'ConsistencyHub' && this.hubsSetting && this.hubsSetting.enableConsistencyHub)
                 || (topic === 'NotificationHub' && this.hubsSetting && this.hubsSetting.enableNotificationHub)
-                || (topic === 'PublicHub');
+                || (topic === 'PublicHub')
+                || this.isSingleSignalR;
         };
         SignalRService.prototype.stop = function () {
             this._hubConnection.stop();
@@ -19088,7 +19097,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 +19268,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 +19364,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 +19391,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 +19444,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: