Compare commits

..

8 Commits

Author SHA1 Message Date
好多大米
d216a252f3 Docs: add format attribute description to the progress component (#20641) 2021-01-04 14:20:42 +08:00
好多大米
3d7c3d71df Drawer: fix focus bug (#20626)
Co-authored-by: wp178491 <wp178491@alibaba-inc.com>
2020-12-30 13:25:23 +08:00
Lucas Soulier
127dfadb6a docs: fix typo in french translation of datetime-picker.md (#20543) 2020-12-29 11:13:23 +08:00
Peng Gao
5fecffa353 Merge pull request #20622 from iamkun/fix/error-i18n-prop
fix: fix Popconfirm i18n bug
2020-12-28 16:59:23 +08:00
iamkun
e2e63e698f fix: fix Popconfirm i18n bug 2020-12-27 19:40:01 +08:00
nzh63
7e22785a58 Select: fix placeholder i18n bug (#17644) 2020-12-27 19:39:28 +08:00
iamkun
3ceec7aa6a chore: update issue template (#20588) 2020-12-19 01:40:41 +08:00
iamkun
a2683e975e Update faas config 2020-11-12 15:08:16 +08:00
11 changed files with 36 additions and 24 deletions

5
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -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.

View File

@@ -15,5 +15,5 @@ cp -rf ../../examples/element-ui/** $SUB_FOLDER/
cd ../..
# deploy domestic site
faas deploy alpha -P element
faas deploy daily -P element
rm -rf temp_web

View File

@@ -170,4 +170,5 @@ You also can specify `type` attribute to `dashboard` to use dashboard progress b
| color | background color of progress bar. Overrides `status` prop | string/function/array | — | '' |
| width | the canvas width of circle progress bar | number | — | 126 |
| show-text | whether to show percentage | boolean | — | true |
| stroke-linecap | circle/dashboard type shape at the end path | string | butt/round/square | round |
| stroke-linecap | circle/dashboard type shape at the end path | string | butt/round/square | round |
| format | custom text format | function(percentage) | — | — |

View File

@@ -168,4 +168,5 @@ Puede utilizar el atributo `color` para establecer el color de la barra de progr
| color | color de fondo de la barra de progreso. Sobrescribe la propiedad `status` | string/function/array | — | '' |
| width | ancho del canvas que contiene la barra de progreso circula | number | — | 126 |
| show-text | mostrar porcentaje | boolean | — | true |
| stroke-linecap | circle/dashboard tipo de diseño al final del camino | string | butt/round/square | round |
| stroke-linecap | circle/dashboard tipo de diseño al final del camino | string | butt/round/square | round |
| format | personalizar el formato de texto estableciendo format | function(percentage) | — | — |

View File

@@ -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());
}

View File

@@ -4,7 +4,7 @@ Progress est utilisé pour afficher la progression d'une opération et informer
### Barre de progression linéaire
:::demo Utilisez l'attribut `percentage` pour indiquer le pourcentage. Cet attribut est **requis** et doit être compris entre 0 et 100. You can custom text format by setting `format`.
:::demo Utilisez l'attribut `percentage` pour indiquer le pourcentage. Cet attribut est **requis** et doit être compris entre 0 et 100. Vous pouvez personnaliser le format du texte en définissant le `format`.
```html
<el-progress :percentage="50"></el-progress>
<el-progress :percentage="100" :format="format"></el-progress>
@@ -171,4 +171,5 @@ Vous pouvez également spécifier l'attribut `type` de `dashboard` pour utiliser
| color | La couleur de fon de la barre. Écrase `status`. | string/function/array | — | '' |
| width | La largeur du canvas dans le cas d'une barre circulaire. | number | — | 126 |
| show-text | Si le pourcentage doit être affiché. | boolean | — | true |
| stroke-linecap | circle/dashboard type shape at the end path | string | butt/round/square | round |
| stroke-linecap | circle/dashboard type shape at the end path | string | butt/round/square | round |
| format | Vous pouvez personnaliser le format du texte en définissant le format | function(percentage) | — | — |

View File

@@ -174,4 +174,5 @@ Progress 组件可通过 `type` 属性来指定使用环形进度条,在环形
| color | 进度条背景色(会覆盖 status 状态颜色) | string/function/array | — | '' |
| width | 环形进度条画布宽度(只在 type 为 circle 或 dashboard 时可用) | number | | 126 |
| show-text | 是否显示进度条文字内容 | boolean | — | true |
| stroke-linecap | circle/dashboard 类型路径两端的形状 | string | butt/round/square | round |
| stroke-linecap | circle/dashboard 类型路径两端的形状 | string | butt/round/square | round |
| format | 指定进度条文字内容 | function(percentage) | — | — |

View File

@@ -26,7 +26,7 @@
>
<header class="el-drawer__header" id="el-drawer__title" v-if="withHeader">
<slot name="title">
<span role="heading" tabindex="0" :title="title">{{ title }}</span>
<span role="heading" :title="title">{{ title }}</span>
</slot>
<button
:aria-label="`close ${title || 'drawer'}`"
@@ -49,7 +49,6 @@
<script>
import Popup from 'element-ui/src/utils/popup';
import emitter from 'element-ui/src/mixins/emitter';
import Utils from 'element-ui/src/utils/aria-utils';
export default {
name: 'ElDrawer',
@@ -133,9 +132,6 @@ export default {
document.body.appendChild(this.$el);
}
this.prevActiveElement = document.activeElement;
this.$nextTick(() => {
Utils.focusFirstDescendant(this.$refs.drawer);
});
} else {
if (!this.closed) this.$emit('close');
this.$nextTick(() => {

View File

@@ -20,14 +20,14 @@
:type="cancelButtonType"
@click="cancel"
>
{{cancelButtonText}}
{{ displayCancelButtonText }}
</el-button>
<el-button
size="mini"
:type="confirmButtonType"
@click="confirm"
>
{{confirmButtonText}}
{{ displayConfirmButtonText }}
</el-button>
</div>
</div>
@@ -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;

View File

@@ -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', []);
}

View File

@@ -119,6 +119,7 @@ $directions: rtl, ltr, ttb, btt;
0 16px 24px 2px rgba(0, 0, 0, 0.14),
0 6px 30px 5px rgba(0, 0, 0, 0.12);
overflow: hidden;
outline: 0;
@each $direction in $directions {
@include animation-out($direction);