feat: 云版锁库数据更新逻辑调整

src/pages/Product/Cloud/components/Detail/Form.jsx

@@ -3,7 +3,7 @@ import { Row, Col } from 'antd'
 import EditableForm from '@/components/EditableForm'
 
 const RoadpricingForm = props => {
-  const { cloudUser, updateKey, projectType } = props
+  const { cloudUser, actionPayload, projectType } = props
   const titleEnum = {
     1: '养护云造价',
     2: '大司空',
@@ -90,7 +90,7 @@ const RoadpricingForm = props => {
         dataSource={cloudUser}
         columns={columns}
         tartgetUrl="/cloud/update"
-        type={updateKey}
+        type={actionPayload}
       />
     </div>
   )

src/pages/Product/Cloud/components/Detail/TabList.jsx

@@ -17,7 +17,8 @@ const RoadpricingTabList = props => {
     compilationList,
     cloudUser: { online_list = [], mobile, username },
     projectType,
-    ssoId
+    ssoId,
+    actionPayload = { main: 'cloud' }
   } = props
   const isUpgradeEnum = {
     true: '已升级',
@@ -56,7 +57,7 @@ const RoadpricingTabList = props => {
       // 刷新数据
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'cloud'
+        payload: actionPayload
       })
     }
   }
@@ -100,37 +101,35 @@ const RoadpricingTabList = props => {
                 ...setRoadPricingUpgrade,
                 visible: true,
                 type: titleType.GIVE,
-                // eslint-disable-next-line no-underscore-dangle
                 compilationId: record._id,
                 compilationName: record.name,
                 lockTypeEnum: lockTypeEnum.GIVE,
                 upgradeTypeEnum: upgradeTypeEnum.UPGRADE
               })
-            }>
+            }
+          >
             赠送
           </Button>
           {record.lock === 1 ? (
-            <>
-              <Button
-                type="primary"
-                ghost
-                size="small"
-                className="m-2px"
-                onClick={() =>
-                  setRoadPricingUpgrade({
-                    ...setRoadPricingUpgrade,
-                    visible: true,
-                    type: titleType.SALE,
-                    // eslint-disable-next-line no-underscore-dangle
-                    compilationId: record._id,
-                    compilationName: record.name,
-                    lockTypeEnum: lockTypeEnum.SALE,
-                    upgradeTypeEnum: upgradeTypeEnum.UPGRADE
-                  })
-                }>
-                销售
-              </Button>
-            </>
+            <Button
+              type="primary"
+              ghost
+              size="small"
+              className="m-2px"
+              onClick={() =>
+                setRoadPricingUpgrade({
+                  ...setRoadPricingUpgrade,
+                  visible: true,
+                  type: titleType.SALE,
+                  compilationId: record._id,
+                  compilationName: record.name,
+                  lockTypeEnum: lockTypeEnum.SALE,
+                  upgradeTypeEnum: upgradeTypeEnum.UPGRADE
+                })
+              }
+            >
+              销售
+            </Button>
           ) : null}
           {record.isUpgrade ? (
             <>
@@ -144,13 +143,13 @@ const RoadpricingTabList = props => {
                     ...setRoadPricingUpgrade,
                     visible: true,
                     type: titleType.DEMOTION,
-                    // eslint-disable-next-line no-underscore-dangle
                     compilationId: record._id,
                     compilationName: record.name,
                     compilationListName: record.name,
                     upgradeTypeEnum: upgradeTypeEnum.DEMOTION
                   })
-                }>
+                }
+              >
                 降级
               </Button>
               <Button
@@ -164,14 +163,14 @@ const RoadpricingTabList = props => {
                     visible: true,
                     type: titleType.DEADLINE,
                     deadline: record.deadline,
-                    // eslint-disable-next-line no-underscore-dangle
                     compilationId: record._id,
                     compilationName: record.name,
                     compilationListName: record.name,
                     lockTypeEnum: record.lock,
                     upgradeTypeEnum: upgradeTypeEnum.DEADLINE
                   })
-                }>
+                }
+              >
                 限期
               </Button>
             </>
@@ -187,13 +186,13 @@ const RoadpricingTabList = props => {
                     ...setRoadPricingUpgrade,
                     visible: true,
                     type: titleType.LEND,
-                    // eslint-disable-next-line no-underscore-dangle
                     compilationId: record._id,
                     compilationName: record.name,
                     lockTypeEnum: lockTypeEnum.LEND,
                     upgradeTypeEnum: upgradeTypeEnum.UPGRADE
                   })
-                }>
+                }
+              >
                 借出
               </Button>
               <Button
@@ -206,13 +205,13 @@ const RoadpricingTabList = props => {
                     ...setRoadPricingUpgrade,
                     visible: true,
                     type: titleType.SALE,
-                    // eslint-disable-next-line no-underscore-dangle
                     compilationId: record._id,
                     compilationName: record.name,
                     lockTypeEnum: lockTypeEnum.SALE,
                     upgradeTypeEnum: upgradeTypeEnum.UPGRADE
                   })
-                }>
+                }
+              >
                 销售
               </Button>
             </>
