فهرست منبع

fix: 修复umi报错

lanjianrong 4 سال پیش
والد
کامیت
01d5d6d992

+ 3 - 1
config/config.js

@@ -20,7 +20,9 @@ export default defineConfig({
     ...defaultSettings
   },
   dva: {
-    hmr: true
+    hmr: true,
+    disableModelsReExport: true,
+    lazyLoad: true
   },
   history: {
     type: 'browser'

+ 3 - 2
src/hooks/core/useWebSocketFn.tsx

@@ -34,8 +34,8 @@ export default function useWebSocketFn() {
 
   const { currentUser } = initialState
 
-  const { disconnect, connect, webSocketIns } = useWebSocket(
-    `ws://cld2qa.com/summon/v1/chat/link?username=${currentUser.username}&id=${currentUser.staffId}`,
+  const { disconnect, connect, webSocketIns, readyState } = useWebSocket(
+    `ws://cld2qa.com/summon/v1/chat/link?username=${currentUser?.username}&id=${currentUser?.staffId}`,
     {
       manual: true,
       reconnectLimit: 3,
@@ -65,6 +65,7 @@ export default function useWebSocketFn() {
   useEffect(() => {
     if (currentUser && currentUser.staffId) {
       connect()
+      console.log('readyState', readyState)
     }
     return () => {
       disconnect()

+ 5 - 3
src/pages/Customer/Client/components/ClientDetail/index.jsx

@@ -5,7 +5,7 @@ import ContanctTabList from './TabList.jsx'
 import ContanctLowerList from './LowerList.jsx'
 import { apiContactDetail } from '@/services/customer'
 import consts from '@/consts'
-import { connect } from 'dva'
+import { connect } from 'umi'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 
@@ -56,7 +56,8 @@ const ContactDetail = props => {
             md={{ span: 24 }}
             lg={{ span: 9 }}
             xl={{ span: 9 }}
-            className="sheet-box-left">
+            className="sheet-box-left"
+          >
             {orderIds.length ? (
               <div className="mb-3">
                 <Tooltip title="上一条记录">
@@ -91,7 +92,8 @@ const ContactDetail = props => {
             md={{ span: 24 }}
             lg={{ span: 15 }}
             xl={{ span: 15 }}
-            className="sheet-box-right">
+            className="sheet-box-right"
+          >
             <ContanctTabList clientId={state.client.id} software={state.software} />
             <ContanctLowerList log={state.log} servicelist={state.serviceLog} />
           </Col>

+ 18 - 20
src/pages/Product/Cloud/components/RoadpricingDetail/index.jsx

@@ -2,28 +2,24 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col } from 'antd'
 import { connect } from 'umi'
 import consts from '@/consts'
-import RoadpricingForm from './Form'
-import RoadpricingLowerList from './LowerList'
-import RoadpricingTabList from './TabList'
+import Form from './Form'
+import LowerList from './LowerList'
+import TabList from './TabList'
 import { apiRoadpricingDetail } from '@/services/product'
-import roadpricingEnum from '../RoadpricingDetail'
 
-const RoadpricingDetail = props => {
-  const { dispatch, updateKey = 'cloud', refresh, visible, dataId = '' } = props
+const Detail = props => {
+  const { dispatch, updateKey = 'cloud', refresh, visible, dataId = '', projectType } = props
   const shouldUpdate = refresh[updateKey] || false
-  const columnStateType = pathname?.match(/\/([^/]*)$/)[1]?.toUpperCase()
   const [state, setState] = useState({
     loading: false,
-    cloudUser: {},
-    projectPype: roadpricingEnum[columnStateType]
+    cloudUser: {}
   })
-  console.log(state.projectPype)
-  const initData = async (id = dataId) => {
-    setState({ ...state, loading: true, projectPype })
+  const initData = async id => {
+    setState({ ...state, loading: true })
     const {
       data: { cloudUser = {} },
       code = -1
-    } = await apiRoadpricingDetail(id)
+    } = await apiRoadpricingDetail({ id, projectType })
     if (code === consts.RET_CODE.SUCCESS) {
       if (shouldUpdate) {
         dispatch({
@@ -31,7 +27,7 @@ const RoadpricingDetail = props => {
           payload: updateKey
         })
       }
-      setState({ ...state, cloudUser, loading: false, projectPype })
+      setState({ ...state, cloudUser, loading: false })
     }
   }
   useEffect(() => {
@@ -48,9 +44,10 @@ const RoadpricingDetail = props => {
           md={{ span: 24 }}
           lg={{ span: 9 }}
           xl={{ span: 9 }}
-          className="sheet-box-left">
+          className="sheet-box-left"
+        >
           <div className="sheet-left-panel pr-4">
-            <RoadpricingForm updateKey={updateKey} />
+            <Form updateKey={updateKey} />
           </div>
         </Col>
         <Col
@@ -59,9 +56,10 @@ const RoadpricingDetail = props => {
           lg={{ span: 15 }}
           xl={{ span: 15 }}
           flex={{ flexDirection: 'column' }}
-          className="sheet-box-right">
-          <RoadpricingTabList />
-          <RoadpricingLowerList />
+          className="sheet-box-right"
+        >
+          <TabList />
+          <LowerList />
         </Col>
       </Row>
     </div>
@@ -71,4 +69,4 @@ const RoadpricingDetail = props => {
 export default connect(({ refresh, single }) => ({
   refresh,
   visible: single.drawer.visible
-}))(RoadpricingDetail)
+}))(Detail)