feat: add UIFrom validate

apache · Apr 8, 2021 · b9c89ae · b9c89ae
1 parent 59dba3e
commit b9c89ae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/web/src/components/Plugin/PluginDetail.tsx b/web/src/components/Plugin/PluginDetail.tsx
@@ -38,7 +38,7 @@ import addFormats from 'ajv-formats';
 
 import { fetchSchema } from './service';
 import { json2yaml, yaml2json } from '../../helpers';
-import { PluginForm, PLUGIN_UI_LIST } from './UI'
+import { PluginForm, PLUGIN_UI_LIST } from './UI';
 
 type Props = {
   name: string;
@@ -290,7 +290,13 @@ const PluginDetail: React.FC<Props> = ({
                     } else if (codeMirrorMode === 'YAML') {
                       editorData = yaml2json(ref.current?.editor.getValue(), false).data;
                     } else {
-                      editorData = UIForm.getFieldsValue();
+                      UIForm.validateFields().then(value => {
+                        editorData = value;
+                        validateData(name, editorData).then((value) => {
+                          onChange({ formData: form.getFieldsValue(), codemirrorData: value });
+                        });
+                      });
+                      return;
                     }
 
                     validateData(name, editorData).then((value) => {

diff --git a/web/src/components/Plugin/UI/basic-auth.tsx b/web/src/components/Plugin/UI/basic-auth.tsx
@@ -42,13 +42,23 @@ const BasicAuth: React.FC<Props> = ({ form }) => {
         label="username"
         required
         name="username"
+        rules={[
+          {
+            required: true,
+          }]
+        }
       >
         <Input></Input>
       </Form.Item>
       <Form.Item
         label="password"
         name="password"
         required
+        rules={[
+          {
+            required: true,
+          }]
+        }
       >
         <Input></Input>
       </Form.Item>