feat: upgrade the molecule to latest version

DTStack · Jan 6, 2023 · 377590d · 377590d
1 parent e1d3d01
commit 377590d
Show file tree

Hide file tree

Showing 4 changed files with 304 additions and 641 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
 		"@babel/preset-env": "^7.12.16",
 		"@babel/preset-react": "^7.12.13",
 		"@babel/preset-typescript": "^7.12.16",
-		"@dtinsight/molecule": "^0.9.0-beta.1",
+		"@dtinsight/molecule": "^1.3.0",
 		"@jcubic/lips": "^1.0.0-beta.14",
 		"@types/tape": "^4.13.0",
 		"babel-loader": "^8.2.2",

diff --git a/web/app.js b/web/app.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { MoleculeProvider, Workbench } from '@dtinsight/molecule';
+import { create, Workbench } from '@dtinsight/molecule';
 import '@dtinsight/molecule/esm/style/mo.css';
 import { ExtendsWorkbench } from './extensions/workbench';
 
@@ -35,10 +35,10 @@ window.MonacoEnvironment = {
 	}
 };
 
-const App = () => (
-	<MoleculeProvider extensions={[ExtendsWorkbench]}>
-		<Workbench />
-	</MoleculeProvider>
-);
+const moInstance = create({
+	extensions: [ExtendsWorkbench]
+});
+
+const App = () => moInstance.render(<Workbench />);
 
 ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/web/extensions/workbench/sidebar.tsx b/web/extensions/workbench/sidebar.tsx
@@ -48,11 +48,12 @@ export default class Sidebar extends React.Component {
 	}, 200);
 
 	convertMsgToProblemItem = (tab: IEditorTab, code, msgs = []): IProblemsItem => {
-		const rootId = Number(tab.id);
+		const rootId = tab.id;
 		const rootName = `${tab.name || ''}`;
 		const languageProblems: IProblemsItem = {
 			id: rootId,
 			name: rootName,
+			isLeaf: false,
 			value: {
 				code: rootName,
 				message: '',
@@ -67,15 +68,16 @@ export default class Sidebar extends React.Component {
 
 		languageProblems.children = msgs.map((msg: any, index: number) => {
 			return {
-				id: rootId + index,
-				name: code || '',
+				id: `${rootId}-${index}`,
+				name: msg.code || '',
+				isLeaf: true,
 				value: {
-					code: '',
+					code: msg.code,
 					message: msg.message,
 					startLineNumber: Number(msg.startLine),
 					startColumn: Number(msg.startCol),
 					endLineNumber: Number(msg.endLine),
-					endColumn: Number(msg.endLine),
+					endColumn: Number(msg.endCol),
 					status: MarkerSeverity.Error
 				},
 				children: []
@@ -129,11 +131,7 @@ export default class Sidebar extends React.Component {
 
 	renderColorThemes() {
 		const options = languages.map((language: string) => {
-			return (
-				<Option key={language} value={language}>
-					{language}
-				</Option>
-			);
+			return <Option value={language}>{language}</Option>;
 		});
 		return (
 			<Select