问题修改

src/components/RegularManage/addRegular.js

@@ -12,28 +12,37 @@ function EditBlock(props) {
     }, []);
     const [form] = Form.useForm();
     const [visible, setVisible] = useState(false);
-    const [data, setData] = useState(false);
+    const [title, setTitle] = useState();
+    const [data, setData] = useState({});
     const { regularDetail, type, flag } = useContext(RegularContext);
     const initialValues = regularDetail;
     const onFinish = values => {
-        console.log(flag);
-        if (flag == 1) {
+        setData(values)
+        if(type == 2){
             setVisible(true)
-        } else {
-            addRegular()
+            if (flag == 1) {
+                setTitle('该正则式关联字段校验规则，修改后将同步更新，确认修改？')
+            } else {
+                setTitle('是否确认修改该正则式？')
+            }
+        }else{
+            addRegular(values)
         }
-        setData(values)
+        
     };
     //添加
-    function addRegular() {
+    function addRegular(values) {
         let url
+        let param
         if (type == 1) {
             url = api.addRegular
+            param = values
         } else {
+            param = data
             url = api.upRegularById
-            data.id = regularDetail.id
+            param.id = regularDetail.id
         }
-        post(url, data).then((res) => {
+        post(url, param).then((res) => {
             if (res.data.code === 200) {
                 props.userChange()
                 message.success(res.data.message);
@@ -47,6 +56,9 @@ function EditBlock(props) {
     function cancel() {
         props.cancel()
     }
+    function onCancel(){
+        setVisible(false)
+    }
     return (
         <>
             <Form
@@ -58,10 +70,10 @@ function EditBlock(props) {
                 onFinish={onFinish}
                 initialValues={initialValues}
             >
-                <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式名称',}]}>
+                <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' }]}>
                     <Input placeholder="请输入" autoComplete='off'/>
                 </Form.Item>
-                <Form.Item label="正则式值" name="val" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
+                <Form.Item label="正则式值" name="val" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' }]}>
                     <TextArea
                         autoSize={{ minRows: 5, maxRows: 5 }}
                         placeholder="请输入"
@@ -92,10 +104,10 @@ function EditBlock(props) {
                 visible={visible}
                 onOk={addRegular}
                 /*confirmLoading={confirmLoading}*/
-                onCancel={() => cancel()}
+                onCancel={onCancel}
                 maskClosable={false}
             >
-                <p>该正则式关联字段校验规则，修改后将同步更新，确认修改？</p>
+                <p>{title}</p>
             </Modal>
         </>
     );