Merge pull request #49 from Lohoyo/master

fix: 填上最后一个迁移 Day.js 带来的坑
ecomfe · Mar 24, 2021 · a71ac74 · a71ac74
2 parents bf9cafa + b823d48
commit a71ac74
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 12 deletions.
diff --git a/src/calendar/docs/customHeader.md b/src/calendar/docs/customHeader.md
@@ -43,8 +43,9 @@
 <script>
 import dayjs from 'dayjs';
 import {Calendar, Grid, Radio, Select} from 'santd';
+import localeData from 'dayjs/plugin/localeData';
 
-dayjs.extend(require('dayjs/plugin/localeData'));
+dayjs.extend(localeData);
 
 export default {
     components: {

diff --git a/src/calendar/index.js b/src/calendar/index.js
@@ -10,9 +10,12 @@ import Select from '../select';
 import Calendar from './src/fullCalendar';
 import './style/index.less';
 import localeReceiver from '../localeprovider/receiver';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import localeData from 'dayjs/plugin/localeData';
+
+dayjs.extend(weekOfYear);
+dayjs.extend(localeData);
 
-dayjs.extend(require('dayjs/plugin/weekOfYear'));
-dayjs.extend(require('dayjs/plugin/localeData'));
 const prefixCls = classCreator('fullcalendar')();
 
 function getMonthsLocale(value) {

diff --git a/src/calendar/src/date/dateInput.js b/src/calendar/src/date/dateInput.js
@@ -7,6 +7,9 @@ import san, {DataTypes} from 'san';
 import dayjs from 'dayjs';
 import {formatDate} from '../util/index';
 import KeyCode from '../../../core/util/keyCode';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+
+dayjs.extend(customParseFormat);
 
 export default san.defineComponent({
     dataTypes: {
@@ -68,7 +71,6 @@ export default san.defineComponent({
         }
 
         // 不合法直接退出
-        dayjs.extend(require('dayjs/plugin/customParseFormat'));
         const parsed = dayjs(showDate, format, true);
         if (!parsed.isValid()) {
             this.data.set('invalid', true);

diff --git a/src/calendar/src/util/index.js b/src/calendar/src/util/index.js
@@ -3,6 +3,9 @@
  * @author [email protected]
  **/
 import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+
+dayjs.extend(utc);
 
 const defaultDisabledTime = {
     disabledHours() {
@@ -19,7 +22,6 @@ const defaultDisabledTime = {
 export function getTodayTime(value) {
     const locale = value.locale();
     require(`dayjs/locale/${locale}.js`);
-    dayjs.extend(require('dayjs/plugin/utc'));
     return dayjs().locale(locale).utcOffset(value.utcOffset());
 }
 

diff --git a/src/comment/docs/basic.md b/src/comment/docs/basic.md
@@ -36,8 +36,9 @@
 <script>
 import dayjs from 'dayjs';
 import {Comment, Icon, Avatar, Tooltip} from 'santd';
+import relativeTime from 'dayjs/plugin/relativeTime';
 
-dayjs.extend(require('dayjs/plugin/relativeTime'));
+dayjs.extend(relativeTime);
 
 export default {
     components: {

diff --git a/src/comment/docs/list.md b/src/comment/docs/list.md
@@ -24,8 +24,10 @@
 <script>
 import dayjs from 'dayjs';
 import {Comment, Avatar, List} from 'santd';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+dayjs.extend(relativeTime);
 
-dayjs.extend(require('dayjs/plugin/relativeTime'));
 const data = [{
     author: 'Han Solo',
     avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',

diff --git a/src/comment/docs/nested.md b/src/comment/docs/nested.md
@@ -18,8 +18,10 @@
 import san from 'san';
 import dayjs from 'dayjs';
 import {Comment, Icon, Avatar} from 'santd';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+dayjs.extend(relativeTime);
 
-dayjs.extend(require('dayjs/plugin/relativeTime'));
 const pComment = san.defineComponent({
     template: `
         <template>

diff --git a/src/comment/docs/reply.md b/src/comment/docs/reply.md
@@ -26,8 +26,10 @@
 import san from 'san';
 import dayjs from 'dayjs';
 import {Comment, Icon, Avatar, Form, Button, Input} from 'santd';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+dayjs.extend(relativeTime);
 
-dayjs.extend(require('dayjs/plugin/relativeTime'));
 const pComment = san.defineComponent({
     template: `
         <template>

diff --git a/src/date-picker/docs/customdisabled.md b/src/date-picker/docs/customdisabled.md
@@ -29,6 +29,8 @@
 import dayjs from 'dayjs';
 import {DatePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 function range(start, end) {
     const result = [];
     for (let i = start; i < end; i++) {

diff --git a/src/date-picker/docs/disabled.md b/src/date-picker/docs/disabled.md
@@ -19,6 +19,8 @@
 import dayjs from 'dayjs';
 import {DatePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 const dateFormat = 'YYYY-MM-DD';
 
 export default {

diff --git a/src/date-picker/docs/format.md b/src/date-picker/docs/format.md
@@ -22,6 +22,8 @@
 import dayjs from 'dayjs';
 import {DatePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 const dateFormat = 'YYYY/MM/DD';
 const monthFormat = 'YYYY/MM';
 const dateFormatList = ['DD/MM/YYYY', 'DD/MM/YY'];

diff --git a/src/date-picker/index.js b/src/date-picker/index.js
@@ -11,9 +11,11 @@ import createPicker from './CreatePicker';
 import wrapPicker from './wrapPicker';
 import WeekPicker from './WeekPicker';
 import dayjs from 'dayjs';
+import weekYear from 'dayjs/plugin/weekYear';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
 
-dayjs.extend(require('dayjs/plugin/weekYear'));
-dayjs.extend(require('dayjs/plugin/advancedFormat'));
+dayjs.extend(weekYear);
+dayjs.extend(advancedFormat);
 
 const DatePicker = wrapPicker(createPicker(Calendar), 'date');
 

diff --git a/src/timepicker/Header.js b/src/timepicker/Header.js
@@ -5,6 +5,9 @@
 
 import san, {DataTypes} from 'san';
 import dayjs from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+
+dayjs.extend(customParseFormat);
 
 export default san.defineComponent({
     dataTypes: {
@@ -64,7 +67,6 @@ export default san.defineComponent({
         if (inputValue) {
             const originalValue = this.data.get('value');
             let value = this.data.get('value') || this.data.get('defaultOpenValue');
-            dayjs.extend(require('dayjs/plugin/customParseFormat'));
             const parsed = dayjs(inputValue, format, true);
             if (!parsed.isValid()) {
                 this.data.set('invalid', true);

diff --git a/src/timepicker/Panel.js b/src/timepicker/Panel.js
@@ -28,6 +28,7 @@ function toNearestValidTime(time, hourOptions, minuteOptions, secondOptions) {
     const second = secondOptions
         .slice()
         .sort((a, b) => Math.abs(time.second() - a) - Math.abs(time.second() - b))[0];
+    dayjs.extend(require('dayjs/plugin/customParseFormat'));
     return dayjs(`${hour}:${minute}:${second}`, 'HH:mm:ss');
 }
 

diff --git a/src/timepicker/docs/basic.md b/src/timepicker/docs/basic.md
@@ -13,6 +13,8 @@
 import dayjs from 'dayjs';
 import {TimePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 export default {
     components: {
         's-timepicker': TimePicker

diff --git a/src/timepicker/docs/disable.md b/src/timepicker/docs/disable.md
@@ -13,6 +13,8 @@
 import dayjs from 'dayjs';
 import {TimePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 export default {
     components: {
         's-timepicker': TimePicker

diff --git a/src/timepicker/docs/format.md b/src/timepicker/docs/format.md
@@ -12,6 +12,9 @@ TimePicker 浮层中的列会随着 `format` 变化，当略去 `format` 中的
 <script>
 import dayjs from 'dayjs';
 import {TimePicker} from 'santd';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+
+dayjs.extend(customParseFormat);
 
 export default {
     components: {

diff --git a/src/timepicker/docs/size.md b/src/timepicker/docs/size.md
@@ -15,6 +15,8 @@
 import dayjs from 'dayjs';
 import {TimePicker} from 'santd';
 
+dayjs.extend(require('dayjs/plugin/customParseFormat'));
+
 export default {
     components: {
         's-timepicker': TimePicker