mirror of https://github.com/ElemeFE/element
pull/16357/head
parent
1bc3e5aa65
commit
911ce3d3e5
|
@ -52,10 +52,6 @@ Display date.
|
|||
```
|
||||
:::
|
||||
|
||||
:::tip
|
||||
The `first-day-of-week` attribute is not supported when using custom ranges.
|
||||
:::
|
||||
|
||||
### Attributes
|
||||
| Attribute | Description | Type | Accepted Values | Default |
|
||||
|-----------------|------------------- |---------- |---------------------- |--------- |
|
||||
|
|
|
@ -53,10 +53,6 @@ Muestra fechas.
|
|||
```
|
||||
:::
|
||||
|
||||
:::tip
|
||||
The `first-day-of-week` attribute is not supported when using custom ranges.
|
||||
:::
|
||||
|
||||
### Atributos
|
||||
| Atributo | Descripción | Tipo | Valores aceptados | Por defecto |
|
||||
|-----------------|------------------- |---------- |---------------------- |------------ |
|
||||
|
|
|
@ -52,10 +52,6 @@ Affiche un calendrier.
|
|||
```
|
||||
:::
|
||||
|
||||
:::tip
|
||||
The `first-day-of-week` attribute is not supported when using custom ranges.
|
||||
:::
|
||||
|
||||
### Attributs
|
||||
|
||||
| Attribut | Description | Type | Valeurs acceptées | Défaut |
|
||||
|
|
|
@ -394,7 +394,7 @@ Les callback de validations personnalisées doivent être appelées. Un usage pl
|
|||
prop="email"
|
||||
label="Email"
|
||||
:rules="[
|
||||
{ required: true, message: 'Veuillez entrer l\'adresse e-mail', trigger: 'blur' },
|
||||
{ required: true, message: 'Veuillez entrer l'adresse e-mail', trigger: 'blur' },
|
||||
{ type: 'email', message: 'Veuillez entrer une adresse e-mail valide', trigger: ['blur', 'change'] }
|
||||
]"
|
||||
>
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
```
|
||||
:::
|
||||
|
||||
:::tip
|
||||
使用自定义范围时,不支持 first-day-of-week 属性。
|
||||
:::
|
||||
|
||||
### Attributes
|
||||
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
|
||||
|-----------------|-------------- |---------- |------------ |-------- |
|
||||
|
|
|
@ -141,10 +141,7 @@ export default {
|
|||
},
|
||||
|
||||
weekDays() {
|
||||
let start = this.firstDayOfWeek;
|
||||
if (this.isInRange) {
|
||||
start = 1;
|
||||
}
|
||||
const start = this.firstDayOfWeek;
|
||||
if (typeof start !== 'number' || start === 0) {
|
||||
return WEEK_DAYS.slice();
|
||||
} else {
|
||||
|
|
|
@ -85,24 +85,5 @@ describe('Calendar', () => {
|
|||
expect(firstRow.firstElementChild.innerText).to.be.equal('31');
|
||||
expect(firstRow.lastElementChild.innerText).to.be.equal('6');
|
||||
});
|
||||
|
||||
it('if range is specified, firstDayOfWeek will be ignored', async() => {
|
||||
vm = createVue({
|
||||
template: `
|
||||
<el-calendar v-model="value" :first-day-of-week="0" :range="['2019-03-04', '2019-03-24']"></el-calendar>
|
||||
`,
|
||||
data() {
|
||||
return {
|
||||
value: new Date('2019-03-04')
|
||||
};
|
||||
}
|
||||
}, true);
|
||||
const head = vm.$el.querySelector('.el-calendar-table thead');
|
||||
expect(head.firstElementChild.innerText).to.be.equal('一');
|
||||
expect(head.lastElementChild.innerText).to.be.equal('日');
|
||||
const firstRow = vm.$el.querySelector('.el-calendar-table__row');
|
||||
expect(firstRow.firstElementChild.innerText).to.be.equal('4');
|
||||
expect(firstRow.lastElementChild.innerText).to.be.equal('10');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue