From b7010795b1e5e6bc0cb357f0cb4d716afef91138 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 08:53:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
package.json | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index ef3b7f9..bc043bf 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,11 @@
"scripts": {
"precommit": "npm run lint-staged",
"ng": "ng",
- "start": "ng serve -o",
+ "start": "ng serve --host=0.0.0.0",
"serve:hmr": "ng serve -o --hmr -e=hmr",
"build": "ng build --prod --build-optimizer",
+ "build-dev": "ng build --build-optimizer --aot --dev",
+ "build-prod": "ng build --build-optimizer --prod",
"analyze": "ng build --prod --build-optimizer --stats-json",
"lint": "run-s lint:ts lint:style",
"lint:ts": "ng lint",
@@ -40,19 +42,19 @@
"@antv/data-set": "^0.8.3",
"@antv/g2": "^3.0.1",
"@antv/g2-plugin-slider": "^2.0.0",
- "@delon/abc": "^0.6.0-rc.2",
- "@delon/acl": "^0.6.0-rc.2",
- "@delon/auth": "^0.6.0-rc.2",
- "@delon/theme": "^0.6.0-rc.2",
- "@delon/mock": "^0.6.0-rc.2",
- "@delon/cache": "^0.6.0-rc.2",
+ "@delon/abc": "0.6.1",
+ "@delon/acl": "0.6.1",
+ "@delon/auth": "0.6.1",
+ "@delon/theme": "0.6.1",
+ "@delon/cache": "0.6.1",
"@ngx-translate/core": "^9.0.0",
"@ngx-translate/http-loader": "^2.0.0",
- "angular-baidu-maps": "^1.0.1",
+ "angular2-baidu-map": "^4.1.0",
"angular-qq-maps": "^1.0.1",
"angular-split": "^1.0.0-rc.0",
"angular-tree-component": "^7.0.1",
"core-js": "^2.5.1",
+ "echarts": "^3.8.5",
"file-saver": "^1.3.3",
"font-awesome": "^4.7.0",
"moment": "^2.19.3",
@@ -83,6 +85,7 @@
"@types/jasmine": "~2.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/jszip": "^3.1.2",
+ "@types/mockjs": "^1.0.0",
"@types/node": "~6.0.60",
"codecov": "^3.0.0",
"codelyzer": "~4.0.1",
@@ -97,6 +100,7 @@
"karma-remap-istanbul": "^0.6.0",
"karma-sauce-launcher": "^1.2.0",
"lint-staged": "^5.0.0",
+ "mockjs": "^1.0.1-beta3",
"npm-run-all": "^4.1.1",
"protractor": "~5.1.2",
"stylelint": "^8.2.0",
@@ -105,8 +109,6 @@
"tslint": "~5.7.0",
"typescript": "~2.5.0",
"webpack-bundle-analyzer": "^2.9.0",
- "mockjs": "^1.0.1-beta3",
- "@types/mockjs": "^1.0.0",
"xlsx": "^0.11.16"
},
"lint-staged": {
--
Gitblit v1.8.0