Skip to content

Commit b5ba8a2

Browse files
authored
Merge pull request #1 from philipgreat/master
Merge from the newest code
2 parents b7d7b8e + d850635 commit b5ba8a2

File tree

218 files changed

+10524
-2649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+10524
-2649
lines changed

dump.rdb

4.03 KB
Binary file not shown.

package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@
2323
"dependencies": {
2424
"@antv/data-set": "^0.8.0",
2525
"@babel/polyfill": "^7.0.0-beta.36",
26-
"antd": "^3.8.3",
26+
"antd": "^3.10.8",
2727
"axios": "^0.16.2",
2828
"babel-plugin-transform-decorators-legacy": "^1.3.4",
29+
"babel-preset-env": "^1.7.0",
2930
"babel-runtime": "^6.9.2",
3031
"bizcharts": "^3.1.5",
3132
"bizcharts-plugin-slider": "^2.0.1",
3233
"classnames": "^2.2.5",
3334
"dva": "^2.2.3",
3435
"dva-loading": "^1.0.4",
36+
"echarts-for-react": "^2.0.14",
3537
"enquire-js": "^0.2.1",
3638
"keymaster": "^1.6.2",
3739
"less": "2.7.2",
@@ -51,16 +53,19 @@
5153
"react-fittext": "^1.0.0",
5254
"react-fontawesome": "^1.6.1",
5355
"rollbar": "^2.3.4",
54-
"svg2ttf": "^4.1.0",
5556
"url-polyfill": "^1.0.10"
5657
},
5758
"devDependencies": {
59+
"@babel/cli": "^7.2.0",
60+
"@babel/core": "^7.2.0",
61+
"@babel/node": "^7.2.0",
5862
"babel-eslint": "^8.1.2",
5963
"babel-plugin-dva-hmr": "^0.4.1",
6064
"babel-plugin-import": "^1.6.7",
6165
"babel-plugin-module-resolver": "^3.1.1",
6266
"cross-env": "^5.1.1",
6367
"cross-port-killer": "^1.0.1",
68+
"echarts": "^4.1.0",
6469
"enzyme": "^3.1.0",
6570
"eslint": "^4.14.0",
6671
"eslint-config-airbnb": "^16.0.0",

public/css/font-awesome.min.css

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)