@@ -244,7 +243,6 @@ const RoadpricingTabList = props => {
                 columns={columns}
                 search={false}
                 toolBarRender={false}
-                // eslint-disable-next-line no-underscore-dangle
                 rowKey={record => record._id}
                 dataSource={compilationList}
                 pagination={false}
@@ -258,7 +256,6 @@ const RoadpricingTabList = props => {
                 columns={columnOnline}
                 search={false}
                 toolBarRender={false}
-                // eslint-disable-next-line no-underscore-dangle
                 rowKey={record => record._id}
                 dataSource={online_list}
                 pagination={false}
@@ -272,6 +269,7 @@ const RoadpricingTabList = props => {
         loading={roadPricingUpgrade.loading}
         visible={roadPricingUpgrade.visible}
         type={roadPricingUpgrade.type}
+        actionPayload={actionPayload}
         onCancel={() => setRoadPricingUpgrade({ ...roadPricingUpgrade, visible: false })}
         projectType={projectType}
         ssoId={ssoId}

src/pages/Product/Cloud/components/Detail/UpgradeModal.jsx

@@ -48,7 +48,8 @@ const UpgradeModal = props => {
     lock,
     upgradeType,
     cloudUser,
-    deadline
+    deadline,
+    actionPayload
   } = props
   const [form] = Form.useForm()
   const dispatch = useDispatch()
@@ -85,7 +86,7 @@ const UpgradeModal = props => {
       form.resetFields()
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'cloud'
+        payload: actionPayload
       })
     })
   }
@@ -101,7 +102,8 @@ const UpgradeModal = props => {
         onCancel()
         form?.resetFields()
       }}
-      onOk={handleonOk}>
+      onOk={handleonOk}
+    >
       {type === lockTypeEnum.GIVE || type === lockTypeEnum.LEND || type === lockTypeEnum.SALE ? (
         <div className="mb-6">
           <p className="pb-3">

src/pages/Product/Cloud/components/Detail/index.jsx

@@ -17,16 +17,19 @@ const CloudDetail = props => {
     updateKey = 'cloud',
     refresh,
     visible,
-    dataId = '',
+    dataId,
     projectType,
     ...resetDrawerProps
   } = props
   const dispatchModal = useModal()
-  const shouldUpdate = refresh?.[updateKey] || false
-  const refreshClient = () => {
+  const shouldUpdate = refresh?.[dataId ?? updateKey] || false
+  const refreshDetail = () => {
     dispatch({
       type: 'refresh/commitAction',
-      payload: 'cloud'
+      payload: {
+        main: updateKey,
+        target: dataId
+      }
     })
   }
   const [state, setState] = useState({
@@ -45,17 +48,14 @@ const CloudDetail = props => {
     } = await apiRoadpricingDetail({ ssoId: id, projectType })
     if (code === consts.RET_CODE.SUCCESS) {
       if (shouldUpdate) {
-        dispatch({
-          type: 'refresh/commitAction',
-          payload: updateKey
-        })
+        refreshDetail()
       }
       setState({ ...state, cloudUser, compilationList, log, serviceLog, client, loading: false })
     }
   }
   const handleConnectClient = () => {
     dispatchModal('M_CONNECT_CLIENT', {
-      onSelect: refreshClient,
+      onSelect: refreshDetail,
       dataId: state.cloudUser.ssoId,
       preUrl: 'RoadPricing',
       showFooter: false,
@@ -65,7 +65,6 @@ const CloudDetail = props => {
   // 移除cld客户
   const pricingUnLinkClient = clientId => {
     Modal.confirm({
-      zIndex: 1002,
       title: '确认移除',
       onOk: async () => {
         const { code = -1 } = await apiRoadPricingUnLinkClient({
@@ -76,7 +75,10 @@ const CloudDetail = props => {
         if (code === consts.RET_CODE.SUCCESS) {
           dispatch({
             type: 'refresh/commitAction',
-            payload: updateKey
+            payload: {
+              main: updateKey,
+              target: dataId
+            }
           })
         }
       }
@@ -97,7 +99,11 @@ const CloudDetail = props => {
           <Row>
             <Col span={9} className="sheet-box-left">
               <div className="sheet-left-panel pr-4">
-                <Form cloudUser={state.cloudUser} updateKey={updateKey} projectType={projectType} />
+                <Form
+                  cloudUser={state.cloudUser}
+                  actionPayload={{ main: updateKey, target: dataId }}
+                  projectType={projectType}
+                />
                 {state.cloudUser.cld?.clientId ? (
                   <>
                     <div className="mt-4">
@@ -110,9 +116,8 @@ const CloudDetail = props => {
                           type="primary"
                           ghost
                           size="small"
-                          onClick={() => {
-                            pricingUnLinkClient(state.cloudUser.cld?.clientId)
-                          }}>
+                          onClick={() => pricingUnLinkClient(state.cloudUser.cld?.clientId)}
+                        >
                           <LinkInterrupt size="14" />
                           <span className="ml-5px">移除CLD客户</span>
                         </Button>
@@ -129,15 +134,9 @@ const CloudDetail = props => {
                 )}
               </div>
             </Col>
-            <Col
-              span={15}
-              // sm={{ span: 24 }}
-              // md={{ span: 24 }}
-              // lg={{ span: 15 }}
-              // xl={{ span: 15 }}
-              flex={{ flexDirection: 'column' }}
-              className="sheet-box-right">
+            <Col span={15} flex={{ flexDirection: 'column' }} className="sheet-box-right">
               <TabList
+                actionPayload={{ main: updateKey, target: dataId }}
                 compilationList={state.compilationList}
                 cloudUser={state.cloudUser}
                 projectType={projectType}