From aa0734a2f94e09a8b52b4bfacacd3ded85f0f33c Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Fri, 24 Feb 2023 19:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001342):=20=E3=80=90?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=95=86=E5=9F=8E&=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E3=80=91-=E5=8A=9F=E8=83=BD{=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=89=AA=E6=A0=B7}=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8E=89=E5=B7=B2=E7=BB=8F=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=89=AA?=
 =?UTF-8?q?=E6=A0=B7=E5=90=8E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E6=98=BE=E7=A4=BA=E7=BB=A7=E7=BB=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【电子商城&amp;内部商城】&#45;功能{添加剪样}：取消掉已经添加的剪样后刷新页面依然显示继续添加，】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001342
---
 .../sampleCuttingList/index.module.scss            |  2 +-
 .../sampleCutting/sampleCuttingList/index.tsx      | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/sampleCutting/sampleCuttingList/index.module.scss b/src/pages/sampleCutting/sampleCuttingList/index.module.scss
index 429fe8f..a394e7c 100644
--- a/src/pages/sampleCutting/sampleCuttingList/index.module.scss
+++ b/src/pages/sampleCutting/sampleCuttingList/index.module.scss
@@ -84,7 +84,7 @@ page {
     flex-flow: column nowrap;
   }
   .addButton {
-    width: 30%;
+    width: 250px;
     display: flex;
     justify-content: flex-end;
     align-items: center;
diff --git a/src/pages/sampleCutting/sampleCuttingList/index.tsx b/src/pages/sampleCutting/sampleCuttingList/index.tsx
index 2f8da32..f3abf1e 100644
--- a/src/pages/sampleCutting/sampleCuttingList/index.tsx
+++ b/src/pages/sampleCutting/sampleCuttingList/index.tsx
@@ -169,6 +169,10 @@ const SampleCuttingList = () => {
   const [show, setShow] = useState(false)
 
   const onClose = () => {
+    const index = multipleSelection.current.findIndex(mul => mul.product_id === currentSelect.current.id)
+    if (index !== -1) {
+      multipleSelection.current[index].multipleSelection = productMultipleSelection
+    }
     setShow(false)
     setProductMultipleSelection([])
   }
@@ -197,9 +201,6 @@ const SampleCuttingList = () => {
     }
   }
 
-  const handleClose = () => {
-    onClose()
-  }
   const handleAddProduct = () => {
     const index = multipleSelection.current.findIndex(mul => mul.product_id === currentSelect.current.id)
     if (index !== -1) {
@@ -212,7 +213,8 @@ const SampleCuttingList = () => {
         multipleSelection: productMultipleSelection,
       })
     }
-    onClose()
+    setShow(false)
+    setProductMultipleSelection([])
   }
   const [productMultipleSelection, setProductMultipleSelection] = useState<SampleCuttingCache['multipleSelection']>([])
 
@@ -263,7 +265,7 @@ const SampleCuttingList = () => {
                     onClick={() => handleClickAddButton(item)}
                   >
                     {
-                      isAdd?.includes(item.id) || multipleSelection.current.some(mul => mul.product_id === item.id) ? '继续添加' : '添加'
+                      isAdd?.includes(item.id) || multipleSelection.current.find(mul => mul.product_id === item.id)?.multipleSelection.length ? '继续添加' : '添加'
                     }
                   </NormalButton>
                 </View>
@@ -335,7 +337,7 @@ const SampleCuttingList = () => {
           round
           plain
           customStyles={{ width: '48%' }}
-          onClick={handleClose}
+          onClick={onClose}
         >
           取消
         </NormalButton>