From 7cd19fe4286df014df8e416bb1ad4bdc6618e69d Mon Sep 17 00:00:00 2001
From: zhuyue <zhu.yue@99cloud.net>
Date: Fri, 10 Dec 2021 12:25:14 +0800
Subject: [PATCH] fix: fix for lb members subnet id params

fix for lb members subnet id params

Change-Id: I875557396867938119ac1f22f3df2818b33b5a48
---
 src/components/FormItem/MemberAllocator/Item.jsx    |  2 +-
 src/components/FormItem/MemberAllocator/index.jsx   | 13 ++++++++-----
 .../Listener/Detail/Member/Actions/CreateMember.jsx |  3 ++-
 .../actions/StepCreate/index.jsx                    |  4 +++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/FormItem/MemberAllocator/Item.jsx b/src/components/FormItem/MemberAllocator/Item.jsx
index ed9f4f88..ac9e0d25 100644
--- a/src/components/FormItem/MemberAllocator/Item.jsx
+++ b/src/components/FormItem/MemberAllocator/Item.jsx
@@ -17,7 +17,7 @@ import IPAddress from './IPAddress';
 
 const Item = ({ onChange, value }) => {
   value = value || {
-    ip_address: { ip: undefined, protocol_port: undefined, weight: 1 },
+    ip_address: { ip: undefined, protocol_port: undefined, weight: 1, subnet_id: undefined },
     canEdit: true,
   };
   const [ip_address, setIP] = useState(value.ip_address);
diff --git a/src/components/FormItem/MemberAllocator/index.jsx b/src/components/FormItem/MemberAllocator/index.jsx
index 6232f7f5..d48644b7 100644
--- a/src/components/FormItem/MemberAllocator/index.jsx
+++ b/src/components/FormItem/MemberAllocator/index.jsx
@@ -47,7 +47,7 @@ const MemberAllocator = ({ componentProps, formItemProps }) => {
     return getLinkRender({ key, params: { id }, value: id });
   }
 
-  let addOuter = () => {};
+  let addOuter = () => { };
 
   return (
     <div style={{ padding: 20 }}>
@@ -93,12 +93,14 @@ const MemberAllocator = ({ componentProps, formItemProps }) => {
                   subnet_id: i.subnet_id,
                 }));
                 record.currentOption = options[0].value;
+                record.currentSubnetId = options[0].subnet_id;
                 return (
                   <Select
                     style={{ minWidth: 200 }}
                     options={options}
                     defaultValue={options[0].value}
-                    onChange={(e) => {
+                    onChange={(e, opt) => {
+                      record.currentSubnetId = opt.subnet_id;
                       record.currentOption = e;
                     }}
                   />
@@ -131,6 +133,7 @@ const MemberAllocator = ({ componentProps, formItemProps }) => {
                         protocol_port: undefined,
                         weight: 1,
                         name: record.server_name,
+                        subnet_id: record.currentSubnetId,
                       },
                       canEdit: false,
                     });
@@ -172,8 +175,8 @@ const MemberAllocator = ({ componentProps, formItemProps }) => {
               filterFunc: (record, val) => {
                 return val
                   ? record.fixed_ips.some(
-                      (item) => item.subnet_id === lbSubnetId
-                    )
+                    (item) => item.subnet_id === lbSubnetId
+                  )
                   : true;
               },
             },
@@ -247,7 +250,7 @@ const MemberAllocator = ({ componentProps, formItemProps }) => {
                                 (it) =>
                                   it.address === value1.ip_address.ip &&
                                   it.protocol_port ===
-                                    value1.ip_address.protocol_port
+                                  value1.ip_address.protocol_port
                               );
                               if (!value1 || !value1.ip_address.ip) {
                                 return Promise.reject(
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
index 6634353c..73319cc8 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
@@ -129,12 +129,13 @@ export default class CreateAction extends ModalAction {
       return { weight, protocol_port, address, name, subnet_id };
     });
     extMembers.forEach((member) => {
-      const { ip, protocol_port, weight, name = null } = member.ip_address;
+      const { ip, protocol_port, weight, name = null, subnet_id } = member.ip_address;
       const addMember = {
         weight,
         protocol_port,
         address: ip,
         name,
+        subnet_id
       };
       members.push(addMember);
     });
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
index 5f20eeff..c5f8be3e 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
@@ -141,19 +141,21 @@ class StepCreate extends StepAction {
         memberData.push(addMember);
       });
     });
+
     extMembers.forEach((member) => {
       const {
         ip,
         protocol_port,
         weight,
         name: server_name = null,
+        subnet_id,
       } = member.ip_address;
       const addMember = {
         weight,
         protocol_port,
         address: ip,
         name: server_name,
-        subnet_id: member.subnet,
+        subnet_id,
       };
       memberData.push(addMember);
     });