陈帅 6 лет назад
Родитель
Сommit
5684b5d579

+ 1 - 1
config/config.js

@@ -6,7 +6,7 @@ import defaultSettings from '../src/defaultSettings';
 import slash from 'slash2';
 
 const { pwa, primaryColor } = defaultSettings;
-const { NODE_ENV, APP_TYPE, TEST } = process.env;
+const { APP_TYPE, TEST } = process.env;
 
 const plugins = [
   [

+ 0 - 44
src/components/Charts/AsyncLoadBizCharts.js

@@ -1,44 +0,0 @@
-import React from 'react';
-import PageLoading from '../PageLoading';
-import { importCDN } from '@/utils/utils';
-
-let isLoaderBizChart = false;
-const loadBizCharts = async () => {
-  if (isLoaderBizChart) {
-    return Promise.resolve(true);
-  }
-  await Promise.all([
-    importCDN('//gw.alipayobjects.com/os/lib/bizcharts/3.4.3/umd/BizCharts.min.js'),
-    importCDN('//gw.alipayobjects.com/os/lib/antv/data-set/0.10.1/dist/data-set.min.js'),
-  ]);
-  // eslint-disable-next-line no-console
-  console.log('bizCharts load success');
-  isLoaderBizChart = true;
-  return Promise.resolve(true);
-};
-
-class AsyncLoadBizCharts extends React.Component {
-  state = {
-    loading: !isLoaderBizChart,
-  };
-
-  async componentDidMount() {
-    await loadBizCharts();
-    requestAnimationFrame(() => {
-      this.setState({
-        loading: false,
-      });
-    });
-  }
-
-  render() {
-    const { children } = this.props;
-    const { loading } = this.state;
-    if (!loading) {
-      return children;
-    }
-    return <PageLoading />;
-  }
-}
-
-export { loadBizCharts, AsyncLoadBizCharts };

+ 10 - 18
src/components/Charts/index.js

@@ -1,24 +1,16 @@
-import React, { Suspense } from 'react';
 import numeral from 'numeral';
 import ChartCard from './ChartCard';
 import Field from './Field';
-
-const getComponent = Component => props => (
-  <Suspense fallback="...">
-    <Component {...props} />
-  </Suspense>
-);
-
-const Bar = getComponent(React.lazy(() => import('./Bar')));
-const Pie = getComponent(React.lazy(() => import('./Pie')));
-const Radar = getComponent(React.lazy(() => import('./Radar')));
-const Gauge = getComponent(React.lazy(() => import('./Gauge')));
-const MiniArea = getComponent(React.lazy(() => import('./MiniArea')));
-const MiniBar = getComponent(React.lazy(() => import('./MiniBar')));
-const MiniProgress = getComponent(React.lazy(() => import('./MiniProgress')));
-const WaterWave = getComponent(React.lazy(() => import('./WaterWave')));
-const TagCloud = getComponent(React.lazy(() => import('./TagCloud')));
-const TimelineChart = getComponent(React.lazy(() => import('./TimelineChart')));
+import Bar from './Bar';
+import Pie from './Pie';
+import Radar from './Radar';
+import Gauge from './Gauge';
+import MiniArea from './MiniArea';
+import MiniBar from './MiniBar';
+import MiniProgress from './MiniProgress';
+import WaterWave from './WaterWave';
+import TagCloud from './TagCloud';
+import TimelineChart from './TimelineChart';
 
 const yuan = val => `¥ ${numeral(val).format('0,0')}`;
 

+ 1 - 6
src/pages/Dashboard/Analysis.js

@@ -5,7 +5,6 @@ import GridContent from '@/components/PageHeaderWrapper/GridContent';
 import { getTimeDistance } from '@/utils/utils';
 import styles from './Analysis.less';
 import PageLoading from '@/components/PageLoading';
-import { AsyncLoadBizCharts } from '@/components/Charts/AsyncLoadBizCharts';
 
 const IntroduceRow = React.lazy(() => import('./IntroduceRow'));
 const SalesCard = React.lazy(() => import('./SalesCard'));
@@ -182,8 +181,4 @@ class Analysis extends Component {
   }
 }
 
-export default props => (
-  <AsyncLoadBizCharts>
-    <Analysis {...props} />
-  </AsyncLoadBizCharts>
-);
+export default Analysis;

+ 1 - 6
src/pages/Dashboard/Monitor.js

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { AsyncLoadBizCharts } from '@/components/Charts/AsyncLoadBizCharts';
 import { connect } from 'dva';
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import { Row, Col, Card, Tooltip } from 'antd';
@@ -242,8 +241,4 @@ class Monitor extends Component {
   }
 }
 
-export default props => (
-  <AsyncLoadBizCharts>
-    <Monitor {...props} />
-  </AsyncLoadBizCharts>
-);
+export default Monitor;

+ 1 - 6
src/pages/Dashboard/Workplace.js

@@ -3,7 +3,6 @@ import moment from 'moment';
 import { connect } from 'dva';
 import Link from 'umi/link';
 import { Row, Col, Card, List, Avatar } from 'antd';
-import { AsyncLoadBizCharts } from '@/components/Charts/AsyncLoadBizCharts';
 import { Radar } from '@/components/Charts';
 import EditableLinkGroup from '@/components/EditableLinkGroup';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
@@ -253,8 +252,4 @@ class Workplace extends PureComponent {
   }
 }
 
-export default props => (
-  <AsyncLoadBizCharts>
-    <Workplace {...props} />
-  </AsyncLoadBizCharts>
-);
+export default Workplace;