diff --git a/src/calendar/__tests__/__snapshots__/calendar.test.tsx.snap b/src/calendar/__tests__/__snapshots__/calendar.test.tsx.snap index 0e7efd02a..d76646cd0 100644 --- a/src/calendar/__tests__/__snapshots__/calendar.test.tsx.snap +++ b/src/calendar/__tests__/__snapshots__/calendar.test.tsx.snap @@ -37,7 +37,6 @@ exports[`base.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -93,7 +92,6 @@ exports[`base.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -682,7 +680,6 @@ exports[`card.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -738,7 +735,6 @@ exports[`card.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -1211,7 +1207,6 @@ exports[`cell.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -1267,7 +1262,6 @@ exports[`cell.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -1932,7 +1926,6 @@ exports[`cell-append.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -1988,7 +1981,6 @@ exports[`cell-append.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -2843,7 +2835,6 @@ exports[`controller-config.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -2899,7 +2890,6 @@ exports[`controller-config.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -3416,7 +3406,6 @@ exports[`event-props-api.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -3472,7 +3461,6 @@ exports[`event-props-api.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -4005,7 +3993,6 @@ exports[`events.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -4061,7 +4048,6 @@ exports[`events.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -4576,7 +4562,6 @@ exports[`filter.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -4632,7 +4617,6 @@ exports[`filter.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -5182,7 +5166,6 @@ exports[`first-day-of-week.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -5238,7 +5221,6 @@ exports[`first-day-of-week.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -5780,7 +5762,6 @@ exports[`head.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -5836,7 +5817,6 @@ exports[`head.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -6385,7 +6365,6 @@ exports[`mode.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -6659,7 +6638,6 @@ exports[`range.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -6715,7 +6693,6 @@ exports[`range.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -7213,7 +7190,6 @@ exports[`slot-props-api.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -7269,7 +7245,6 @@ exports[`slot-props-api.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> @@ -7934,7 +7909,6 @@ exports[`value.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="1998 年" /> @@ -7990,7 +7964,6 @@ exports[`value.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="11 月" /> @@ -8484,7 +8457,6 @@ exports[`week.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="2021 年" /> @@ -8540,7 +8512,6 @@ exports[`week.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="8 月" /> diff --git a/src/cascader/__tests__/__snapshots__/cascader.test.tsx.snap b/src/cascader/__tests__/__snapshots__/cascader.test.tsx.snap index 5c95c057d..6a0598366 100644 --- a/src/cascader/__tests__/__snapshots__/cascader.test.tsx.snap +++ b/src/cascader/__tests__/__snapshots__/cascader.test.tsx.snap @@ -535,7 +535,6 @@ exports[`filterable.jsx 1`] = ` @@ -632,7 +631,6 @@ exports[`keys.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> @@ -740,7 +738,6 @@ exports[`max.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> @@ -1058,7 +1055,6 @@ exports[`show-all-levels.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> @@ -1346,7 +1342,6 @@ exports[`value-mode.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> @@ -1394,7 +1389,6 @@ exports[`value-mode.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> @@ -1442,7 +1436,6 @@ exports[`value-mode.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="" /> diff --git a/src/cascader/core/helper.ts b/src/cascader/core/helper.ts index 82c7c3b3e..0e6bcf9a9 100644 --- a/src/cascader/core/helper.ts +++ b/src/cascader/core/helper.ts @@ -14,17 +14,14 @@ import { * @param cascaderContext * @returns */ -export function getSingleContent(cascaderContext: CascaderContextType) { - const { value, multiple, treeStore, showAllLevels, setValue } = cascaderContext; +export function getSingleContent(cascaderContext: CascaderContextType): string { + const { value, multiple, treeStore, showAllLevels } = cascaderContext; if (multiple || !value) return ''; if (Array.isArray(value)) return ''; const node = treeStore && treeStore.getNodes(value as TreeNodeValue | TreeNode); if (!(node && node.length)) { - if (value) { - setValue(multiple ? [] : '', 'invalid-value'); - } - return ''; + return value as string; } const path = node && node[0].getPath(); if (path && path.length) { diff --git a/src/color-picker/__tests__/__snapshots__/color-picker.test.tsx.snap b/src/color-picker/__tests__/__snapshots__/color-picker.test.tsx.snap index eb46b824f..4485a071a 100644 --- a/src/color-picker/__tests__/__snapshots__/color-picker.test.tsx.snap +++ b/src/color-picker/__tests__/__snapshots__/color-picker.test.tsx.snap @@ -46,7 +46,6 @@ exports[`color-mode.jsx 1`] = ` @@ -102,7 +101,6 @@ exports[`color-mode.jsx 1`] = ` @@ -164,7 +162,6 @@ exports[`color-mode.jsx 1`] = ` @@ -306,7 +303,6 @@ exports[`enable-alpha.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -1097,7 +1093,6 @@ exports[`panel.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -1876,7 +1871,6 @@ exports[`recent-color.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -2765,7 +2759,6 @@ exports[`recent-color.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -3423,7 +3416,6 @@ exports[`status-disabled.jsx 1`] = ` class="t-input__inner" disabled="" placeholder="请输入" - style="width: 0px;" type="text" value="#0052d9" /> @@ -3549,7 +3541,6 @@ exports[`status-readonly.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -4331,7 +4322,6 @@ exports[`swatch-color.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -4683,7 +4673,6 @@ exports[`swatch-color.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="RGB" /> @@ -4881,7 +4870,6 @@ exports[`trigger.jsx 1`] = ` diff --git a/src/input-adornment/__tests__/__snapshots__/input-adornment.test.tsx.snap b/src/input-adornment/__tests__/__snapshots__/input-adornment.test.tsx.snap index 447a1adcf..995bd8924 100644 --- a/src/input-adornment/__tests__/__snapshots__/input-adornment.test.tsx.snap +++ b/src/input-adornment/__tests__/__snapshots__/input-adornment.test.tsx.snap @@ -35,7 +35,6 @@ exports[`select.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="http://" /> @@ -127,7 +126,6 @@ exports[`select.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value=".cn" /> @@ -191,7 +189,6 @@ exports[`select.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="http://" /> @@ -293,7 +290,6 @@ exports[`select.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value=".cn" /> diff --git a/src/input-number/__tests__/__snapshots__/input-number.test.tsx.snap b/src/input-number/__tests__/__snapshots__/input-number.test.tsx.snap index 6238c2f65..61da5076b 100644 --- a/src/input-number/__tests__/__snapshots__/input-number.test.tsx.snap +++ b/src/input-number/__tests__/__snapshots__/input-number.test.tsx.snap @@ -264,7 +264,6 @@ exports[`auto-width.jsx 1`] = ` diff --git a/src/input/Input.tsx b/src/input/Input.tsx index 2a565dfa1..ee62f9db5 100644 --- a/src/input/Input.tsx +++ b/src/input/Input.tsx @@ -125,6 +125,7 @@ const Input = forwardRefWithStatics( useEffect(() => { if (!autoWidth) return; + if (inputPreRef.current?.offsetWidth === 0) return; if (inputRef.current) inputRef.current.style.width = `${inputPreRef.current?.offsetWidth}px`; }, [autoWidth, value, placeholder, inputRef]); diff --git a/src/input/__tests__/__snapshots__/input.test.tsx.snap b/src/input/__tests__/__snapshots__/input.test.tsx.snap index 6ac2d1997..f7881fcd9 100644 --- a/src/input/__tests__/__snapshots__/input.test.tsx.snap +++ b/src/input/__tests__/__snapshots__/input.test.tsx.snap @@ -300,7 +300,6 @@ exports[`auto-width.jsx 1`] = ` diff --git a/src/pagination/__tests__/__snapshots__/pagination.test.tsx.snap b/src/pagination/__tests__/__snapshots__/pagination.test.tsx.snap index eabe06026..5b8397e4c 100644 --- a/src/pagination/__tests__/__snapshots__/pagination.test.tsx.snap +++ b/src/pagination/__tests__/__snapshots__/pagination.test.tsx.snap @@ -33,7 +33,6 @@ exports[`base.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -188,7 +187,6 @@ exports[`jump.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="20 条/页" /> @@ -368,7 +366,6 @@ exports[`mini.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -527,7 +524,6 @@ exports[`more.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -680,7 +676,6 @@ exports[`more.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -814,7 +809,6 @@ exports[`page-num.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="20 条/页" /> @@ -969,7 +963,6 @@ exports[`simple.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -1042,7 +1035,6 @@ exports[`simple.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="1/20" /> @@ -1129,7 +1121,6 @@ exports[`simple-mini.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -1202,7 +1193,6 @@ exports[`simple-mini.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="1/20" /> @@ -1289,7 +1279,6 @@ exports[`total.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="10 条/页" /> diff --git a/src/select/__tests__/__snapshots__/select.test.tsx.snap b/src/select/__tests__/__snapshots__/select.test.tsx.snap index 0a43b6005..093173e5e 100644 --- a/src/select/__tests__/__snapshots__/select.test.tsx.snap +++ b/src/select/__tests__/__snapshots__/select.test.tsx.snap @@ -525,7 +525,6 @@ exports[`filterable.jsx 1`] = ` @@ -1033,7 +1032,6 @@ exports[`multiple.jsx 1`] = ` diff --git a/src/table/__tests__/__snapshots__/table.test.tsx.snap b/src/table/__tests__/__snapshots__/table.test.tsx.snap index 8c546163a..b1a912ead 100644 --- a/src/table/__tests__/__snapshots__/table.test.tsx.snap +++ b/src/table/__tests__/__snapshots__/table.test.tsx.snap @@ -669,7 +669,6 @@ exports[`affix.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -1622,7 +1621,6 @@ exports[`base.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -2278,7 +2276,6 @@ exports[`custom-col.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -2897,7 +2894,6 @@ exports[`custom-col-button.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -5200,7 +5196,6 @@ exports[`editable-row.jsx 1`] = ` @@ -5239,7 +5234,6 @@ exports[`editable-row.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="Vue" /> @@ -7060,7 +7054,6 @@ exports[`filter-controlled.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -20504,7 +20497,6 @@ exports[`pagination.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -20774,7 +20766,6 @@ exports[`pagination-ajax.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="5 条/页" /> @@ -23290,7 +23281,6 @@ exports[`tree.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="10 条/页" /> diff --git a/src/transfer/__tests__/__snapshots__/transfer.test.tsx.snap b/src/transfer/__tests__/__snapshots__/transfer.test.tsx.snap index e4c83a5f6..73e7ca94d 100644 --- a/src/transfer/__tests__/__snapshots__/transfer.test.tsx.snap +++ b/src/transfer/__tests__/__snapshots__/transfer.test.tsx.snap @@ -2729,7 +2729,6 @@ exports[`pagination.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="1/2" /> @@ -2918,7 +2917,6 @@ exports[`pagination.jsx 1`] = ` class="t-input__inner" placeholder="请选择" readonly="" - style="width: 0px;" type="text" value="1/1" />