From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
yarn.lock | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 73e87a9..1484f9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -219,29 +219,25 @@
lodash "^4.17.4"
wolfy87-eventemitter "^5.1.0"
-"@delon/abc@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/abc/download/@delon/abc-0.6.0-rc.2.tgz#29042b329147492d2900eff5266dce2f760118c9"
+"@delon/abc@0.6.1":
+ version "0.6.1"
+ resolved "http://registry.npm.taobao.org/@delon/abc/download/@delon/abc-0.6.1.tgz#161ab09848715700fd00d073c55ac0a51268195d"
-"@delon/acl@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/acl/download/@delon/acl-0.6.0-rc.2.tgz#3e62d7ea2b7b5faa03644354e9bc9c0e496baa8e"
+"@delon/acl@0.6.1":
+ version "0.6.1"
+ resolved "http://registry.npm.taobao.org/@delon/acl/download/@delon/acl-0.6.1.tgz#2728f2c24684640caff36db98c0777589b59f747"
-"@delon/auth@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/auth/download/@delon/auth-0.6.0-rc.2.tgz#2aab1245f114845b29f3d127846efa19d617ce5c"
+"@delon/auth@0.6.1":
+ version "0.6.1"
+ resolved "http://registry.npm.taobao.org/@delon/auth/download/@delon/auth-0.6.1.tgz#26b0945008663b7126ea30aca6372a6bc5d6a9cb"
-"@delon/cache@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/cache/download/@delon/cache-0.6.0-rc.2.tgz#d65789d375c7939d398395e97adf66b9f87a2fa4"
+"@delon/cache@0.6.1":
+ version "0.6.1"
+ resolved "http://registry.npm.taobao.org/@delon/cache/download/@delon/cache-0.6.1.tgz#13b412897743dc2ad612c4c4fca280c3dc044825"
-"@delon/mock@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/mock/download/@delon/mock-0.6.0-rc.2.tgz#9e7b677c692241845425e82116755f3c0dfed439"
-
-"@delon/theme@^0.6.0-rc.2":
- version "0.6.0-rc.2"
- resolved "http://registry.npm.taobao.org/@delon/theme/download/@delon/theme-0.6.0-rc.2.tgz#906f81ba8fe292aa86dea2cb97f7dffff37ffef3"
+"@delon/theme@0.6.1":
+ version "0.6.1"
+ resolved "http://registry.npm.taobao.org/@delon/theme/download/@delon/theme-0.6.1.tgz#4e98b1dc565c2f0684717c44ed73509cd866f120"
"@ngtools/json-schema@1.1.0", "@ngtools/json-schema@^1.1.0":
version "1.1.0"
@@ -420,10 +416,6 @@
version "1.0.1"
resolved "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-angular-baidu-maps@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/angular-baidu-maps/download/angular-baidu-maps-1.0.1.tgz#000f206b1992336baca42cc7a4ae8575726a96b9"
-
angular-qq-maps@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/angular-qq-maps/download/angular-qq-maps-1.0.1.tgz#ba4f312f501bb208837081ed9dd7e595ba53c810"
@@ -441,6 +433,10 @@
lodash "4.17.4"
mobx ">=3"
mobx-angular ">=1"
+
+angular2-baidu-map@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/angular2-baidu-map/-/angular2-baidu-map-4.1.0.tgz#9992840349a78e3d3c3eaf3b3857fd85e59ccb32"
ansi-escapes@^1.0.0:
version "1.4.0"
@@ -2176,6 +2172,12 @@
resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
dependencies:
jsbn "~0.1.0"
+
+echarts@^3.8.5:
+ version "3.8.5"
+ resolved "https://registry.yarnpkg.com/echarts/-/echarts-3.8.5.tgz#58e4a51d2743c6fb75257b0dc0a9cf9f5378ac0e"
+ dependencies:
+ zrender "3.7.4"
ee-first@1.1.1:
version "1.1.1"
@@ -7864,9 +7866,9 @@
semver "^5.3.0"
xml2js "^0.4.17"
-webpack-bundle-analyzer@^2.9.0:
+webpack-bundle-analyzer@^2.9.2:
version "2.9.2"
- resolved "http://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
+ resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
dependencies:
acorn "^5.1.1"
chalk "^1.1.3"
@@ -8253,3 +8255,7 @@
zone.js@^0.8.14, zone.js@^0.8.18:
version "0.8.19"
resolved "http://registry.npm.taobao.org/zone.js/download/zone.js-0.8.19.tgz#a4b522cd9e8b7b616a638c297d720d4c7f292f71"
+
+zrender@3.7.4:
+ version "3.7.4"
+ resolved "https://registry.yarnpkg.com/zrender/-/zrender-3.7.4.tgz#f847d53948481ef6d42906d1ea9aeec7acbefdf2"
--
Gitblit v1.8.0