From 49e75c847eea51532e430ff58f078a631033c590 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 10:38:55 +0800 Subject: [PATCH 01/13] feat(Calendar): reset method support specified date (#7966) --- src/calendar/README.md | 2 +- src/calendar/README.zh-CN.md | 8 ++++---- src/calendar/index.js | 4 ++-- types/calendar.d.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/calendar/README.md b/src/calendar/README.md index 15faa7689..6666f9039 100644 --- a/src/calendar/README.md +++ b/src/calendar/README.md @@ -336,7 +336,7 @@ Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get Calend | Name | Description | Attribute | Return value | | --- | --- | --- | --- | -| reset | Reset selected date to default date | - | - | +| reset | Reset selected date, will reset to default date when no params passed | _date?: Date \| Date[]_ | - | | scrollToDate | Scroll to date | _date: Date_ | - | ### Less Variables diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index 5fb6e2437..d4710d487 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -340,10 +340,10 @@ export default { 通过 ref 可以获取到 Calendar 实例并调用实例方法,详见[组件实例方法](#/zh-CN/advanced-usage#zu-jian-shi-li-fang-fa)。 -| 方法名 | 说明 | 参数 | 返回值 | -| ------------ | ---------------------- | ------------ | ------ | -| reset | 重置选中的日期到默认值 | - | - | -| scrollToDate | 滚动到某个日期 | _date: Date_ | - | +| 方法名 | 说明 | 参数 | 返回值 | +| --- | --- | --- | --- | +| reset | 将选中的日期重置到指定日期,未传参时会重置到默认日期 | _date?: Date \| Date[]_ | - | +| scrollToDate | 滚动到某个日期 | _date: Date_ | - | ### 样式变量 diff --git a/src/calendar/index.js b/src/calendar/index.js index 1929690ac..60c477ff5 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -311,8 +311,8 @@ export default createComponent({ }); }; - const reset = () => { - state.currentDate = getInitialDate(state.currentDate); + const reset = (date = getInitialDate(state.currentDate)) => { + state.currentDate = date; scrollIntoView(); }; diff --git a/types/calendar.d.ts b/types/calendar.d.ts index bc815f8d0..f516e2f06 100644 --- a/types/calendar.d.ts +++ b/types/calendar.d.ts @@ -1,7 +1,7 @@ import { VanComponent } from './component'; export class Calendar extends VanComponent { - reset(): void; + reset(date?: Date | Date[]): void; scrollToDate(date: Date): void; } From acc983338b29f5c3c4ce00529a6a93debe509efb Mon Sep 17 00:00:00 2001 From: mmm <38420246+mogulano@users.noreply.github.com> Date: Sat, 23 Jan 2021 04:45:55 +0200 Subject: [PATCH 02/13] Create SECURITY.md (#7965) Please provide an email where to send reports about security vulnerabilities in this project --- SECURITY.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..613881df9 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +xxxxxxxxxxx@xxxxxxxxxxxxx.com From c71b48ed9fd3fe30530265b6a9d6d49a6e3102df Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 10:46:52 +0800 Subject: [PATCH 03/13] Update SECURITY.md --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index 613881df9..079ea4888 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,4 +2,4 @@ ## Reporting a Vulnerability -xxxxxxxxxxx@xxxxxxxxxxxxx.com +chenjiahan@buaa.edu.cn From c30740ecc5aa3fd3a39fa9612742bfdf03de47b1 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 10:47:22 +0800 Subject: [PATCH 04/13] fix(Calendar): should reset to default date when calling reset method (#7967) --- src/calendar/index.js | 6 ++-- src/calendar/test/index.legacy.js | 25 ---------------- src/calendar/test/index.spec.js | 50 +++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 27 deletions(-) create mode 100644 src/calendar/test/index.spec.js diff --git a/src/calendar/index.js b/src/calendar/index.js index 60c477ff5..88a621d17 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -311,7 +311,7 @@ export default createComponent({ }); }; - const reset = (date = getInitialDate(state.currentDate)) => { + const reset = (date = getInitialDate()) => { state.currentDate = date; scrollIntoView(); }; @@ -500,7 +500,9 @@ export default createComponent({ ); watch(() => props.show, init); - watch([() => props.type, () => props.minDate, () => props.maxDate], reset); + watch([() => props.type, () => props.minDate, () => props.maxDate], () => { + reset(getInitialDate(state.currentDate)); + }); watch( () => props.defaultDate, (value) => { diff --git a/src/calendar/test/index.legacy.js b/src/calendar/test/index.legacy.js index 2b3298129..eb496309e 100644 --- a/src/calendar/test/index.legacy.js +++ b/src/calendar/test/index.legacy.js @@ -196,31 +196,6 @@ test('default range date', async () => { ); }); -test('reset method', async () => { - const wrapper = mount(Calendar, { - props: { - minDate, - maxDate, - type: 'range', - poppable: false, - defaultDate: [minDate, getNextDay(minDate)], - }, - }); - - await later(); - - const days = wrapper.findAll('.van-calendar__day'); - days.at(15).trigger('click'); - days.at(18).trigger('click'); - - wrapper.vm.reset(); - - wrapper.find('.van-calendar__confirm').trigger('click'); - expect(formatRange(wrapper.emitted('confirm')[0][0])).toEqual( - '2010/1/10-2010/1/11' - ); -}); - test('set show-confirm to false', async () => { const wrapper = mount(Calendar, { props: { diff --git a/src/calendar/test/index.spec.js b/src/calendar/test/index.spec.js new file mode 100644 index 000000000..4ee865418 --- /dev/null +++ b/src/calendar/test/index.spec.js @@ -0,0 +1,50 @@ +import Calendar from '..'; +import { mount } from '../../../test'; +import { getNextDay, getPrevDay } from '../utils'; +import { minDate, maxDate } from './utils'; + +test('should reset to default date when calling reset method', async () => { + const defaultDate = [minDate, getNextDay(minDate)]; + const wrapper = mount(Calendar, { + props: { + minDate, + maxDate, + type: 'range', + poppable: false, + lazyRender: false, + defaultDate, + }, + }); + + const days = wrapper.findAll('.van-calendar__day'); + await days[15].trigger('click'); + await days[18].trigger('click'); + + wrapper.vm.reset(); + + wrapper.find('.van-calendar__confirm').trigger('click'); + expect(wrapper.emitted('confirm')[0][0]).toEqual(defaultDate); +}); + +test('should reset to specific date when calling reset method with date', async () => { + const wrapper = mount(Calendar, { + props: { + minDate, + maxDate, + type: 'range', + poppable: false, + lazyRender: false, + defaultDate: [minDate, getNextDay(minDate)], + }, + }); + + const days = wrapper.findAll('.van-calendar__day'); + await days[15].trigger('click'); + await days[18].trigger('click'); + + const newDate = [getPrevDay(maxDate), maxDate]; + wrapper.vm.reset(newDate); + + wrapper.find('.van-calendar__confirm').trigger('click'); + expect(wrapper.emitted('confirm')[0][0]).toEqual(newDate); +}); From f157e99534401aaca50a6e4717fbe7e98c99740e Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 11:08:52 +0800 Subject: [PATCH 05/13] fix(Dialog): failed to render when toggling allowHtml (#7968) --- src/dialog/Dialog.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js index 95edeccf6..f59792fd8 100644 --- a/src/dialog/Dialog.js +++ b/src/dialog/Dialog.js @@ -120,7 +120,12 @@ export default createComponent({ if (message) { const hasTitle = title || slots.title; return ( -
+
Date: Sat, 23 Jan 2021 11:13:31 +0800 Subject: [PATCH 06/13] docs(Picker): add Cascader link (#7969) --- src/picker/README.zh-CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/picker/README.zh-CN.md b/src/picker/README.zh-CN.md index 29af4b9f5..4fc5437b0 100644 --- a/src/picker/README.zh-CN.md +++ b/src/picker/README.zh-CN.md @@ -100,7 +100,7 @@ export default { ### 级联选择 -使用 `columns` 的 `children` 字段可以实现选项级联的效果。 +使用 `columns` 的 `children` 字段可以实现选项级联的效果。如果级联层级较多,推荐使用 [Cascader 级联选项组件](#/zh-CN/cascader)。 ```html @@ -143,7 +143,7 @@ export default { }; ``` -> 级联选择的数据嵌套深度需要保持一致,如果部分选项没有子选项,可以使用空字符串进行占位 +> 级联选择的数据嵌套深度需要保持一致,如果部分选项没有子选项,可以使用空字符串进行占位。 ### 禁用选项 From fcb5c223ba6735ad31a0eb6ebd189e0638f7ba58 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 11:31:56 +0800 Subject: [PATCH 07/13] perf(ImagePreview): adjust default swipeDuration to 300ms (#7970) --- src/image-preview/ImagePreview.js | 2 +- src/image-preview/README.md | 2 +- src/image-preview/README.zh-CN.md | 4 ++-- src/image-preview/index.js | 2 +- src/image-preview/test/__snapshots__/index.spec.js.snap | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js index 53299d088..70c32fac3 100644 --- a/src/image-preview/ImagePreview.js +++ b/src/image-preview/ImagePreview.js @@ -47,7 +47,7 @@ export default createComponent({ }, swipeDuration: { type: [Number, String], - default: 500, + default: 300, }, startPosition: { type: [Number, String], diff --git a/src/image-preview/README.md b/src/image-preview/README.md index baec912d5..a8af3945f 100644 --- a/src/image-preview/README.md +++ b/src/image-preview/README.md @@ -147,7 +147,7 @@ export default { | --- | --- | --- | --- | | images | Images URL list | _string[]_ | `[]` | | start-position | Start position | _number \| string_ | `0` | -| swipe-duration | Animation duration (ms) | _number \| string_ | `500` | +| swipe-duration | Animation duration (ms) | _number \| string_ | `300` | | show-index | Whether to show index | _boolean_ | `true` | | show-indicators | Whether to show indicators | _boolean_ | `false` | | loop | Whether to enable loop | _boolean_ | `true` | diff --git a/src/image-preview/README.zh-CN.md b/src/image-preview/README.zh-CN.md index 789a38114..56c944490 100644 --- a/src/image-preview/README.zh-CN.md +++ b/src/image-preview/README.zh-CN.md @@ -161,7 +161,7 @@ export default { | --- | --- | --- | --- | | images | 需要预览的图片 URL 数组 | _string[]_ | `[]` | | startPosition | 图片预览起始位置索引 | _number \| string_ | `0` | -| swipeDuration | 动画时长,单位为`ms` | _number \| string_ | `500` | +| swipeDuration | 动画时长,单位为 `ms` | _number \| string_ | `300` | | showIndex | 是否显示页码 | _boolean_ | `true` | | showIndicators | 是否显示轮播指示器 | _boolean_ | `false` | | loop | 是否开启循环播放 | _boolean_ | `true` | @@ -175,7 +175,7 @@ export default { | minZoom | 手势缩放时,最小缩放比例 | _number \| string_ | `1/3` | | closeable | 是否显示关闭图标 | _boolean_ | `false` | | closeIcon | 关闭图标名称或图片链接 | _string_ | `clear` | -| closeIconPosition | 关闭图标位置,可选值为`top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | +| closeIconPosition | 关闭图标位置,可选值为 `top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | | teleport | 指定挂载的节点,[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| Element_ | - | ### Props diff --git a/src/image-preview/index.js b/src/image-preview/index.js index 4cd178fd8..b83aec2ce 100644 --- a/src/image-preview/index.js +++ b/src/image-preview/index.js @@ -19,7 +19,7 @@ const defaultConfig = { closeIcon: 'clear', beforeClose: null, startPosition: 0, - swipeDuration: 500, + swipeDuration: 300, showIndicators: false, closeOnPopstate: true, closeIconPosition: 'top-right', diff --git a/src/image-preview/test/__snapshots__/index.spec.js.snap b/src/image-preview/test/__snapshots__/index.spec.js.snap index b972b1098..d6f6ae45f 100644 --- a/src/image-preview/test/__snapshots__/index.spec.js.snap +++ b/src/image-preview/test/__snapshots__/index.spec.js.snap @@ -22,7 +22,7 @@ exports[`should render cover slot correctly 1`] = `
-
From 95e45ab88a067002d24e45daa1490f7937242dd1 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 15:46:30 +0800 Subject: [PATCH 08/13] fix(ImagePreview): scale event index is undefined (#7971) --- src/image-preview/ImagePreviewItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/image-preview/ImagePreviewItem.js b/src/image-preview/ImagePreviewItem.js index 73885debd..a91ca14bf 100644 --- a/src/image-preview/ImagePreviewItem.js +++ b/src/image-preview/ImagePreviewItem.js @@ -97,7 +97,7 @@ export default { state.scale = range(scale, +props.minZoom, +props.maxZoom); emit('scale', { scale: state.scale, - index: state.active, + index: props.active, }); }; From 598fd4a4649ba65a4cc10dd3e54198b2729f60b9 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 15:51:55 +0800 Subject: [PATCH 09/13] feat(ImagePreview): reset scale after swiping (#7972) --- src/image-preview/ImagePreviewItem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/image-preview/ImagePreviewItem.js b/src/image-preview/ImagePreviewItem.js index a91ca14bf..c8fb7fbd2 100644 --- a/src/image-preview/ImagePreviewItem.js +++ b/src/image-preview/ImagePreviewItem.js @@ -235,6 +235,7 @@ export default { state.imageRatio = naturalHeight / naturalWidth; }; + watch(() => props.active, resetScale); watch( () => props.show, (value) => { From 93298ec3b7a17db0e5016028b2d9fed5de47882c Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 16:28:36 +0800 Subject: [PATCH 10/13] fix(Calendar): should not emit scale event when scale not changed (#7975) * fix(Calendar): should not emit scale event when scale not changed * chore: update --- src/image-preview/ImagePreviewItem.js | 14 +++++++++----- src/image-preview/README.md | 2 +- src/image-preview/README.zh-CN.md | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/image-preview/ImagePreviewItem.js b/src/image-preview/ImagePreviewItem.js index c8fb7fbd2..9bc00f044 100644 --- a/src/image-preview/ImagePreviewItem.js +++ b/src/image-preview/ImagePreviewItem.js @@ -94,11 +94,15 @@ export default { }); const setScale = (scale) => { - state.scale = range(scale, +props.minZoom, +props.maxZoom); - emit('scale', { - scale: state.scale, - index: props.active, - }); + scale = range(scale, +props.minZoom, +props.maxZoom); + + if (scale !== state.scale) { + state.scale = scale; + emit('scale', { + scale, + index: props.active, + }); + } }; const resetScale = () => { diff --git a/src/image-preview/README.md b/src/image-preview/README.md index a8af3945f..d463479e7 100644 --- a/src/image-preview/README.md +++ b/src/image-preview/README.md @@ -127,7 +127,7 @@ export default { | showIndex | Whether to show index | _boolean_ | `true` | | showIndicators | Whether to show indicators | _boolean_ | `false` | | loop | Whether to enable loop | _boolean_ | `true` | -| swipeDuration | Animation duration (ms) | _number \| string_ | `500` | +| swipeDuration | Animation duration (ms) | _number \| string_ | `300` | | onClose | Emitted when ImagePreview is closed | _Function_ | - | | onChange | Emitted when current image changed | _Function_ | - | | onScale | Emitted when scaling current image | _Function_ | - | diff --git a/src/image-preview/README.zh-CN.md b/src/image-preview/README.zh-CN.md index 56c944490..1f9d5b688 100644 --- a/src/image-preview/README.zh-CN.md +++ b/src/image-preview/README.zh-CN.md @@ -186,7 +186,7 @@ export default { | --- | --- | --- | --- | | images | 需要预览的图片 URL 数组 | _string[]_ | `[]` | | start-position | 图片预览起始位置索引 | _number \| string_ | `0` | -| swipe-duration | 动画时长,单位为 ms | _number \| string_ | `500` | +| swipe-duration | 动画时长,单位为 ms | _number \| string_ | `300` | | show-index | 是否显示页码 | _boolean_ | `true` | | show-indicators | 是否显示轮播指示器 | _boolean_ | `false` | | loop | 是否开启循环播放 | _boolean_ | `true` | From 7a190058ae9014c9133b375c4417fec223e3383c Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 Jan 2021 16:38:09 +0800 Subject: [PATCH 11/13] docs(Badge): fix missing demo (#7976) --- src/badge/demo/index.vue | 35 +++++++++++ .../test/__snapshots__/demo.spec.js.snap | 61 +++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/src/badge/demo/index.vue b/src/badge/demo/index.vue index 8fb338850..8394dc342 100644 --- a/src/badge/demo/index.vue +++ b/src/badge/demo/index.vue @@ -3,6 +3,12 @@
+ +
+ + +
+
@@ -12,6 +18,9 @@
+ +
+
@@ -21,12 +30,37 @@
+ +
+
+ + +
+ + + +
+ + + +
+ + + + + @@ -76,6 +110,7 @@ export default { .badge-icon { display: block; + margin-left: 0; font-size: 10px; line-height: 16px; } diff --git a/src/badge/test/__snapshots__/demo.spec.js.snap b/src/badge/test/__snapshots__/demo.spec.js.snap index 108c54e9b..b2109b53e 100644 --- a/src/badge/test/__snapshots__/demo.spec.js.snap +++ b/src/badge/test/__snapshots__/demo.spec.js.snap @@ -9,6 +9,20 @@ exports[`should render demo and match snapshot 1`] = ` 5
+
+
+
+
+ 10 +
+
+
+
+
+
+ Hot +
+
@@ -24,6 +38,13 @@ exports[`should render demo and match snapshot 1`] = ` 9+
+
+
+
+
+ 20+ +
+
@@ -42,6 +63,15 @@ exports[`should render demo and match snapshot 1`] = ` 5
+
+
+
+
+ 10 +
+
@@ -52,6 +82,37 @@ exports[`should render demo and match snapshot 1`] = `
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ 20 +
From e0b463630108b5031a02a8afcd0c141a7fdbac9e Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sat, 23 Jan 2021 16:52:48 +0800 Subject: [PATCH 12/13] feat(Badge): add offset prop --- src/badge/README.md | 1 + src/badge/README.zh-CN.md | 1 + src/badge/index.tsx | 20 ++++++++++++++++++-- src/badge/test/index.spec.js | 29 +++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/badge/README.md b/src/badge/README.md index fc72752f5..c442a3cba 100644 --- a/src/badge/README.md +++ b/src/badge/README.md @@ -117,6 +117,7 @@ Use `content` slot to custom :content of badge. | color | Background color | _string_ | `#ee0a24` | | dot | Whether to show dot | _boolean_ | `false` | | max | Max value,show `{max}+` when exceed,only works when content is number | _number \| string_ | - | +| offset `v3.0.5` | Offset of badge dot | _[number, number]_ | - | ### Slots diff --git a/src/badge/README.zh-CN.md b/src/badge/README.zh-CN.md index 454bf8247..0408ff493 100644 --- a/src/badge/README.zh-CN.md +++ b/src/badge/README.zh-CN.md @@ -129,6 +129,7 @@ app.use(Badge); | color | 徽标背景颜色 | _string_ | `#ee0a24` | | dot | 是否展示为小红点 | _boolean_ | `false` | | max | 最大值,超过最大值会显示 `{max}+`,仅当 content 为数字时有效 | _number \| string_ | - | +| offset `v3.0.5` | 设置徽标的偏移量, 数组的两项分别对应水平和垂直方向的偏移量 | _[number, number]_ | - | ### Slots diff --git a/src/badge/index.tsx b/src/badge/index.tsx index 596820199..7544f90cb 100644 --- a/src/badge/index.tsx +++ b/src/badge/index.tsx @@ -1,4 +1,4 @@ -import type { PropType } from 'vue'; +import type { PropType, CSSProperties } from 'vue'; import { isDef, createNamespace } from '../utils'; import { isNumeric } from '../utils/validate/number'; @@ -9,6 +9,7 @@ export default createComponent({ dot: Boolean, max: [Number, String], color: String, + offset: (Array as unknown) as PropType<[number, number]>, content: [Number, String], tag: { type: String as PropType, @@ -38,10 +39,25 @@ export default createComponent({ const renderBadge = () => { if (hasContent() || props.dot) { + const style: CSSProperties = { + background: props.color, + }; + + if (props.offset) { + const [x, y] = props.offset; + if (slots.default) { + style.top = `${y}px`; + style.right = `${-x}px`; + } else { + style.marginTop = `${y}px`; + style.marginLeft = `${x}px`; + } + } + return (
{renderContent()}
diff --git a/src/badge/test/index.spec.js b/src/badge/test/index.spec.js index 86984be2d..af105d21b 100644 --- a/src/badge/test/index.spec.js +++ b/src/badge/test/index.spec.js @@ -40,3 +40,32 @@ test('should render content slot correctly', () => { expect(wrapper.html()).toMatchSnapshot(); }); + +test('should change dot position when using offset prop', () => { + const wrapper = mount(Badge, { + props: { + dot: true, + offset: [2, 4], + }, + slots: { + default: () => 'Child', + }, + }); + + const badge = wrapper.find('.van-badge').element; + expect(badge.style.top).toEqual('4px'); + expect(badge.style.right).toEqual('-2px'); +}); + +test('should change dot position when using offset prop without children', () => { + const wrapper = mount(Badge, { + props: { + dot: true, + offset: [2, 4], + }, + }); + + const badge = wrapper.find('.van-badge').element; + expect(badge.style.marginTop).toEqual('4px'); + expect(badge.style.marginLeft).toEqual('2px'); +}); From f84f349ec96c0ff0424bf60737a20427f8a88fa3 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sat, 23 Jan 2021 16:54:14 +0800 Subject: [PATCH 13/13] docs: update --- src/badge/README.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/badge/README.zh-CN.md b/src/badge/README.zh-CN.md index 0408ff493..1b76865ac 100644 --- a/src/badge/README.zh-CN.md +++ b/src/badge/README.zh-CN.md @@ -129,7 +129,7 @@ app.use(Badge); | color | 徽标背景颜色 | _string_ | `#ee0a24` | | dot | 是否展示为小红点 | _boolean_ | `false` | | max | 最大值,超过最大值会显示 `{max}+`,仅当 content 为数字时有效 | _number \| string_ | - | -| offset `v3.0.5` | 设置徽标的偏移量, 数组的两项分别对应水平和垂直方向的偏移量 | _[number, number]_ | - | +| offset `v3.0.5` | 设置徽标的偏移量,数组的两项分别对应水平和垂直方向的偏移量 | _[number, number]_ | - | ### Slots