Merge branch 'dev' into next

2020-09-05 07:17:49 +08:00
parent 71bae3fcb4 d0eb103cba
commit f19386fe1f
82 changed files with 264 additions and 228 deletions
@@ -120,7 +120,7 @@ Use `action` slot to custom right button, `cancel` event will no longer be trigg
 | clear-trigger `v2.9.1` | When to display the clear icon, `always` means to display the icon when value is not empty, `focus` means to display the icon when input is focused | _string_ | `focus` |
 | autofocus | Whether to auto focus, unsupported in iOS | _boolean_ | `false` |
 | show-action | Whether to show right action button | _boolean_ | `false` |
-| action-text `v2.2.2` | Text of action button | _boolean_ | `Cancel` |
+| action-text | Text of action button | _boolean_ | `Cancel` |
 | disabled | Whether to disable field | _boolean_ | `false` |
 | readonly | Whether to be readonly | _boolean_ | `false` |
 | error | Whether to show error info | _boolean_ | `false` |
@@ -124,7 +124,7 @@ export default {
 | clear-trigger `v2.9.1` | 显示清除图标的时机，`always` 表示输入框不为空时展示，<br>`focus` 表示输入框聚焦且不为空时展示 | _string_ | `focus` |
 | autofocus | 是否自动聚焦，iOS 系统不支持该属性 | _boolean_ | `false` |
 | show-action | 是否在搜索框右侧显示取消按钮 | _boolean_ | `false` |
-| action-text `v2.2.2` | 取消按钮文字 | _boolean_ | `取消` |
+| action-text | 取消按钮文字 | _boolean_ | `取消` |
 | disabled | 是否禁用输入框 | _boolean_ | `false` |
 | readonly | 是否将输入框设为只读 | _boolean_ | `false` |
 | error | 是否将输入内容标红 | _boolean_ | `false` |