Skip to content

Commit

Permalink
fix according to the need to load resources
Browse files Browse the repository at this point in the history
  • Loading branch information
hm.hm committed May 28, 2018
1 parent b43c772 commit 38b76aa
Show file tree
Hide file tree
Showing 21 changed files with 191 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"linebreak-style" : "off",
"arrow-body-style" : "off",
"no-unused-vars" : "warn",
"guard-for-in" : "off"
"guard-for-in" : "off",
"react/no-unused-prop-types": "off"
}
}
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,36 +62,38 @@
},
"devDependencies": {
"@antv/data-set": "0.6.2",
"bizcharts-plugin-slider": "2.0.1",
"babel-cli": "^6.18.0",
"babel-core": "^6.18.2",
"babel-eslint": "6.1.2",
"babel-loader": "^6.2.8",
"babel-plugin-add-module-exports": "~0.1.2",
"babel-plugin-istanbul": "3.0.0",
"babel-plugin-lodash": "^3.2.10",
"babel-plugin-add-module-exports": "~0.1.2",
"babel-plugin-transform-class-properties": "^6.19.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
"babel-plugin-transform-export-extensions": "^6.8.0",
"babel-plugin-transform-function-bind": "^6.8.0",
"babel-plugin-transform-object-rest-spread": "^6.19.0",
"babel-plugin-transform-object-assign": "~6.5.0",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
"babel-eslint": "6.1.2",
"babel-plugin-transform-object-rest-spread": "^6.19.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "~6.5.0",
"bizcharts-plugin-slider": "2.0.1",
"chai": "^3.5.0",
"chai-enzyme": "^0.5.2",
"core-js": "2.5.3",
"cross-env": "^3.1.4",
"enzyme": "^2.6.0",
"escope": "^3.6.0",
"eslint": "^3.8.1",
"eslint-config-airbnb": "^12.0.0",
"eslint-config-ais": "0.0.16",
"eslint-plugin-import": "^1.16.0",
"eslint-plugin-jsx-a11y": "^2.2.0",
"eslint-plugin-react": "^6.4.1",
"eslint-config-ais": "0.0.16",
"estraverse-fb": "^1.3.1",
"interface-es6": "1.0.1",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-chai": "^0.1.0",
Expand All @@ -106,17 +108,15 @@
"mocha": "^3.1.0",
"pre-commit": "^1.1.3",
"react": "16.0.0",
"react-dom": "16.0.0",
"react-addons-test-utils": "^15.4.1",
"react-dom": "16.0.0",
"react-hot-loader": "^1.3.0",
"react-router": "^3.0.1",
"rimraf": "^2.5.3",
"sinon": "^1.17.0",
"webpack": "^2.2.0",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-dev-server": "^2.2.0",
"interface-es6": "1.0.1",
"core-js": "2.5.3"
"webpack-bundle-analyzer": "^2.13.1",
"webpack-dev-server": "^2.2.0"
},
"license": "MIT",
"directories": {
Expand Down
1 change: 1 addition & 0 deletions src/components/Facet/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import '@antv/g2/lib/facet/index';
import BaseComponent from '../Base';

export default BaseComponent.generateBaseTypedComponent('Facet');
Expand Down
1 change: 1 addition & 0 deletions src/components/Geom/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/**
* Geom Component
*/
import '@antv/g2/lib/geom/index';
import Base from '../Base';

export default Base.generateBaseTypedComponent('Geom');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Area/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/area';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'area');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Edge/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/edge';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'edge');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Heatmap/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/heatmap';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'heatmap');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Interval/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/interval';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'interval');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Line/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/line';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'line');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Path/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/path';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'path');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Point/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/point';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'point');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Polygon/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/polygon';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'polygon');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Schema/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/schema';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'schema');
7 changes: 7 additions & 0 deletions src/components/TypedGeom/Venn/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Line geometry Component
*/
import '@antv/g2/lib/geom/venn';
import generateTypedGeom from '../generateTypedGeom';

