diff --git a/.webpackrc.js b/.webpackrc.js
index 07289577e4a9c4519261076f03898b78eaa14a70..7ca7eee5b1e00749995cddbabdf57376299015a6 100755
--- a/.webpackrc.js
+++ b/.webpackrc.js
@@ -20,6 +20,11 @@ export default {
alias: {
components: path.resolve(__dirname, 'src/components/'),
},
+ externals: {
+ '@antv/data-set': 'DataSet',
+ bizcharts: 'BizCharts',
+ rollbar: 'rollbar',
+ },
ignoreMomentLocale: true,
theme: './src/theme.js',
html: {
diff --git a/package.json b/package.json
index c7dd37853a7a006bdbf86dc53809fbcffbe80710..ba0c6c32df2bbd4287a1aaa9e0b0b807a49fefaa 100755
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"build": "cross-env ESLINT=none roadhog build",
"build-site": "roadhog-api-doc static",
"site": "roadhog-api-doc static && gh-pages -d dist",
- "analyze": "cross-env ANALYZE=true roadhog build",
+ "analyze": "cross-env ANALYZE=1 roadhog build",
"lint:style": "stylelint \"src/**/*.less\" --syntax less",
"lint": "eslint --ext .js src mock tests && npm run lint:style",
"lint:fix": "eslint --fix --ext .js src mock tests && npm run lint:style",
@@ -24,7 +24,7 @@
"dependencies": {
"@antv/data-set": "^0.8.0",
"antd": "^3.6.2",
- "bizcharts": "^3.1.8",
+ "bizcharts": "^3.1.10",
"bizcharts-plugin-slider": "^2.0.3",
"classnames": "^2.2.6",
"dva": "^2.3.1",
diff --git a/src/components/Authorized/PromiseRender.js b/src/components/Authorized/PromiseRender.js
index 62b24808258ad36e90a8637f5256bc2f9caaf874..8e2a4059d8689ca1e0be623aedd14cc9a2d75134 100644
--- a/src/components/Authorized/PromiseRender.js
+++ b/src/components/Authorized/PromiseRender.js
@@ -44,9 +44,10 @@ export default class PromiseRender extends React.PureComponent {
};
render() {
- const { component } = this.state;
- return component ? (
-
+ const { component: Component } = this.state;
+ const { ok, error, promise, ...rest } = this.props;
+ return Component ? (
+
) : (