From 32b74da53075b17a0da945ccaf388b16a7b1f195 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 1 Jul 2020 22:50:44 +0800 Subject: [PATCH 1/4] docs(Dialog): add allow-html prop (#6666) --- src/dialog/README.md | 2 ++ src/dialog/README.zh-CN.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/dialog/README.md b/src/dialog/README.md index d96742faa..941616d97 100644 --- a/src/dialog/README.md +++ b/src/dialog/README.md @@ -133,6 +133,7 @@ export default { | closeOnPopstate `v2.0.5` | Whether to close when popstate | _boolean_ | `false` | | closeOnClickOverlay | Whether to close when click overlay | _boolean_ | `false` | | lockScroll | Whether to lock body scroll | _boolean_ | `true` | +| allowHtml `v2.8.7` | Whether to allow HTML rendering in message | _boolean_ | `true` | | beforeClose | Callback before close,
call done() to close dialog,
call done(false) to cancel loading | (action: string, done: Function) => void | - | | transition `v2.2.6` | Transition, equivalent to `name` prop of [transtion](https://vuejs.org/v2/api/#transition) | _string_ | - | | getContainer | Return the mount node for Dialog | _string \| () => Element_ | `body` | @@ -159,6 +160,7 @@ export default { | close-on-click-overlay | Whether to close when click overlay | _boolean_ | `false` | | lazy-render | Whether to lazy render util appeared | _boolean_ | `true` | | lock-scroll | Whether to lock background scroll | _boolean_ | `true` | +| allow-html `v2.8.7` | Whether to allow HTML rendering in message | _boolean_ | `true` | | before-close | Callback before close,
call done() to close dialog,
call done(false) to cancel loading | (action: string, done: Function) => void | - | | transition `v2.2.6` | Transition, equivalent to `name` prop of [transtion](https://vuejs.org/v2/api/#transition) | _string_ | - | | get-container | Return the mount node for Dialog | _string \| () => Element_ | - | diff --git a/src/dialog/README.zh-CN.md b/src/dialog/README.zh-CN.md index 4b19385ca..4845d1ca2 100644 --- a/src/dialog/README.zh-CN.md +++ b/src/dialog/README.zh-CN.md @@ -163,6 +163,7 @@ export default { | closeOnPopstate `v2.0.5` | 是否在页面回退时自动关闭 | _boolean_ | `false` | | closeOnClickOverlay | 是否在点击遮罩层后关闭弹窗 | _boolean_ | `false` | | lockScroll | 是否锁定背景滚动 | _boolean_ | `true` | +| allowHtml `v2.8.7` | 是否允许 message 内容中渲染 HTML | _boolean_ | `true` | | beforeClose | 关闭前的回调函数，
调用 done() 后关闭弹窗，
调用 done(false) 阻止弹窗关闭 | _(action, done) => void_ | - | | transition `v2.2.6` | 动画类名，等价于 [transtion](https://cn.vuejs.org/v2/api/index.html#transition) 的`name`属性 | _string_ | - | | getContainer | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| () => Element_ | `body` | @@ -191,6 +192,7 @@ export default { | close-on-click-overlay | 是否在点击遮罩层后关闭弹窗 | _boolean_ | `false` | | lazy-render | 是否在显示弹层时才渲染节点 | _boolean_ | `true` | | lock-scroll | 是否锁定背景滚动 | _boolean_ | `true` | +| allow-html `v2.8.7` | 是否允许 message 内容中渲染 HTML | _boolean_ | `true` | | before-close | 关闭前的回调函数，
调用 done() 后关闭弹窗，
调用 done(false) 阻止弹窗关闭 | _(action, done) => void_ | - | | transition `v2.2.6` | 动画类名，等价于 [transtion](https://cn.vuejs.org/v2/api/index.html#transition) 的`name`属性 | _string_ | - | | get-container | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| () => Element_ | - | From 5b7265fa5f271a6592e62cfc707000513ecfdb34 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 1 Jul 2020 22:59:38 +0800 Subject: [PATCH 2/4] fix(NumberKeyboard): eliminate tap delay on safari (#6667) * fix(NumberKeyboard): eliminate click delay on safari * chore: upd comment --- src/image-preview/ImagePreviewItem.js | 1 + src/number-keyboard/Key.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/image-preview/ImagePreviewItem.js b/src/image-preview/ImagePreviewItem.js index d0f022db9..e05ae5ba8 100644 --- a/src/image-preview/ImagePreviewItem.js +++ b/src/image-preview/ImagePreviewItem.js @@ -193,6 +193,7 @@ export default { } } + // eliminate tap delay on safari preventDefault(event, stopPropagation); this.checkTap(); diff --git a/src/number-keyboard/Key.js b/src/number-keyboard/Key.js index ee4d0b8e9..158aa0a57 100644 --- a/src/number-keyboard/Key.js +++ b/src/number-keyboard/Key.js @@ -45,8 +45,10 @@ export default createComponent({ } }, - onTouchEnd() { + onTouchEnd(event) { if (this.active) { + // eliminate tap delay on safari + event.preventDefault(); this.active = false; this.$emit('press', this.text, this.type); } From 984a90820c9941916df2b547e53a6afc8c53711f Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 1 Jul 2020 23:13:43 +0800 Subject: [PATCH 3/4] docs: move toast to basic components (#6668) --- vant.config.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vant.config.js b/vant.config.js index 73d8f62d7..9972a3faa 100644 --- a/vant.config.js +++ b/vant.config.js @@ -105,6 +105,10 @@ module.exports = { path: 'style', title: 'Style 内置样式', }, + { + path: 'toast', + title: 'Toast 轻提示', + }, ], }, { @@ -211,10 +215,6 @@ module.exports = { path: 'swipe-cell', title: 'SwipeCell 滑动单元格', }, - { - path: 'toast', - title: 'Toast 轻提示', - }, ], }, { @@ -452,6 +452,10 @@ module.exports = { path: 'style', title: 'Built-in style', }, + { + path: 'toast', + title: 'Toast', + }, ], }, { @@ -562,10 +566,6 @@ module.exports = { path: 'swipe-cell', title: 'SwipeCell', }, - { - path: 'toast', - title: 'Toast', - }, ], }, { From f277e5929bebec33079ef281cf5ae4170227f544 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 2 Jul 2020 09:59:23 +0800 Subject: [PATCH 4/4] build: add release-tag workflow (#6670) --- .github/workflows/release-tag.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/release-tag.yml diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml new file mode 100644 index 000000000..2e0e91cc6 --- /dev/null +++ b/.github/workflows/release-tag.yml @@ -0,0 +1,25 @@ +on: + push: + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + +name: Create Release + +jobs: + build: + name: Create Release + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@master + - name: Create Release for Tag + id: release_tag + uses: yyx990803/release-tag@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + body: | + 更新内容参见 [CHANGELOG](https://youzan.github.io/vant/#/zh-CN/changelog)。 + + Please refer to [CHANGELOG](https://youzan.github.io/vant/#/en-US/changelog) for details.