From 44e1f020c84393161d998582e5c0506187ea60e9 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 24 May 2022 14:39:40 +0800 Subject: [PATCH 01/26] fix: useForm style error, close #5635 --- components/form/useForm.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/form/useForm.ts b/components/form/useForm.ts index cf34170ee..43a72f288 100644 --- a/components/form/useForm.ts +++ b/components/form/useForm.ts @@ -252,7 +252,7 @@ function useForm( if (validateInfos[name].validateStatus === 'validating') { const res = results.filter(result => result && result.errors.length); validateInfos[name].validateStatus = res.length ? 'error' : 'success'; - validateInfos[name].help = res.length ? res.map(r => r.errors) : ''; + validateInfos[name].help = res.length ? res.map(r => r.errors) : null; options?.onValidate?.( name, !res.length, @@ -293,7 +293,7 @@ function useForm( validateInfos[key] && Object.assign(validateInfos[key], { validateStatus: '', - help: '', + help: null, }); }); }; From 4f9b67755594f3c0201aa07ddc872c16a1555f04 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 24 May 2022 15:12:08 +0800 Subject: [PATCH 02/26] fix: tooltip global getPopupContainer not work, #5636 --- components/tooltip/Tooltip.tsx | 7 +++---- components/vc-tooltip/src/Tooltip.tsx | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/components/tooltip/Tooltip.tsx b/components/tooltip/Tooltip.tsx index 560ae47bd..0df852a35 100644 --- a/components/tooltip/Tooltip.tsx +++ b/components/tooltip/Tooltip.tsx @@ -75,7 +75,7 @@ export default defineComponent({ slots: ['title'], // emits: ['update:visible', 'visibleChange'], setup(props, { slots, emit, attrs, expose }) { - const { prefixCls, getTargetContainer } = useConfigInject('tooltip', props); + const { prefixCls, getPopupContainer } = useConfigInject('tooltip', props); const visible = ref(firstNotUndefined([props.visible, props.defaultVisible])); @@ -217,7 +217,7 @@ export default defineComponent({ }; return () => { - const { openClassName, getPopupContainer, color, overlayClassName } = props; + const { openClassName, color, overlayClassName } = props; let children = filterEmpty(slots.default?.()) ?? null; children = children.length === 1 ? children[0] : children; @@ -245,12 +245,11 @@ export default defineComponent({ formattedOverlayInnerStyle = { backgroundColor: color }; arrowContentStyle = { backgroundColor: color }; } - const vcTooltipProps = { ...attrs, ...(props as TooltipProps), prefixCls: prefixCls.value, - getTooltipContainer: getPopupContainer || getTargetContainer.value, + getPopupContainer: getPopupContainer.value, builtinPlacements: tooltipPlacements.value, visible: tempVisible, ref: tooltip, diff --git a/components/vc-tooltip/src/Tooltip.tsx b/components/vc-tooltip/src/Tooltip.tsx index 8f6d53daf..12b6eff51 100644 --- a/components/vc-tooltip/src/Tooltip.tsx +++ b/components/vc-tooltip/src/Tooltip.tsx @@ -22,7 +22,7 @@ export default defineComponent({ prefixCls: PropTypes.string.def('rc-tooltip'), mouseEnterDelay: PropTypes.number.def(0.1), mouseLeaveDelay: PropTypes.number.def(0.1), - getTooltipContainer: Function, + getPopupContainer: Function as PropType<(triggerNode?: HTMLElement) => HTMLElement>, destroyTooltipOnHide: { type: Boolean, default: false }, align: PropTypes.object.def(() => ({})), arrowContent: PropTypes.any.def(null), @@ -94,7 +94,6 @@ export default defineComponent({ align, destroyTooltipOnHide, defaultVisible, - getTooltipContainer, ...restProps } = props; const extraProps = { ...restProps }; @@ -109,7 +108,6 @@ export default defineComponent({ builtinPlacements: placements, popupPlacement: placement, popupAlign: align, - getPopupContainer: getTooltipContainer, afterPopupVisibleChange: afterVisibleChange, popupTransitionName: transitionName, popupAnimation: animation, From dead1a3753d8fa758cfb569cd1d29eb03e8192c3 Mon Sep 17 00:00:00 2001 From: Gin Date: Wed, 25 May 2022 16:00:13 +0800 Subject: [PATCH 03/26] fix: table dragging css class should only be effective in table component (#5644) --- components/table/style/resize.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/table/style/resize.less b/components/table/style/resize.less index 746ef1e78..1ca091e1f 100644 --- a/components/table/style/resize.less +++ b/components/table/style/resize.less @@ -23,7 +23,7 @@ } } -.dragging { +.@{table-prefix-cls}-resize-handle.dragging { .@{table-prefix-cls}-resize-handle-line { opacity: 1; } From c7e079bd65731a1db857683d0bcf8257e567c62d Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Wed, 25 May 2022 16:02:11 +0800 Subject: [PATCH 04/26] feat: enable the left or right keyboard to switch image (#5642), close #5630 * feat: enable the left or right keyboard to switch image * fix: eslint error --- components/vc-image/src/Preview.tsx | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/components/vc-image/src/Preview.tsx b/components/vc-image/src/Preview.tsx index aada154b1..58ab37877 100644 --- a/components/vc-image/src/Preview.tsx +++ b/components/vc-image/src/Preview.tsx @@ -15,6 +15,7 @@ import Dialog from '../../vc-dialog'; import { type IDialogChildProps, dialogPropTypes } from '../../vc-dialog/IDialogPropTypes'; import { getOffset } from '../../vc-util/Dom/css'; import addEventListener from '../../vc-util/Dom/addEventListener'; +import KeyCode from '../../_util/KeyCode'; import { warning } from '../../vc-util/warning'; import useFrameSetState from './hooks/useFrameSetState'; import getFixScaleEleTransPosition from './getFixScaleEleTransPosition'; @@ -221,6 +222,32 @@ const Preview = defineComponent({ lastWheelZoomDirection.value = { wheelDirection }; }; + const onKeyDown = (event: KeyboardEvent) => { + if (!props.visible || !showLeftOrRightSwitches.value) return; + + event.preventDefault(); + if (event.keyCode === KeyCode.LEFT) { + if (currentPreviewIndex.value > 0) { + setCurrent(previewUrlsKeys.value[currentPreviewIndex.value - 1]); + } + } else if (event.keyCode === KeyCode.RIGHT) { + if (currentPreviewIndex.value < previewGroupCount.value - 1) { + setCurrent(previewUrlsKeys.value[currentPreviewIndex.value + 1]); + } + } + }; + + const onDoubleClick = () => { + if (props.visible) { + if (scale.value !== 1) { + scale.value = 1; + } + if (position.x !== initialPosition.x || position.y !== initialPosition.y) { + setPosition(initialPosition); + } + } + }; + let removeListeners = () => {}; onMounted(() => { watch( @@ -235,6 +262,7 @@ const Preview = defineComponent({ const onScrollWheelListener = addEventListener(window, 'wheel', onWheelMove, { passive: false, }); + const onKeyDownListener = addEventListener(window, 'keydown', onKeyDown, false); try { // Resolve if in iframe lost event @@ -257,6 +285,7 @@ const Preview = defineComponent({ onMouseUpListener.remove(); onMouseMoveListener.remove(); onScrollWheelListener.remove(); + onKeyDownListener.remove(); /* istanbul ignore next */ if (onTopMouseUpListener) onTopMouseUpListener.remove(); @@ -310,6 +339,7 @@ const Preview = defineComponent({ > Date: Thu, 26 May 2022 15:03:26 +0800 Subject: [PATCH 05/26] fix: steps progressDot slot not work, close #5648 #5649 --- components/vc-steps/Steps.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/vc-steps/Steps.tsx b/components/vc-steps/Steps.tsx index 702812c6a..e25c112e8 100644 --- a/components/vc-steps/Steps.tsx +++ b/components/vc-steps/Steps.tsx @@ -31,7 +31,7 @@ export default defineComponent({ labelPlacement: PropTypes.string.def('horizontal'), status: PropTypes.string.def('process'), size: PropTypes.string.def(''), - progressDot: PropTypes.oneOfType([PropTypes.looseBool, PropTypes.func]).def(false), + progressDot: PropTypes.oneOfType([PropTypes.looseBool, PropTypes.func]).def(undefined), initial: PropTypes.number.def(0), current: PropTypes.number.def(0), icons: PropTypes.shape({ From 2c2a3721370645e55bd9bf7041a5b43c35841bf5 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 26 May 2022 21:55:56 +0800 Subject: [PATCH 06/26] test: update snap --- .../steps/__tests__/__snapshots__/demo.test.js.snap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/steps/__tests__/__snapshots__/demo.test.js.snap b/components/steps/__tests__/__snapshots__/demo.test.js.snap index 5203add56..fad070f40 100644 --- a/components/steps/__tests__/__snapshots__/demo.test.js.snap +++ b/components/steps/__tests__/__snapshots__/demo.test.js.snap @@ -98,13 +98,13 @@ exports[`renders ./components/steps/demo/clickable.vue correctly 1`] = ` exports[`renders ./components/steps/demo/customized-progress-dot.vue correctly 1`] = `
-
+
-
+
Finished @@ -118,7 +118,7 @@ exports[`renders ./components/steps/demo/customized-progress-dot.vue correctly 1
-
2
+
In Progress @@ -132,7 +132,7 @@ exports[`renders ./components/steps/demo/customized-progress-dot.vue correctly 1
-
3
+
Waiting @@ -146,7 +146,7 @@ exports[`renders ./components/steps/demo/customized-progress-dot.vue correctly 1
-
4
+
Waiting From 9b0fb707e2aecaeaefcf0d5116d4d4379fa61752 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 26 May 2022 22:02:20 +0800 Subject: [PATCH 07/26] release 3.2.5 --- CHANGELOG.en-US.md | 12 +++++++++++- CHANGELOG.zh-CN.md | 10 ++++++++++ package.json | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 9c73e6078..339adb93d 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,7 +10,17 @@ --- -##3.2.4 +## 3.2.5 + +`2022-05-26` + +- 🌟 Image Added left and right arrow switching function [#5642](https://github.com/vueComponent/ant-design-vue/issues/5642) +- 🐞 Fix Steps progressDot slot failure [#5648](https://github.com/vueComponent/ant-design-vue/issues/5648) +- 🐞 Fix Tooltip global getPopupContainer invalid problem [#5636](https://github.com/vueComponent/ant-design-vue/issues/5636) +- 🐞 Fix useForm help style issue [#5635](https://github.com/vueComponent/ant-design-vue/issues/5635) +- 🐞 Fix Table, Tree drag and drop style conflict [#5644](https://github.com/vueComponent/ant-design-vue/issues/5644) + +## 3.2.4 `2022-05-23` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index c6ba6cf7e..3668b5e86 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,16 @@ --- +## 3.2.5 + +`2022-05-26` + +- 🌟 Image 新增左右箭头切换功能 [#5642](https://github.com/vueComponent/ant-design-vue/issues/5642) +- 🐞 修复 Steps progressDot 插槽失效问题 [#5648](https://github.com/vueComponent/ant-design-vue/issues/5648) +- 🐞 修复 Tooltip 全局 getPopupContainer 失效问题 [#5636](https://github.com/vueComponent/ant-design-vue/issues/5636) +- 🐞 修复 useForm help 样式问题 [#5635](https://github.com/vueComponent/ant-design-vue/issues/5635) +- 🐞 修复 Table、Tree 拖拽样式冲突问题 [#5644](https://github.com/vueComponent/ant-design-vue/issues/5644) + ## 3.2.4 `2022-05-23` diff --git a/package.json b/package.json index 83674cd4e..0e0e59e14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-vue", - "version": "3.2.4", + "version": "3.2.5", "title": "Ant Design Vue", "description": "An enterprise-class UI design language and Vue-based implementation", "keywords": [ From d5bb271dd8e8e805ab577fcd899a16b712358b43 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 28 May 2022 14:21:03 +0800 Subject: [PATCH 08/26] doc: link error, close #5652 --- plugin/md/markdown/plugins/link.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/md/markdown/plugins/link.ts b/plugin/md/markdown/plugins/link.ts index 164f521a7..7a81c0091 100644 --- a/plugin/md/markdown/plugins/link.ts +++ b/plugin/md/markdown/plugins/link.ts @@ -45,10 +45,10 @@ export const linkPlugin = (md: MarkdownIt, externalAttrs: Record if (cleanUrl.endsWith('.md')) { cleanUrl = cleanUrl.replace(/\.md$/, '.html'); } - // ./foo -> ./foo.html - if (!cleanUrl.endsWith('.html') && !cleanUrl.endsWith('/')) { - cleanUrl += '.html'; - } + // // ./foo -> ./foo.html + // if (!cleanUrl.endsWith('.html') && !cleanUrl.endsWith('/')) { + // cleanUrl += '.html'; + // } const parsed = new URL(url, 'http://a.com'); url = cleanUrl + parsed.search + parsed.hash; } From 387141ae685ed9004cddaba7cf2e72b5c7a3e2bd Mon Sep 17 00:00:00 2001 From: Ichiro Date: Mon, 30 May 2022 09:59:04 +0900 Subject: [PATCH 09/26] Update vi_VN.tsx (#5653) --- components/locale/vi_VN.tsx | 65 +++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/components/locale/vi_VN.tsx b/components/locale/vi_VN.tsx index 3bc626aec..202e1aabd 100644 --- a/components/locale/vi_VN.tsx +++ b/components/locale/vi_VN.tsx @@ -41,6 +41,71 @@ const localeValues: Locale = { Empty: { description: 'Trống', }, + Icon: { + icon: 'biểu tượng' + }, + Text: { + edit: 'Sửa', + copy: 'Sao chép', + copied: 'Đã sao chép', + expand: 'Mở rộng' + }, + PageHeader: { + back: 'Quay lại' + }, + Form: { + optional: '(tuỳ chọn)', + defaultValidateMessages: { + default: 'Lỗi xác thực cho trường ${label}', + required: 'Hãy nhập ${label}', + enum: '${label} phải là mộ trong [${enum}]', + whitespace: '${label} không thể là một ký tự trống', + date: { + format: '${label} định dạng ngày không hợp lệ', + parse: '${label} không thể chuyển đổi sang định dạng ngày', + invalid: '${label} là một ngày không hợp lệ', + }, + types: { + string: typeTemplate, + method: typeTemplate, + array: typeTemplate, + object: typeTemplate, + number: typeTemplate, + date: typeTemplate, + boolean: typeTemplate, + integer: typeTemplate, + float: typeTemplate, + regexp: typeTemplate, + email: typeTemplate, + url: typeTemplate, + hex: typeTemplate + }, + string: { + len: '${label} phải là ${len} ký tự', + min: '${label} phải có ít nhất ${min} ký tự', + max: '${label} phải có tối đa ${max} ký tự', + range: '${label} phải nằm trong khoảng ${min}-${max} ký tự' + }, + number: { + len: '${label} phải bằng ${len}', + min: '${label} phải tối thiểu là ${min}', + max: '${label} phải tối đa là ${max}', + range: '${label} phải nằm trong khoảng từ ${min}-${max}' + }, + array: { + len: 'Phải là ${len} ${label}', + min: 'Tối thiểu ${min} ${label}', + max: 'Tối đa ${max} ${label}', + range: 'Số lượng ${label} phải nằm trong khoảng ${min}-${max}' + }, + pattern: { + mismatch: '${label} không khớp với mẫu ${pattern}' + }, + }, + }, + Image: { + preview: 'Xem trước' + } }; export default localeValues; From 3cd7ca3e0ba5d1a4f7d366e37088e8d9939db21f Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 31 May 2022 15:12:25 +0800 Subject: [PATCH 10/26] Revert "Update vi_VN.tsx (#5653)" (#5660) This reverts commit 387141ae685ed9004cddaba7cf2e72b5c7a3e2bd. --- components/locale/vi_VN.tsx | 65 ------------------------------------- 1 file changed, 65 deletions(-) diff --git a/components/locale/vi_VN.tsx b/components/locale/vi_VN.tsx index 202e1aabd..3bc626aec 100644 --- a/components/locale/vi_VN.tsx +++ b/components/locale/vi_VN.tsx @@ -41,71 +41,6 @@ const localeValues: Locale = { Empty: { description: 'Trống', }, - Icon: { - icon: 'biểu tượng' - }, - Text: { - edit: 'Sửa', - copy: 'Sao chép', - copied: 'Đã sao chép', - expand: 'Mở rộng' - }, - PageHeader: { - back: 'Quay lại' - }, - Form: { - optional: '(tuỳ chọn)', - defaultValidateMessages: { - default: 'Lỗi xác thực cho trường ${label}', - required: 'Hãy nhập ${label}', - enum: '${label} phải là mộ trong [${enum}]', - whitespace: '${label} không thể là một ký tự trống', - date: { - format: '${label} định dạng ngày không hợp lệ', - parse: '${label} không thể chuyển đổi sang định dạng ngày', - invalid: '${label} là một ngày không hợp lệ', - }, - types: { - string: typeTemplate, - method: typeTemplate, - array: typeTemplate, - object: typeTemplate, - number: typeTemplate, - date: typeTemplate, - boolean: typeTemplate, - integer: typeTemplate, - float: typeTemplate, - regexp: typeTemplate, - email: typeTemplate, - url: typeTemplate, - hex: typeTemplate - }, - string: { - len: '${label} phải là ${len} ký tự', - min: '${label} phải có ít nhất ${min} ký tự', - max: '${label} phải có tối đa ${max} ký tự', - range: '${label} phải nằm trong khoảng ${min}-${max} ký tự' - }, - number: { - len: '${label} phải bằng ${len}', - min: '${label} phải tối thiểu là ${min}', - max: '${label} phải tối đa là ${max}', - range: '${label} phải nằm trong khoảng từ ${min}-${max}' - }, - array: { - len: 'Phải là ${len} ${label}', - min: 'Tối thiểu ${min} ${label}', - max: 'Tối đa ${max} ${label}', - range: 'Số lượng ${label} phải nằm trong khoảng ${min}-${max}' - }, - pattern: { - mismatch: '${label} không khớp với mẫu ${pattern}' - }, - }, - }, - Image: { - preview: 'Xem trước' - } }; export default localeValues; From 18ce00d2398950f4d96f2183bcc6d303958cc113 Mon Sep 17 00:00:00 2001 From: Gin Date: Fri, 3 Jun 2022 14:28:44 +0800 Subject: [PATCH 11/26] fix: global `mousedown` handler in picker input hooks (#5657) --- components/vc-picker/hooks/usePickerInput.ts | 40 +++++++++----------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/components/vc-picker/hooks/usePickerInput.ts b/components/vc-picker/hooks/usePickerInput.ts index 32b96cc10..80b616f40 100644 --- a/components/vc-picker/hooks/usePickerInput.ts +++ b/components/vc-picker/hooks/usePickerInput.ts @@ -1,5 +1,5 @@ import type { ComputedRef, HTMLAttributes, Ref } from 'vue'; -import { onBeforeUnmount, watchEffect, watch, ref, computed } from 'vue'; +import { onBeforeUnmount, onMounted, watch, ref, computed } from 'vue'; import type { FocusEventHandler } from '../../_util/EventInterface'; import KeyCode from '../../_util/KeyCode'; import { addGlobalMousedownEvent, getTargetFromEvent } from '../utils/uiUtil'; @@ -148,30 +148,26 @@ export default function usePickerInput({ }); const globalMousedownEvent = ref(); // Global click handler - watchEffect( - () => - globalMousedownEvent.value && - globalMousedownEvent.value()( - (globalMousedownEvent.value = addGlobalMousedownEvent((e: MouseEvent) => { - const target = getTargetFromEvent(e); + onMounted(() => { + globalMousedownEvent.value = addGlobalMousedownEvent((e: MouseEvent) => { + const target = getTargetFromEvent(e); - if (open) { - const clickedOutside = isClickOutside(target); + if (open.value) { + const clickedOutside = isClickOutside(target); - if (!clickedOutside) { - preventBlurRef.value = true; + if (!clickedOutside) { + preventBlurRef.value = true; - // Always set back in case `onBlur` prevented by user - raf(() => { - preventBlurRef.value = false; - }); - } else if (!focused.value || clickedOutside) { - triggerOpen(false); - } - } - })), - ), - ); + // Always set back in case `onBlur` prevented by user + raf(() => { + preventBlurRef.value = false; + }); + } else if (!focused.value || clickedOutside) { + triggerOpen(false); + } + } + }); + }); onBeforeUnmount(() => { globalMousedownEvent.value && globalMousedownEvent.value(); }); From e907ffd759be72b394010293d55d6349117ebd16 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Mon, 6 Jun 2022 09:50:33 +0800 Subject: [PATCH 12/26] doc: update useInjectFormItemContext, close #5667 --- components/form/index.en-US.md | 6 +++--- components/form/index.zh-CN.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md index f40a1cedc..674b32243 100644 --- a/components/form/index.en-US.md +++ b/components/form/index.en-US.md @@ -100,7 +100,7 @@ You can reference [Customized Form Controls](#components-form-demo-customized-fo But it also has some disadvantages: -1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` and call the corresponding method. +1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` and call the corresponding method. 2. A Form.Item can only collect the data of one form item. If there are multiple form items, it will cause collection confusion, for example, @@ -122,7 +122,7 @@ The first is to use multiple `a-form-item`: ``` -The second way is to wrap it with a custom component and call `useFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. +The second way is to wrap it with a custom component and call `useInjectFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. ```html diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md index d2d3ec8ba..29f79c85e 100644 --- a/components/form/index.zh-CN.md +++ b/components/form/index.zh-CN.md @@ -99,7 +99,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/ORmcdeaoO/Form.svg 但它同样会有一些缺点： -1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` 注入，并调用相应的方法。 +1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` 注入，并调用相应的方法。 2、一个 Form.Item 只能收集一个表单项的数据，如果有多个表单项，会导致收集错乱，例如， @@ -121,7 +121,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/ORmcdeaoO/Form.svg ``` -第二种，使用自定义组件包裹，并在自定义组件中调用 `useFormItemContext`，相当于把多个表单项合并成了一个 +第二种，使用自定义组件包裹，并在自定义组件中调用 `useInjectFormItemContext`，相当于把多个表单项合并成了一个 ```html From 71c6195771c0b9ddffadd294ce01f7515c5adc40 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 7 Jun 2022 09:52:47 +0800 Subject: [PATCH 13/26] fix: datepicker arrow error --- components/vc-picker/RangePicker.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx index cba4984b4..e56c97aae 100644 --- a/components/vc-picker/RangePicker.tsx +++ b/components/vc-picker/RangePicker.tsx @@ -986,7 +986,6 @@ function RangerPicker() { ) { // Arrow offset arrowLeft = startInputDivRef.value.offsetWidth + separatorRef.value.offsetWidth; - if ( panelDivRef.value.offsetWidth && arrowRef.value.offsetWidth && @@ -1001,7 +1000,8 @@ function RangerPicker() { } } - const arrowPositionStyle = direction === 'rtl' ? { right: arrowLeft } : { left: arrowLeft }; + const arrowPositionStyle = + direction === 'rtl' ? { right: `${arrowLeft}px` } : { left: `${arrowLeft}px` }; function renderPanels() { let panels: VueNode; @@ -1092,7 +1092,7 @@ function RangerPicker() { return (
{ e.preventDefault(); From 3ddc7cdd7c0c7a678551b99eb4579e5b9a838baf Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 7 Jun 2022 10:47:51 +0800 Subject: [PATCH 14/26] fix: rangePicker xxxStep not work, close #5671 --- components/date-picker/generatePicker/props.ts | 7 +++++++ components/vc-picker/Picker.tsx | 4 ++++ components/vc-picker/RangePicker.tsx | 5 +++++ components/vc-picker/panels/TimePanel/TimeBody.tsx | 1 - 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/components/date-picker/generatePicker/props.ts b/components/date-picker/generatePicker/props.ts index 86281d6b8..f64febfb0 100644 --- a/components/date-picker/generatePicker/props.ts +++ b/components/date-picker/generatePicker/props.ts @@ -82,6 +82,13 @@ function commonProps() { mode: { type: String as PropType }, picker: { type: String as PropType }, valueFormat: String, + + /** @deprecated Please use `disabledTime` instead. */ + disabledHours: Function as PropType, + /** @deprecated Please use `disabledTime` instead. */ + disabledMinutes: Function as PropType, + /** @deprecated Please use `disabledTime` instead. */ + disabledSeconds: Function as PropType, }; } diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx index 9d23d6201..7aa2ffaae 100644 --- a/components/vc-picker/Picker.tsx +++ b/components/vc-picker/Picker.tsx @@ -187,6 +187,10 @@ function Picker() { 'showToday', 'renderExtraFooter', 'dateRender', + 'minuteStep', + 'hourStep', + 'secondStep', + 'hideDisabledOptions', ] as any, // slots: [ // 'suffixIcon', diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx index e56c97aae..46f64577c 100644 --- a/components/vc-picker/RangePicker.tsx +++ b/components/vc-picker/RangePicker.tsx @@ -232,6 +232,11 @@ function RangerPicker() { 'direction', 'activePickerIndex', 'autocomplete', + 'minuteStep', + 'hourStep', + 'secondStep', + 'hideDisabledOptions', + 'disabledMinutes', ] as any, setup(props, { attrs, expose }) { const needConfirmButton = computed( diff --git a/components/vc-picker/panels/TimePanel/TimeBody.tsx b/components/vc-picker/panels/TimePanel/TimeBody.tsx index 9ee29374a..e67c35614 100644 --- a/components/vc-picker/panels/TimePanel/TimeBody.tsx +++ b/components/vc-picker/panels/TimePanel/TimeBody.tsx @@ -205,7 +205,6 @@ const TimeBody = defineComponent({ hideDisabledOptions, onSelect, } = props; - const columns: { node: VueNode; value: number; From e86a833b15632a37431e4eeffb0a4344864e46b4 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 7 Jun 2022 19:53:07 +0800 Subject: [PATCH 15/26] doc: update doc, close #5675 --- CHANGELOG.en-US.md | 6 +++--- CHANGELOG.zh-CN.md | 6 +++--- site/src/vueDocs/migration-v3.en-US.md | 10 +++++----- site/src/vueDocs/migration-v3.zh-CN.md | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 339adb93d..46511fe4e 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -564,7 +564,7 @@ Github：[https://github.com/surely-vue/table] You can reference [Customized Form Controls](#components-form-demo-customized-form-controls), but it also has some disadvantages: - 1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` and call the corresponding method. + 1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` and call the corresponding method. 2. A Form.Item can only collect the data of one form item. If there are multiple form items, it will cause collection confusion. For example, @@ -586,7 +586,7 @@ Github：[https://github.com/surely-vue/table] ``` - The second way is to wrap it with a custom component and call `useFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. + The second way is to wrap it with a custom component and call `useInjectFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. ```html diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 3668b5e86..ca268f97a 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -561,7 +561,7 @@ Github：[https://github.com/surely-vue/table] - 自 3.0 版本以后，Form.Item 不再劫持子元素，而是通过 provider / inject 依赖注入的方式进行自动校验，这种方式可以提高组件性能，子元素也不会限制个数，同样子元素也可以是进一步封装的高级组件。你可以参考[自定义表单控件示例](#components-form-demo-customized-form-controls)，但它同样会有一些缺点： - 1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` 注入，并调用相应的方法。 + 1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` 注入，并调用相应的方法。 2、一个 Form.Item 只能收集一个表单项的数据，如果有多个表单项，会导致收集错乱。例如： @@ -583,7 +583,7 @@ Github：[https://github.com/surely-vue/table] ``` - 第二种，使用自定义组件包裹，并在自定义组件中调用 `useFormItemContext`，相当于把多个表单项合并成了一个。 + 第二种，使用自定义组件包裹，并在自定义组件中调用 `useInjectFormItemContext`，相当于把多个表单项合并成了一个。 ```html diff --git a/site/src/vueDocs/migration-v3.en-US.md b/site/src/vueDocs/migration-v3.en-US.md index f1f483317..39203a4ec 100644 --- a/site/src/vueDocs/migration-v3.en-US.md +++ b/site/src/vueDocs/migration-v3.en-US.md @@ -28,7 +28,7 @@ The 2.x version is a compatible version developed for compatibility with Vue 3. - Deprecated `replaceFields`, use `fieldNames` instead. - `Table` - Removed the `rowSelection.hideDefaultSelections` property of Table, please use `SELECTION_ALL` and `SELECTION_INVERT` in `rowSelection.selections` instead, [custom options](/components/table/#components-table-demo- row-selection-custom). - - Removed Column slots and replaced them with `v-slot:headerCell` `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon`. + - Removed Column slots and replaced them with `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon`. #### Component refactoring @@ -49,7 +49,7 @@ Major updates after the 3.0 version refactoring include `Tree` `TreeSelect` `Dat - `Table` - Removed the `rowSelection.hideDefaultSelections` property of Table, please use `SELECTION_ALL` and `SELECTION_INVERT` in `rowSelection.selections` instead, [custom options](/components/table/#components-table-demo- row-selection-custom). - - Removed Column slots and replaced them with `v-slot:headerCell` `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` to improve ease of use , To avoid slot configuration expansion, but also to avoid the problem of slot conflicts. + - Removed Column slots and replaced them with `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` to improve ease of use , To avoid slot configuration expansion, but also to avoid the problem of slot conflicts. - Added expandFixed to control whether the expanded icon is fixed. - Added the showSorterTooltip header whether to display the tooltip for the next sort. - Added sticky for setting sticky head and scroll bar. @@ -72,7 +72,7 @@ Major updates after the 3.0 version refactoring include `Tree` `TreeSelect` `Dat You can reference [Customized Form Controls](#components-form-demo-customized-form-controls), but it also has some disadvantages: - 1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` and call the corresponding method. + 1. If the custom component wants Form.Item to be verified and displayed, you need to inject `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` and call the corresponding method. 2. A Form.Item can only collect the data of one form item. If there are multiple form items, it will cause collection confusion. For example: @@ -94,7 +94,7 @@ Major updates after the 3.0 version refactoring include `Tree` `TreeSelect` `Dat ``` - The second way is to wrap it with a custom component and call `useFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. + The second way is to wrap it with a custom component and call `useInjectFormItemContext` in the custom component, It is equivalent to merging multiple form items into one. ```html diff --git a/site/src/vueDocs/migration-v3.zh-CN.md b/site/src/vueDocs/migration-v3.zh-CN.md index 4694c89f1..e17d323a3 100644 --- a/site/src/vueDocs/migration-v3.zh-CN.md +++ b/site/src/vueDocs/migration-v3.zh-CN.md @@ -29,7 +29,7 @@ - 废弃 `replaceFields` , 使用 `fieldNames` 替换。 - `Table` - 移除了 Table 的 `rowSelection.hideDefaultSelections` 属性，请在 `rowSelection.selections` 中使用 `SELECTION_ALL` 和 `SELECTION_INVERT` 替代，[自定义选择项](/components/table/#components-table-demo-row-selection-custom)。 - - 移除了 Column slots，分别使用 `v-slot:headerCell` `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` 替换。 + - 移除了 Column slots，分别使用 `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` 替换。 #### 组件重构 @@ -50,7 +50,7 @@ - `Table` - 移除了 Table 的 `rowSelection.hideDefaultSelections` 属性，请在 `rowSelection.selections` 中使用 `SELECTION_ALL` 和 `SELECTION_INVERT` 替代，[自定义选择项](/components/table/#components-table-demo-row-selection-custom)。 - - 移除了 Column slots，分别使用 `v-slot:headerCell` `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` 替换，提升易用性，避免插槽配置膨胀，同时也避免了插槽冲突问题。 + - 移除了 Column slots，分别使用 `v-slot:headerCell` `v-slot:bodyCell` `v-slot:customFilterDropdown` `v-slot:customFilterIcon` 替换，提升易用性，避免插槽配置膨胀，同时也避免了插槽冲突问题。 - 新增 expandFixed 控制展开图标是否固定。 - 新增 showSorterTooltip 表头是否显示下一次排序的 tooltip 提示。 - 新增 sticky 用于设置粘性头部和滚动条。 @@ -71,7 +71,7 @@ - 自 3.0 版本以后，Form.Item 不再劫持子元素，而是通过 provider / inject 依赖注入的方式进行自动校验，这种方式可以提高组件性能，子元素也不会限制个数，同样子元素也可以是进一步封装的高级组件。你可以参考[自定义表单控件示例](#components-form-demo-customized-form-controls)，但它同样会有一些缺点： - 1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useFormItemContext()` 注入，并调用相应的方法。 + 1、自定义组件如果希望 Form.Item 进行校验展示，你需要 `const {id, onFieldChange, onFieldBlur} = useInjectFormItemContext()` 注入，并调用相应的方法。 2、一个 Form.Item 只能收集一个表单项的数据，如果有多个表单项，会导致收集错乱。例如： @@ -93,7 +93,7 @@ ``` - 第二种，使用自定义组件包裹，并在自定义组件中调用 `useFormItemContext`，相当于把多个表单项合并成了一个。 + 第二种，使用自定义组件包裹，并在自定义组件中调用 `useInjectFormItemContext`，相当于把多个表单项合并成了一个。 ```html From 361e818bcc80295be71ac998e7ab37e677a95705 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 7 Jun 2022 20:09:09 +0800 Subject: [PATCH 16/26] fix: cascader trigger support custom component, close #5677 --- components/vc-trigger/Trigger.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/vc-trigger/Trigger.tsx b/components/vc-trigger/Trigger.tsx index 6d5608744..2a51fb547 100644 --- a/components/vc-trigger/Trigger.tsx +++ b/components/vc-trigger/Trigger.tsx @@ -390,7 +390,8 @@ export default defineComponent({ getRootDomNode() { const { getTriggerDOMNode } = this.$props; if (getTriggerDOMNode) { - return getTriggerDOMNode(this.triggerRef); + const domNode = findDOMNode(this.triggerRef); + return findDOMNode(getTriggerDOMNode(domNode)); } try { From fef42fd089957ded9b0050d8115af0243b92d80f Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 7 Jun 2022 20:22:56 +0800 Subject: [PATCH 17/26] release 3.2.6 --- CHANGELOG.en-US.md | 8 ++++++++ CHANGELOG.zh-CN.md | 8 ++++++++ package.json | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 46511fe4e..170bc1c4c 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,14 @@ --- +## 3.2.6 + +`2022-06-07` + +- 🌟 `Cascader` custom trigger supports custom components [#5677](https://github.com/vueComponent/ant-design-vue/issues/5677) +- 🐞 Fix `DateRangePicker` `TimeRangePicker` arrow not following the movement issue [#71c619](https://github.com/vueComponent/ant-design-vue/commit/71c6195771c0b9ddffadd294ce01f7515c5adc40) +- 🐞 Fix `TimeRangePicker` minSteps, hourSteps, secondStep not taking effect [#5671](https://github.com/vueComponent/ant-design-vue/issues/5671) + ## 3.2.5 `2022-05-26` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index ca268f97a..b54080f13 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,14 @@ --- +## 3.2.6 + +`2022-06-07` + +- 🌟 `Cascader` 自定义 trigger 支持自定义组件 [#5677](https://github.com/vueComponent/ant-design-vue/issues/5677) +- 🐞 修复 `DateRangePicker` `TimeRangePicker` 箭头没有跟随移动问题 [#71c619](https://github.com/vueComponent/ant-design-vue/commit/71c6195771c0b9ddffadd294ce01f7515c5adc40) +- 🐞 修复 `TimeRangePicker` minSteps、hourSteps、secondStep 未生效问题 [#5671](https://github.com/vueComponent/ant-design-vue/issues/5671) + ## 3.2.5 `2022-05-26` diff --git a/package.json b/package.json index 0e0e59e14..8f2e09477 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-vue", - "version": "3.2.5", + "version": "3.2.6", "title": "Ant Design Vue", "description": "An enterprise-class UI design language and Vue-based implementation", "keywords": [ From 87db9bd87d97584572f5021c81d8d4093630e07f Mon Sep 17 00:00:00 2001 From: wengjq <2410808055@qq.com> Date: Wed, 8 Jun 2022 15:59:21 +0800 Subject: [PATCH 18/26] =?UTF-8?q?fix:=20checkbox=20set=20additional=20attr?= =?UTF-8?q?ibute=20no=20work=EF=BC=8Cclose=20#5678=20(#5682)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/vc-checkbox/Checkbox.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/vc-checkbox/Checkbox.tsx b/components/vc-checkbox/Checkbox.tsx index a8b7ea89a..0220c58c0 100644 --- a/components/vc-checkbox/Checkbox.tsx +++ b/components/vc-checkbox/Checkbox.tsx @@ -113,9 +113,10 @@ export default defineComponent({ onKeypress, onKeyup, } = attrs as HTMLAttributes; - const globalProps = Object.keys({ ...others, ...attrs }).reduce((prev, key) => { + const othersAndAttrs = { ...others, ...attrs }; + const globalProps = Object.keys(othersAndAttrs).reduce((prev, key) => { if (key.substr(0, 5) === 'aria-' || key.substr(0, 5) === 'data-' || key === 'role') { - prev[key] = others[key]; + prev[key] = othersAndAttrs[key]; } return prev; }, {}); From 171b2b643fe6dd683507ce4ea339c3e2d0dfa1bc Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Sat, 11 Jun 2022 13:38:46 +0800 Subject: [PATCH 19/26] feat(radio-group): support global component size prop (#5690), close #5688 * fix(radio-group): remove the default value of the component size prop * update test --- components/radio/Group.tsx | 2 +- .../radio/__tests__/__snapshots__/group.test.js.snap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/radio/Group.tsx b/components/radio/Group.tsx index 59c901dce..7b29700d8 100644 --- a/components/radio/Group.tsx +++ b/components/radio/Group.tsx @@ -23,7 +23,7 @@ export type RadioGroupChildOption = { export const radioGroupProps = () => ({ prefixCls: String, value: PropTypes.any, - size: PropTypes.oneOf(RadioGroupSizeTypes).def('default'), + size: PropTypes.oneOf(RadioGroupSizeTypes), options: { type: Array as PropType>, }, diff --git a/components/radio/__tests__/__snapshots__/group.test.js.snap b/components/radio/__tests__/__snapshots__/group.test.js.snap index 1cfc6747b..28a8170c5 100644 --- a/components/radio/__tests__/__snapshots__/group.test.js.snap +++ b/components/radio/__tests__/__snapshots__/group.test.js.snap @@ -1,9 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Radio all children should have a name property 1`] = `
`; +exports[`Radio all children should have a name property 1`] = `
`; -exports[`Radio fire change events when value changes 1`] = `
`; +exports[`Radio fire change events when value changes 1`] = `
`; -exports[`Radio fire change events when value changes 2`] = `
`; +exports[`Radio fire change events when value changes 2`] = `
`; -exports[`Radio passes prefixCls down to radio 1`] = `
`; +exports[`Radio passes prefixCls down to radio 1`] = `
`; From e5b930837412f848209c55e6d2d727b378f87d4d Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 11 Jun 2022 21:56:41 +0800 Subject: [PATCH 20/26] fix: global form message not work, close #5693 --- components/config-provider/context.ts | 4 ++-- components/form/Form.tsx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/config-provider/context.ts b/components/config-provider/context.ts index 2d763e7d9..f1661a215 100644 --- a/components/config-provider/context.ts +++ b/components/config-provider/context.ts @@ -1,5 +1,5 @@ import type { ExtractPropTypes, InjectionKey, PropType, Ref } from 'vue'; -import { inject, provide } from 'vue'; +import { computed, inject, provide } from 'vue'; import type { ValidateMessages } from '../form/interface'; import type { RequiredMark } from '../form/Form'; import type { RenderEmptyHandler } from './renderEmpty'; @@ -17,7 +17,7 @@ export const useProvideGlobalForm = (state: GlobalFormCOntextProps) => { }; export const useInjectGlobalForm = () => { - return inject(GlobalFormContextKey, {}); + return inject(GlobalFormContextKey, { validateMessages: computed(() => undefined) }); }; export const GlobalConfigContextKey: InjectionKey = diff --git a/components/form/Form.tsx b/components/form/Form.tsx index 36b00e835..ac33a8b5c 100755 --- a/components/form/Form.tsx +++ b/components/form/Form.tsx @@ -30,6 +30,7 @@ import useConfigInject from '../_util/hooks/useConfigInject'; import { useProvideForm } from './context'; import type { SizeType } from '../config-provider'; import useForm from './useForm'; +import { useInjectGlobalForm } from '../config-provider/context'; export type RequiredMark = boolean | 'optional'; export type FormLayout = 'horizontal' | 'inline' | 'vertical'; @@ -127,10 +128,11 @@ const Form = defineComponent({ return true; }); const mergedColon = computed(() => props.colon ?? contextForm.value?.colon); + const { validateMessages: globalValidateMessages } = useInjectGlobalForm(); const validateMessages = computed(() => { return { ...defaultValidateMessages, - ...contextForm.value?.validateMessages, + ...globalValidateMessages.value, ...props.validateMessages, }; }); From 033e55af5d0ff45c43e8b4b5c9fd12f799a2f297 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 11 Jun 2022 21:58:12 +0800 Subject: [PATCH 21/26] test: update snap --- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 6 ++-- .../__snapshots__/index.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 4 +-- .../__tests__/__snapshots__/demo.test.js.snap | 10 +++---- .../__tests__/__snapshots__/demo.test.js.snap | 30 +++++++++---------- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 6 ++-- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 6 ++-- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap index 7ccd06064..25dbe2644 100644 --- a/components/button/__tests__/__snapshots__/demo.test.js.snap +++ b/components/button/__tests__/__snapshots__/demo.test.js.snap @@ -228,7 +228,7 @@ exports[`renders ./components/button/demo/multiple.vue correctly 1`] = ` `; exports[`renders ./components/button/demo/size.vue correctly 1`] = ` -
+


-
+
@@ -1217,7 +1217,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.vue correctly 1`] =
-
+
@@ -1641,7 +1641,7 @@ exports[`renders ./components/calendar/demo/select.vue correctly 1`] = `
-
+
diff --git a/components/calendar/__tests__/__snapshots__/index.test.js.snap b/components/calendar/__tests__/__snapshots__/index.test.js.snap index 03a4dbfb2..8faba0ec6 100644 --- a/components/calendar/__tests__/__snapshots__/index.test.js.snap +++ b/components/calendar/__tests__/__snapshots__/index.test.js.snap @@ -19,7 +19,7 @@ exports[`Calendar Calendar should support locale 1`] = `
-
+
diff --git a/components/carousel/__tests__/__snapshots__/demo.test.js.snap b/components/carousel/__tests__/__snapshots__/demo.test.js.snap index ed6cd91c6..b8735472f 100644 --- a/components/carousel/__tests__/__snapshots__/demo.test.js.snap +++ b/components/carousel/__tests__/__snapshots__/demo.test.js.snap @@ -356,7 +356,7 @@ exports[`renders ./components/carousel/demo/fade.vue correctly 1`] = ` `; exports[`renders ./components/carousel/demo/position.vue correctly 1`] = ` -
+
diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap index f1e1e3fe9..bccf1abcf 100644 --- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap @@ -486,7 +486,7 @@ exports[`renders ./components/date-picker/demo/select-in-range.vue correctly 1`] exports[`renders ./components/date-picker/demo/size.vue correctly 1`] = `
-
+
diff --git a/components/descriptions/__tests__/__snapshots__/demo.test.js.snap b/components/descriptions/__tests__/__snapshots__/demo.test.js.snap index 6dad11503..736954b8a 100644 --- a/components/descriptions/__tests__/__snapshots__/demo.test.js.snap +++ b/components/descriptions/__tests__/__snapshots__/demo.test.js.snap @@ -208,7 +208,7 @@ exports[`renders ./components/descriptions/demo/responsive.vue correctly 1`] = ` exports[`renders ./components/descriptions/demo/size.vue correctly 1`] = `
-


+


Custom Size
diff --git a/components/drawer/__tests__/__snapshots__/demo.test.js.snap b/components/drawer/__tests__/__snapshots__/demo.test.js.snap index b43a56be4..86005e66a 100644 --- a/components/drawer/__tests__/__snapshots__/demo.test.js.snap +++ b/components/drawer/__tests__/__snapshots__/demo.test.js.snap @@ -7,7 +7,7 @@ exports[`renders ./components/drawer/demo/basic.vue correctly 1`] = ` `; exports[`renders ./components/drawer/demo/extra.vue correctly 1`] = ` -
+
@@ -22,7 +22,7 @@ exports[`renders ./components/drawer/demo/multi-level-drawer.vue correctly 1`] = `; exports[`renders ./components/drawer/demo/placement.vue correctly 1`] = ` -
+
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index ec527199e..99acb9a49 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -688,7 +688,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = `
-
+
@@ -736,7 +736,7 @@ exports[`renders ./components/form/demo/layout.vue correctly 1`] = `
-
+
@@ -1432,7 +1432,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = `
-
+
@@ -1447,7 +1447,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = `
-
+
@@ -1674,7 +1674,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = `
-
+
diff --git a/components/radio/__tests__/__snapshots__/demo.test.js.snap b/components/radio/__tests__/__snapshots__/demo.test.js.snap index 436d25dfd..b4f2fd3ce 100644 --- a/components/radio/__tests__/__snapshots__/demo.test.js.snap +++ b/components/radio/__tests__/__snapshots__/demo.test.js.snap @@ -13,13 +13,13 @@ exports[`renders ./components/radio/demo/disabled.vue correctly 1`] = ` exports[`renders ./components/radio/demo/radioButton.vue correctly 1`] = `
-
+
-
+
-
+
`; @@ -27,52 +27,52 @@ exports[`renders ./components/radio/demo/radioButton.vue correctly 1`] = ` exports[`renders ./components/radio/demo/radioButton-solid.vue correctly 1`] = `
-
+
-
+
`; exports[`renders ./components/radio/demo/radioGroup.vue correctly 1`] = `
-
+
`; -exports[`renders ./components/radio/demo/radioGroup-more.vue correctly 1`] = `
`; +exports[`renders ./components/radio/demo/radioGroup-more.vue correctly 1`] = `
`; exports[`renders ./components/radio/demo/radioGroup-options.vue correctly 1`] = `
-
+
-
+
-
+
-
+
-
+
-
+
`; -exports[`renders ./components/radio/demo/radioGroup-with-name.vue correctly 1`] = `
`; +exports[`renders ./components/radio/demo/radioGroup-with-name.vue correctly 1`] = `
`; exports[`renders ./components/radio/demo/size.vue correctly 1`] = `
@@ -80,7 +80,7 @@ exports[`renders ./components/radio/demo/size.vue correctly 1`] = `
-
+
diff --git a/components/select/__tests__/__snapshots__/demo.test.js.snap b/components/select/__tests__/__snapshots__/demo.test.js.snap index 74f404aa1..08767c117 100644 --- a/components/select/__tests__/__snapshots__/demo.test.js.snap +++ b/components/select/__tests__/__snapshots__/demo.test.js.snap @@ -469,7 +469,7 @@ exports[`renders ./components/select/demo/select-users.vue correctly 1`] = ` `; exports[`renders ./components/select/demo/size.vue correctly 1`] = ` -
+


diff --git a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap index 56a9c77af..bf28685ec 100644 --- a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap +++ b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap @@ -124,7 +124,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
-
+
@@ -139,7 +139,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
-
+
@@ -154,7 +154,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
-
+
diff --git a/components/space/__tests__/__snapshots__/demo.test.js.snap b/components/space/__tests__/__snapshots__/demo.test.js.snap index b9a1b8aa9..cdba29120 100644 --- a/components/space/__tests__/__snapshots__/demo.test.js.snap +++ b/components/space/__tests__/__snapshots__/demo.test.js.snap @@ -109,7 +109,7 @@ exports[`renders ./components/space/demo/customize.vue correctly 1`] = ` exports[`renders ./components/space/demo/size.vue correctly 1`] = `
-


+