Merge branch 'fix0318' into 'v2-220318'

src/pages/commodity/products/addProductsItem/selectGoodsForm.tsx

@@ -24,7 +24,7 @@ const SelectGoodsForm: React.FC<{}> = (props) => {
   const [selectGoodsRow, setSelectGoodsRow] = useState<GetProductGoodsGetGoodsListResponseDetail[]>([]) // 模态框选择的行数据
   const [selectedGoodsRowKeys, setSelectedGoodsRowKeys] = useState<Array<number>>([])
   const { ProductStore } = store
-  const { productInfoByEdit, selectCategoryId, selectBrandId } = ProductStore
+  const { productInfoByEdit, selectCategoryId, selectBrandId, setIsRecombination } = ProductStore
 
   useEffect(() => {
     // 品类 品牌变动重新渲染货品表格 清空选择 清空store
@@ -107,6 +107,7 @@ const SelectGoodsForm: React.FC<{}> = (props) => {
     ProductStore.setSelectedGoods([])
     setIsSelectGoods(value.target.checked)
     setIsChecked(value.target.checked)
+    setIsRecombination(true)
   }
 
   const rowSelection = {
@@ -115,6 +116,7 @@ const SelectGoodsForm: React.FC<{}> = (props) => {
       ProductStore.setSelectedGoods(selectedRows)
       setSelectGoodsRow(selectedRows);
       setSelectedGoodsRowKeys(selectedRowKeys);
+      setIsRecombination(true)
     }
   }