Merge branch 'next' of github.com:vueComponent/ant-design-vue into next

pull/3733/head
tangjinzhou 2021-02-27 22:50:42 +08:00
commit 9dbc46cfa6
5 changed files with 6 additions and 4 deletions

View File

@ -13,6 +13,8 @@ jobs:
- name: issue - name: issue
if: github.event_name == 'issues' if: github.event_name == 'issues'
uses: actions-cool/translation-helper@v1.1.1 uses: actions-cool/translation-helper@v1.1.1
with:
translate-body: false
- name: pr - name: pr
if: github.event_name == 'pull_request_target' if: github.event_name == 'pull_request_target'

View File

@ -93,11 +93,11 @@ const Calendar = defineComponent({
}, },
triggerPanelChange(value: moment.Moment, mode: CalendarMode | undefined) { triggerPanelChange(value: moment.Moment, mode: CalendarMode | undefined) {
const val = this.valueFormat ? momentToString(value, this.valueFormat) : value; const val = this.valueFormat ? momentToString(value, this.valueFormat) : value;
this.$emit('panelChange', val, mode);
if (value !== this.sValue) { if (value !== this.sValue) {
this.$emit('update:value', val); this.$emit('update:value', val);
this.$emit('change', val); this.$emit('change', val);
} }
this.$emit('panelChange', val, mode);
}, },
triggerSelect(value: moment.Moment) { triggerSelect(value: moment.Moment) {

View File

@ -32,10 +32,10 @@ export default defineComponent({
this.input = node; this.input = node;
}, },
handleChange(e: Event) { handleChange(e: Event) {
this.$emit('update:value', (e.target as HTMLInputElement).value);
if (e && e.target && e.type === 'click') { if (e && e.target && e.type === 'click') {
this.$emit('search', (e.target as HTMLInputElement).value, e); this.$emit('search', (e.target as HTMLInputElement).value, e);
} }
this.$emit('update:value', (e.target as HTMLInputElement).value);
this.$emit('change', e); this.$emit('change', e);
}, },
handleSearch(e: Event) { handleSearch(e: Event) {

View File

@ -237,10 +237,10 @@ export default defineComponent({
} }
} }
this.__emit('update:pageSize', size); this.__emit('update:pageSize', size);
this.__emit('showSizeChange', current, size);
if (current !== preCurrent) { if (current !== preCurrent) {
this.__emit('update:current', current); this.__emit('update:current', current);
} }
this.__emit('showSizeChange', current, size);
}, },
handleChange(p) { handleChange(p) {
const { disabled } = this.$props; const { disabled } = this.$props;

View File

@ -51,8 +51,8 @@ export default defineComponent({
if (!hasProp(this, 'checked')) { if (!hasProp(this, 'checked')) {
this.stateChecked = checked; this.stateChecked = checked;
} }
this.__emit('change', checked, e);
this.__emit('update:checked', checked); this.__emit('update:checked', checked);
this.__emit('change', checked, e);
}, },
handleClick(e) { handleClick(e) {
const checked = !this.stateChecked; const checked = !this.stateChecked;