Merge pull request #2069 from dspangenberg/2.0

DatePicker: weekStartDay did not influence the order of the weekdays in the header

Merge pull request #2069 from dspangenberg/2.0
DatePicker: weekStartDay did not influence the order of the weekdays in the header
Aresn · GitHub
2 parents f1800986 af6a7c48
Showing 2 changed files with 11 additions and 1 deletions Show diff stats
src/components/date-picker/base/date-table.vue
yarn.lock
@@ -3,7 +3,9 @@
         :class="classes"
         @mousemove="handleMouseMove">
         <div :class="[prefixCls + '-header']">
-            <span>{{ t('i.datepicker.weeks.sun') }}</span><span>{{ t('i.datepicker.weeks.mon') }}</span><span>{{ t('i.datepicker.weeks.tue') }}</span><span>{{ t('i.datepicker.weeks.wed') }}</span><span>{{ t('i.datepicker.weeks.thu') }}</span><span>{{ t('i.datepicker.weeks.fri') }}</span><span>{{ t('i.datepicker.weeks.sat') }}</span>
+            <span v-for="day in headerDays" :key="day">
+                {{day}}
+            </span>
         </div>
         <span :class="getCellCls(cell)" v-for="(cell, index) in readCells"><em :index="index" @click="handleClick(cell)">{{ cell.text }}</em></span>
     </div>
@@ -87,6 +89,14 @@
                     `${prefixCls}`
                 ];
             },
+            headerDays () {
+                const weekStartDay = Number(this.t('i.datepicker.weekStartDay'));
+                const translatedDays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'].map(item => {
+                    return this.t('i.datepicker.weeks.' + item);
+                })
+                const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay));
+                return weekDays;
+            },
             cells () {
                 const date = new Date(this.year, this.month, 1);
                 const weekStartDay = Number(this.t('i.datepicker.weekStartDay'));