diff --git a/README.md b/README.md index ec18f9fee9..d44f070f89 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ delong is a production-ready solution for admin business components packages, Bu | ng-alain(scaffold) | [![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) | | @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) | diff --git a/_screenshot/architecture.png b/_screenshot/architecture.png index 685a5bb60b..54927b8648 100644 Binary files a/_screenshot/architecture.png and b/_screenshot/architecture.png differ diff --git a/docs/architecture.md b/docs/architecture.md index eba52b589c..5bd1d9092a 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -20,27 +20,31 @@ ng-alain 脚手架是基于 Angular 和 ng-zorro-antd(Ant Design 的 Angular **@delon/cli** -针对脚手架的[命令行工具](http://ng-alain.com/docs/cli),它是继 Angular Cli 基础上新增一些额外命令用于创建 ng-alain 项目、业务页等。 +针对脚手架的[命令行工具](/docs/cli),它是继 Angular Cli 基础上新增一些额外命令用于创建 ng-alain 项目、业务页等。 **@delon/abc** -脚手架内提供了一套默认[业务组件](http://ng-alain.com/components/),这些组件抽象了控制台业务中的一些常见区块。我们将持续维护和迭代这些组件,为中后台业务提供比 Ant Design 基础组件更高级别的抽象。 +脚手架内提供了一套默认[业务组件](/components/),这些组件抽象了控制台业务中的一些常见区块。我们将持续维护和迭代这些组件,为中后台业务提供比 Ant Design 基础组件更高级别的抽象。 + +**@delon/form** + +[@delon/form](/form) 是一个基于 [JSON Schema](http://json-schema.org/) 标准的动态构建表单。 **@delon/auth** -[用户认证](http://ng-alain.com/docs/auth)模块,用于解决如何获取、存取、使用这三个步骤的用户认证环节。 +[用户认证](/docs/auth)模块,用于解决如何获取、存取、使用这三个步骤的用户认证环节。 **@delon/acl** -[ACL](http://ng-alain.com/docs/acl)访问控制列表,是一种非常简单的基于角色权限控制,甚至至某个按钮的粒度。 +[ACL](/docs/acl)访问控制列表,是一种非常简单的基于角色权限控制,甚至至某个按钮的粒度。 **@delon/cache** -将字典、城市数据等[缓存](http://ng-alain.com/docs/cache)至内存或持久化当中,有效减少 Http 请求。 +将字典、城市数据等[缓存](/docs/cache)至内存或持久化当中,有效减少 Http 请求。 **@delon/mock** -[Mock](http://ng-alain.com/docs/mock)会拦截 Angular Http 请求并返回测试数据。 +[Mock](/docs/mock)会拦截 Angular Http 请求并返回测试数据。 ## 文档和反馈 @@ -54,6 +58,7 @@ ng-alain 脚手架是基于 Angular 和 ng-zorro-antd(Ant Design 的 Angular | ------------ |:-----:|:----------:| | @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) | diff --git a/docs/changelog.md b/docs/changelog.md index ed2828649c..3fae6e3414 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,6 +6,15 @@ title: type: Other --- +### 1.0.0-beta.7@next + +`2018-4-26` + +- 脚手架 + - 增加 `@delon/form` 示例,[92d5d3](https://github.com/cipchk/ng-alain/commit/92d5d3) +- @delon/form + - 基于JSON Schema动态表单 + ### 1.0.0-beta.6@next `2018-4-22` diff --git a/package.json b/package.json index fdf906a618..7e64ce091e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "delon", - "version": "1.0.0-beta.6", + "version": "1.0.0-beta.7", "typings": "index.d.ts", "description": "Delon is a set of essential modules for ng-alain.", "repository": { diff --git a/packages/form/docs/getting-started.md b/packages/form/docs/getting-started.md index 60e4bfdf70..cd9e4b218b 100644 --- a/packages/form/docs/getting-started.md +++ b/packages/form/docs/getting-started.md @@ -13,6 +13,7 @@ type: Documents - 秉承 Ant Design 价值观 - 二十几种小部件 - 可自定义小部件满足业务需求 +- 无任何第三方依赖,可适用所有 antd 项目 ## 如何使用? diff --git a/scaffold b/scaffold index 92d5d3b803..063b6d1087 160000 --- a/scaffold +++ b/scaffold @@ -1 +1 @@ -Subproject commit 92d5d3b803a3994eb35057300ff682495d46b703 +Subproject commit 063b6d1087acfb63d0be993f72277e08bd40c347 diff --git a/scaffold.sh b/scaffold.sh index 28c8bea20e..8038cce84a 100644 --- a/scaffold.sh +++ b/scaffold.sh @@ -30,7 +30,7 @@ updateVersionReferences() { ( echo "====== VERSION: Updating version references in ${PACKAGE_DIR}" sed -i "s/\"version\":[ ]*\"[^\"]*\"/\"version\": \"${VERSION}\"/g" ${PACKAGE_DIR} - PACKAGE_NAMES=(abc acl auth cache mock theme cli) + PACKAGE_NAMES=(abc acl auth cache mock form theme cli) for name in ${PACKAGE_NAMES[@]} do sed -i "s/\"@delon\/${name}\":[ ]*\"[^\"]*\"/\"@delon\/${name}\": \"^${VERSION}\"/g" ${PACKAGE_DIR}