fix: '集成登录界面优化'

src/pages/platformCenter/integratedLogin/AddModal.jsx

@@ -40,6 +40,7 @@ const AddModal = props => {
   const [keepImgeUrl, setKeepImgeUrl] = useState('');
   const [show, setShow] = useState(0);
   const [optionslist, setOptionsList] = useState([]);
+  const [keepLength, setKeeplength] = useState('');
 
   const { Option } = Select;
 
@@ -102,13 +103,16 @@ const AddModal = props => {
       if (res.data.displayMode == '地图') {
         let list = []; // 存省数据
         let listSecord = []; // 存市数据
+        let aa = [];
         let fff = 0;
         res.data.mapSettings.map(i => {
+          aa.push(i);
           list.push(i[0]);
           if (i[1]) {
             listSecord.push(i[1]);
           }
         });
+        setKeeplength(aa);
         if (list.indexOf('100000') != -1) {
           fff = 1;
         }
@@ -454,59 +458,78 @@ const AddModal = props => {
           </Item>
         )}
         <Item
-          label="外网地址"
-          name="internetAddress"
+          label="内网地址"
+          name="intranetAddress"
           rules={[
             {
               validator: (rule, value) => {
-                let aa = form.getFieldValue().internetAddress;
-                let bb = aa.split('//');
-                let cc = bb[1].split(':');
-                let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let reg = /^(127\.0\.0\.1)|(localhost)/;
-                let ss = [];
-                ss.push(regEn.test(cc[0]));
-                ss.push(regFn.test(cc[0]));
-                ss.push(regCn.test(cc[0]));
-                ss.push(reg.test(cc[0]));
-                if (ss.indexOf(true) !== -1) {
-                  return Promise.reject('外网IP不正确');
+                let aa = form.getFieldValue().intranetAddress;
+                if (aa) {
+                  let bb = aa.split('//');
+                  let cc = [];
+                  if (bb[1]) {
+                    cc = bb[1].split(':');
+                  }
+
+                  let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let ss = [];
+                  let url = /^http(s)?/;
+                  ss.push(regEn.test(cc[0]));
+                  ss.push(regFn.test(cc[0]));
+                  ss.push(regCn.test(cc[0]));
+                  if (!url.test(aa)) {
+                    return Promise.reject('url格式不正确');
+                  } else if (ss.indexOf(true) == -1) {
+                    return Promise.reject('局域网IP不正确');
+                  }
                 }
                 return Promise.resolve();
               },
             },
           ]}
         >
-          <AutoComplete placeholder="建议使用公网IP或域名" options={options} allowClear />
+          <AutoComplete placeholder="建议使用局域网IP" options={options} allowClear />
         </Item>
         <Item
-          label="内网地址"
-          name="intranetAddress"
+          label="外网地址"
+          name="internetAddress"
           rules={[
             {
               validator: (rule, value) => {
-                let aa = form.getFieldValue().intranetAddress;
-                let bb = aa.split('//');
-                let cc = bb[1].split(':');
-                let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
-                let ss = [];
-                ss.push(regEn.test(cc[0]));
-                ss.push(regFn.test(cc[0]));
-                ss.push(regCn.test(cc[0]));
-                if (ss.indexOf(true) == -1) {
-                  return Promise.reject('局域网IP不正确');
+                let aa = form.getFieldValue().internetAddress;
+                if (aa) {
+                  let bb = aa.split('//');
+                  let cc = [];
+                  if (bb[1]) {
+                    cc = bb[1].split(':');
+                  }
+                  let url = /^http(s)?/;
+                  let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
+                  let reg = /^(127\.0\.0\.1)|(localhost)/;
+                  let ss = [];
+                  ss.push(regEn.test(cc[0]));
+                  ss.push(regFn.test(cc[0]));
+                  ss.push(regCn.test(cc[0]));
+                  ss.push(reg.test(cc[0]));
+                  if (!url.test(aa)) {
+                    return Promise.reject('url格式不正确');
+                  } else if (ss.indexOf(true) !== -1) {
+                    return Promise.reject('外网IP不正确');
+                  }
                 }
+
                 return Promise.resolve();
               },
             },
           ]}
         >
-          <AutoComplete placeholder="建议使用局域网IP" options={options} allowClear />
+          <AutoComplete placeholder="建议使用公网IP或域名" options={options} allowClear />
         </Item>
+
         <Row>
           <Col span={12}>
             <Item
@@ -588,6 +611,21 @@ const AddModal = props => {
                   required: true,
                   message: '地区选择为必填项',
                 },
+                {
+                  validator: (rule, value) => {
+                    let aa = form.getFieldValue().mapSetting;
+                    if (aa) {
+                      let list = keepLength.find(i => i[0] == aa[0]);
+                      if (list.length > 0) {
+                        if (aa.length <= list.length) {
+                          return Promise.reject('请选择下级');
+                        }
+                      }
+                    }
+
+                    return Promise.resolve();
+                  },
+                },
               ]}
             >
               <Cascader