Merge branch 'master' of http://gogsb.soaringnova.com/liutao/ai-proj-demo

src/module/datasource/component/StepOne.jsx

@@ -23,9 +23,13 @@ export default function StepOne({ drawDataForm, dataSourceList, updateTableStruc
 
   // 初始化表单类型
   useEffect(() => {
-    if (drawDataForm.getFieldValue('datasource_name')) {
-      const type = dataSourceList.find(item => item.key === drawDataForm.getFieldValue('datasource_name')).datasource
+    const ds_id = drawDataForm.getFieldValue('datasource_name')
+    const table_name = drawDataForm.getFieldValue('datasource_table')
+    if (ds_id) {
+      const type = dataSourceList.find(item => item.key === ds_id).datasource
       setDatasourceType(type)
+      selectDatasource(ds_id)
+      drawDataForm.setFieldValue('datasource_table', table_name)
     }
   }, [])
 

src/module/datasource/component/StepTwo.jsx

@@ -25,11 +25,13 @@ export default function LoadFormConfig({ loadDataForm, dataSourceList, updateTab
 
   // 初始化表单类型
   useEffect(() => {
-    if (loadDataForm.getFieldValue('datasource_name')) {
-      const type = dataSourceList.find(
-        item => item.key === loadDataForm.getFieldValue('datasource_name')
-      ).datasource
+    const ds_id = loadDataForm.getFieldValue('datasource_name')
+    const table_name = loadDataForm.getFieldValue('datasource_table')
+    if (ds_id) {
+      const type = dataSourceList.find(item => item.key === ds_id).datasource
       setDatasourceType(type)
+      selectDatasource(ds_id)
+      loadDataForm.setFieldValue('datasource_table', table_name)
     }
   }, [])
 

src/module/datasource/component/SyncTaskAdd.jsx

@@ -289,17 +289,17 @@ export default function SyncTaskAdd() {
     const { data } = await buildJsonData(buildParams)
     console.log(data)
     if (data.code === 200) {
-      const jsonData = data.json
+      const jsonData = data.data.json
       console.log(jsonData)
       message.success('构建成功')
       const json = data.data.json
       setDataxJson(json)
       showDrawer()
+      setIsFinishBuild(true)
     } else {
-      message.error('构建失败,请检查表单数据', data.msg)
+      message.error('构建失败,请检查表单数据')
     }
     setBuilding(false)
-    setIsFinishBuild(true)
   }
 
   // 完成提交