bug修复

src/module/datasource/component/DatasourceSyncView.jsx

@@ -75,7 +75,7 @@ export default function DatasourceSyncView({ selectLog }) {
       setRunning(true)
       const { data } = await executeOnce(id)
       if (data.code === 200) {
-        message.success('执行完成')
+        message.success('开始执行')
       } else {
         message.error(data.msg)
       }

src/module/datasource/component/LogWatcher.jsx

@@ -1,4 +1,4 @@
-import { Button } from 'antd'
+import { Button, Checkbox, Space } from 'antd'
 import React, { useEffect, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
@@ -25,10 +25,13 @@ const LogWrapper = styled.div`
   }
 `
 
+// let timeout = null
+
 const LogWatcher = () => {
   const navigate = useNavigate()
   const { state } = useLocation()
   const [logData, setLogData] = useState(null)
+  // const [autoRefresh, setAutoRefresh] = useState(false)
 
   const fetchOnceJoblog = async () => {
     const { data } = await getOnceJoblog(state.id)
@@ -45,16 +48,36 @@ const LogWatcher = () => {
       state: { key: '3' },
     })
   }
+
+  // const changeRefresh = e => {
+  //   if (e.target.checked) {
+  //     fetchOnceJoblog()
+  //   } else {
+  //     clearTimeout(timeout)
+  //   }
+  //   setAutoRefresh(e.target.checked)
+  // }
+
+  // const onClickRefresh = () => {
+  //   fetchOnceJoblog()
+  // }
+
   return (
     <LogWrapper>
       <div className="return">
-        <Button
-          type="primary"
-          onClick={() => {
-            returnLogTable()
-          }}>
-          返回上一级
-        </Button>
+        <Space>
+          {/* <Checkbox onChange={changeRefresh} checked={autoRefresh}>
+            自动刷新
+          </Checkbox>
+          <Button onClick={onClickRefresh}>刷新</Button> */}
+          <Button
+            type="primary"
+            onClick={() => {
+              returnLogTable()
+            }}>
+            返回上一级
+          </Button>
+        </Space>
       </div>
       <pre className="log">{logData}</pre>
     </LogWrapper>

src/module/datasource/component/StepFour.jsx

@@ -159,7 +159,7 @@ export default function StepFour({
                 span: 6,
               }}
               wrapperCol={{
-                span: 18,
+                span: 12,
               }}>
               <Input
                 onChange={e => {
@@ -175,7 +175,7 @@ export default function StepFour({
           </Col>
           {showPartitionTime ? (
             <>
-              <Col span={8}>
+              <Col span={4}>
                 <FormItem
                   label="分区时间"
                   name="partition_time"

src/module/datasource/component/SyncTaskAdd.jsx

@@ -438,16 +438,17 @@ export default function SyncTaskAdd() {
       {/* 表结构预览 */}
       {(currentStep === 0 || currentStep === 1 || currentStep === 3) && (
         <>
-          {dataxJson !== null && (
-            <Button
-              type="primary"
-              onClick={showDrawer}
-              className="check__btn"
-              size="large"
-              icon={<MenuFoldOutlined />}>
-              {currentStep !== 3 ? '表结构预览' : '构建'}
-            </Button>
-          )}
+          {dataxJson !== null ||
+            (currentStep !== 3 && (
+              <Button
+                type="primary"
+                onClick={showDrawer}
+                className="check__btn"
+                size="large"
+                icon={<MenuFoldOutlined />}>
+                {currentStep !== 3 ? '表结构预览' : '构建'}
+              </Button>
+            ))}
 
           <Drawer
             title={currentStep === 3 ? '构建' : '表结构预览'}
@@ -470,13 +471,23 @@ export default function SyncTaskAdd() {
 
       {/* 按扭操作 */}
       <Space style={{ margin: '20px' }}>
-        <Button
-          onClick={() => {
-            changeStep(-1)
-          }}
-          disabled={currentStep === 0 || building}>
-          上一步
-        </Button>
+        {currentStep === 0 && (
+          <Button
+            onClick={() => {
+              navigate(-1)
+            }}>
+            返回上一级
+          </Button>
+        )}
+        {currentStep !== 0 && (
+          <Button
+            onClick={() => {
+              changeStep(-1)
+            }}
+            disabled={building}>
+            上一步
+          </Button>
+        )}
         {currentStep === 3 ? (
           <Button
             type="primary"

src/module/tasklog/component/TaskLogWatcher.jsx

@@ -131,8 +131,8 @@ const TaskLogWatcher = () => {
   }
 
   const onClickTableNode = async record => {
-    fetchTaskLog(record)
     setSelectJob(record)
+    fetchTaskLog(record)
   }
 
   const fetchTaskLog = async record => {
@@ -148,6 +148,11 @@ const TaskLogWatcher = () => {
         timeout = setTimeout(() => {
           fetchTaskLog(params)
         }, 3000)
+      } else {
+        const index = jobList.findIndex(item => (item.key = record.key))
+        const list = [...jobList]
+        list[index].handleResult = data.data.status === 'success' ? 2 : 3
+        setJobList(list)
       }
     } else {
       message.error(data.msg)

src/module/taskmgmt/page/TaskMgmtView.jsx

@@ -73,7 +73,7 @@ const TaskMgmtView = () => {
       setRunning(true)
       const { data } = await executeJmJob(id)
       if (data.code === 200) {
-        message.success('执行完成')
+        message.success('开始执行')
       } else {
         message.error(data.msg)
       }