Merge pull request #48 from Lohoyo/master

fix: 修改原来用的 Moment.js 的可变数据写法为现在用的 Day.js 的不可变数据写法

docs/changelog.md

@@ -10,6 +10,10 @@
 
 ---
 
+## 1.0.2
+`2020-3-24`
+- 🐞 修复 1.0.0 版本把 Moment.js 换成 Day.js 后引起的和时间日期相关的组件的一系列 bug，涉及的组件包括 Calendar、DatePicker、LocaleProvider、TimePicker [#48](https://github.com/ecomfe/santd/pull/48)
+
 ## 1.0.1
 `2020-3-23`
 - Menu

src/calendar/docs/customHeader.md

@@ -78,12 +78,10 @@ export default {
     },
     getMonths(value) {
         const options = [];
-        const current = value.clone();
         const localeData = value.localeData();
 
         for (let i = 0; i < 12; i++) {
-            current.month(i);
-            options.push({label: localeData.monthsShort(current), value: String(i)});
+            options.push({label: localeData.monthsShort(value.month(i)), value: String(i)});
         }
         return options;
     },

src/calendar/index.js

@@ -16,12 +16,10 @@ dayjs.extend(require('dayjs/plugin/localeData'));
 const prefixCls = classCreator('fullcalendar')();
 
 function getMonthsLocale(value) {
-    const current = value.clone();
     const localeData = value.localeData();
     const months = [];
     for (let i = 0; i < 12; i++) {
-        current.month(i);
-        months.push(localeData.monthsShort(current));
+        months.push(localeData.monthsShort(value.month(i)));
     }
     return months;
 }
@@ -103,7 +101,7 @@ export default san.defineComponent({
         }
     },
     setValue(value, way) {
-        const prevValue = this.data.get('value').clone();
+        const prevValue = this.data.get('value');
         const mode = this.data.get('mode');
 
         this.data.set('value', value);
@@ -118,14 +116,10 @@ export default san.defineComponent({
         }
     },
     handleMonthChange(month) {
-        const value = this.data.get('value').clone();
-        value.month(month);
-        this.setValue(value, 'changePanel');
+        this.setValue(this.data.get('value').month(month), 'changePanel');
     },
     handleYearChange(year) {
-        const value = this.data.get('value').clone();
-        value.year(year);
-        this.setValue(value, 'changePanel');
+        this.setValue(this.data.get('value').year(year), 'changePanel');
     },
     handlePanelChange(value, mode) {
         this.fire('panelChange', {value, mode});
@@ -137,19 +131,21 @@ export default san.defineComponent({
         localeReceiver.inited.call(this);
 
         const defaultValue = this.data.get('defaultValue');
-        const value = this.data.get('value') || defaultValue || dayjs();
+        let value = this.data.get('value') || defaultValue || dayjs();
         const localeCode = this.data.get('localeCode');
 
         if (localeCode) {
+            require(`dayjs/locale/${localeCode}.js`);
             dayjs.locale(localeCode);
-            value.locale(localeCode);
+            value = value.locale(localeCode);
         }
         this.data.set('value', value);
         this.data.set('hasHeaderRender', !!this.sourceSlots.named.headerRender);
 
         this.watch('localeCode', val => {
+            require(`dayjs/locale/${val}.js`);
             dayjs.locale(val);
-            value.locale(val);
+            value = value.locale(val);
             this.data.set('value', value, {force: true});
         });
     },

src/calendar/src/calendar.js

@@ -36,8 +36,13 @@ export default inherits(san.defineComponent({
         const localeCode = this.data.get('localeCode');
 
         // 如果有国际化编码，对dayjs进行国际化处理
-        localeCode && dayjs.locale(localeCode);
-        localeCode && value && value.locale(localeCode);
+        if (localeCode) {
+            require(`dayjs/locale/${localeCode}.js`);
+            dayjs.locale(localeCode);
+            if (value) {
+                value = value.locale(localeCode);
+            }
+        }
 
         this.data.set('mode', mode || 'date');
         this.data.set('value', value);
@@ -51,7 +56,7 @@ export default inherits(san.defineComponent({
         if (!selectedValue && showTime) {
             const timePickerDefaultValue = showTime.defaultValue || dayjs();
             if (timePickerDefaultValue) {
-                syncTime(timePickerDefaultValue, value);
+                value = syncTime(timePickerDefaultValue, value);
             }
         }
         this.fire('select', {value});

src/calendar/src/calendar/calendarHeader.js

@@ -48,23 +48,19 @@ export default san.defineComponent({
         }
     },
     handlePreviousYear() {
-        const previous = this.data.get('value').clone();
-        previous.add(-1, 'years');
+        const previous = this.data.get('value').add(-1, 'years');
         this.fire('valueChange', previous);
     },
     handleNextYear() {
-        const next = this.data.get('value').clone();
-        next.add(1, 'years');
+        const next = this.data.get('value').add(1, 'years');
         this.fire('valueChange', next);
     },
     handlePreviousMonth() {
-        const previous = this.data.get('value').clone();
-        previous.add(-1, 'month');
+        const previous = this.data.get('value').add(-1, 'month');
         this.fire('valueChange', previous);
     },
     handleNextMonth() {
-        const next = this.data.get('value').clone();
-        next.add(1, 'month');
+        const next = this.data.get('value').add(1, 'month');
         this.fire('valueChange', next);
     },
     handleDecadeSelect(value) {
@@ -87,8 +83,7 @@ export default san.defineComponent({
         this.fire('valueChange', value);
     },
     goYear(direction) {
-        const next = this.data.get('value').clone();
-        next.add(direction, 'years');
+        const next = this.data.get('value').add(direction, 'years');
         this.fire('valueChange', next);
     },
     handleYearSelect(value) {

src/calendar/src/date/dateInput.js

@@ -68,15 +68,15 @@ export default san.defineComponent({
         }
 
         // 不合法直接退出
+        dayjs.extend(require('dayjs/plugin/customParseFormat'));
         const parsed = dayjs(showDate, format, true);
         if (!parsed.isValid()) {
             this.data.set('invalid', true);
             this.data.set('showDate', showDate);
             return;
         }
 
-        const value = this.data.get('value').clone();
-        value.year(parsed.year())
+        const value = this.data.get('value').year(parsed.year())
             .month(parsed.month())
             .date(parsed.date())
             .hour(parsed.hour())
@@ -104,7 +104,7 @@ export default san.defineComponent({
         if (e.keyCode === KeyCode.ENTER) {
             const validateDate = !disabledDate || !disabledDate(value);
             if (validateDate) {
-                this.fire('select', value.clone());
+                this.fire('select', value);
             }
         }
     },

src/calendar/src/date/dateTable.js

@@ -46,12 +46,10 @@ export default san.defineComponent({
             const selectedValue = this.data.get('selectedValue');
             const hoverValue = this.data.get('hoverValue');
             const disabledDate = this.data.get('disabledDate');
-            const month = value.clone();
-            month.date(1);
+            const month = value.date(1);
             const day = month.day();
             const lastMonthDiffDay = (day + 7 - value.localeData().firstDayOfWeek()) % 7;
-            const lastMonth = month.clone();
-            lastMonth.add(0 - lastMonthDiffDay, 'days');
+            const lastMonth = month.add(0 - lastMonthDiffDay, 'days');
             const dataTable = [];
             let passed = 0;
             let current;
@@ -65,8 +63,7 @@ export default san.defineComponent({
                 for (let j = 0; j < COL; j++) {
                     current = lastMonth;
                     if (passed) {
-                        current = current.clone();
-                        current.add(passed, 'days');
+                        current = current.add(passed, 'days');
                     }
                     dataTable[i].current.push({data: current});
                     dataTable[i].week = current.week();
@@ -75,10 +72,10 @@ export default san.defineComponent({
                     let next = null;
                     let last = null;
                     if (j < COL - 1) {
-                        next = current.clone().add(passed + 1, 'days');
+                        next = current.add(passed + 1, 'days');
                     }
                     if (j > 0) {
-                        last = current.clone().add(passed - 1, 'days');
+                        last = current.add(passed - 1, 'days');
                     }
                     let className = [`${prefixCls}-cell`];
                     let disabled = false;
@@ -126,7 +123,7 @@ export default san.defineComponent({
                     isSameDay(current, selectedValue) && className.push(`${prefixCls}-selected-date`);
                     isBeforeCurrentMonthYear && className.push(`${prefixCls}-last-month-cell`);
                     isAfterCurrentMonthYear && className.push(`${prefixCls}-next-month-btn-day`);
-                    (current.clone().endOf('month').date() === current.date()) && className.push(` ${prefixCls}-last-day-of-month`);
+                    (current.endOf('month').date() === current.date()) && className.push(` ${prefixCls}-last-day-of-month`);
 
                     if (disabledDate) {
                         if (disabledDate(current, value)) {
@@ -154,11 +151,11 @@ export default san.defineComponent({
             const firstDayOfWeek = localeData.firstDayOfWeek();
             const weekDays = [];
             const veryShortWeekdays = [];
-            const now = dayjs();
+            let now = dayjs();
 
             for (let dateColIndex = 0; dateColIndex < COL; dateColIndex++) {
                 const index = (firstDayOfWeek + dateColIndex) % COL;
-                now.day(index);
+                now = now.day(index);
                 veryShortWeekdays[dateColIndex] = localeData.weekdaysMin(now);
                 weekDays[dateColIndex] = localeData.weekdaysShort(now);
             }

src/calendar/src/decade/decadePanel.js

@@ -40,8 +40,7 @@ export default san.defineComponent({
         this.fire('select', value);
     },
     goYear(year) {
-        const value = this.data.get('value').clone();
-        value.add(year, 'year');
+        const value = this.data.get('value').add(year, 'year');
         this.data.set('value', value);
     },
     components: {

src/calendar/src/decade/decadeTable.js

@@ -70,14 +70,11 @@ export default san.defineComponent({
         }
     },
     goYear(year) {
-        const value = this.data.get('value').clone();
-        value.add(year, 'year');
+        const value = this.data.get('value').add(year, 'year');
         this.data.set('value', value);
     },
     chooseDecade(year) {
-        const value = this.data.get('value').clone();
-        value.year(year);
-        value.month(this.data.get('value').month());
+        const value = this.data.get('value').year(year).month(this.data.get('value').month());
         this.fire('select', value);
         this.nextTick(() => {
             this.data.set('refresh', Math.random(), {force: true});

src/calendar/src/fullCalendarHeader.js

@@ -33,12 +33,10 @@ export default san.defineComponent({
             return String(this.data.get('value').year());
         },
         months() {
-            const value = this.data.get('value').clone();
             const result = [];
 
             for (let i = 0; i < 12; i++) {
-                value.month(i);
-                result.push({label: getMonthName(value), value: String(i)});
+                result.push({label: getMonthName(this.data.get('value').month(i)), value: String(i)});
             }
             return result;
         },
@@ -67,14 +65,10 @@ export default san.defineComponent({
         this.fire('typeChange', 'month');
     },
     handleChangeMonth(month) {
-        const value = this.data.get('value').clone();
-        value.month(parseInt(month, 10));
-        this.fire('valueChange', value);
+        this.fire('valueChange', this.data.get('value').month(parseInt(month, 10)));
     },
     handleChangeYear(year) {
-        const value = this.data.get('value').clone();
-        value.year(parseInt(year, 10));
-        this.fire('valueChange', value);
+        this.fire('valueChange', this.data.get('value').year(parseInt(year, 10)));
     },
     template: `
         <div class="{{prefixCls}}-header">

src/calendar/src/month/monthTable.js

@@ -25,8 +25,7 @@ export default san.defineComponent({
             for (let rowIndex = 0; rowIndex < ROW; rowIndex++) {
                 months[rowIndex] = [];
                 for (let colIndex = 0; colIndex < COL; colIndex++) {
-                    const current = value.clone();
-                    current.month(index);
+                    const current = value.month(index);
                     const content = getMonthName(current);
                     months[rowIndex][colIndex] = {
                         value: index,
@@ -49,8 +48,7 @@ export default san.defineComponent({
 
         let disabled = false;
         if (disabledDate) {
-            const testValue = value.clone();
-            testValue.month(monthData.value);
+            const testValue = value.month(monthData.value);
             disabled = disabledDate(testValue);
         }
 
@@ -66,14 +64,12 @@ export default san.defineComponent({
         const disabledDate = this.data.get('disabledDate');
         let disabled = false;
         if (disabledDate) {
-            const testValue = value.clone();
-            testValue.month(monthData.value);
+            const testValue = value.month(monthData.value);
             disabled = disabledDate(testValue);
         }
 
         if (!disabled) {
-            const next = value.clone();
-            next.month(monthData.value);
+            const next = value.month(monthData.value);
             this.fire('select', next);
         }
     },

src/calendar/src/monthCalendar.js

@@ -20,14 +20,19 @@ export default inherits(san.defineComponent({
         let selectedValue = this.data.get('selectedValue') || this.data.get('defaultSelectedValue');
         const localeCode = this.data.get('localeCode');
 
-        localeCode && value.locale(localeCode);
+        if (localeCode) {
+            require(`dayjs/locale/${localeCode}.js`);
+            value = value.locale(localeCode);
+        }
 
         this.data.set('value', value);
         this.data.set('selectedValue', selectedValue);
         this.data.set('mode', 'month');
 
         this.watch('selectedValue', val => {
-            localeCode && val.locale(localeCode);
+            if (localeCode) {
+                val = val.locale(localeCode);
+            }
             this.data.set('value', val);
         });
     },

src/calendar/src/range/rangePanel.js

@@ -60,7 +60,7 @@ export default san.defineComponent({
     dateInputValue(selectedValue = []) {
         const direction = this.data.get('direction');
         const value = selectedValue[direction === 'left' ? 0 : 1];
-        return value && value.clone();
+        return value;
     },
     getTimeConfig(selectedValue, disabledTime, mode) {
         const showTimePicker = this.data.get('showTimePicker');