Merge pull request #49 from Lohoyo/master

fix: 填上最后一个迁移 Day.js 带来的坑

Author: jinzhan

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: {

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) {

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);

src/calendar/src/util/index.js

@@ -3,6 +3,9 @@
  * @author mayihui@baidu.com
  **/
 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());
 }
 

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: {

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',

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>

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>

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++) {

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 {