From 53a75db35cbe5f6df44094f148eeae4c1eb42fb5 Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Sun, 25 Mar 2018 23:03:01 +0800 Subject: [PATCH 1/2] update changelog --- changelog.md | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 0399c860..965abd83 100644 --- a/changelog.md +++ b/changelog.md @@ -1,18 +1,32 @@ `ZanUI-WeApp` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。 -## [v2.4.6](https://github.com/youzan/zanui-weapp/tree/v2.4.6) (2018-02-27) -[Full Changelog](https://github.com/youzan/zanui-weapp/compare/v2.4.5...v2.4.6) +## [v2.4.7](https://github.com/youzan/zanui-weapp/tree/v2.4.7) (2018-03-25) +[Full Changelog](https://github.com/youzan/zanui-weapp/compare/v2.4.6...v2.4.7) + +**Improvements** + +- Field 组件新增 disabled 属性支持 [\#150](https://github.com/youzan/zanui-weapp/pull/150) ([pangxie1991](https://github.com/pangxie1991)) +- 移除多余的日志信息 [\#144](https://github.com/youzan/zanui-weapp/pull/144) ([pangxie1991](https://github.com/pangxie1991)) +- 新增小程序文档网页 [\#142](https://github.com/youzan/zanui-weapp/pull/142) ([realywithoutname](https://github.com/realywithoutname)) **Bug Fixes** -- 修复 Field 组件圆角输入框，边框显示问题 [\#134](https://github.com/youzan/zanui-weapp/pull/134) ([pangxie1991](https://github.com/pangxie1991)) -- 修复 Noticebar 组件元素查询返回空，导致报错的问题 [\#130](https://github.com/youzan/zanui-weapp/pull/130) ([pangxie1991](https://github.com/pangxie1991)) +- 修复弹窗被输入框文本覆盖的问题 [\#149](https://github.com/youzan/zanui-weapp/pull/149) ([pangxie1991](https://github.com/pangxie1991)) +- 修复 NoticeBar 组件动画播放异常的问题 [\#155](https://github.com/youzan/zanui-weapp/pull/155) ([pangxie1991](https://github.com/pangxie1991)) + +## [v2.4.6](https://github.com/youzan/zanui-weapp/tree/v2.4.6) (2018-02-27) +[Full Changelog](https://github.com/youzan/zanui-weapp/compare/v2.4.5...v2.4.6) **new feature** - 新增 Field 组件 focus 自动聚焦属性 [\#135](https://github.com/youzan/zanui-weapp/pull/135) ([pangxie1991](https://github.com/pangxie1991)) - 新增文档网站 [\#126](https://github.com/youzan/zanui-weapp/pull/126) ([realywithoutname](https://github.com/realywithoutname)) +**Bug Fixes** + +- 修复 Field 组件圆角输入框，边框显示问题 [\#134](https://github.com/youzan/zanui-weapp/pull/134) ([pangxie1991](https://github.com/pangxie1991)) +- 修复 Noticebar 组件元素查询返回空，导致报错的问题 [\#130](https://github.com/youzan/zanui-weapp/pull/130) ([pangxie1991](https://github.com/pangxie1991)) + ## [v2.4.5](https://github.com/youzan/zanui-weapp/tree/v2.4.5) (2018-02-07) [Full Changelog](https://github.com/youzan/zanui-weapp/compare/v2.4.4...v2.4.5) From 15ecc4120a119af24ca7cd4ca7ec92ae533dd836 Mon Sep 17 00:00:00 2001 From: Yao Date: Wed, 28 Mar 2018 19:36:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[improvement]=20Dialog:=20=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=8C=BA=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/pages/dialog/index.js | 2 +- packages/dialog/index.wxml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/example/pages/dialog/index.js b/example/pages/dialog/index.js index c6553092..f768fa14 100644 --- a/example/pages/dialog/index.js +++ b/example/pages/dialog/index.js @@ -4,7 +4,7 @@ Page(Object.assign({}, Zan.Dialog, { toggleBaseDialog() { this.showZanDialog({ title: '弹窗', - content: '这是一个模态弹窗', + content: '这是一个模态弹窗\n换行', showCancel: true }).then(() => { console.log('=== dialog ===', 'type: confirm'); diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml index 5197c41c..cd103b1e 100644 --- a/packages/dialog/index.wxml +++ b/packages/dialog/index.wxml @@ -4,11 +4,16 @@ {{ zanDialog.title }} + class="zan-dialog__header" + >{{ zanDialog.title }} {{ zanDialog.content }} + class="zan-dialog__content {{ zanDialog.title ? 'zan-dialog__content--title' : '' }}" + > + {{ zanDialog.content }} + + class="zan-dialog__footer {{ zanDialog.buttonsShowVertical ? 'zan-dialog__footer--vertical' : 'zan-dialog__footer--horizon' }}" + >