瀏覽代碼

bug修复

Leo 2 年之前
父節點
當前提交
30e62085dc

+ 9 - 2
src/module/datasource/component/DatasourceAdd.jsx

@@ -8,7 +8,7 @@ import {
   ProForm,
 } from '@ant-design/pro-components'
 import { Button, Col, message, Form } from 'antd'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import {
   testDataSourceConnection,
   createDataSource,
@@ -117,6 +117,11 @@ export default function DatasourceAdd({ updateDataSource }) {
     }
     return true
   }
+
+  useEffect(() => {
+    form.setFieldValue('use_ssl', useSSL)
+  }, [useSSL])
+
   const uploadKerbFile = async fileList => {
     const file = new FormData()
     fileList.forEach(item => {
@@ -298,7 +303,9 @@ export default function DatasourceAdd({ updateDataSource }) {
             },
           ]}
           fieldProps={{
-            onChange: e => setUseSSL(e.target.value),
+            onChange: e => {
+              setUseSSL(e.target.value)
+            },
             value: useSSL,
           }}
           options={[

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

@@ -50,7 +50,9 @@ export default function DatasourceAdd({ ds_id, ds_info, setDsModalVisible }) {
     setDataType(ds_info.datasource)
     setKerbsValid(ds_info.kerberos === 1)
     setUseSSL(ds_info.use_ssl === 1)
-    if (ds_info.kerbsValid) {
+    if (ds_info.kerberos) {
+      setKeytabFile([])
+      setKrd5File([])
       setKerberosServiceName(ds_info.kerberos_service_name)
       setPrincipal(ds_info.principal)
     }
@@ -385,18 +387,18 @@ export default function DatasourceAdd({ ds_id, ds_info, setDsModalVisible }) {
         <>
           <ProFormUploadButton
             label="keytab文件"
-            name="keytab"
             title="上传keyTabPath"
             fieldProps={{ ...keytabUpProps }}
             max={1}
+            accept=".keytab"
           />
           <Col span={12} />
           <ProFormUploadButton
             label="krb5config文件"
-            name="krb5config"
             title="上传krb5config"
             fieldProps={{ ...krd5UpProps }}
             max={1}
+            accept=".conf"
           />
           <Col span={12} />
           <ProFormText

+ 2 - 2
src/module/workmgmt/component/JobCreate.jsx

@@ -783,7 +783,7 @@ export default function JobCreate() {
                   </Radio>
 
                   <Radio value={'fromLocal'}>
-                    <Upload {...UpProps}>
+                    <Upload {...UpProps} accept=".jar">
                       <Button
                         disabled={radioValue === 'fromLocal' ? false : true}
                         type="primary"
@@ -943,7 +943,7 @@ export default function JobCreate() {
                     </span>
                   </Radio>
                   <Radio value={'fromLocal'}>
-                    <Upload {...UpProps}>
+                    <Upload {...UpProps} accept=".py">
                       <Button
                         className="upButton"
                         type="primary"