优化 作业配置查看及全屏开发按钮

dlink-web/src/components/Studio/StudioConsole/StudioHistory/index.tsx

@@ -39,19 +39,24 @@ type HistoryItem = {
 };
 
 type HistoryConfig={
-  useSession:boolean;
-  session:string;
-  useRemote:boolean;
-  clusterId:number;
-  host:string;
-  useResult:boolean;
-  maxRowNum:number;
-  taskId:number;
-  jobName:string;
-  useSqlFragment:boolean;
-  checkpoint:number;
-  parallelism:number;
-  savePointPath:string;
+  useSession: boolean;
+  session: string;
+  useRemote: boolean;
+  type: string;
+  clusterId: number;
+  clusterConfigurationId: number;
+  host: string;
+  useResult: boolean;
+  useChangeLog: boolean;
+  maxRowNum: number;
+  useAutoCancel: boolean;
+  taskId: number;
+  jobName: string;
+  useSqlFragment: boolean;
+  useStatementSet: boolean;
+  checkpoint: number;
+  parallelism: number;
+  savePointPath: string;
 };
 
 const url = '/api/history';
@@ -289,15 +294,27 @@ const StudioHistory = (props: any) => {
               <ProDescriptions.Item label="执行方式" >
                 {config.useRemote?'远程':'本地'}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="任务类型">
+                {config.type}
+              </ProDescriptions.Item>
               <ProDescriptions.Item label="集群ID">
                 {config.clusterId}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="集群配置ID">
+                {config.clusterConfigurationId}
+              </ProDescriptions.Item>
               <ProDescriptions.Item label="预览结果" >
                 {config.useResult?'启用':'禁用'}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="打印流" >
+                {config.useChangeLog?'启用':'禁用'}
+              </ProDescriptions.Item>
               <ProDescriptions.Item label="最大行数">
                 {config.maxRowNum}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="自动停止" >
+                {config.useAutoCancel?'启用':'禁用'}
+              </ProDescriptions.Item>
               <ProDescriptions.Item span={2} label="JobManagerAddress">
                 {row.jobManagerAddress}
               </ProDescriptions.Item>
@@ -310,12 +327,18 @@ const StudioHistory = (props: any) => {
               <ProDescriptions.Item label="片段机制">
                 {config.useSqlFragment?'启用':'禁用'}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="语句集">
+                {config.useStatementSet?'启用':'禁用'}
+              </ProDescriptions.Item>
               <ProDescriptions.Item label="并行度">
                 {config.parallelism}
               </ProDescriptions.Item>
               <ProDescriptions.Item label="CheckPoint">
                 {config.checkpoint}
               </ProDescriptions.Item>
+              <ProDescriptions.Item label="savePoint 机制">
+                {config.savePointStrategy}
+              </ProDescriptions.Item>
               <ProDescriptions.Item label="SavePointPath">
                 {config.savePointPath}
               </ProDescriptions.Item>

dlink-web/src/components/Studio/StudioConsole/index.tsx

@@ -64,19 +64,6 @@ const StudioConsole = (props: any) => {
           {current? <Chart height={consoleHeight} />:<Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>}
         </Scrollbars>
       </TabPane>
-      <TabPane
-        tab={
-          <span>
-          <RadarChartOutlined/>
-          指标
-        </span>
-        }
-        key="StudioMetrics"
-      >
-        <Scrollbars style={{height: consoleHeight}}>
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
-        </Scrollbars>
-      </TabPane>
       <TabPane
         tab={
           <span>
@@ -129,19 +116,6 @@ const StudioConsole = (props: any) => {
           <StudioFX/>
         </Scrollbars>
       </TabPane>
-      <TabPane
-        tab={
-          <span>
-          <FileSearchOutlined/>
-          文档
-        </span>
-        }
-        key="StudioDocument"
-      >
-        <Scrollbars style={{height: consoleHeight}}>
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
-        </Scrollbars>
-      </TabPane>
     </Tabs>
   );
 };

dlink-web/src/components/Studio/StudioMenu/index.tsx

@@ -2,7 +2,7 @@ import styles from "./index.less";
 import {Menu, Dropdown, Tooltip, Row, Col, Popconfirm, notification, Modal, message} from "antd";
 import {
   PauseCircleTwoTone, CopyTwoTone, DeleteTwoTone, PlayCircleTwoTone, DiffTwoTone,SnippetsTwoTone,
-  FileAddTwoTone, FolderOpenTwoTone, SafetyCertificateTwoTone, SaveTwoTone, FlagTwoTone,
+  FileAddTwoTone, FolderOpenTwoTone, SafetyCertificateTwoTone, SaveTwoTone, FlagTwoTone,CodeTwoTone,
   EnvironmentOutlined, SmileOutlined, RocketTwoTone, QuestionCircleTwoTone, MessageOutlined, ClusterOutlined
 } from "@ant-design/icons";
 import Space from "antd/es/space";
@@ -246,6 +246,12 @@ const StudioMenu = (props: any) => {
     return str.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
   }
 
+  const toFullScreen = () => {
+    if(current) {
+      props.changeFullScreen(true);
+    }
+  };
+
   const saveSqlAndSettingToTask = () => {
     props.saveTask(current);
   };
@@ -336,6 +342,13 @@ const StudioMenu = (props: any) => {
           </Col>
           {current?
           <Col span={8}>
+            <Tooltip title="全屏开发">
+              <Button
+                type="text"
+                icon={<CodeTwoTone />}
+                onClick={toFullScreen}
+              />
+            </Tooltip>
             <Button
               type="text"
               icon={<FileAddTwoTone twoToneColor="#ddd"/>}

dlink-web/src/components/Studio/StudioRightTool/index.tsx

@@ -64,9 +64,7 @@ const StudioRightTool = (props: any) => {
       <TabPane tab={<span><ScheduleOutlined /> 保存点</span>} key="StudioSavePoint" >
         <StudioSavePoint />
       </TabPane>
-      <TabPane tab={<span><AuditOutlined /> 审计</span>} key="Other" >
-        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-      </TabPane></>)
+      </>)
   };
 
   return (

dlink-web/src/pages/Welcome.tsx

@@ -564,7 +564,7 @@ export default (): React.ReactNode => {
               </ul>
             </Paragraph>
           </Timeline.Item>
-          <Timeline.Item><Text code>0.5.1</Text> <Text type="secondary">2022-01-?</Text>
+          <Timeline.Item><Text code>0.5.1</Text> <Text type="secondary">2022-01-23</Text>
             <p> </p>
             <Paragraph>
               <ul>
@@ -616,6 +616,9 @@ export default (): React.ReactNode => {
                 <li>
                   <Link>修复 Flink 1.14 提交任务报错缺类 bug</Link>
                 </li>
+                <li>
+                  <Link>优化 作业配置查看及全屏开发按钮</Link>
+                </li>
               </ul>
             </Paragraph>
           </Timeline.Item>

dlink-web/src/pages/document.ejs

@@ -14,15 +14,14 @@
     />
     <meta
       name="description"
-      content="
-      开箱即用的中台前端/设计解决方案。"
+      content="实时计算平台"
     />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
-    <title>Ant Design Pro</title>
-    <link rel="icon" href="<%= context.config.publicPath +'favicon.ico'%>" type="image/x-icon" />
+    <title>Dinky</title>
+    <link rel="icon" href="<%= context.config.publicPath +'dinky.svg'%>" type="image/x-icon" />
   </head>
   <body>
     <noscript>Out-of-the-box mid-stage front/design solution!</noscript>
@@ -201,11 +200,11 @@
         </div>
         <div style="display: flex; align-items: center; justify-content: center">
           <img
-            src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
+            src="<%= context.config.publicPath +'dinky.svg'%>"
             width="32"
             style="margin-right: 8px"
           />
-          Ant Design
+          Dinky
         </div>
       </div>
     </div>