tnx-shared 5.3.195 → 5.3.197

package/fesm2015/tnx-shared.js

@@ -18472,6 +18472,7 @@ class ListComponentBase extends ComponentBase {
         this.FileUploadMode = FileUploadMode;
         this.Operator = Operator;
         this.showSaveReorder = false;
+        this.settingDefault = new CrudListSetting();
         this._unSubscribeAll = new Subject();
         this.handleSelectRow = (evt, data) => {
             if (this.setting.hasCustomHandleClickRow) {
@@ -18757,6 +18758,7 @@ class ListComponentBase extends ComponentBase {
         this._rawDataSource = dataSource;
     }
     ngOnInit() {
+        this.settingDefault = Object.assign({}, this.setting);
         this.subscribe(ComCtxConstants.COMMON.ENTITY_METADATA_RELOADED, service => {
             this.entityMetadataService = service;
         });
@@ -18944,18 +18946,28 @@ class ListComponentBase extends ComponentBase {
             }
             temp.push(element);
             const config = this.setting.columnSetting.details.find(p => p.columnCode == element.field);
+            const col = this.setting.cols.find(p => 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._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 = DataType.string;
             }
@@ -19054,12 +19066,13 @@ class ListComponentBase extends ComponentBase {
     getColumnSetting(colGroup) {
         this.setting.groupColumn = colGroup;
         const dataSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING);
-        if (dataSetting) {
+        const jsonData = this.tryParseJson(dataSetting);
+        if (dataSetting && jsonData.valid && jsonData.value.length > 0) {
             let pathName = location.pathname;
             if (this.setting.settingKey) {
                 pathName += '/' + this.setting.settingKey;
             }
-            const settings = JSON.parse(dataSetting);
+            const settings = jsonData.value;
             for (const element of settings) {
                 // const element = settings[i];
                 if (element.pathname === pathName) {
@@ -19129,6 +19142,7 @@ class ListComponentBase extends ComponentBase {
             if (index > -1)
                 columnSetting.splice(index, 1);
         }
+        // this.setting.columnSetting.details = [];
         localStorage.setItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING, JSON.stringify(columnSetting));
     }
     getColorSetting() {
@@ -19949,8 +19963,10 @@ class ListComponentBase extends ComponentBase {
         this._showSettings = false;
     }
     onDeleteSettings() {
+        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);
@@ -20866,7 +20882,9 @@ class ListComponentBase extends ComponentBase {
                 this.startWorkflowModel.showEditForm = true;
                 rowData.__startingWorkflow = false;
                 const compRef = yield this._federationService.loadRemoteNewComponent('commonapp', 'StartWorkflowComponent', this.startWorkflowViewContainer);
-                dialog.buttonTemplateInput = compRef.instance.buttonTemplate;
+                if (dialog) {
+                    dialog.buttonTemplateInput = compRef.instance.buttonTemplate;
+                }
                 compRef.workflows = workflowSetting.workflows;
                 compRef.defaultWorkflow = workflowSetting.workflowCode;
                 compRef.instance.onSaved.subscribe(event => this.handleStartWorkflowFromDialog(event));