Merge branch 'master' of ssh://132.232.112.242:7022/zcx/szse

src/view/Manage/DatasourceManage/Component/DatasourceItem.jsx

@@ -99,7 +99,6 @@ const DatasourceItem = (props) => {
             </Row>
            </>
         }
-         
         </Spin>
       }
     </div>

src/view/Manage/DatasourceManage/Component/UpdateDatasourceModal.jsx

@@ -303,7 +303,7 @@ const UpdateDatasourceModal = (props) => {
               key={index}
               rules={[{ required: item.required, message: '必填项'}]}
             >
-              <Input  />
+            { ( item.show ? <Input placeholder={item.explain||''} /> : <Input.Password placeholder={item.explain||''} visibilityToggle={false} /> ) }
             </Form.Item>
           )
         })
@@ -338,7 +338,7 @@ const UpdateDatasourceModal = (props) => {
                   选择文件上传
                 </Button>
               </Upload> 
-              ) : ( item.show ? <Input  /> : <Input.Password /> ) }
+              ) : ( item.show ? <Input placeholder={item.explain||''}  /> : <Input.Password placeholder={item.explain||''} visibilityToggle={false} /> ) }
             </Form.Item>
           )
         })

src/view/Manage/DatasourceManage/Component/UpdateTaskModal.jsx

@@ -19,8 +19,7 @@ const UpdateTaskModal = (props) => {
 
     if (visible) {
 
-      setSelectedSchemas([]);
-      form.resetFields();
+      reset();
 
       if (action==='add' && datasourceId) {
         getTaskSettings();
@@ -119,6 +118,13 @@ const UpdateTaskModal = (props) => {
     }
   }
 
+  const reset = () => {
+    setSchemas([]);
+    setSelectedSchemas([]);
+    setTaskSettings({});
+    form.resetFields();
+  }
+
   const onSearchInputChange = (e) => {
     setKeyword(e.target.value||'');
   }
@@ -197,7 +203,7 @@ const UpdateTaskModal = (props) => {
               rules={[{ required: param.required, message: '必填项'}]}
             >
             {
-              ( param.show ? <Input  /> : <Input.Password /> )
+              ( param.show ? <Input placeholder={param.explain||''} /> : <Input.Password placeholder={param.explain||''} visibilityToggle={false} /> )
             }
             </Form.Item>
           )