diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md index 900465b07..14bfa00da 100644 --- a/docs/markdown/v2-progress-tracking.md +++ b/docs/markdown/v2-progress-tracking.md @@ -14,8 +14,12 @@ ### Field -- [ ] icon 属性重命名为 right-icon -- [ ] icon 插槽重命名为 right-icon +- [x] 移除 onIconClick 属性 +- [x] icon 属性重命名为 right-icon +- [x] icon 插槽重命名为 right-icon +- [x] click-icon 事件重命名为 click-right-icon + +改动原因:规范命名,onIconClick 属性可以被 click-right-icon 代替 ### GoodsAction diff --git a/packages/field/index.js b/packages/field/index.js index e017fa5f2..cb82fc55a 100644 --- a/packages/field/index.js +++ b/packages/field/index.js @@ -20,7 +20,6 @@ export default sfc({ labelWidth: [String, Number], labelAlign: String, inputAlign: String, - onIconClick: Function, autosize: [Boolean, Object], errorMessage: String, errorMessageAlign: String, @@ -130,10 +129,7 @@ export default sfc({ }, onClickRightIcon() { - // compatible old version - this.$emit('click-icon'); this.$emit('click-right-icon'); - this.onIconClick && this.onIconClick(); }, onClear(event) { @@ -220,11 +216,11 @@ export default sfc({ renderRightIcon() { const { slots } = this; - const showRightIcon = slots('right-icon') || slots('icon') || this.rightIcon || this.icon; + const showRightIcon = slots('right-icon') || this.rightIcon; if (showRightIcon) { return (
); } diff --git a/packages/field/test/__snapshots__/index.spec.js.snap b/packages/field/test/__snapshots__/index.spec.js.snap index 7a9c49cd7..d7de2096e 100644 --- a/packages/field/test/__snapshots__/index.spec.js.snap +++ b/packages/field/test/__snapshots__/index.spec.js.snap @@ -44,17 +44,6 @@ exports[`render label slot 1`] = ` `; -exports[`render right icon with icon prop for old version 1`] = ` -