Calendar: first-day-of-week is not supported when using custom ranges (#16235)

pull/16353/head
hetech 2019-07-02 10:42:56 +08:00 committed by GitHub
parent 72a715a33e
commit 1bc3e5aa65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 40 additions and 2 deletions

View File

@ -52,6 +52,10 @@ Display date.
```
:::
:::tip
The `first-day-of-week` attribute is not supported when using custom ranges.
:::
### Attributes
| Attribute | Description | Type | Accepted Values | Default |
|-----------------|------------------- |---------- |---------------------- |--------- |

View File

@ -53,6 +53,10 @@ 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 |
|-----------------|------------------- |---------- |---------------------- |------------ |

View File

@ -52,6 +52,10 @@ 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 |

View File

@ -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'] }
]"
>

View File

@ -52,6 +52,10 @@
```
:::
:::tip
使用自定义范围时,不支持 first-day-of-week 属性。
:::
### Attributes
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
|-----------------|-------------- |---------- |------------ |-------- |

View File

@ -141,7 +141,10 @@ export default {
},
weekDays() {
const start = this.firstDayOfWeek;
let start = this.firstDayOfWeek;
if (this.isInRange) {
start = 1;
}
if (typeof start !== 'number' || start === 0) {
return WEEK_DAYS.slice();
} else {

View File

@ -85,5 +85,24 @@ 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');
});
});