From 3ceec7aa6a7ab46e61dbafa4c68b77ba09384b40 Mon Sep 17 00:00:00 2001 From: iamkun Date: Sat, 19 Dec 2020 01:40:41 +0800 Subject: [PATCH 001/191] chore: update issue template (#20588) --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..149bb4e4cea --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: true +contact_links: + - name: Create new issue + url: https://elementui.github.io/issue-generator + about: The issue which is not created via https://elementui.github.io/issue-generator will be closed immediately. From 7e22785a5861450d968024916c284f4a445543bf Mon Sep 17 00:00:00 2001 From: nzh63 Date: Sun, 27 Dec 2020 19:39:28 +0800 Subject: [PATCH 002/191] Select: fix placeholder i18n bug (#17644) --- packages/select/src/select.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index 5365991c8d4..af8be3584b4 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -145,7 +145,6 @@ import debounce from 'throttle-debounce/debounce'; import Clickoutside from 'element-ui/src/utils/clickoutside'; import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event'; - import { t } from 'element-ui/src/locale'; import scrollIntoView from 'element-ui/src/utils/scroll-into-view'; import { getValueByPath, valueEquals, isIE, isEdge } from 'element-ui/src/utils/util'; import NavigationMixin from './navigation-mixin'; @@ -235,6 +234,9 @@ return ['small', 'mini'].indexOf(this.selectSize) > -1 ? 'mini' : 'small'; + }, + propPlaceholder() { + return typeof this.placeholder !== 'undefined' ? this.placeholder : this.t('el.select.placeholder'); } }, @@ -288,9 +290,7 @@ }, placeholder: { type: String, - default() { - return t('el.select.placeholder'); - } + required: false }, defaultFirstOption: Boolean, reserveKeyword: Boolean, @@ -339,7 +339,7 @@ }); }, - placeholder(val) { + propPlaceholder(val) { this.cachedPlaceHolder = this.currentPlaceholder = val; }, @@ -838,7 +838,7 @@ }, created() { - this.cachedPlaceHolder = this.currentPlaceholder = this.placeholder; + this.cachedPlaceHolder = this.currentPlaceholder = this.propPlaceholder; if (this.multiple && !Array.isArray(this.value)) { this.$emit('input', []); } From e2e63e698f8ceae3795aa25a41756414a8feb7a8 Mon Sep 17 00:00:00 2001 From: iamkun Date: Sun, 27 Dec 2020 19:40:01 +0800 Subject: [PATCH 003/191] fix: fix Popconfirm i18n bug --- packages/popconfirm/src/main.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/popconfirm/src/main.vue b/packages/popconfirm/src/main.vue index 574362ec5e2..8e2c991bf1f 100644 --- a/packages/popconfirm/src/main.vue +++ b/packages/popconfirm/src/main.vue @@ -20,14 +20,14 @@ :type="cancelButtonType" @click="cancel" > - {{cancelButtonText}} + {{ displayCancelButtonText }} - {{confirmButtonText}} + {{ displayConfirmButtonText }} @@ -47,12 +47,10 @@ export default { type: String }, confirmButtonText: { - type: String, - default: t('el.popconfirm.confirmButtonText') + type: String }, cancelButtonText: { - type: String, - default: t('el.popconfirm.cancelButtonText') + type: String }, confirmButtonType: { type: String, @@ -84,6 +82,14 @@ export default { visible: false }; }, + computed: { + displayConfirmButtonText() { + return this.confirmButtonText || t('el.popconfirm.confirmButtonText') + }, + displayCancelButtonText() { + return this.cancelButtonText || t('el.popconfirm.cancelButtonText') + } + }, methods: { confirm() { this.visible = false; From 127dfadb6aeeb5b1d24a3c5128e0aa74afd3b575 Mon Sep 17 00:00:00 2001 From: Lucas Soulier Date: Tue, 29 Dec 2020 04:13:23 +0100 Subject: [PATCH 004/191] docs: fix typo in french translation of datetime-picker.md (#20543) --- examples/docs/fr-FR/datetime-picker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docs/fr-FR/datetime-picker.md b/examples/docs/fr-FR/datetime-picker.md index 64609219e89..cae6139ad4a 100644 --- a/examples/docs/fr-FR/datetime-picker.md +++ b/examples/docs/fr-FR/datetime-picker.md @@ -46,7 +46,7 @@ DateTimePicker est dérivé de DatePicker et TimePicker. Pour plus d'information return { pickerOptions: { shortcuts: [{ - text: 'Aujourdh\'ui', + text: 'Aujourd\'hui', onClick(picker) { picker.$emit('pick', new Date()); } From 3d7c3d71df74505e1cc8aa538fdf21217863be14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=BD=E5=A4=9A=E5=A4=A7=E7=B1=B3?= Date: Wed, 30 Dec 2020 13:25:23 +0800 Subject: [PATCH 005/191] Drawer: fix focus bug (#20626) Co-authored-by: wp178491 --- packages/drawer/src/main.vue | 6 +----- packages/theme-chalk/src/drawer.scss | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/drawer/src/main.vue b/packages/drawer/src/main.vue index a378194df3a..275a390b572 100644 --- a/packages/drawer/src/main.vue +++ b/packages/drawer/src/main.vue @@ -26,7 +26,7 @@ >
- {{ title }} + {{ title }}