From 5562436e2898f5d013a2ccd7138d4dfe0888c5f5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 17:21:31 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
package.json | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/package.json b/package.json
index cdfaf25..bc043bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
- "name": "screen-frontend",
- "version": "1.0.0",
+ "name": "ng-alain",
+ "version": "0.6.0-rc.2",
"description": "ng-zorro-antd admin panel front-end framework",
"author": "cipchk",
"homepage": "https://cipchk.github.io/ng-alain/",
@@ -15,17 +15,19 @@
"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",
"lint:style": "stylelint \"{src}/**/*.less\" --syntax less",
"lint-staged": "lint-staged",
"e2e": "ng e2e",
- "test": "ng test -sr",
- "test-coverage": "ng test -sr -cc"
+ "test": "ng test -sr -sm=false",
+ "test-coverage": "ng test -sr -cc -sm=false"
},
"dependencies": {
"@angular/animations": "^5.0.0",
@@ -37,30 +39,36 @@
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/router": "^5.0.0",
- "@antv/data-set": "^0.7.0",
+ "@antv/data-set": "^0.8.3",
"@antv/g2": "^3.0.1",
"@antv/g2-plugin-slider": "^2.0.0",
- "@delon/abc": "^0.3.0-rc.1",
- "@delon/acl": "^0.3.0-rc.1",
- "@delon/theme": "^0.3.0-rc.1",
- "@delon/auth": "^0.3.0-rc.1",
+ "@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-tree-component": "^6.1.0",
+ "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",
+ "ng-clipboard-antd": "^2.0.1",
"ng-tree-antd": "^2.0.0",
"ng-zorro-antd": "^0.6.5",
- "ng-zorro-antd-extra": "^1.1.3",
+ "ng-zorro-antd-extra": "^1.1.6",
"ng2-dnd": "^5.0.0",
"ng2-file-upload": "^1.2.1",
"ng2-img-cropper": "^0.9.0",
"ngx-color-picker": "^5.0.0",
"ngx-countdown": "^2.0.0",
+ "ngx-tinymce": "^1.0.1",
+ "ngx-ueditor": "^1.1.0",
"rxjs": "^5.5.5",
"screenfull": "^3.3.1",
"simple-line-icons": "^2.4.1",
@@ -76,6 +84,8 @@
"@angularclass/hmr-loader": "^3.0.4",
"@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",
@@ -90,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",
@@ -97,7 +108,8 @@
"ts-node": "~3.2.0",
"tslint": "~5.7.0",
"typescript": "~2.5.0",
- "webpack-bundle-analyzer": "^2.9.0"
+ "webpack-bundle-analyzer": "^2.9.0",
+ "xlsx": "^0.11.16"
},
"lint-staged": {
"src/**/*.ts": "lint:ts",
--
Gitblit v1.8.0