Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui into feature/20230327_public_takeaway

src/pages/GoodsManage/Takeaway/components/GoodsGroup.jsx

-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { Button, Select, Tag } from 'antd';
 import { DndProvider } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
@@ -8,7 +8,7 @@ import InsertTag from './InsertTag';
 import GroupInfo from './GroupInfo';
 import { apiDelStorage, apiSortStorage, apiStorageList, apiSupplierShopList } from '../../service';
 
-const GoodsGroup = options => {
+const GoodsGroup = forwardRef((options, ref) => {
   const [groupEdit, setGroupEdit] = useState(false);
   const [selected, setSelected] = useState(0);
   const [storageId, setStorageId] = useState(0);
@@ -110,6 +110,10 @@ const GoodsGroup = options => {
     options.changeGroup(selected);
   }, [selected]);
 
+  useImperativeHandle(ref, () => ({
+    setSelected,
+  }));
+
   return (
     <div className={styles.groupBox}>
       {(shops && shops.length && (
@@ -182,6 +186,6 @@ const GoodsGroup = options => {
       />
     </div>
   );
-};
+});
 
 export default GoodsGroup;

src/pages/GoodsManage/Takeaway/index.jsx

-import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Spin, Table, Pagination, message, notification } from 'antd';
 import { unstable_batchedUpdates } from 'react-dom';
 import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc';
@@ -39,6 +39,8 @@ const Takeaway = options => {
   const [visibleSwitchGroup, setVisibleSwitchGroup] = useState(false);
   const [scribeToken, setScribeToken] = useState('');
 
+  const groupRef = useRef(null);
+
   const rowSelection = {
     selectedRowKeys,
     onChange: setSelectedRowKeys,
@@ -184,11 +186,16 @@ const Takeaway = options => {
 
   useEffect(() => {
     const stoken = PubSub.subscribe('refreshTakeAway', (_, data) => {
-      setShopId(data.shopId);
-      setGroupId(data.groupId);
-      getDataList(0, pageSize, data.groupId);
+      console.log('refreshTakeAway :>> ', data);
+      if (data.groupId && groupId !== data.groupId) {
+        setGroupId(data.groupId);
+        if (groupRef.current) {
+          groupRef.current.setSelected(`${data.groupId}`);
+        }
+      }
     });
     setScribeToken(stoken);
+
     return () => {
       PubSub.unsubscribe(scribeToken);
     };
@@ -208,7 +215,12 @@ const Takeaway = options => {
   return (
     <div className={styles.takeawayBox}>
       <Spin spinning={loading}>
-        <GoodsGroup shopId={shopId} changeShop={setShopId} changeGroup={setGroupId} />
+        <GoodsGroup
+          ref={groupRef}
+          shopId={shopId}
+          changeShop={setShopId}
+          changeGroup={setGroupId}
+        />
         {(shopId && (
           <ActionBar
             selectedRowKeys={selectedRowKeys}