Commit 238fc58fe87f2ce1ead1dc7f4a064292b3d10b6c
1 parent
b2a29158
umi组件
Showing
6 changed files
with
4 additions
and
6 deletions
src/components/Common/Flows/CommonFlow.js
| @@ -13,7 +13,7 @@ import ReactFlow, { | @@ -13,7 +13,7 @@ import ReactFlow, { | ||
| 13 | import * as commonutils from '../../../utils/utils' | 13 | import * as commonutils from '../../../utils/utils' |
| 14 | import './flows.less' | 14 | import './flows.less' |
| 15 | import { MarkerType } from 'react-flow-renderer'; | 15 | import { MarkerType } from 'react-flow-renderer'; |
| 16 | -import { connect } from "dva" | 16 | +import { connect } from "umi" |
| 17 | const getNodeId = () => `randomnode_${+new Date()}`; | 17 | const getNodeId = () => `randomnode_${+new Date()}`; |
| 18 | const OverviewFlow = (props) => { | 18 | const OverviewFlow = (props) => { |
| 19 | const { flowData} = props; | 19 | const { flowData} = props; |
src/components/Common/Flows/OverviewFlow.js
| @@ -13,7 +13,7 @@ import ReactFlow, { | @@ -13,7 +13,7 @@ import ReactFlow, { | ||
| 13 | import * as commonutils from '../../../utils/utils' | 13 | import * as commonutils from '../../../utils/utils' |
| 14 | import './flows.less' | 14 | import './flows.less' |
| 15 | import { MarkerType } from 'react-flow-renderer'; | 15 | import { MarkerType } from 'react-flow-renderer'; |
| 16 | -import { connect } from "dva" | 16 | +import { connect } from "umi" |
| 17 | import { set } from 'lodash'; | 17 | import { set } from 'lodash'; |
| 18 | const getNodeId = () => `randomnode_${+new Date()}`; | 18 | const getNodeId = () => `randomnode_${+new Date()}`; |
| 19 | const OverviewFlow = (props) => { | 19 | const OverviewFlow = (props) => { |
src/mobile/common/SceneMobile.js
| @@ -107,7 +107,6 @@ class SceneMobile extends React.Component { | @@ -107,7 +107,6 @@ class SceneMobile extends React.Component { | ||
| 107 | .replace('{sUserId}', userinfo.sId) | 107 | .replace('{sUserId}', userinfo.sId) |
| 108 | .replace('{token}', token) | 108 | .replace('{token}', token) |
| 109 | : ''; | 109 | : ''; |
| 110 | - | ||
| 111 | if (iframeUrl.startsWith('http')) { | 110 | if (iframeUrl.startsWith('http')) { |
| 112 | this.handleChangeIframeVisible(true, iframeUrl); | 111 | this.handleChangeIframeVisible(true, iframeUrl); |
| 113 | return; | 112 | return; |
src/routes/mobile/IndexMobile.js
| @@ -357,7 +357,7 @@ class IndexMobile extends React.Component { | @@ -357,7 +357,7 @@ class IndexMobile extends React.Component { | ||
| 357 | selectedTab: "workbench", | 357 | selectedTab: "workbench", |
| 358 | title: "工作台", | 358 | title: "工作台", |
| 359 | }); | 359 | }); |
| 360 | - routerRedux.push("/indexMobile"); | 360 | + history.push("/indexMobile"); |
| 361 | }} | 361 | }} |
| 362 | > | 362 | > |
| 363 | {this.state.selectedTab === "workbench" ? this.renderContent(this.state.selectedTab) : ""} | 363 | {this.state.selectedTab === "workbench" ? this.renderContent(this.state.selectedTab) : ""} |
src/routes/mobile/commobileList/commobileList.js
| @@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
| 3 | * @Last modified time: 2019-06-26T18:40:44+08:00 | 3 | * @Last modified time: 2019-06-26T18:40:44+08:00 |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | -import React from 'react'; | ||
| 7 | import { connect } from 'umi'; | 6 | import { connect } from 'umi'; |
| 8 | import CommobileListComponent from '../../../mobile/common/CommobileList'; | 7 | import CommobileListComponent from '../../../mobile/common/CommobileList'; |
| 9 | import * as commonUtils from '../../../utils/utils'; | 8 | import * as commonUtils from '../../../utils/utils'; |
src/routes/mobile/common/SceneMobile.js
| 1 | import React from 'react'; | 1 | import React from 'react'; |
| 2 | -import { connect } from 'dva'; | 2 | +import { connect } from 'umi'; |
| 3 | import SceneMobileComponent from '../../../mobile/common/SceneMobile'; | 3 | import SceneMobileComponent from '../../../mobile/common/SceneMobile'; |
| 4 | 4 | ||
| 5 | function SceneMobile({ | 5 | function SceneMobile({ |