Merge branch 'dev' into next

docs/markdown/changelog.en-US.md

@@ -10,6 +10,22 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/).
 - Minor version：released every one to two months, including backwards compatible features.
 - Major version：including breaking changes and new features.
 
+### [v2.10.4](https://github.com/youzan/vant/compare/v2.10.3...v2.10.4)
+
+`2020-09-03`
+
+**Feature**
+
+- ActionSheet: add description slot [#7068](https://github.com/youzan/vant/issues/7068)
+- Icon: add share-o icon [ea6324](https://github.com/youzan/vant/commit/ea6324234beae3bc4a700c59523a7091add49480)
+- Tabbar: add before-change prop [#7081](https://github.com/youzan/vant/issues/7081)
+
+**Bug Fixes**
+
+- Calendar: row-height should work on selected month [#7046](https://github.com/youzan/vant/issues/7046)
+- Field: fix the issue of checking empty value [#7050](https://github.com/youzan/vant/issues/7050)
+- Icon: fix calendar-o typo [#7080](https://github.com/youzan/vant/issues/7080)
+
 ### [v2.10.3](https://github.com/youzan/vant/compare/v2.10.2...v2.10.3)
 
 `2020-08-25`

docs/markdown/changelog.zh-CN.md

@@ -10,6 +10,23 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。
 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。
 
+### [v2.10.4](https://github.com/youzan/vant/compare/v2.10.3...v2.10.4)
+
+`2020-09-03`
+
+**Feature**
+
+- 设计资源：新增 Axure 元件库，感谢 [@axure-tczy](https://github.com/axure-tczy) 同学提供资源
+- ActionSheet: 新增 description 插槽 [#7068](https://github.com/youzan/vant/issues/7068)
+- Icon: 新增 share-o 图标 [ea6324](https://github.com/youzan/vant/commit/ea6324234beae3bc4a700c59523a7091add49480)
+- Tabbar: 新增 before-change 属性 [#7081](https://github.com/youzan/vant/issues/7081)
+
+**Bug Fixes**
+
+- Calendar: 修复 row-height 对选中的日期不生效的问题 [#7046](https://github.com/youzan/vant/issues/7046)
+- Field: 修复表单项的值为 0 会导致 required 校验不通过的问题 [#7050](https://github.com/youzan/vant/issues/7050)
+- Icon: 修复 calendar-o 图标名称拼写错误 [#7080](https://github.com/youzan/vant/issues/7080)
+
 ### [v2.10.3](https://github.com/youzan/vant/compare/v2.10.2...v2.10.3)
 
 `2020-08-25`

package.json

@@ -54,7 +54,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "7.x",
-    "@vant/icons": "1.2.5",
+    "@vant/icons": "1.3.0",
     "vue-lazyload": "1.2.3"
   },
   "peerDependencies": {

packages/vant-icons/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+## 1.3.0
+
+- add share-o icon
+- fix calendar-o typo
+
 ## 1.2.5
 
 - add back-top icon

packages/vant-icons/build/codepoints.js

@@ -34,7 +34,7 @@ const map = {
   F01F: 'brush-o',
   F020: 'bulb-o',
   F021: 'bullhorn-o',
-  F022: 'calender-o',
+  F022: 'calendar-o',
   F023: 'card',
   F024: 'cart-circle-o',
   F025: 'cart-circle',
@@ -231,6 +231,7 @@ const map = {
   F0E4: 'enlarge',
   F0E5: 'photo-fail',
   F0E6: 'back-top',
+  F0E7: 'share-o',
 };
 
 const reversedMap = {};

packages/vant-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vant/icons",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "vant icons",
   "main": "./src/config.js",
   "files": [

packages/vant-icons/src/config.js

@@ -54,6 +54,7 @@ module.exports = {
     'video-o',
     'shop-o',
     'shop-collect-o',
+    'share-o',
     'chat-o',
     'smile-comment-o',
     'vip-card-o',
@@ -97,7 +98,7 @@ module.exports = {
     'newspaper-o',
     'warn-o',
     'notes-o',
-    'calender-o',
+    'calendar-o',
     'bulb-o',
     'user-circle-o',
     'desktop-o',
@@ -188,6 +189,7 @@ module.exports = {
     'video',
     'shop',
     'shop-collect',
+    'share',
     'chat',
     'smile-comment',
     'vip-card',
@@ -212,7 +214,6 @@ module.exports = {
     'goods-collect',
     'eye',
     // without corresponding outline icon
-    'share',
     'alipay',
     'wechat',
     'photograph',

packages/vant-icons/src/index.less

@@ -5,9 +5,9 @@
   font-family: 'vant-icon';
   font-style: normal;
   font-display: auto;
-  src: url('https://img.yzcdn.cn/vant/vant-icon-eeb192.woff2') format('woff2'),
+  src: url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff2') format('woff2'),
-    url('https://img.yzcdn.cn/vant/vant-icon-eeb192.woff') format('woff'),
+    url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff') format('woff'),
-    url('https://img.yzcdn.cn/vant/vant-icon-eeb192.ttf') format('truetype');
+    url('https://img.yzcdn.cn/vant/vant-icon-0c347b.ttf') format('truetype');
 }
 
 .van-icon {
@@ -163,7 +163,7 @@
   content: '\F021';
 }
 
-.van-icon-calender-o::before {
+.van-icon-calendar-o::before {
   content: '\F022';
 }
 
@@ -763,6 +763,10 @@
   content: '\F0B5';
 }
 
+.van-icon-share-o::before {
+  content: '\F0E7';
+}
+
 .van-icon-share::before {
   content: '\F0B6';
 }

src/dialog/README.md

@@ -170,7 +170,7 @@ export default {
 | width `v2.2.7` | Width | _number \| string_ | `320px` |
 | message | Message | _string_ | - |
 | message-align | Message align，can be set to `left` `right` | _string_ | `center` |
-| theme `v2.10.0` | theme style，can be set to `round` | _string_ | `default` |
+| theme `v2.10.0` | theme style，can be set to `round-button` | _string_ | `default` |
 | show-confirm-button | Whether to show confirm button | _boolean_ | `true` |
 | show-cancel-button | Whether to show cancel button | _boolean_ | `false` |
 | cancel-button-text | Cancel button text | _string_ | `Cancel` |

src/dialog/README.zh-CN.md

@@ -202,7 +202,7 @@ export default {
 | width `v2.2.7` | 弹窗宽度，默认单位为`px` | _number \| string_ | `320px` |
 | message | 文本内容，支持通过`\n`换行 | _string_ | - |
 | message-align | 内容对齐方式，可选值为`left` `right` | _string_ | `center` |
-| theme | 样式风格，可选值为`round` | _string_ | `default` |
+| theme | 样式风格，可选值为`round-button` | _string_ | `default` |
 | show-confirm-button | 是否展示确认按钮 | _boolean_ | `true` |
 | show-cancel-button | 是否展示取消按钮 | _boolean_ | `false` |
 | confirm-button-text | 确认按钮文案 | _string_ | `确认` |

src/field/index.js

@@ -191,7 +191,9 @@ export default createComponent({
       if (Array.isArray(value)) {
         return !value.length;
       }
-
+      if (value === 0) {
+        return false;
+      }
       return !value;
     },
 

src/form/test/field-type.spec.js

@@ -126,10 +126,7 @@ test('use stepper', async () => {
   });
 
   await submitForm(wrapper);
-  expect(onFailed).toHaveBeenCalledWith({
+  expect(onFailed).toBeCalledTimes(0);
-    errors: [{ message: 'foo', name: 'A' }],
-    values: { A: 0 },
-  });
 
   wrapper.setData({ value: 1 });
 
@@ -146,10 +143,7 @@ test('use rate', async () => {
   });
 
   await submitForm(wrapper);
-  expect(onFailed).toHaveBeenCalledWith({
+  expect(onFailed).toBeCalledTimes(0);
-    errors: [{ message: 'foo', name: 'A' }],
-    values: { A: 0 },
-  });
 
   wrapper.setData({ value: 1 });
 
@@ -166,10 +160,7 @@ test('use slider', async () => {
   });
 
   await submitForm(wrapper);
-  expect(onFailed).toHaveBeenCalledWith({
+  expect(onFailed).toBeCalledTimes(0);
-    errors: [{ message: 'foo', name: 'A' }],
-    values: { A: 0 },
-  });
 
   wrapper.setData({ value: 50 });
 

yarn.lock

@@ -2116,10 +2116,10 @@
     eslint-plugin-import "^2.22.0"
     eslint-plugin-vue "7.0.0-beta.2"
 
-"@vant/icons@1.2.5":
+"@vant/icons@1.3.0":
-  version "1.2.5"
+  version "1.3.0"
-  resolved "https://registry.npmjs.org/@vant/icons/-/icons-1.2.5.tgz#f3db43c4b300300829e3c4e909beaa33d1cbe786"
+  resolved "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.3.0.tgz#94f4c93122fd7331e0e00df55804779aead8c9c2"
-  integrity sha512-PNVSAaAzL3LtWK16qDCtMMfM2A5v+Ie9YTMVHF4QmumpuWxjyk0iUppJ+YRD0MjwR/CTx2OWkIB57+IAqbHnlg==
+  integrity sha1-lPTJMSL9czHg4A31WAR3murYycI=
 
 "@vant/markdown-loader@^3.0.0-alpha.0":
   version "3.0.0-alpha.0"