From d87af0e86c094192670650fa11e570a71f8019eb Mon Sep 17 00:00:00 2001 From: plucik Date: Thu, 16 May 2024 15:47:50 +0300 Subject: [PATCH] change non existent v_font_size with fontSize variable from settingsStore, adds autoResize == false to tabulator grids --- .../js/pgmanage_frontend/src/components/DataEditorTab.vue | 1 + .../js/pgmanage_frontend/src/components/MonitoringTab.vue | 1 + .../js/pgmanage_frontend/src/components/MonitoringWidget.vue | 1 + .../static/assets/js/pgmanage_frontend/src/header_actions.js | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/DataEditorTab.vue b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/DataEditorTab.vue index 2759bc7a8..b0635a8ac 100644 --- a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/DataEditorTab.vue +++ b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/DataEditorTab.vue @@ -108,6 +108,7 @@ export default { let table = new Tabulator(this.$refs.tabulator, { layout: 'fitDataStretch', data: [], + autoResize: false, columnDefaults: { headerHozAlign: "left", headerSort: false, diff --git a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringTab.vue b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringTab.vue index 4ba5276a2..199694408 100644 --- a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringTab.vue +++ b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringTab.vue @@ -85,6 +85,7 @@ export default { this.table = new Tabulator(this.$refs.tabulator, { autoColumns: true, layout: "fitDataStretch", + autoResize: false, columnDefaults: { headerHozAlign: "left", headerSort: false, diff --git a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringWidget.vue b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringWidget.vue index f885b40fd..a8659ac81 100644 --- a/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringWidget.vue +++ b/pgmanage/app/static/assets/js/pgmanage_frontend/src/components/MonitoringWidget.vue @@ -269,6 +269,7 @@ export default { let tabulator = new Tabulator(this.$refs.gridContent, { data: data.data, height: "100%", + autoResize: false, layout: "fitDataStretch", selectableRows: true, clipboard: "copy", diff --git a/pgmanage/app/static/assets/js/pgmanage_frontend/src/header_actions.js b/pgmanage/app/static/assets/js/pgmanage_frontend/src/header_actions.js index 6eee90515..44b0cb515 100644 --- a/pgmanage/app/static/assets/js/pgmanage_frontend/src/header_actions.js +++ b/pgmanage/app/static/assets/js/pgmanage_frontend/src/header_actions.js @@ -188,7 +188,7 @@ function cellDataModal(p_ht, p_row, p_col, p_content, p_can_alter) { v_editor.session.setMode("ace/mode/sql"); v_editor.$blockScrolling = Infinity; - v_editor.setFontSize(Number(v_font_size)); + v_editor.setFontSize(settingsStore.fontSize); v_editor.setOptions({enableBasicAutocompletion: true});