+
+- add base-font-family [#6126](https://github.com/youzan/vant/issues/6126)
+- DropdownMenu: add box-shadow style [7db744](https://github.com/youzan/vant/commit/7db74490956ec9d4c742a885e436dc6915f1f9dc)
+- NavBar: left & right part align to bottom [#6147](https://github.com/youzan/vant/issues/6147)
+- Sidebar: add less vars [e1a7c6](https://github.com/youzan/vant/commit/e1a7c6668de0b7da58028210e174c9156e87bea2)
+- Sidebar: update border style [a31032](https://github.com/youzan/vant/commit/a31032e0d63956b2e9f0c75c8a85ca662fe42545)
+- Toast: increase border-radius to 8px [2364c4](https://github.com/youzan/vant/commit/2364c4f526912433abf5ee2f36e2148beea7140b)
+- TreeSelect: change checked icon to success icon [5b72e4](https://github.com/youzan/vant/commit/5b72e4339347a710620bf630f1bc8ee09511d63c)
+
+**Feature**
+
+- NoticeBar: add start method [#6069](https://github.com/youzan/vant/issues/6069)
+- ImagePreview: adjust double-click interval to 250ms [#6136](https://github.com/youzan/vant/issues/6136)
+- NumberKeyboard: add collapse icon [#6152](https://github.com/youzan/vant/issues/6152)
+- NumberKeyboard: add close-button-loading prop [#6158](https://github.com/youzan/vant/issues/6158)
+
+**Bug Fixes**
+
+- Layout: outside of the screen after setting gutter [#6143](https://github.com/youzan/vant/issues/6143)
+- Tab: incorrect vnode order in some cases [#6140](https://github.com/youzan/vant/issues/6140)
+- uploader: automatically filter files exceeding the max-size [#6150](https://github.com/youzan/vant/issues/6150)
+- Uploader: file message should be reactive [#6142](https://github.com/youzan/vant/issues/6142)
+- types: VanComponent should extends Vue [#6148](https://github.com/youzan/vant/issues/6148)
+
+### [v2.6.3](https://github.com/youzan/vant/compare/v2.6.2...v2.6.3)
+
+`2020-04-20`
+
+**Bug Fixes**
+
+- Tab: fail to init in some cases [#6101](https://github.com/youzan/vant/issues/6101)
+- sort vnode not work [#6100](https://github.com/youzan/vant/issues/6100)
+
### [v2.6.2](https://github.com/youzan/vant/compare/v2.6.1...v2.6.2)
`2020-04-18`
diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index c94404eb2..f55d78bb7 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -10,6 +10,181 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
- 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。
- 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。
+### [v2.8.4](https://github.com/youzan/vant/compare/v2.8.3...v2.8.4)
+
+`2020-05-28`
+
+**Feature**
+
+- AddressList: 增加底部安全区适配 [#6355](https://github.com/youzan/vant/issues/6355)
+- DatetimePicker: 新增 month-day 类型，用于选择月份和日期 [#6395](https://github.com/youzan/vant/issues/6395)
+- Popup: 现在每个弹层会单独创建一个遮罩层，而不是共用一个遮罩层 [#6357](https://github.com/youzan/vant/issues/6357)
+
+**style**
+
+- ActionSheet: subname 的颜色调整为 gray-6 [e54c11](https://github.com/youzan/vant/commit/e54c11d55244e65246df7eddd7751983dbc4d331)
+- ActionSheet: 移除选项之间的分隔线 [8db218](https://github.com/youzan/vant/commit/8db218e9c0ca6905491a019cf983a0269f3aea8c)
+- Cell: 降低边框选择器的 CSS 优先级，便于覆盖样式 [#6359](https://github.com/youzan/vant/issues/6359)
+- Collapse: 调整边框与左右两侧的边距 [#6361](https://github.com/youzan/vant/issues/6361)
+- Collapse: 内容的字号增大为 14px [#6358](https://github.com/youzan/vant/issues/6358)
+
+**Bug Fixes**
+
+- Area: 修复区列表为空时未默认选中第一个城市的问题 [#6356](https://github.com/youzan/vant/issues/6356)
+- Field: 修复设置 error 为 false 无法禁用错误提示颜色的问题 [#6382](https://github.com/youzan/vant/issues/6382)
+- GoodsAction: 修复只有一个按钮时圆角大小错误的问题 [#6347](https://github.com/youzan/vant/issues/6347)
+- Sidebar: 修复 v-model 绑定的值变化时不会触发 change 事件的问题 [#6383](https://github.com/youzan/vant/issues/6383)
+
+### [v2.8.3](https://github.com/youzan/vant/compare/v2.8.2...v2.8.3)
+
+`2020-05-21`
+
+**Feature**
+
+- Form: 新增 submit-on-enter 属性，用于控制回车时是否提交表单 [#6336](https://github.com/youzan/vant/issues/6336)
+- Form: 优化 scrollToField 方法，支持通过传参来控制滚动位置 [#6335](https://github.com/youzan/vant/issues/6335)
+- Field: 调整 placeholder 的色值为 @gray-5 [#6304](https://github.com/youzan/vant/issues/6304)
+- Field: 使用 digit 类型时，只能在第一位输入减号 [#6303](https://github.com/youzan/vant/issues/6303)
+- Picker: 优化 methods 的类型定义，支持泛型 [#6315](https://github.com/youzan/vant/issues/6315)
+
+**Bug Fixes**
+
+- Button: 修复在低版本 iOS 下按钮文字不居中的问题 [#6325](https://github.com/youzan/vant/issues/6325)
+- Calendar: 修复范围选择到同一天时 color 属性不生效的问题 [#6331](https://github.com/youzan/vant/issues/6331)
+
+### [v2.8.2](https://github.com/youzan/vant/compare/v2.8.1...v2.8.2)
+
+`2020-05-17`
+
+**Feature**
+
+- Field: 新增 extra 插槽 [#6290](https://github.com/youzan/vant/issues/6290)
+- Grid: 新增 direction 属性 [#6256](https://github.com/youzan/vant/issues/6256)
+- Calendar: 新增 month-show 事件 [#6292](https://github.com/youzan/vant/issues/6292)
+- NumberKeyboard: 支持定义两个 extra-key [#6276](https://github.com/youzan/vant/issues/6276)
+- Stepper: 新增 theme 属性，用于展示圆角风格步进器 [#6282](https://github.com/youzan/vant/issues/6282)
+
+**style**
+
+- Rate: 更新禁用状态下的图标颜色 [#6253](https://github.com/youzan/vant/issues/6253)
+- Sku: 优化内部分割线的布局 [#6272](https://github.com/youzan/vant/issues/6272)
+- Sku: 价格符号由居中对齐调整为底对齐 [#6274](https://github.com/youzan/vant/issues/6274)
+- NoticeBar: 图标宽度由 22px 调整为 24px [#6280](https://github.com/youzan/vant/issues/6280)
+
+**Bug Fixes**
+
+- Field: 修复 textarea 无法通过回车换行的问题 [#6263](https://github.com/youzan/vant/issues/6263)
+- NoticeBar: 修复 replay 事件只能触发一次的问题，内部动画机制由 animation 调整为 transition [#6293](https://github.com/youzan/vant/issues/6293)
+
+### [v2.8.1](https://github.com/youzan/vant/compare/v2.8.1-beta.0...v2.8.1)
+
+`2020-05-09`
+
+**Feature**
+
+- Calendar: 新增 lazy-render 属性，用于控制是否开启延迟渲染 [#6245](https://github.com/youzan/vant/issues/6245)
+- Field: 新增 click-input 事件，在点击输入框时触发 [#6239](https://github.com/youzan/vant/issues/6239)
+- Sku: 新增 sku-reset 事件，在规格重置时触发 [#6220](https://github.com/youzan/vant/issues/6220)
+- GoodsActionButton: 适配系统字体放大 [b1dcf3](https://github.com/youzan/vant/commit/b1dcf36263ae7a19197f2c162e67f220dd171047)
+
+**Bug Fixes**
+
+- Button: 修复文字在部分机型上不居中的问题 [8c53db](https://github.com/youzan/vant/commit/8c53db040dd0dfff60eca1ac284d98f13b4e4ce6)
+- Field: 修复回车键会触发表单提交的问题 [#6240](https://github.com/youzan/vant/issues/6240)
+- Step: 修复 active-color 属性对小圆点颜色不生效的问题 [#6229](https://github.com/youzan/vant/issues/6229)
+- Stepper: 修复输入负数时格式化错误的问题 [#6238](https://github.com/youzan/vant/issues/6238)
+- Stepper: 修复个别情况下会展示 NaN 的问题 [7327a4](https://github.com/youzan/vant/commit/7327a481d18271393e25b17d4402dad6d336bb3a)
+- Stepper: 修复设置 disable-input 属性后在部分浏览器上仍会触发 focus 事件的问题 [c6024b](https://github.com/youzan/vant/commit/c6024b18b4191a3a56db0bed1ababa48420c0946)
+
+### [v2.8.0](https://github.com/youzan/vant/compare/v2.7.1...v2.8.0)
+
+`2020-05-05`
+
+**适配系统字体放大**
+
+ 部分手机用户会使用系统或微信提供的字体放大功能，开启该功能后，组件的 font-size 和 line-height 会等比例放大，导致部分组件出现样式偏移的问题，在 2.8.0 版本中，我们针对这个场景进行了适配，使得所有组件在字体缩放后仍保持正确的布局，改动涉及以下组件：
+
+- ActionSheet [#6175](https://github.com/youzan/vant/issues/6175)
+- Checkbox [#6168](https://github.com/youzan/vant/issues/6168)
+- NavBar [7effb7](https://github.com/youzan/vant/commit/7effb7cf6cf59a8db1eb77fa16692712de4a18ba)
+- NoticeBar [#6177](https://github.com/youzan/vant/issues/6177)
+- NumberKeyboard [#6179](https://github.com/youzan/vant/issues/6179)
+- Pagination [#6178](https://github.com/youzan/vant/issues/6178)
+- PasswordInput [#6176](https://github.com/youzan/vant/issues/6176)
+- Picker [#6174](https://github.com/youzan/vant/issues/6174) [#6205](https://github.com/youzan/vant/issues/6205)
+- Radio [#6173](https://github.com/youzan/vant/issues/6173)
+- Tab [#6209](https://github.com/youzan/vant/issues/6209)
+
+**style**
+
+- Button: 使用 flex 进行内容居中，display 由 inline-block 调整为 inline-flex [#6180](https://github.com/youzan/vant/issues/6180)
+- Picker: 优化顶部操作栏的样式，调整操作按钮颜色 [#6214](https://github.com/youzan/vant/issues/6214)
+- CouponList: 新增 @coupon-list-close-button-height 样式变量 [18a0c5](https://github.com/youzan/vant/commit/18a0c545ec881eb296ba6cc11dfaa12febd79e5c)
+
+**Feature**
+
+- Calendar: 新增 unselect 事件，在取消选中时触发 [#6198](https://github.com/youzan/vant/issues/6198)
+- Calendar: 支持在多选模式下使用 max-range 属性 [#6202](https://github.com/youzan/vant/issues/6202)
+- Field: 新增 colon 属性，用于配置是否显示冒号 [#6195](https://github.com/youzan/vant/issues/6195)
+- Locale: 新增罗马尼亚语配置文件 [#6193](https://github.com/youzan/vant/issues/6193)
+- ShareSheet: 优化无障碍访问 [#6208](https://github.com/youzan/vant/issues/6208)
+
+**Bug Fixes**
+
+- Layout: 修复设置 gutter 属性后间距错误的问题 [#6197](https://github.com/youzan/vant/issues/6197) [#6143](https://github.com/youzan/vant/issues/6143)
+- NoticeBar: 修复动态修改 scrollable 属性后未正确生效的问题 [#6190](https://github.com/youzan/vant/issues/6190)
+- ShareSheet: 修复在部分浏览器上底部间距错误的问题 [#6207](https://github.com/youzan/vant/issues/6207)
+- Tab: 修复文字截断时无法正确展示徽标的问题 [#6209](https://github.com/youzan/vant/issues/6209)
+
+### [v2.7.1](https://github.com/youzan/vant/compare/v2.7.0...v2.7.1)
+
+`2020-04-28`
+
+**Bug Fixes**
+
+- 修复 NavBar 图标不居中的问题 [#6147](https://github.com/youzan/vant/issues/6147)
+
+### [v2.7.0](https://github.com/youzan/vant/compare/v2.6.3...v2.7.0)
+
+`2020-04-28`
+
+**style**
+
+- NumberKeyboard: 升级组件样式 [#6149](https://github.com/youzan/vant/issues/6149) [#6151](https://github.com/youzan/vant/issues/6151) [3188b4](https://github.com/youzan/vant/commit/3188b4d25bb6e60ed5de930ec8947929a7577dd3)
+
+
+
## 关于桌面端组件
diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md
index 2d83ac219..392684a06 100644
--- a/packages/vant-cli/changelog.md
+++ b/packages/vant-cli/changelog.md
@@ -1,19 +1,45 @@
# 更新日志
-### [v2.4.0]
+### v2.5.1
+
+`2020-05-27`
+
+- 移除多余的 log
+
+### v2.5.0
+
+`2020-05-27`
+
+- 开启 fork-ts-checker-webpack-plugin，在编译时进行类型检查
+- 现在点击锚点时会立即滚动到对应位置
+
+### v2.4.2
+
+`2020-05-04`
+
+- 升级 less-loader@6
+- 优化移动端示例导航栏样式
+
+### v2.4.1
+
+`2020-04-19`
+
+- 支持 style 类型的 commit message
+
+### v2.4.0
`2020-04-02`
- 升级 prettier v2
- 升级 html-webpack-plugin v4
-### [v2.3.1]
+### v2.3.1
`2020-03-29`
- 优化网站导航栏在大屏上的适配 ([#5928](https://github.com/youzan/vant/pull/5928))
-### [v2.3.0]
+### v2.3.0
`2020-03-25`
@@ -22,26 +48,26 @@
- clean 命令现在会移除而不是清空文件夹 ([#5895](https://github.com/youzan/vant/issues/5895))
- 升级 @vant/markdown-vetur 2.0.0
-### [v2.2.8]
+### v2.2.8
`2020-03-20`
- 修复构建 changelog 可能失败的问题
-### [v2.2.7]
+### v2.2.7
`2020-03-19`
- 新增 process.env.VANT_CLI_VERSION 环境变量
-### [v2.2.6]
+### v2.2.6
`2020-03-18`
- 升级 commander 5
- 修复右侧预览 iframe 链接可能错误的问题
-### [v2.2.5]
+### v2.2.5
`2020-03-08`
@@ -49,38 +75,38 @@
- 优化代码块与底部文字之间的间距
- 修复 create-vant-cli-app 初始化时报错的问题
-### [v2.2.4]
+### v2.2.4
`2020-02-14`
- 修复在 windows 上构建出的样式入口文件路径错误的问题 ([#5655](https://github.com/youzan/vant/pull/5655)
-### [v2.2.3]
+### v2.2.3
`2020-02-13`
- 链接颜色调整为蓝色
-### [v2.2.2]
+### v2.2.2
`2020-02-05`
- 修复在 windows 上获取 markdown 路径错误的问题 ([#5626](https://github.com/youzan/vant/pull/5626))
-### [v2.2.1]
+### v2.2.1
`2020-02-04`
- 升级 babel@7.8
- 修复切换版本时跳转 undefined 的问题 ([#5620](https://github.com/youzan/vant/pull/5620))
-### [v2.2.0]
+### v2.2.0
`2020-01-19`
- 升级 @vant/eslint-config@2.0.0
-### [v2.1.8]
+### v2.1.8
`2020-01-18`
@@ -89,14 +115,14 @@
- 优化站点导航栏颜色
- 优化站点代码块颜色
-### [v2.1.7]
+### v2.1.7
`2020-01-15`
- 优化 help 命令
- 优化控制台输出信息
-### [v2.1.6]
+### v2.1.6
`2020-01-12`
@@ -105,14 +131,14 @@
- 优化文档站点的 meta 字段
- 新增 API 文档中的版本标签样式
-### [v2.1.5]
+### v2.1.5
`2020-01-10`
- 修复编译时未替换 import 语句中的 CSS 后缀的问题
- 升级 husky 版本到 4.0
-### [v2.1.4]
+### v2.1.4
`2020-01-06`
@@ -120,7 +146,7 @@
- 锁死 @vue/test-utils 版本为 1.0.0-beta.29
-### [v2.1.3]
+### v2.1.3
`2020-01-06`
@@ -129,7 +155,7 @@
- 增加 cache-loader，提高构建速度
- 调整 jest setup 文件执行时机，延迟至 env 初始化后执行
-### [v2.1.2]
+### v2.1.2
`2020-01-05`
diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md
index 6c2b637dd..bc83205e6 100644
--- a/packages/vant-cli/docs/config.md
+++ b/packages/vant-cli/docs/config.md
@@ -30,8 +30,8 @@ module.exports = {
// 构建配置
build: {
site: {
- publicPath: '/demo-ui/'
- }
+ publicPath: '/demo-ui/',
+ },
},
// 文档站点配置
site: {
@@ -48,21 +48,21 @@ module.exports = {
items: [
{
path: 'home',
- title: '介绍'
- }
- ]
+ title: '介绍',
+ },
+ ],
},
{
title: '基础组件',
items: [
{
path: 'my-button',
- title: 'MyButton 按钮'
- }
- ]
- }
- ]
- }
+ title: 'MyButton 按钮',
+ },
+ ],
+ },
+ ],
+ },
};
```
@@ -84,9 +84,9 @@ CSS 预处理器配置，目前支持`less`和`sass`两种预处理器，默认
module.exports = {
build: {
css: {
- preprocessor: 'sass'
- }
- }
+ preprocessor: 'sass',
+ },
+ },
};
```
@@ -103,9 +103,22 @@ module.exports = {
module.exports = {
build: {
site: {
- publicPath: '/demo-ui/'
- }
- }
+ publicPath: '/demo-ui/',
+ },
+ },
+};
+```
+
+### build.srcDir
+
+- Type: `string`
+- Default: `src`
+
+```js
+module.exports = {
+ build: {
+ srcDir: 'myDir',
+ },
};
```
@@ -150,12 +163,12 @@ module.exports = {
// 导航项路由
path: 'home',
// 导航项文案
- title: '介绍'
- }
- ]
- }
- ]
- }
+ title: '介绍',
+ },
+ ],
+ },
+ ],
+ },
};
```
@@ -172,10 +185,10 @@ module.exports = {
versions: [
{
label: '1.x',
- link: 'https://youzan.github.io/vant/1.x/'
- }
- ]
- }
+ link: 'https://youzan.github.io/vant/1.x/',
+ },
+ ],
+ },
};
```
@@ -193,9 +206,9 @@ module.exports = {
// 打开百度统计 ->『管理』->『代码获取』
// 找到下面这串 URL: "https://hm.baidu.com/hm.js?xxxxx"
// 将 `xxxxx` 填写在 seed 中即可
- seed: 'xxxxx'
- }
- }
+ seed: 'xxxxx',
+ },
+ },
};
```
@@ -208,8 +221,8 @@ module.exports = {
```js
module.exports = {
devServer: {
- port: 9000
- }
+ port: 9000,
+ },
};
```
@@ -223,7 +236,7 @@ module.exports = {
```js
module.exports = {
- presets: ['@vant/cli/preset']
+ presets: ['@vant/cli/preset'],
};
```
@@ -270,8 +283,8 @@ module.exports = {
```js
module.exports = {
plugins: {
- autoprefixer: {}
- }
+ autoprefixer: {},
+ },
};
```
diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json
index df66ffd74..a0cc5001b 100644
--- a/packages/vant-cli/package.json
+++ b/packages/vant-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@vant/cli",
- "version": "2.4.0",
+ "version": "2.5.1",
"description": "",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
@@ -34,22 +34,22 @@
},
"devDependencies": {
"@types/fs-extra": "^8.1.0",
- "@types/lodash": "^4.14.149",
+ "@types/lodash": "^4.14.150",
"@types/postcss-load-config": "^2.0.1",
- "@types/webpack": "^4.41.10",
+ "@types/webpack": "^4.41.12",
"@types/webpack-dev-server": "^3.10.1",
"@types/webpack-merge": "^4.1.5"
},
"dependencies": {
- "@babel/core": "^7.9.0",
+ "@babel/core": "^7.9.6",
"@babel/plugin-syntax-jsx": "^7.8.3",
"@babel/plugin-transform-object-assign": "^7.8.3",
- "@babel/plugin-transform-runtime": "^7.9.0",
- "@babel/preset-env": "^7.9.5",
+ "@babel/plugin-transform-runtime": "^7.9.6",
+ "@babel/preset-env": "^7.9.6",
"@babel/preset-typescript": "^7.9.0",
"@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
"@types/jest": "^25.2.1",
- "@vant/eslint-config": "^2.0.0",
+ "@vant/eslint-config": "^2.2.2",
"@vant/markdown-loader": "^2.3.0",
"@vant/markdown-vetur": "^2.0.1",
"@vant/stylelint-config": "^1.3.0",
@@ -59,47 +59,48 @@
"@vue/test-utils": "1.0.0-beta.29",
"address": "^1.1.2",
"autoprefixer": "^9.7.6",
- "babel-jest": "^25.3.0",
+ "babel-jest": "^25.5.1",
"babel-loader": "^8.1.0",
"babel-plugin-import": "^1.13.0",
"babel-plugin-transform-jsx-vue3": "^0.1.8",
"cache-loader": "^4.1.0",
- "chokidar": "^3.3.1",
+ "chokidar": "^3.4.0",
"clean-css": "^4.2.3",
"codecov": "^3.6.5",
- "commander": "^5.0.0",
+ "commander": "^5.1.0",
"consola": "^2.11.3",
"conventional-changelog": "^3.1.18",
"cross-env": "^7.0.2",
- "css-loader": "^3.5.2",
+ "css-loader": "^3.5.3",
"eslint": "^6.8.0",
"fast-glob": "^3.2.2",
+ "fork-ts-checker-webpack-plugin": "^4.1.6",
"gh-pages": "^2.2.0",
"hash-sum": "^2.0.0",
- "html-webpack-plugin": "4.2.0",
+ "html-webpack-plugin": "4.3.0",
"husky": "^4.2.5",
- "jest": "^25.3.0",
+ "jest": "^25.5.4",
"jest-canvas-mock": "^2.2.0",
"jest-serializer-vue": "^2.0.2",
"less": "^3.11.1",
- "less-loader": "^5.0.0",
- "lint-staged": "^10.1.3",
+ "less-loader": "^6.0.0",
+ "lint-staged": "^10.2.2",
"lodash": "^4.17.15",
- "ora": "^4.0.3",
- "portfinder": "^1.0.25",
- "postcss": "^7.0.27",
+ "ora": "^4.0.4",
+ "portfinder": "^1.0.26",
+ "postcss": "^7.0.28",
"postcss-loader": "^3.0.0",
- "prettier": "^2.0.4",
- "release-it": "^13.5.2",
- "sass": "^1.26.3",
+ "prettier": "^2.0.5",
+ "release-it": "^13.5.7",
+ "sass": "^1.26.5",
"sass-loader": "^8.0.2",
- "style-loader": "^1.1.3",
- "stylelint": "^13.3.1",
+ "style-loader": "^1.2.1",
+ "stylelint": "^13.3.3",
"typescript": "^3.8.3",
"vue-jest": "4.0.0-beta.2",
"vue-loader": "^16.0.0-alpha.3",
- "vue-router": "^4.0.0-alpha.7 ",
- "webpack": "^4.42.1",
+ "vue-router": "^4.0.0-alpha.12",
+ "webpack": "^4.43.0",
"webpack-dev-server": "3.10.3",
"webpack-merge": "^4.2.2",
"webpackbar": "^4.0.0"
diff --git a/packages/vant-cli/site/common/style/base.less b/packages/vant-cli/site/common/style/base.less
index efd18e307..7bb9384f5 100644
--- a/packages/vant-cli/site/common/style/base.less
+++ b/packages/vant-cli/site/common/style/base.less
@@ -6,7 +6,9 @@ body {
overflow-x: auto;
color: @van-doc-black;
font-size: 16px;
- font-family: PingFang SC, 'Helvetica Neue', Arial, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
+ Segoe UI, Arial, Roboto, 'PingFang SC', 'Hiragino Sans GB',
+ 'Microsoft Yahei', sans-serif;
background-color: @van-doc-background-color;
-webkit-font-smoothing: antialiased;
}
diff --git a/packages/vant-cli/site/desktop/utils.js b/packages/vant-cli/site/desktop/utils.js
index 154d088a5..085afa72f 100644
--- a/packages/vant-cli/site/desktop/utils.js
+++ b/packages/vant-cli/site/desktop/utils.js
@@ -4,9 +4,7 @@ export function scrollToAnchor(selector) {
const timer = setInterval(() => {
const el = document.querySelector(selector);
if (el) {
- el.scrollIntoView({
- behavior: 'smooth',
- });
+ el.scrollIntoView();
clearInterval(timer);
} else {
count++;
diff --git a/packages/vant-cli/site/mobile/components/DemoNav.vue b/packages/vant-cli/site/mobile/components/DemoNav.vue
index b5509c7e9..899d3ee6e 100644
--- a/packages/vant-cli/site/mobile/components/DemoNav.vue
+++ b/packages/vant-cli/site/mobile/components/DemoNav.vue
@@ -39,9 +39,10 @@ export default {
```
diff --git a/src/count-down/README.zh-CN.md b/src/count-down/README.zh-CN.md
index 7068fae52..cfd1aada5 100644
--- a/src/count-down/README.zh-CN.md
+++ b/src/count-down/README.zh-CN.md
@@ -52,21 +52,27 @@ export default {
```html
-
+
-
-
-
- 2020 +
-
+ 2020+
-
+
-
-
-
- 05 -
- 10 +
-
+ 05+
+
-
+ 10+
-
+
-
-
-
- 05 -
- 10 -
- 15 -
- 20 -
- 25 -
- 30 +
-
+ 05+
+
-
+ 10+
+
-
+ 15+
+
-
+ 20+
+
-
+ 25+
+
-
+ 30+
-
+
-
-
-
- 00 -
- 05 -
- 10 -
- 15 -
- 20 +
-
+ 00+
+
-
+ 05+
+
-
+ 10+
+
-
+ 15+
+
-
+ 20+
-
+
-
@@ -60,54 +112,108 @@ exports[`filter prop 1`] = `
exports[`formatter prop 1`] = `
-
-
- 00 -
- 05 -
- 10 -
- 15 -
- 20 -
- 25 -
- 30 -
- 35 -
- 40 -
- 45 -
- 50 -
- 55 +
-
+ 00+
+
-
+ 05+
+
-
+ 10+
+
-
+ 15+
+
-
+ 20+
+
-
+ 25+
+
-
+ 30+
+
-
+ 35+
+
-
+ 40+
+
-
+ 45+
+
-
+ 50+
+
-
+ 55+
-
+
-
+
-
-
-
- 2010 year -
- 2020 year +
-
+ 2010 year+
+
-
+ 2020 year+
-
+
-
-
-
- 05 month -
- 10 month +
-
+ 05 month+
+
-
+ 10 month+
-
+
-
-
-
- 05 day -
- 10 day -
- 15 day -
- 20 day -
- 25 day -
- 30 day +
-
+ 05 day+
+
-
+ 10 day+
+
-
+ 15 day+
+
-
+ 20 day+
+
-
+ 25 day+
+
-
+ 30 day+
-
+
-
-
-
- 00 hour -
- 05 hour -
- 10 hour -
- 15 hour -
- 20 hour +
-
+ 00 hour+
+
-
+ 05 hour+
+
-
+ 10 hour+
+
-
+ 15 hour+
+
-
+ 20 hour+
-
+
-
diff --git a/src/datetime-picker/test/__snapshots__/datetime-picker.spec.js.snap b/src/datetime-picker/test/__snapshots__/datetime-picker.spec.js.snap
index 72bd141c5..93186057a 100644
--- a/src/datetime-picker/test/__snapshots__/datetime-picker.spec.js.snap
+++ b/src/datetime-picker/test/__snapshots__/datetime-picker.spec.js.snap
@@ -2,19 +2,27 @@
exports[`time type 1`] = `
-
-
- 00 minute -
- 05 minute -
- 10 minute -
- 15 minute -
- 20 minute -
- 25 minute -
- 30 minute -
- 35 minute -
- 40 minute -
- 45 minute -
- 50 minute -
- 55 minute +
-
+ 00 minute+
+
-
+ 05 minute+
+
-
+ 10 minute+
+
-
+ 15 minute+
+
-
+ 20 minute+
+
-
+ 25 minute+
+
-
+ 30 minute+
+
-
+ 35 minute+
+
-
+ 40 minute+
+
-
+ 45 minute+
+
-
+ 50 minute+
+
-
+ 55 minute+
-
+
-
+
-
-
-
- 22 -
- 23 +
-
+ 22+
+
-
+ 23+
-
+
-
diff --git a/src/datetime-picker/test/__snapshots__/demo.spec.js.snap b/src/datetime-picker/test/__snapshots__/demo.spec.js.snap
index 4e590239f..27f96fe12 100644
--- a/src/datetime-picker/test/__snapshots__/demo.spec.js.snap
+++ b/src/datetime-picker/test/__snapshots__/demo.spec.js.snap
@@ -4,160 +4,168 @@ exports[`renders demo correctly 1`] = `
-
-
- 58 -
- 59 +
-
+ 58+
+
-
+ 59+
-
+
-
+
-
-
-
- 2020 -
- 2021 -
- 2022 -
- 2023 -
- 2024 -
- 2025 +
-
+ 2020+
+
-
+ 2021+
+
-
+ 2022+
+
-
+ 2023+
+
-
+ 2024+
+
-
+ 2025+
-
+
-
-
-
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 +
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
-
+
-
- -
-
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 -
- 24 -
- 25 -
- 26 -
- 27 -
- 28 -
- 29 -
- 30 -
- 31 -
-
- -
-
- 00 -
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 -
-
@@ -168,68 +176,71 @@ exports[`renders demo correctly 1`] = `
-
-
- 00 -
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 -
- 24 -
- 25 -
- 26 -
- 27 -
- 28 -
- 29 -
- 30 -
- 31 -
- 32 -
- 33 -
- 34 -
- 35 -
- 36 -
- 37 -
- 38 -
- 39 -
- 40 -
- 41 -
- 42 -
- 43 -
- 44 -
- 45 -
- 46 -
- 47 -
- 48 -
- 49 -
- 50 -
- 51 -
- 52 -
- 53 -
- 54 -
- 55 -
- 56 -
- 57 -
- 58 -
- 59 +
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
-
+ 24+
+
-
+ 25+
+
-
+ 26+
+
-
+ 27+
+
-
+ 28+
+
-
+ 29+
+
-
+ 30+
+
-
+ 31+
-
+
-
+
-
-
-
- 2020 -
- 2021 -
- 2022 -
- 2023 -
- 2024 -
- 2025 +
-
+ 2020年+
+
-
+ 2021年+
+
-
+ 2022年+
+
-
+ 2023年+
+
-
+ 2024年+
+
-
+ 2025年+
-
+
-
- -
-
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
-
@@ -240,33 +251,146 @@ exports[`renders demo correctly 1`] = `
-
-
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 -
- 24 -
- 25 -
- 26 -
- 27 -
- 28 -
- 29 -
- 30 -
- 31 +
-
+ 01月+
+
-
+ 02月+
+
-
+ 03月+
+
-
+ 04月+
+
-
+ 05月+
+
-
+ 06月+
+
-
+ 07月+
+
-
+ 08月+
+
-
+ 09月+
+
-
+ 10月+
+
-
+ 11月+
+
-
+ 12月+
-
+
-
+
-
-
-
- 2020年 -
- 2021年 -
- 2022年 -
- 2023年 -
- 2024年 -
- 2025年 +
-
+ 01月+
+
-
+ 02月+
+
-
+ 03月+
+
-
+ 04月+
+
-
+ 05月+
+
-
+ 06月+
+
-
+ 07月+
+
-
+ 08月+
+
-
+ 09月+
+
-
+ 10月+
+
-
+ 11月+
+
-
+ 12月+
-
+
-
@@ -277,86 +401,230 @@ exports[`renders demo correctly 1`] = `
-
-
- 01月 -
- 02月 -
- 03月 -
- 04月 -
- 05月 -
- 06月 -
- 07月 -
- 08月 -
- 09月 -
- 10月 -
- 11月 -
- 12月 +
-
+ 01日+
+
-
+ 02日+
+
-
+ 03日+
+
-
+ 04日+
+
-
+ 05日+
+
-
+ 06日+
+
-
+ 07日+
+
-
+ 08日+
+
-
+ 09日+
+
-
+ 10日+
+
-
+ 11日+
+
-
+ 12日+
+
-
+ 13日+
+
-
+ 14日+
+
-
+ 15日+
+
-
+ 16日+
+
-
+ 17日+
+
-
+ 18日+
+
-
+ 19日+
+
-
+ 20日+
+
-
+ 21日+
+
-
+ 22日+
+
-
+ 23日+
+
-
+ 24日+
+
-
+ 25日+
+
-
+ 26日+
+
-
+ 27日+
+
-
+ 28日+
+
-
+ 29日+
+
-
+ 30日+
+
-
+ 31日+
-
+
-
+
+
-
-
-
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 +
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
-
+
-
@@ -367,51 +635,557 @@ exports[`renders demo correctly 1`] = `
-
-
- 00 -
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 -
- 24 -
- 25 -
- 26 -
- 27 -
- 28 -
- 29 -
- 30 -
- 31 -
- 32 -
- 33 -
- 34 -
- 35 -
- 36 -
- 37 -
- 38 -
- 39 -
- 40 -
- 41 -
- 42 -
- 43 -
- 44 -
- 45 -
- 46 -
- 47 -
- 48 -
- 49 -
- 50 -
- 51 -
- 52 -
- 53 -
- 54 -
- 55 -
- 56 -
- 57 -
- 58 -
- 59 +
-
+ 00+
+
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
-
+ 24+
+
-
+ 25+
+
-
+ 26+
+
-
+ 27+
+
-
+ 28+
+
-
+ 29+
+
-
+ 30+
+
-
+ 31+
+
-
+ 32+
+
-
+ 33+
+
-
+ 34+
+
-
+ 35+
+
-
+ 36+
+
-
+ 37+
+
-
+ 38+
+
-
+ 39+
+
-
+ 40+
+
-
+ 41+
+
-
+ 42+
+
-
+ 43+
+
-
+ 44+
+
-
+ 45+
+
-
+ 46+
+
-
+ 47+
+
-
+ 48+
+
-
+ 49+
+
-
+ 50+
+
-
+ 51+
+
-
+ 52+
+
-
+ 53+
+
-
+ 54+
+
-
+ 55+
+
-
+ 56+
+
-
+ 57+
+
-
+ 58+
+
-
+ 59+
-
+
-
+
+
+
+
-
-
-
- 00 -
- 01 -
- 02 -
- 03 -
- 04 -
- 05 -
- 06 -
- 07 -
- 08 -
- 09 -
- 10 -
- 11 -
- 12 -
- 13 -
- 14 -
- 15 -
- 16 -
- 17 -
- 18 -
- 19 -
- 20 -
- 21 -
- 22 -
- 23 +
-
+ 2020+
+
-
+ 2021+
+
-
+ 2022+
+
-
+ 2023+
+
-
+ 2024+
+
-
+ 2025+
-
+
-
+ -
-
- 00 -
- 05 -
- 10 -
- 15 -
- 20 -
- 25 -
- 30 -
- 35 -
- 40 -
- 45 -
- 50 -
- 55 +
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+
+
+ -
+
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
-
+ 24+
+
-
+ 25+
+
-
+ 26+
+
-
+ 27+
+
-
+ 28+
+
-
+ 29+
+
-
+ 30+
+
-
+ 31+
+
+
+ -
+
-
+ 00+
+
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
+
+
+
+ -
+
-
+ 00+
+
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
-
+ 24+
+
-
+ 25+
+
-
+ 26+
+
-
+ 27+
+
-
+ 28+
+
-
+ 29+
+
-
+ 30+
+
-
+ 31+
+
-
+ 32+
+
-
+ 33+
+
-
+ 34+
+
-
+ 35+
+
-
+ 36+
+
-
+ 37+
+
-
+ 38+
+
-
+ 39+
+
-
+ 40+
+
-
+ 41+
+
-
+ 42+
+
-
+ 43+
+
-
+ 44+
+
-
+ 45+
+
-
+ 46+
+
-
+ 47+
+
-
+ 48+
+
-
+ 49+
+
-
+ 50+
+
-
+ 51+
+
-
+ 52+
+
-
+ 53+
+
-
+ 54+
+
-
+ 55+
+
-
+ 56+
+
-
+ 57+
+
-
+ 58+
+
-
+ 59+
+
+
+
+
+
+
+
+ -
+
-
+ 00+
+
-
+ 01+
+
-
+ 02+
+
-
+ 03+
+
-
+ 04+
+
-
+ 05+
+
-
+ 06+
+
-
+ 07+
+
-
+ 08+
+
-
+ 09+
+
-
+ 10+
+
-
+ 11+
+
-
+ 12+
+
-
+ 13+
+
-
+ 14+
+
-
+ 15+
+
-
+ 16+
+
-
+ 17+
+
-
+ 18+
+
-
+ 19+
+
-
+ 20+
+
-
+ 21+
+
-
+ 22+
+
-
+ 23+
+
+
diff --git a/src/datetime-picker/test/__snapshots__/time-picker.spec.js.snap b/src/datetime-picker/test/__snapshots__/time-picker.spec.js.snap
index 6d7e9887f..ec25eb174 100644
--- a/src/datetime-picker/test/__snapshots__/time-picker.spec.js.snap
+++ b/src/datetime-picker/test/__snapshots__/time-picker.spec.js.snap
@@ -2,26 +2,48 @@
exports[`filter prop 1`] = `
-
+
-
+ 00+
+
-
+ 05+
+
-
+ 10+
+
-
+ 15+
+
-
+ 20+
+
-
+ 25+
+
-
+ 30+
+
-
+ 35+
+
-
+ 40+
+
-
+ 45+
+
-
+ 50+
+
-
+ 55+
-
+
-
-
-
- 00 -
- 05 -
- 10 -
- 15 -
- 20 +
-
+ 00+
+
-
+ 05+
+
-
+ 10+
+
-
+ 15+
+
-
+ 20+
-
+
-
@@ -33,19 +55,27 @@ exports[`filter prop 1`] = `
exports[`format initial value 1`] = `
-
-
- 00 -
- 10 -
- 20 -
- 30 -
- 40 -
- 50 +
-
+ 00+
+
-
+ 10+
+
-
+ 20+
+
-
+ 30+
+
-
+ 40+
+
-
+ 50+
-
+
-
+
-
-
-
- 22 -
- 23 +
-
+ 22+
+
-
+ 23+
-
+
-
@@ -57,26 +87,48 @@ exports[`format initial value 1`] = `
exports[`formatter prop 1`] = `
-
-
- 58 -
- 59 +
-
+ 58+
+
-
+ 59+
-
+
-
+
-
-
-
- 00 hour -
- 05 hour -
- 10 hour -
- 15 hour -
- 20 hour +
-
+ 00 hour+
+
-
+ 05 hour+
+
-
+ 10 hour+
+
-
+ 15 hour+
+
-
+ 20 hour+
-
+
-
@@ -88,21 +140,33 @@ exports[`formatter prop 1`] = `
exports[`max-hour & max-minute 1`] = `
-
-
- 00 minute -
- 10 minute -
- 20 minute -
- 30 minute -
- 40 minute -
- 50 minute +
-
+ 00 minute+
+
-
+ 10 minute+
+
-
+ 20 minute+
+
-
+ 30 minute+
+
-
+ 40 minute+
+
-
+ 50 minute+
-
+
-
+
-
-
-
- 00 -
- 01 -
- 02 +
-
+ 00+
+
-
+ 01+
+
-
+ 02+
-
+
-
diff --git a/src/datetime-picker/test/date-picker.spec.js b/src/datetime-picker/test/date-picker.spec.js
index caac0e8dc..8701e109e 100644
--- a/src/datetime-picker/test/date-picker.spec.js
+++ b/src/datetime-picker/test/date-picker.spec.js
@@ -68,6 +68,60 @@ test('confirm event', () => {
expect(wrapper.emitted('confirm')[1][0].getFullYear()).toEqual(2025);
});
+test('year-month type', () => {
+ const date = new Date(2020, 10, 1, 0, 0);
+
+ const wrapper = mount(DatePicker, {
+ propsData: {
+ type: 'year-month',
+ value: date,
+ minDate: new Date(2020, 0, 1),
+ maxDate: new Date(2025, 10, 1),
+ },
+ });
+
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[0][0].getFullYear()).toEqual(2020);
+ expect(wrapper.emitted('confirm')[0][0].getMonth()).toEqual(10);
+
+ triggerDrag(wrapper.find('.van-picker-column'), 0, -100);
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[1][0].getFullYear()).toEqual(2025);
+ expect(wrapper.emitted('confirm')[1][0].getMonth()).toEqual(0);
+
+ triggerDrag(wrapper.findAll('.van-picker-column').at(1), 0, -100);
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[2][0].getFullYear()).toEqual(2025);
+ expect(wrapper.emitted('confirm')[2][0].getMonth()).toEqual(10);
+});
+
+test('month-day type', () => {
+ const date = new Date(2020, 10, 1, 0, 0);
+
+ const wrapper = mount(DatePicker, {
+ propsData: {
+ type: 'month-day',
+ value: date,
+ minDate: new Date(2020, 0, 1),
+ maxDate: new Date(2025, 10, 1),
+ },
+ });
+
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[0][0].getMonth()).toEqual(10);
+ expect(wrapper.emitted('confirm')[0][0].getDate()).toEqual(1);
+
+ triggerDrag(wrapper.find('.van-picker-column'), 0, -100);
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[1][0].getMonth()).toEqual(11);
+ expect(wrapper.emitted('confirm')[1][0].getDate()).toEqual(1);
+
+ triggerDrag(wrapper.findAll('.van-picker-column').at(1), 0, -100);
+ wrapper.find('.van-picker__confirm').trigger('click');
+ expect(wrapper.emitted('confirm')[2][0].getMonth()).toEqual(11);
+ expect(wrapper.emitted('confirm')[2][0].getDate()).toEqual(31);
+});
+
test('cancel event', () => {
const wrapper = mount(DatePicker);
diff --git a/src/dialog/test/__snapshots__/demo.spec.js.snap b/src/dialog/test/__snapshots__/demo.spec.js.snap
index 0e32cfd65..d1c83443a 100644
--- a/src/dialog/test/__snapshots__/demo.spec.js.snap
+++ b/src/dialog/test/__snapshots__/demo.spec.js.snap
@@ -2,24 +2,38 @@
exports[`renders demo correctly 1`] = `
-
-
- 00 -
- 01 -
- 02 +
-
+ 00+
+
-
+ 01+
+
-
+ 02+
-
+
-
diff --git a/src/dialog/test/__snapshots__/index.spec.js.snap b/src/dialog/test/__snapshots__/index.spec.js.snap
index 100a324a3..09ae657df 100644
--- a/src/dialog/test/__snapshots__/index.spec.js.snap
+++ b/src/dialog/test/__snapshots__/index.spec.js.snap
@@ -2,26 +2,38 @@
exports[`button color 1`] = `
`;
exports[`title slot 1`] = `
`;
diff --git a/src/dropdown-menu/index.js b/src/dropdown-menu/index.js
index 087193685..383591887 100644
--- a/src/dropdown-menu/index.js
+++ b/src/dropdown-menu/index.js
@@ -1,6 +1,5 @@
// Utils
-import { createNamespace } from '../utils';
-import { BORDER_TOP_BOTTOM } from '../utils/constant';
+import { createNamespace, isDef } from '../utils';
import { getScroller } from '../utils/dom/scroll';
// Mixins
@@ -49,15 +48,27 @@ export default createComponent({
scroller() {
return getScroller(this.$el);
},
+
+ opened() {
+ return this.children.some((item) => item.showWrapper);
+ },
+
+ barStyle() {
+ if (this.opened && isDef(this.zIndex)) {
+ return {
+ zIndex: 1 + this.zIndex,
+ };
+ }
+ },
},
methods: {
updateOffset() {
- if (!this.$refs.menu) {
+ if (!this.$refs.bar) {
return;
}
- const rect = this.$refs.menu.getBoundingClientRect();
+ const rect = this.$refs.bar.getBoundingClientRect();
if (this.direction === 'down') {
this.offset = rect.bottom;
@@ -113,8 +124,14 @@ export default createComponent({
));
return (
-
-
+
`;
exports[`button text 1`] = `
-
+
`;
exports[`default slot 1`] = `
Custom Message
-
+
Custom Title
-
+
- {Titles}
+
+
{this.slots('default')}
);
diff --git a/src/dropdown-menu/index.less b/src/dropdown-menu/index.less
index ff747bc28..e293babc3 100644
--- a/src/dropdown-menu/index.less
+++ b/src/dropdown-menu/index.less
@@ -1,11 +1,20 @@
@import '../style/var';
.van-dropdown-menu {
- display: flex;
- height: @dropdown-menu-height;
- background-color: @dropdown-menu-background-color;
user-select: none;
+ &__bar {
+ position: relative;
+ display: flex;
+ height: @dropdown-menu-height;
+ background-color: @dropdown-menu-background-color;
+ box-shadow: 0 2px 12px fade(@gray-7, 8);
+
+ &--opened {
+ z-index: @dropdown-item-z-index + 1;
+ }
+ }
+
&__item {
display: flex;
flex: 1;
@@ -44,7 +53,7 @@
right: -4px;
margin-top: -5px;
border: 3px solid;
- border-color: transparent transparent currentColor currentColor;
+ border-color: transparent transparent @gray-4 @gray-4;
transform: rotate(-45deg);
opacity: 0.8;
content: '';
@@ -52,6 +61,10 @@
&--active {
color: @dropdown-menu-title-active-text-color;
+
+ &::after {
+ border-color: transparent transparent currentColor currentColor;
+ }
}
&--down {
diff --git a/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap b/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap
index 5afee72d1..2e154118c 100644
--- a/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap
+++ b/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap
@@ -3,9 +3,11 @@
exports[`renders demo correctly 1`] = `
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
