Skip to content

Commit

Permalink
feat: upgrade to 2.0 version (#673)
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk committed Sep 9, 2018
1 parent 0265c13 commit 73f11d1
Show file tree
Hide file tree
Showing 91 changed files with 29,831 additions and 16,277 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
## PR Checklist
Please check if your PR fulfills the following requirements:

- [ ] The commit message follows our guidelines: https://github.com/cipchk/ng-alain/blob/master/CONTRIBUTING.md#commit
- [ ] The commit message follows our guidelines: https://github.com/ng-alain/ng-alain/blob/master/CONTRIBUTING.md#commit
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)

Expand Down Expand Up @@ -40,4 +40,4 @@ Issue Number: N/A
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->


## Other information
## Other information
23 changes: 16 additions & 7 deletions .travis.yml
Expand Up @@ -4,22 +4,31 @@ node_js:
- "8.11"

addons:
chrome: stable
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
- google-chrome-beta

git:
depth: 1

cache:
yarn: true
directories:
- ./node_modules

before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

install:
- npm install
env:
- TASK=build
- TASK=lint
- TASK=test-coverage

script:
- npm run test-coverage

after_success:
- ./node_modules/.bin/codecov
- npm run $TASK

2 changes: 1 addition & 1 deletion .vscode/settings.json
@@ -1,7 +1,7 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
// 确保代码片断优先级高于内置
// https://github.com/cipchk/ng-zorro-vscode
// https://github.com/ng-alain/ng-zorro-vscode
"editor.snippetSuggestions": "top"
// 保存时自动格式化,需要安装:https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode
// "editor.formatOnSave": true
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Expand Up @@ -43,13 +43,13 @@ We will be insisting on a minimal reproduce scenario in order to save maintainer

Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.

