diff --git a/examples/docs/en-US/color-picker.md b/examples/docs/en-US/color-picker.md index dd5672ba5..e6005cdd6 100644 --- a/examples/docs/en-US/color-picker.md +++ b/examples/docs/en-US/color-picker.md @@ -93,4 +93,5 @@ ColorPicker is a color selector supporting multiple color formats. ### Events | Event Name | Description | Parameters | |---------|--------|---------| -| change | triggers when input value changes | color value | \ No newline at end of file +| change | triggers when input value changes | color value | +| active-change | triggers when the current active color changes | active color value | \ No newline at end of file diff --git a/examples/docs/zh-CN/color-picker.md b/examples/docs/zh-CN/color-picker.md index 32025816e..dc779275c 100644 --- a/examples/docs/zh-CN/color-picker.md +++ b/examples/docs/zh-CN/color-picker.md @@ -93,4 +93,5 @@ ### Events | 事件名称 | 说明 | 回调参数 | |---------- |-------- |---------- | -| change | 当绑定值变化时触发 | 当前值 | \ No newline at end of file +| change | 当绑定值变化时触发 | 当前值 | +| active-change | 面板中当前显示的颜色发生改变时触发 | 当前显示的颜色值 | \ No newline at end of file diff --git a/packages/color-picker/src/main.vue b/packages/color-picker/src/main.vue index a1e4a26ca..13f66901e 100644 --- a/packages/color-picker/src/main.vue +++ b/packages/color-picker/src/main.vue @@ -70,6 +70,9 @@ handler() { this.showPanelColor = true; } + }, + displayedColor(val) { + this.$emit('active-change', val); } }, diff --git a/packages/switch/src/component.vue b/packages/switch/src/component.vue index 8376085e5..cf62a03f3 100644 --- a/packages/switch/src/component.vue +++ b/packages/switch/src/component.vue @@ -40,7 +40,7 @@ props: { value: { type: [Boolean, String, Number], - default: true + default: false }, disabled: { type: Boolean,