[Refactor][Web]Refactoring a new data development interface to enhanc…

…e the user experience (DataLinkDC#3854) Signed-off-by: Zzm0809 <[email protected]> Co-authored-by: zackyoungh <[email protected]> Co-authored-by: Zzm0809 <[email protected]> Co-authored-by: gaoyan <[email protected]> Co-authored-by: gaoyan1998 <[email protected]> Co-authored-by: zhangyuhang <[email protected]> Co-authored-by: LUOSHANGJIE\71826 <[email protected]> Co-authored-by: 18216499322 <[email protected]> Co-authored-by: Zzm0809 <[email protected]>
Zzm0809 · Nov 7, 2024 · e86841b · e86841b
1 parent 258a2c1
commit e86841b
Show file tree

Hide file tree

Showing 106 changed files with 14,772 additions and 1,335 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/StudioServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/StudioServiceImpl.java
@@ -120,7 +120,7 @@ public LineageResult getLineage(StudioLineageDTO studioCADTO) {
             }
         } else {
             TaskDTO taskDTO = taskService.getTaskInfoById(studioCADTO.getTaskId());
-            taskDTO.setStatement(taskService.buildEnvSql(taskDTO) + taskDTO.getStatement());
+            taskDTO.setStatement(taskService.buildEnvSql(taskDTO) + studioCADTO.getStatement());
             JobConfig jobConfig = taskDTO.getJobConfig();
             return LineageBuilder.getColumnLineageByLogicalPlan(taskDTO.getStatement(), jobConfig.getExecutorSetting());
         }

diff --git a/dinky-admin/src/main/java/org/dinky/ws/SqlGateway.java b/dinky-admin/src/main/java/org/dinky/ws/SqlGateway.java
@@ -61,7 +61,7 @@
 
 @Component
 @Slf4j
-@ServerEndpoint("/ws/sql-gateway/")
+@ServerEndpoint("/api/ws/sql-gateway/")
 public class SqlGateway {
 
     private Session session;

diff --git a/dinky-web/config/config.ts b/dinky-web/config/config.ts
@@ -23,7 +23,7 @@ import proxy from './proxy';
 import routes from './routes';
 
 const { REACT_APP_ENV = 'dev' } = process.env;
-
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 // @ts-ignore
 export default defineConfig({
   /**
@@ -196,5 +196,14 @@ export default defineConfig({
     strategy: 'eager'
   },
   // requestRecord: {},
-  dva: {}
+  dva: {},
+
+  chainWebpack: (memo) => {
+    memo.plugin('monaco-editor-webpack-plugin').use(MonacoWebpackPlugin, [
+      // 按需配置
+      { languages: ['shell', 'json', 'java', 'sql', 'python', 'scala', 'yaml'] }
+    ]);
+
+    return memo;
+  }
 });
diff --git a/dinky-web/config/routes.ts b/dinky-web/config/routes.ts
@@ -64,6 +64,13 @@ export default [
     footerRender: false,
     component: './DataStudio'
   },
+  {
+    path: '/datastudio-new',
+    name: 'datastudio',
+    icon: 'CodeOutlined',
+    footerRender: false,
+    component: './DataStudioNew'
+  },
   {
     path: '/devops',
     name: 'devops',