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 index 547f722242..fc34addda9 100644 --- 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 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 index 2e6cfd7749..011f809be6 100644 --- 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 index 781a3b5c7b..08c80e7d69 100644 --- 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={} + icon={} 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 index 70fa24610f..c1fc1e923c 100644 --- 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)?:undefined} + {currentRunningTaskIds.includes(item.taskId)?: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 index df478e97f9..883460ab7a 100644 --- 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: ( {tab.title} - {currentRunningTaskIds.includes(tab.params.taskId)?:undefined} + {currentRunningTaskIds.includes(tab.params.taskId)?:undefined} ), key: tab.params.taskId, icon: icon,