externals bizcharts dataset and rollbar

8bb04158 · 陈帅 · 533c091b · 8bb04158 · 8bb04158 · 8bb04158
Commit 8bb04158 authored Jun 22, 2018 by 陈帅
Showing with 17 additions and 5 deletions

.webpackrc.js .webpackrc.js +5 -0

package.json package.json +2 -2

src/components/Authorized/PromiseRender.js src/components/Authorized/PromiseRender.js +4 -3

src/index.ejs src/index.ejs +6 -0

No files found.
--- 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: {

--- 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",

--- 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 ? (
-      <component {...this.props} />
+    const { component: Component } = this.state;
+    const { ok, error, promise, ...rest } = this.props;
+    return Component ? (
+      <Component {...rest} />
    ) : (
      <div
        style={{

--- a/src/index.ejs
+++ b/src/index.ejs
@@ -7,10 +7,16 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Ant Design Pro</title>
  <link rel="icon" href="/favicon.png" type="image/x-icon">
+  <script src="https://gw.alipayobjects.com/os/rmsportal/nGVBgVyXzzmbAqevIAPy.js">
+  </script>
+  <script src=" https://gw.alipayobjects.com/os/rmsportal/TKSqiyoUxzrHoMwjViwA.js "></script>
+  <script src="https://gw.alipayobjects.com/os/antv/assets/data-set/0.8.7/data-set.min.js"></script>
+
 </head>

 <body>
  <div id="root"></div>
 </body>

+
 </html>
\ No newline at end of file