tnx-shared 5.3.194 → 5.3.196

package/bundles/tnx-shared.umd.js

@@ -21774,6 +21774,7 @@
             _this.FileUploadMode = exports.FileUploadMode;
             _this.Operator = exports.Operator;
             _this.showSaveReorder = false;
+            _this.settingDefault = new CrudListSetting();
             _this._unSubscribeAll = new rxjs.Subject();
             _this.handleSelectRow = function (evt, data) {
                 if (_this.setting.hasCustomHandleClickRow) {
@@ -22091,6 +22092,7 @@
         ListComponentBase.prototype.ngOnInit = function () {
             var e_1, _g;
             var _this = this;
+            this.settingDefault = Object.assign({}, this.setting);
             this.subscribe(ComCtxConstants.COMMON.ENTITY_METADATA_RELOADED, function (service) {
                 _this.entityMetadataService = service;
             });
@@ -22305,18 +22307,28 @@
                 }
                 temp.push(element);
                 var config = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == element.field; });
+                var col = this_1.setting.cols.find(function (p) { return p.field == element.field; });
                 if (config && config.visible !== undefined && config.visible !== null) {
                     element.visible = config.visible;
                 }
+                else if (col) {
+                    // element.visible = col.visible;
+                }
                 if (element.label) {
                     element.label = this_1._translateService.instant(element.label);
                 }
                 if (config && config.textAlign !== undefined && config.textAlign !== null) {
                     element.textAlign = config.textAlign;
                 }
+                else if (col) {
+                    // element.textAlign = col.textAlign;
+                }
                 if (config && config.width !== undefined && config.width !== null) {
                     element.width = config.width;
                 }
+                else if (col) {
+                    // element.width = col.width;
+                }
                 if (element.dataType == null || element.dataType == undefined || element.dataType == '') {
                     element.dataType = exports.DataType.string;
                 }
@@ -22441,12 +22453,13 @@
             var e_5, _g;
             this.setting.groupColumn = colGroup;
             var dataSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING);
-            if (dataSetting) {
+            var jsonData = this.tryParseJson(dataSetting);
+            if (dataSetting && jsonData.valid && jsonData.value.length > 0) {
                 var pathName = location.pathname;
                 if (this.setting.settingKey) {
                     pathName += '/' + this.setting.settingKey;
                 }
-                var settings = JSON.parse(dataSetting);
+                var settings = jsonData.value;
                 try {
                     for (var settings_1 = __values(settings), settings_1_1 = settings_1.next(); !settings_1_1.done; settings_1_1 = settings_1.next()) {
                         var element = settings_1_1.value;
@@ -22526,6 +22539,7 @@
                 if (index > -1)
                     columnSetting.splice(index, 1);
             }
+            // this.setting.columnSetting.details = [];
             localStorage.setItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING, JSON.stringify(columnSetting));
         };
         ListComponentBase.prototype.getColorSetting = function () {
@@ -23429,8 +23443,10 @@
             this._showSettings = false;
         };
         ListComponentBase.prototype.onDeleteSettings = function () {
+            var _a, _b;
             this._showSettings = false;
-            this.setting.columnSetting = new ColumnSetting();
+            // this.setting.columnSetting = new ColumnSetting();
+            this.setting.columnSetting = (_b = (_a = this.settingDefault) === null || _a === void 0 ? void 0 : _a.columnSetting) !== null && _b !== void 0 ? _b : new ColumnSetting();
             this.deleteColumnSetting();
             this.extendColumns(this.setting.cols);
             this.formatColumns(this.setting.cols);