diff --git a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap index 08de198d6..5582909d1 100644 --- a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap +++ b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap @@ -17,7 +17,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.vue correctly
-
+
@@ -30,7 +30,7 @@ exports[`renders ./components/auto-complete/demo/custom.vue correctly 1`] = `
-
+
@@ -67,7 +67,7 @@ exports[`renders ./components/auto-complete/demo/uncertain-category.vue correctl
-
+
diff --git a/components/cascader/__tests__/__snapshots__/demo.test.js.snap b/components/cascader/__tests__/__snapshots__/demo.test.js.snap index 99fcf888f..0f529887a 100644 --- a/components/cascader/__tests__/__snapshots__/demo.test.js.snap +++ b/components/cascader/__tests__/__snapshots__/demo.test.js.snap @@ -1,56 +1,56 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`renders ./components/cascader/demo/basic.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/change-on-select.vue correctly 1`] = ` - + `; -exports[`renders ./components/cascader/demo/custom-render.vue correctly 1`] = `Zhejiang /Hangzhou /West Lake ( 752100 ) `; +exports[`renders ./components/cascader/demo/custom-render.vue correctly 1`] = `Zhejiang /Hangzhou /West Lake ( 752100 ) `; exports[`renders ./components/cascader/demo/custom-trigger.vue correctly 1`] = `Unselect   Change city`; exports[`renders ./components/cascader/demo/disabled-option.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/fields-name.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/hover.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/lazy.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/search.vue correctly 1`] = ` - + `; exports[`renders ./components/cascader/demo/size.vue correctly 1`] = ` - +

- +

- +

`; exports[`renders ./components/cascader/demo/suffix.vue correctly 1`] = ` - + - + ab `; diff --git a/components/cascader/__tests__/__snapshots__/index.test.js.snap b/components/cascader/__tests__/__snapshots__/index.test.js.snap index cea0f4eea..d107c0137 100644 --- a/components/cascader/__tests__/__snapshots__/index.test.js.snap +++ b/components/cascader/__tests__/__snapshots__/index.test.js.snap @@ -113,4 +113,4 @@ exports[`Cascader popup correctly with defaultValue 1`] = `
`; -exports[`Cascader support controlled mode 1`] = `Zhejiang / Hangzhou / West Lake`; +exports[`Cascader support controlled mode 1`] = `Zhejiang / Hangzhou / West Lake`; diff --git a/components/date-picker/__tests__/__snapshots__/other.test.js.snap b/components/date-picker/__tests__/__snapshots__/other.test.js.snap index 28fdef502..31541c514 100644 --- a/components/date-picker/__tests__/__snapshots__/other.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/other.test.js.snap @@ -77,7 +77,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
-
+
diff --git a/components/empty/__tests__/__snapshots__/demo.test.js.snap b/components/empty/__tests__/__snapshots__/demo.test.js.snap index 9a2c40fce..fbf9c049d 100644 --- a/components/empty/__tests__/__snapshots__/demo.test.js.snap +++ b/components/empty/__tests__/__snapshots__/demo.test.js.snap @@ -50,7 +50,7 @@ exports[`renders ./components/empty/demo/config-provider.vue correctly 1`] = `

Cascader

- +

Transfer

diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index c77d46d35..e5efd506b 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -141,7 +141,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = `
-
+
@@ -154,7 +154,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = `
-
+
diff --git a/components/input/Input.tsx b/components/input/Input.tsx index 8b8907aeb..5a19a7c22 100644 --- a/components/input/Input.tsx +++ b/components/input/Input.tsx @@ -295,6 +295,7 @@ export default defineComponent({ 'inputType', 'bordered', 'htmlSize', + 'lazy', ]); const inputProps = { ...otherProps, @@ -314,6 +315,7 @@ export default defineComponent({ ref: inputRef, key: 'ant-input', size: htmlSize, + id: otherProps.id ?? formItemContext.id.value, }; if (valueModifiers.lazy) { delete inputProps.onInput; diff --git a/components/input/Password.tsx b/components/input/Password.tsx index ab87cf052..250e5bb67 100644 --- a/components/input/Password.tsx +++ b/components/input/Password.tsx @@ -82,7 +82,7 @@ export default defineComponent({ }); const omittedProps = { - ...omit(restProps, ['suffix', 'iconRender']), + ...omit(restProps, ['suffix', 'iconRender', 'action']), ...attrs, type: visible.value ? 'text' : 'password', class: inputClassName, diff --git a/components/input/Search.tsx b/components/input/Search.tsx index e73903f1f..620dccb1d 100644 --- a/components/input/Search.tsx +++ b/components/input/Search.tsx @@ -73,7 +73,6 @@ export default defineComponent({ } = props; let { enterButton = slots.enterButton?.() } = props; enterButton = enterButton || enterButton === ''; - const searchIcon = typeof enterButton === 'boolean' ? : null; const btnClassName = `${prefixCls.value}-button`; const enterButtonAsElement = Array.isArray(enterButton) ? enterButton[0] : enterButton; @@ -82,7 +81,6 @@ export default defineComponent({ enterButtonAsElement.type && isPlainObject(enterButtonAsElement.type) && enterButtonAsElement.type.__ANT_BUTTON; - if (isAntdButton || enterButtonAsElement.tagName === 'button') { button = cloneElement( enterButtonAsElement, @@ -110,9 +108,8 @@ export default defineComponent({ onMousedown={onMousedown} onClick={onSearch} loading={loading} - icon={searchIcon} > - {enterButton} + {enterButton === true ? : enterButton} ); } @@ -131,7 +128,7 @@ export default defineComponent({ return ( `; +exports[`Input.Search should support custom Button 1`] = ``; -exports[`Input.Search should support custom button 1`] = ``; +exports[`Input.Search should support custom button 1`] = ``; diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap index 3b9b5c628..c4b029cf3 100644 --- a/components/input/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input/__tests__/__snapshots__/demo.test.js.snap @@ -17,14 +17,14 @@ exports[`renders ./components/input/demo/addon.vue correctly 1`] = ` `; exports[`renders ./components/input/demo/allow-clear.vue correctly 1`] = ` -
-

+
+

`; exports[`renders ./components/input/demo/autosize-textarea.vue correctly 1`] = ` -
-
+
+
`; @@ -76,21 +76,17 @@ exports[`renders ./components/input/demo/group.vue correctly 1`] = `
- +
`; -exports[`renders ./components/input/demo/password-input.vue correctly 1`] = ``; +exports[`renders ./components/input/demo/password-input.vue correctly 1`] = ``; exports[`renders ./components/input/demo/presuffix.vue correctly 1`] = `


￥RMB
`; -exports[`renders ./components/input/demo/search-input.vue correctly 1`] = `






`; +exports[`renders ./components/input/demo/search-input.vue correctly 1`] = `






`; -exports[`renders ./components/input/demo/search-input-loading.vue correctly 1`] = ` -


- -
-`; +exports[`renders ./components/input/demo/search-input-loading.vue correctly 1`] = `


`; exports[`renders ./components/input/demo/show-count.vue correctly 1`] = `
`; diff --git a/components/input/__tests__/__snapshots__/index.test.js.snap b/components/input/__tests__/__snapshots__/index.test.js.snap index 2209f9c4d..5d40d9895 100644 --- a/components/input/__tests__/__snapshots__/index.test.js.snap +++ b/components/input/__tests__/__snapshots__/index.test.js.snap @@ -2,7 +2,7 @@ exports[`Input should support maxlength 1`] = ``; -exports[`Input.Search should support suffix 1`] = `suffix`; +exports[`Input.Search should support suffix 1`] = `suffix`; exports[`TextArea should support disabled 1`] = ``; diff --git a/components/slider/__tests__/__snapshots__/index.test.js.snap b/components/slider/__tests__/__snapshots__/index.test.js.snap index 9b8b02f7e..ddac5dc88 100644 --- a/components/slider/__tests__/__snapshots__/index.test.js.snap +++ b/components/slider/__tests__/__snapshots__/index.test.js.snap @@ -16,7 +16,7 @@ exports[`Slider should show tooltip when hovering slider handler 1`] = `
-
+
@@ -42,7 +42,7 @@ exports[`Slider should show tooltip when hovering slider handler 2`] = `
-