Leo il y a 2 ans
Parent
commit
203f1e4b0a

+ 12 - 4
src/module/datasource/component/DatasourceAdd.jsx

@@ -75,16 +75,24 @@ export default function DatasourceAdd({ updateDataSource }) {
         params['principal'] = principal
         if (checkKrb(keytab, krb5config, kerberosServiceName, principal)) {
           const { data } = await testDataSourceConnection(params)
-          if (data.data) {
-            message.success('连接成功')
+          if (data.code === 200) {
+            if (data.data) {
+              message.success('连接成功')
+            } else {
+              message.error('连接失败')
+            }
           } else {
             message.error(data.msg)
           }
         }
       } else {
         const { data } = await testDataSourceConnection(params)
-        if (data.data) {
-          message.success('连接成功')
+        if (data.code === 200) {
+          if (data.data) {
+            message.success('连接成功')
+          } else {
+            message.error('连接失败')
+          }
         } else {
           message.error(data.msg)
         }

+ 12 - 5
src/module/datasource/component/DatasourceEdit.jsx

@@ -105,16 +105,24 @@ export default function DatasourceAdd({
         params['principal'] = principal
         if (checkKrb(keytab, krb5config, kerberosServiceName, principal)) {
           const { data } = await testDataSourceConnection(params)
-          if (data.data) {
-            message.success('连接成功')
+          if (data.code === 200) {
+            if (data.data) {
+              message.success('连接成功')
+            } else {
+              message.error('连接失败')
+            }
           } else {
             message.error(data.msg)
           }
         }
       } else {
         const { data } = await testDataSourceConnection(params)
-        if (data.data) {
-          message.success('连接成功')
+        if (data.code === 200) {
+          if (data.data) {
+            message.success('连接成功')
+          } else {
+            message.error('连接失败')
+          }
         } else {
           message.error(data.msg)
         }
@@ -175,7 +183,6 @@ export default function DatasourceAdd({
           params['krb5config'] = krb5config
           params['kerberos_service_name'] = kerberosServiceName
           params['principal'] = principal
-          console.log(kerbsValid)
           if (checkKrb(keytab, krb5config, kerberosServiceName, principal)) {
             const { data } = await updateDataSourceInfo(ds_id, params)
             if (data.code === 200) {

+ 0 - 1
src/module/datasource/component/DatasourceSyncView.jsx

@@ -68,7 +68,6 @@ export default function DatasourceSyncView({ selectLog, page, page_size }) {
     }
   }
   const editSyncItem = id => {
-    console.log(currentPage, currentPageSize)
     navigate('/datasource/sync-edit', {
       state: { id, currentPage, currentPageSize },
     })

+ 1 - 1
src/module/datasource/component/EditSyncView.jsx

@@ -53,9 +53,9 @@ const EditSyncView = () => {
         partition_time: data.data.partition_time,
         jvm_param: data.data.jvm_param,
       })
+      setPartitionNum(data.data.partition_num || 0)
       setTriggerStatus(data.data.trigger_status)
       setCronData(data.data.cron_expression_dict)
-      setPartitionNum(data.data.partition_num)
       setDataxJson(JSON.parse(data.data.job_json))
     } else {
       message.error(data.msg)

+ 4 - 1
src/module/datasource/component/StepFour.jsx

@@ -13,7 +13,7 @@ export default function StepFour({
   // 是否展示分区时间
   const [showPartitionTime, setShowPartitionTime] = useState(false)
   const [cronData, setCronData] = useState(null)
-  const [partitionNum, setPartitionNum] = useState(null)
+  const [partitionNum, setPartitionNum] = useState(0)
   useState(() => {
     setCronData(syncDataForm.getFieldValue('cron_expression'))
     if (syncDataForm.getFieldValue('partition_info')) {
@@ -25,6 +25,9 @@ export default function StepFour({
     if (syncDataForm.getFieldValue('partition_info')) {
       setShowPartitionTime(true)
     }
+    if (partitionNumHandle.num !== null) {
+      setPartitionNum(partitionNumHandle.num)
+    }
   }, [cron_data])
   useState(() => {
     if (partitionNumHandle.num !== null) {

+ 0 - 1
src/module/tasklog/component/LogTable.jsx

@@ -135,7 +135,6 @@ const LogTable = () => {
       if (data.code === 200) {
         const list = []
         let logs = []
-        console.log(data.data)
         const keys = Object.keys(data.data)
         keys.forEach(item => {
           if ([2, 3].includes(data.data[item])) {

+ 0 - 1
src/module/workmgmt/component/JobCreate.jsx

@@ -204,7 +204,6 @@ export default function JobCreate() {
     }
     const { data } = await getFileUri(params)
     if (data.code === 200) {
-      console.log(type, data)
       type === 'java' ? setJavas(data.data) : setPythons(data.data)
     } else {
       message.error(data.msg)

+ 0 - 1
src/module/workmgmt/component/JobStepThree.jsx

@@ -262,7 +262,6 @@ export default function JobStepTwo({ OutputDataForm, dagData, checkSync }) {
   const formatSchemaPreview = (index, status) => {
     const prewStatus = { ...schemasPreview }
     prewStatus[index] = status
-    console.log(prewStatus)
     setSchemasPreview(prewStatus)
   }