问题修改

src/components/FieldRules/addRules.js

@@ -68,6 +68,7 @@ function ContentForm(props) {
     const vilidateRules = {
         required: '${label}不能为空!',
     };
+    console.log(initialValues);
     //获取正则式名称
     function getRegular(name) {
         const param = {

src/components/FieldRules/index.js

@@ -177,11 +177,17 @@ function FieldRules() {
             if (res.data.code === 200) {
                 const data = res.data.data;
                 let obj = []
-                data.standardvalue.split(';').forEach(it => {
-                    obj.push({
-                        tit: it
-                    })
-                });
+                if (data.standardValueList) {
+                    data.standardValueList.forEach(it => {
+                        obj.push({
+                            tit: it
+                        })
+                    });
+                    console.log(obj);
+                } else {
+                    obj = [{ tit: null }]
+                }
+                delete data.standardValueList
                 const arr = {
                     columnList: [{
                         columnCname: data.columnCname,
@@ -219,17 +225,66 @@ function FieldRules() {
     function onSelectChange(selectedRowKeys) {
         setSelectedRowKeys(selectedRowKeys);
     };
-    function tableCnameChange(val) {
-        setTableCname(val)
-        setDisable(false)
-        getColumnName('', '', val, '')
+    function tableCnameChange(value, option) {
+        const formData = form.getFieldsValue();
+        setTableCname(value)
+
+        getColumnName('', '', value, '')
+        if (value) {
+            form.setFieldsValue({
+                tableEname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableEname: undefined,
+                columnCname:undefined,
+                columnEname:undefined,
+            })
+            setDisable(true)
+        }
+
+    }
+    function tableEnameChange(value, option) {
+        setTableEname(value)
+        getColumnName('', '', '', value)
+        if (value) {
+            form.setFieldsValue({
+                tableCname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableCname: undefined,
+                columnCname:undefined,
+                columnEname:undefined,
+            })
+            setDisable(true)
+        }
     }
-    function tableEnameChange(val) {
-        setTableEname(val)
-        getColumnName('', '', '', val)
-        setDisable(false)
+    function colchange(value, option, ins) {
+        if (ins == 1) {
+            if (value) {
+                form.setFieldsValue({
+                    columnEname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnEname: undefined
+                })
+            }
+        } else {
+            if (value) {
+                form.setFieldsValue({
+                    columnCname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnCname: undefined
+                })
+            }
+        }
     }
-
     //返回
     function goBack() {
         setAddVisible(false);
@@ -315,10 +370,10 @@ function FieldRules() {
                     <Row gutter={24}>
                         <Col span={6} key={0}>
                             <Form.Item label="表名称（中文）" name="tableCname">
-                                <Select showSearch allowClear onChange={tableCnameChange} onSearch={cnameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableCnameChange(value, option)} onSearch={cnameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
-                                            <Option value={item.tableCname} key={item.tableCname}>{item.tableCname}</Option>
+                                            <Option value={item.tableCname} val={item.tableEname} key={item.tableCname}>{item.tableCname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -326,10 +381,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={1}>
                             <Form.Item label="表名称（英文）" name="tableEname">
-                                <Select showSearch allowClear onChange={tableEnameChange} onSearch={enameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableEnameChange(value, option)} onSearch={enameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
-                                            <Option value={item.tableEname} key={item.tableEname}>{item.tableEname}</Option>
+                                            <Option value={item.tableEname} val={item.tableCname} key={item.tableEname}>{item.tableEname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -337,10 +392,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={2}>
                             <Form.Item label="字段名称（中文）" name="columnCname">
-                                <Select showSearch allowClear onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 1)} onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
-                                            <Option value={item.columnCname} key={item.columnCname}>{item.columnCname}</Option>
+                                            <Option value={item.columnCname} val={item.columnEname} key={item.columnCname}>{item.columnCname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -348,10 +403,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={3}>
                             <Form.Item label="字段名称（英文）" name="columnEname">
-                                <Select showSearch allowClear onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 2)} onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
-                                            <Option value={item.columnEname} key={item.columnEname}>{item.columnEname}</Option>
+                                            <Option value={item.columnEname} val={item.columnCname} key={item.columnEname}>{item.columnEname}</Option>
                                         )
                                     })}
                                 </Select>

src/components/RegularManage/addRegular.js

@@ -59,7 +59,7 @@ function EditBlock(props) {
                 <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式名称',}]}>
                     <Input placeholder="请输入" autoComplete='off'/>
                 </Form.Item>
-                <Form.Item label="正则式值" name="val"  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个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
                     <TextArea
                         autoSize={{ minRows: 5, maxRows: 5 }}
                         placeholder="请输入"

src/components/RegularManage/index.js

@@ -89,6 +89,7 @@ function RegularManage() {
         setTitle(title)
         setType(type)
         setRegularDetail(record)
+        setFlag(0)
         if (type == 2) {
             setFlag(record.relation)
         }