Commit 6da13cef authored by wenmo's avatar wenmo

优化语法检测建议的结果提示

parent b6fc8268
...@@ -6,7 +6,7 @@ import ProList from '@ant-design/pro-list'; ...@@ -6,7 +6,7 @@ import ProList from '@ant-design/pro-list';
import {explainSql} from "@/pages/FlinkSqlStudio/service"; import {explainSql} from "@/pages/FlinkSqlStudio/service";
import {useRef, useState, useEffect} from "react"; import {useRef, useState, useEffect} from "react";
const {Paragraph} = Typography; const {Paragraph,Text} = Typography;
type ExplainItem = { type ExplainItem = {
index: number; index: number;
...@@ -27,6 +27,7 @@ export type StudioExplainProps = { ...@@ -27,6 +27,7 @@ export type StudioExplainProps = {
} }
const StudioExplain = (props: any) => { const StudioExplain = (props: any) => {
const [explainData, setExplainData] = useState([]); const [explainData, setExplainData] = useState([]);
const [result, setResult] = useState(<Text>正在校验中...</Text>);
const { const {
onClose, onClose,
modalVisible, modalVisible,
...@@ -35,7 +36,7 @@ const StudioExplain = (props: any) => { ...@@ -35,7 +36,7 @@ const StudioExplain = (props: any) => {
} = props; } = props;
useEffect(() => { useEffect(() => {
if(!modalVisible){ if (!modalVisible) {
return; return;
} }
let selectsql = null; let selectsql = null;
...@@ -54,11 +55,24 @@ const StudioExplain = (props: any) => { ...@@ -54,11 +55,24 @@ const StudioExplain = (props: any) => {
configJson: JSON.stringify(current.task.config), configJson: JSON.stringify(current.task.config),
statement: selectsql, statement: selectsql,
}; };
setResult(<Text>正在校验中...</Text>);
setExplainData([]);
const result = explainSql(param); const result = explainSql(param);
result.then(res => { result.then(res => {
setExplainData(res.datas); setExplainData(res.datas);
let errorCount: number = 0;
for (let i in res.datas) {
if (!res.datas[i].explainTrue || !res.datas[i].parseTrue) {
errorCount++;
}
}
if (errorCount == 0) {
setResult(<Text type="success">全部正确</Text>);
} else {
setResult(<Text type="danger">存在错误,共计{errorCount}</Text>);
}
}) })
}, [modalVisible]) }, [modalVisible]);
const renderFooter = () => { const renderFooter = () => {
return ( return (
...@@ -162,12 +176,15 @@ const StudioExplain = (props: any) => { ...@@ -162,12 +176,15 @@ const StudioExplain = (props: any) => {
footer={renderFooter()} footer={renderFooter()}
onCancel={onClose} onCancel={onClose}
> >
<Paragraph>
<blockquote>{result}</blockquote>
</Paragraph>
{renderContent()} {renderContent()}
</Modal> </Modal>
); );
}; };
export default connect(({Studio}: { Studio: StateType }) => ({ export default connect(({Studio}: {Studio: StateType}) => ({
current: Studio.current, current: Studio.current,
currentSession: Studio.currentSession, currentSession: Studio.currentSession,
}))(StudioExplain); }))(StudioExplain);
...@@ -33,8 +33,8 @@ export const FLINK_CONFIG_LIST: Config[] = [{ ...@@ -33,8 +33,8 @@ export const FLINK_CONFIG_LIST: Config[] = [{
lable: 'jobmanager.memory.process.size', lable: 'jobmanager.memory.process.size',
placeholder: '1600m', placeholder: '1600m',
}, { }, {
name: 'taskmanager.memory.flink.size', name: 'taskmanager.memory.process.size',
lable: 'taskmanager.memory.flink.size', lable: 'taskmanager.memory.process.size',
placeholder: '2048m', placeholder: '2048m',
}, { }, {
name: 'taskmanager.memory.framework.heap.size', name: 'taskmanager.memory.framework.heap.size',
......
...@@ -716,6 +716,9 @@ export default (): React.ReactNode => { ...@@ -716,6 +716,9 @@ export default (): React.ReactNode => {
<li> <li>
<Link>修复 集群配置参数项为空时无法正常提交perjob任务的bug</Link> <Link>修复 集群配置参数项为空时无法正常提交perjob任务的bug</Link>
</li> </li>
<li>
<Link>优化 语法检测建议的结果提示</Link>
</li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment