Skip to content

Commit b6e1223

Browse files
Fixed an issue where the result grid slowed down when any column contained a large amount of data. #6510
1 parent 28921be commit b6e1223

16 files changed

Lines changed: 484 additions & 471 deletions

File tree

14.4 KB
Loading

docs/en_US/preferences.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,9 @@ preferences for copied data.
542542
setting won't have any effect.
543543
* Specify the number of records to fetch in one batch. Changing this value will
544544
override DATA_RESULT_ROWS_PER_PAGE setting from config file.
545+
* Use the *Max column data display length* to specify the maximum number of
546+
characters to display in a cell. If the data is larger than this value, it
547+
will be truncated.
545548
* Use the *Result copy field separator* drop-down listbox to select the field
546549
separator for copied data.
547550
* Use the *Result copy quote character* drop-down listbox to select the quote

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
"insert-if": "^1.1.0",
115115
"ip-address": "^10.0.1",
116116
"json-bignumber": "^1.0.1",
117-
"jsoneditor": "^10.1.2",
118117
"leaflet": "^1.9.4",
119118
"lodash": "4.*",
120119
"moment": "^2.29.4",
@@ -150,6 +149,7 @@
150149
"uplot": "^1.6.32",
151150
"uplot-react": "^1.1.4",
152151
"valid-filename": "^4.0.0",
152+
"vanilla-jsoneditor": "^3.3.1",
153153
"wkx": "^0.5.0",
154154
"zustand": "^5.0.3"
155155
},

web/pgadmin/static/css/style.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
@import 'node_modules/@xterm/xterm/css/xterm.css';
55

6-
@import 'node_modules/jsoneditor/dist/jsoneditor.min.css';
76
@import 'node_modules/react-checkbox-tree/lib/react-checkbox-tree.css';
87

98
@import 'node_modules/@simonwep/pickr/dist/themes/monolith.min.css';

web/pgadmin/static/js/Theme/overrides/codemirror.override.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ export default function cmOverride(theme) {
1111
const editor = theme.otherVars.editor;
1212
return {
1313
'.cm-editor': {
14+
// CSS variables for jsoneditor's CodeMirror
15+
'--jse-font-family-mono': theme.typography.fontFamilySourceCode,
16+
'--jse-panel-background': editor.guttersBg,
17+
'--jse-panel-color-readonly': editor.guttersFg,
18+
'--jse-panel-border': 'none',
1419
height: '100%',
1520
color: editor.fg,
1621
backgroundColor: editor.bg,

0 commit comments

Comments
 (0)