You can file new issues by filling out our [new issue form](https://github.com/cipchk/ng-alain/issues/new).
You can file new issues by filling out our [new issue form](https://github.com/ng-alain/ng-alain/issues/new).


### <a name="submit-pr"></a> Submitting a Pull Request (PR)
Before you submit your Pull Request (PR) consider the following guidelines:

* Search [GitHub](https://github.com/cipchk/ng-alain/pulls) for an open or closed PR
* Search [GitHub](https://github.com/ng-alain/ng-alain/pulls) for an open or closed PR
that relates to your submission. You don't want to duplicate effort.
* Make your changes in a new git branch:

Expand Down Expand Up @@ -149,7 +149,7 @@ to read on GitHub as well as in various git tools.

Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.

Samples: (even more [samples](https://github.com/cipchk/ng-alain/commits/master))
Samples: (even more [samples](https://github.com/ng-alain/ng-alain/commits/master))

```
docs(changelog): update change log to beta.5
Expand Down Expand Up @@ -197,5 +197,5 @@ reference GitHub issues that this commit **Closes**.
A detailed explanation can be found in this [document][commit-message-format].

[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
[github]: https://github.com/cipchk/ng-alain
[github]: https://github.com/ng-alain/ng-alain
[plunker]: http://plnkr.co/edit
58 changes: 30 additions & 28 deletions README-zh_CN.md
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/cipchk/ng-alain.svg?branch=master)](https://travis-ci.org/cipchk/ng-alain)
[![Dependency Status](https://david-dm.org/cipchk/ng-alain/status.svg)](https://david-dm.org/cipchk/ng-alain)
[![Build Status](https://travis-ci.org/ng-alain/ng-alain.svg?branch=master)](https://travis-ci.org/ng-alain/ng-alain)
[![Dependency Status](https://david-dm.org/ng-alain/ng-alain/status.svg)](https://david-dm.org/ng-alain/ng-alain)
[![NPM version](https://img.shields.io/npm/v/ng-alain.svg)](https://www.npmjs.com/package/ng-alain)
[![prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://prettier.io/)

Expand All @@ -9,7 +9,7 @@

[README in English](README.md)

[DEMO](https://cipchk.github.io/ng-alain/)
[DEMO](https://ng-alain.github.io/ng-alain/)

## 快速入门

Expand All @@ -20,49 +20,51 @@ ng add ng-alain
ng serve
```

请参考[命令行工具](http://ng-alain.com/cli)了解更多细节。
请参考[命令行工具](https://ng-alain.com/cli)了解更多细节。

> [vscode] 建议安装 [ng-zorro-vscode](https://marketplace.visualstudio.com/items?itemName=cipchk.ng-zorro-vscode)[ng-alain-vscode](https://marketplace.visualstudio.com/items?itemName=cipchk.ng-alain-vscode) 插件,开发更爽。

## Links

+ [文档](http://ng-alain.com)
+ [@delon](https://github.com/cipchk/delon)
+ [DEMO](https://cipchk.github.io/ng-alain/)
+ [文档](https://ng-alain.com)
+ [@delon](https://github.com/ng-alain/delon)
+ [DEMO](https://ng-alain.github.io/ng-alain/)

## Delon

[delong](https://github.com/cipchk/delon) 是基于 Ant Design 设计理念的企业级中后台前端业务型组件库。
[delong](https://github.com/ng-alain/delon) 是基于 Ant Design 设计理念的企业级中后台前端业务型组件库。

[![Build Status](https://travis-ci.org/cipchk/delon.svg?branch=master)](https://travis-ci.org/cipchk/delon)
[![Dependency Status](https://david-dm.org/cipchk/delon/status.svg)](https://david-dm.org/cipchk/delon)
[![DevDependency Status](https://david-dm.org/cipchk/delon/dev-status.svg)](https://david-dm.org/cipchk/delon?type=dev)
[![Build Status](https://travis-ci.org/ng-alain/delon.svg?branch=master)](https://travis-ci.org/ng-alain/delon)
[![Dependency Status](https://david-dm.org/ng-alain/delon/status.svg)](https://david-dm.org/ng-alain/delon)
[![DevDependency Status](https://david-dm.org/ng-alain/delon/dev-status.svg)](https://david-dm.org/ng-alain/delon?type=dev)

[![npm](https://img.shields.io/npm/l/@delon/theme.svg)](https://www.npmjs.com/package/@delon/theme)
[![npm](https://img.shields.io/npm/dm/@delon/theme.svg)](https://www.npmjs.com/package/@delon/theme)

| package name | version | next version |
| ------------ |:-----:|:----------:|
| @delon/theme | [![NPM version](https://img.shields.io/npm/v/@delon/theme.svg)](https://www.npmjs.com/package/@delon/theme) | [![NPM version](https://img.shields.io/npm/v/@delon/theme/next.svg)](https://www.npmjs.com/package/@delon/theme) |
| @delon/abc | [![NPM version](https://img.shields.io/npm/v/@delon/abc.svg)](https://www.npmjs.com/package/@delon/abc) | [![NPM version](https://img.shields.io/npm/v/@delon/abc/next.svg)](https://www.npmjs.com/package/@delon/abc) |
| @delon/form | [![NPM version](https://img.shields.io/npm/v/@delon/form.svg)](https://www.npmjs.com/package/@delon/form) | [![NPM version](https://img.shields.io/npm/v/@delon/form/next.svg)](https://www.npmjs.com/package/@delon/form) |
| @delon/acl | [![NPM version](https://img.shields.io/npm/v/@delon/acl.svg)](https://www.npmjs.com/package/@delon/acl) | [![NPM version](https://img.shields.io/npm/v/@delon/acl/next.svg)](https://www.npmjs.com/package/@delon/acl) |
| @delon/auth | [![NPM version](https://img.shields.io/npm/v/@delon/auth.svg)](https://www.npmjs.com/package/@delon/auth) | [![NPM version](https://img.shields.io/npm/v/@delon/auth/next.svg)](https://www.npmjs.com/package/@delon/auth) |
| @delon/mock | [![NPM version](https://img.shields.io/npm/v/@delon/mock.svg)](https://www.npmjs.com/package/@delon/mock) | [![NPM version](https://img.shields.io/npm/v/@delon/mock/next.svg)](https://www.npmjs.com/package/@delon/mock) |
| @delon/cache | [![NPM version](https://img.shields.io/npm/v/@delon/cache.svg)](https://www.npmjs.com/package/@delon/cache) | [![NPM version](https://img.shields.io/npm/v/@delon/cache/next.svg)](https://www.npmjs.com/package/@delon/cache) |
| @delon/util | [![NPM version](https://img.shields.io/npm/v/@delon/util.svg)](https://www.npmjs.com/package/@delon/util) | [![NPM version](https://img.shields.io/npm/v/@delon/util/next.svg)](https://www.npmjs.com/package/@delon/util) |
| package name | npm version | npm next version | taobao version |
| ------------ |:-----:|:----------:|:----------:|
| ng-alain [Document](https://ng-alain.com/cli) | [![NPM version](https://img.shields.io/npm/v/ng-alain.svg)](https://www.npmjs.com/package/ng-alain) | [![NPM version](https://img.shields.io/npm/v/ng-alain/next.svg)](https://www.npmjs.com/package/ng-alain) | [![Taobao version](https://npm.taobao.org/badge/v/ng-alain.svg?style=flat-square)](https://npm.taobao.org/package/ng-alain)
| @delon/theme [Document](https://ng-alain.com/theme) | [![NPM version](https://img.shields.io/npm/v/@delon/theme.svg)](https://www.npmjs.com/package/@delon/theme) | [![NPM version](https://img.shields.io/npm/v/@delon/theme/next.svg)](https://www.npmjs.com/package/@delon/theme) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/theme.svg?style=flat-square)](https://npm.taobao.org/package/@delon/theme)
| @delon/abc [Document](https://ng-alain.com/components) | [![NPM version](https://img.shields.io/npm/v/@delon/abc.svg)](https://www.npmjs.com/package/@delon/abc) | [![NPM version](https://img.shields.io/npm/v/@delon/abc/next.svg)](https://www.npmjs.com/package/@delon/abc) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/abc.svg?style=flat-square)](https://npm.taobao.org/package/@delon/abc)
| @delon/form [Document](https://ng-alain.com/form) | [![NPM version](https://img.shields.io/npm/v/@delon/form.svg)](https://www.npmjs.com/package/@delon/form) | [![NPM version](https://img.shields.io/npm/v/@delon/form/next.svg)](https://www.npmjs.com/package/@delon/form) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/form.svg?style=flat-square)](https://npm.taobao.org/package/@delon/form)
| @delon/acl [Document](https://ng-alain.com/acl) | [![NPM version](https://img.shields.io/npm/v/@delon/acl.svg)](https://www.npmjs.com/package/@delon/acl) | [![NPM version](https://img.shields.io/npm/v/@delon/acl/next.svg)](https://www.npmjs.com/package/@delon/acl) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/acl.svg?style=flat-square)](https://npm.taobao.org/package/@delon/acl)
| @delon/auth [Document](https://ng-alain.com/auch) | [![NPM version](https://img.shields.io/npm/v/@delon/auth.svg)](https://www.npmjs.com/package/@delon/auth) | [![NPM version](https://img.shields.io/npm/v/@delon/auth/next.svg)](https://www.npmjs.com/package/@delon/auth) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/auth.svg?style=flat-square)](https://npm.taobao.org/package/@delon/auth)
| @delon/mock [Document](https://ng-alain.com/mock) | [![NPM version](https://img.shields.io/npm/v/@delon/mock.svg)](https://www.npmjs.com/package/@delon/mock) | [![NPM version](https://img.shields.io/npm/v/@delon/mock/next.svg)](https://www.npmjs.com/package/@delon/mock) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/mock.svg?style=flat-square)](https://npm.taobao.org/package/@delon/mock)
| @delon/cache [Document](https://ng-alain.com/cache) | [![NPM version](https://img.shields.io/npm/v/@delon/cache.svg)](https://www.npmjs.com/package/@delon/cache) | [![NPM version](https://img.shields.io/npm/v/@delon/cache/next.svg)](https://www.npmjs.com/package/@delon/cache) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/cache.svg?style=flat-square)](https://npm.taobao.org/package/@delon/cache)
| @delon/chart [Document](https://ng-alain.com/chart) | [![NPM version](https://img.shields.io/npm/v/@delon/chart.svg)](https://www.npmjs.com/package/@delon/chart) | [![NPM version](https://img.shields.io/npm/v/@delon/chart/next.svg)](https://www.npmjs.com/package/@delon/chart) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/chart.svg?style=flat-square)](https://npm.taobao.org/package/@delon/chart)
| @delon/util [Document](https://ng-alain.com/util) | [![NPM version](https://img.shields.io/npm/v/@delon/util.svg)](https://www.npmjs.com/package/@delon/util) | [![NPM version](https://img.shields.io/npm/v/@delon/util/next.svg)](https://www.npmjs.com/package/@delon/util) | [![Taobao version](https://npm.taobao.org/badge/v/@delon/util.svg?style=flat-square)](https://npm.taobao.org/package/@delon/util)

## Architecture

![Architecture](https://raw.githubusercontent.com/cipchk/delon/master/_screenshot/architecture.png)
![Architecture](https://raw.githubusercontent.com/ng-alain/delon/master/_screenshot/architecture.png)

## 特性

+ 基于 `ng-zorro-antd`
+ 响应式
+ 国际化
+ 基建类库 [@delon](https://github.com/cipchk/delon)(包括:业务组件、ACL访问控制、缓存、授权、动态表单等)
+ 基建类库 [@delon](https://github.com/ng-alain/delon)(包括:业务组件、ACL访问控制、缓存、授权、动态表单等)
+ 延迟加载及良好的启用画面
+ 良好的UI路由设计
+ 定制主题
Expand All @@ -73,19 +75,19 @@ ng serve

## 应用截图

![desktop](https://raw.githubusercontent.com/cipchk/delon/master/_screenshot/desktop.png)
![ipad](https://raw.githubusercontent.com/cipchk/delon/master/_screenshot/ipad.png)
![iphone](https://raw.githubusercontent.com/cipchk/delon/master/_screenshot/iphone.png)
![desktop](https://raw.githubusercontent.com/ng-alain/delon/master/_screenshot/desktop.png)
![ipad](https://raw.githubusercontent.com/ng-alain/delon/master/_screenshot/ipad.png)
![iphone](https://raw.githubusercontent.com/ng-alain/delon/master/_screenshot/iphone.png)

## Troubleshooting

Please follow this guidelines when reporting bugs and feature requests:

1. Use [GitHub Issues](https://github.com/cipchk/ng-alain/issues) board to report bugs and feature requests (not our email address)
1. Use [GitHub Issues](https://github.com/ng-alain/ng-alain/issues) board to report bugs and feature requests (not our email address)
2. Please **always** write steps to reproduce the error. That way we can focus on fixing the bug, not scratching our heads trying to reproduce it.

Thanks for understanding!

### License

The MIT License (see the [LICENSE](https://github.com/cipchk/ng-alain/blob/master/LICENSE) file for the full text)
The MIT License (see the [LICENSE](https://github.com/ng-alain/ng-alain/blob/master/LICENSE) file for the full text)

0 comments on commit 73f11d1

Please sign in to comment.