export default generateTypedGeom('Geom', 'venn');
52 changes: 52 additions & 0 deletions src/components/TypedGeom/generateTypedGeom.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import BaseComponent from '../Base';

function generateTypedGeom(name, geomType) {
class TypedGeom extends BaseComponent {
static contextTypes = {
addElement: PropTypes.func,
updateElement: PropTypes.func,
deleteElement: PropTypes.func,
createId: PropTypes.func,
getParentInfo: PropTypes.func,
getViewId: PropTypes.func,
}

static childContextTypes = {
addElement: PropTypes.func,
updateElement: PropTypes.func,
deleteElement: PropTypes.func,
createId: PropTypes.func,
getParentInfo: PropTypes.func,
getViewId: PropTypes.func,
}

static propTypes = {
type: PropTypes.string,
}

static defaultProps = {
type: geomType,
}

constructor(props) {
super(props, name);
}

getChildContext() {
return {
addElement: this.context.addElement,
updateElement: this.context.updateElement,
deleteElement: this.context.deleteElement,
createId: this.context.createId,
getParentInfo: this.getParentInfo,
getViewId: this.context.getViewId,
};
}
}

return TypedGeom;
}

export default generateTypedGeom;
10 changes: 10 additions & 0 deletions src/components/TypedGeom/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export Area from './Area';
export Edge from './Edge';
export Heatmap from './Heatmap';
export Line from './Line';
export Interval from './Interval';
export Path from './Path';
export Point from './Point';
export Polygon from './Polygon';
export Schema from './Schema';
export Venn from './Venn';
26 changes: 26 additions & 0 deletions src/core.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import G2, { Shape, PathUtil, Animate } from '@antv/g2/lib/core';
import Util from './shared/util';
import Themes from './themes';

const BizCharts = {
G2,
Util,
Shape,
Animate,
PathUtil,
track(enable = false) {
// for srs
G2.track(enable);
},
setTheme(theme) {
let themeObj = theme;
if (typeof theme === 'string' && Themes[theme]) {
themeObj = Themes[theme];
}

G2.Global.setTheme(themeObj);
},
};

exports.default = BizCharts;
module.exports = BizCharts;
8 changes: 4 additions & 4 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import G2, { Shape, PathUtil, Animate } from '@antv/g2';
import G2, { Shape, PathUtil, Animate } from '@antv/g2/lib/core';
import Util from './shared/util';
import Themes from './themes';
import * as Components from './components';
import * as components from './components';

const BizCharts = Util.mix(Components, {
const BizCharts = Util.mix(components, {
G2,
Util,
Shape,
Expand All @@ -24,4 +24,4 @@ const BizCharts = Util.mix(Components, {
});

exports.default = BizCharts;
module.exports = exports['default'];
module.exports = BizCharts;
2 changes: 1 addition & 1 deletion src/processor/g2Creator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import G2 from '@antv/g2';
import * as G2 from '@antv/g2/lib/core';
import { Prop, Util } from '../shared';
import common from './common';
import EventUtil from './event';
Expand Down
2 changes: 1 addition & 1 deletion src/shared/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* util function
*/

import { Util } from '@antv/g2';
import { Util } from '@antv/g2/lib/core';

/* eslint-disable no-self-compare */

Expand Down
13 changes: 12 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,18 @@ var config = {

if (env === 'analyse') {
config.plugins.push(
new BundleAnalyzerPlugin()
new BundleAnalyzerPlugin({
analyzerMode: 'server',
analyzerHost: '127.0.0.1',
analyzerPort: 8889,
reportFilename: 'report.html',
defaultSizes: 'parsed',
openAnalyzer: true,
generateStatsFile: false,
statsFilename: 'stats.json',
statsOptions: null,
logLevel: 'info',
})
);
}

Expand Down

0 comments on commit 38b76aa

Please sign in to comment.