[Optimization-3942][web] Optimize web icon (DataLinkDC#3943)

MactavishCui · Nov 23, 2024 · fc51f7f · fc51f7f
1 parent 5664f55
commit fc51f7f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
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
@@ -209,7 +209,7 @@ public List<Column> getMSColumns(StudioMetaStoreDTO studioMetaStoreDTO) {
     private JobManager getJobManager(StudioMetaStoreDTO studioMetaStoreDTO, String envSql) {
         JobManager jobManager = jobManagerCache.get(envSql, () -> {
             JobConfig config = studioMetaStoreDTO.getJobConfig();
-            JobManager jobManagerTmp = JobManager.build(config);
+            JobManager jobManagerTmp = JobManager.buildPlanMode(config);
             jobManagerTmp.executeDDL(envSql);
             return jobManagerTmp;
         });

diff --git a/dinky-core/src/main/java/org/dinky/job/JobManager.java b/dinky-core/src/main/java/org/dinky/job/JobManager.java
@@ -263,6 +263,7 @@ public JobResult executeJarSql(String statement) throws Exception {
                 .collect(Collectors.toList());
         statement = String.join(";\n", statements);
         jobStatementPlan = Explainer.build(this).parseStatements(SqlUtil.getStatements(statement));
+        jobStatementPlan.buildFinalStatement();
         job = Job.build(runMode, config, executorConfig, executor, statement, useGateway);
         ready();
         try {

diff --git a/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx
@@ -35,11 +35,11 @@ import {
   FullscreenExitOutlined,
   FullscreenOutlined,
   PartitionOutlined,
-  PauseOutlined,
   RocketOutlined,
   RotateRightOutlined,
   SafetyCertificateOutlined,
-  SaveOutlined
+  SaveOutlined,
+  XFilled
 } from '@ant-design/icons';
 import RunToolBarButton from '@/pages/DataStudio/components/RunToolBarButton';
 import { connect, useModel } from '@umijs/max';
@@ -388,7 +388,9 @@ export const SqlTask = memo((props: FlinkSqlProps & any) => {
   const handleSubmit = useCallback(async () => {
     setIsSubmitting(true);
     try {
-      await handleSave();
+      if(currentState.step !== JOB_LIFE_CYCLE.PUBLISH){
+        await handleSave();
+      }
       updateAction({
         actionType: DataStudioActionType.TASK_RUN_SUBMIT,
         params: {
@@ -697,7 +699,7 @@ export const SqlTask = memo((props: FlinkSqlProps & any) => {
               showDesc={showDesc}
               color={'red'}
               desc={l('pages.datastudio.editor.stop')}
-              icon={<PauseOutlined />}
+              icon={<XFilled style={{color:'#b10404'}}/>}
               onClick={handleStop}
               hotKey={{
                 ...hotKeyConfig,

diff --git a/dinky-web/src/pages/DataStudio/Toolbar/Project/function.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/function.tsx
@@ -23,7 +23,7 @@ import { TaskOwnerLockingStrategy } from '@/types/SettingCenter/data.d';
 import { Catalogue } from '@/types/Studio/data.d';
 import { searchTreeNode } from '@/utils/function';
 import { l } from '@/utils/intl';
-import { FireOutlined, LockTwoTone, UnlockTwoTone } from '@ant-design/icons';
+import { FireTwoTone, LockTwoTone, UnlockTwoTone } from '@ant-design/icons';
 import { Badge, Divider, Space, Tooltip } from 'antd';
 import { Key } from 'react';
 import { getTabIcon, lockTask, showAllOwners } from '@/pages/DataStudio/function';
@@ -256,7 +256,7 @@ export const buildProjectTree = (
         // 渲染后缀图标
         const renderSuffixIcon = (
           <>
-            {currentRunningTaskIds.includes(item.taskId)?<FireOutlined />:undefined}
+            {currentRunningTaskIds.includes(item.taskId)?<FireTwoTone twoToneColor="#ff0000"/>:undefined}
             {lockTask(
               item?.task?.firstLevelOwner,
               item?.task?.secondLevelOwners,

diff --git a/dinky-web/src/pages/DataStudio/Toolbar/Service/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/index.tsx
@@ -29,7 +29,7 @@ import {
   ArrowsAltOutlined,
   AuditOutlined,
   CodeOutlined,
-  FireOutlined,
+  FireTwoTone,
   HistoryOutlined,
   MonitorOutlined,
   PartitionOutlined,
@@ -209,7 +209,7 @@ const Service = (props: { showDesc: boolean; tabs: CenterTab[]; action: any }) =
               currentDialectTree.children!!.push({
                 title: (<Space align={'baseline'} size={'small'}>
                   {tab.title}
-                  {currentRunningTaskIds.includes(tab.params.taskId)?<FireOutlined />:undefined}
+                  {currentRunningTaskIds.includes(tab.params.taskId)?<FireTwoTone twoToneColor="#ff0000"/>:undefined}
                 </Space>),
                 key: tab.params.taskId,
                 icon: icon,