fix: fix subnet cidr tip

1. fix subent cidr tip when select network
2. update subnet selector style

Change-Id: I28e00000353e4929c13c74264582dc14d6e726ed

src/components/FormItem/NetworkSelect/index.jsx

@@ -291,33 +291,26 @@ export default class NetworkSelect extends React.Component {
   }
 
   renderIp() {
-    const { subnet, subnets, ipType, ip } = this.state;
-    if (!subnet) {
-      return null;
-    }
-    const item = subnets.find((it) => it.id === subnet);
-    if (!item) {
+    const { subnet, subnets, ipType, ip, network } = this.state;
+    if (!network) {
       return null;
     }
+    if (ipType === 0) {
       const totalAllocationPools = [];
-    subnets.forEach((sub) => {
+      const subnetsForCurrentNetwork = subnets.filter(
+        (s) => s.network_id === network
+      );
+      subnetsForCurrentNetwork.forEach((sub) => {
         const { allocation_pools: pools = [] } = sub;
         pools.forEach((pool) => {
           totalAllocationPools.push(pool);
         });
       });
-    const { allocation_pools: pools } = item;
       const details = totalAllocationPools.map((pool, index) => (
         <span key={`pool.start.${index}`} style={{ marginRight: 10 }}>
           {pool.start}--{pool.end}
         </span>
       ));
-    const detailsDiv = pools.map((pool, index) => (
-      <div key={`pool.start.${index}`}>
-        {pool.start}--{pool.end}
-      </div>
-    ));
-    if (ipType === 0) {
       const tips = (
         <span>
           <span className={styles.label}>{t('Allocation Pools')}: </span>
@@ -326,6 +319,20 @@ export default class NetworkSelect extends React.Component {
       );
       return <Col span={12}>{tips}</Col>;
     }
+    if (!subnet) {
+      return null;
+    }
+    const item = subnets.find((it) => it.id === subnet);
+    if (!item) {
+      return null;
+    }
+    const { allocation_pools: pools } = item;
+
+    const detailsDiv = pools.map((pool, index) => (
+      <div key={`pool.start.${index}`}>
+        {pool.start}--{pool.end}
+      </div>
+    ));
     const tips = (
       <span>
         <span className={styles.label}>{t('Allocation Pools')}: </span>

src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx

@@ -260,6 +260,7 @@ export class NetworkStep extends Base {
           }
           return Promise.resolve();
         },
+        wrapperCol: { span: 19 },
       },
       {
         name: 'divider1',