Skip to content

Commit 1c34b72

Browse files
committed
Merge branch 'dev-4.3.0' into dev-4.3.1
2 parents 1b578b5 + 148c1ef commit 1c34b72

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"mobx": "^5.9.4",
132132
"mobx-react": "^6.3.1",
133133
"moment": "^2.29.0",
134-
"monaco-editor": "^0.49.0",
134+
"monaco-editor": "~0.45.0",
135135
"monaco-editor-webpack-plugin": "^7.0.1",
136136
"npm-run-all": "^4.1.5",
137137
"path-to-regexp": "^2.1.0",

pnpm-lock.yaml

Lines changed: 15 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/component/MonacoEditor/DiffEditor.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ const DiffEditor = inject('settingStore')(
7979
minimap: { enabled: false },
8080
renderOverviewRuler: false,
8181
automaticLayout: true,
82+
useInlineViewWhenSpaceIsLimited: false,
8283
unicodeHighlight: {
8384
invisibleCharacters: false,
8485
ambiguousCharacters: false,

src/component/Task/StructureComparisonTask/DetailContent/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ const StructureComparisonTaskContent: React.FC<IStructureComparisonTaskContentPr
495495
open={detailModalOpen}
496496
destroyOnClose
497497
closable
498-
width={844}
498+
width={900}
499499
footer={null}
500500
onCancel={() => {
501501
setDetailModalOpen(false);

src/page/Workspace/context/WorkspaceStore.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default function WorkspaceStore({ children }) {
101101
true,
102102
true,
103103
);
104-
setDatabaseList(data?.contents);
104+
setDatabaseList(data?.contents || []);
105105
return data?.contents;
106106
}
107107
}, [selectProjectId, selectDatasourceId]);

0 commit comments

Comments
 (0)