Merge pull request #53 from Lohoyo/master

修复部分时间日期相关的组件内部使用的 Day.js 的插件没有在内部引入而需要用户引入的问题

Author: jinzhan

docs/changelog.md

@@ -10,6 +10,10 @@
 
 ---
 
+## 1.0.5
+`2020-3-31`
+- 🐞 修复部分时间日期相关的组件内部使用的 Day.js 的插件没有在内部引入而需要用户引入的问题 [#53](https://github.com/ecomfe/santd/pull/53)
+
 ## 1.0.4
 `2020-3-30`
 - Table

src/calendar/index.js

@@ -10,10 +10,8 @@ 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);
 
 const prefixCls = classCreator('fullcalendar')();

src/calendar/src/calendar/CalendarHeader.js

@@ -7,6 +7,10 @@ import san, {DataTypes} from 'san';
 import MonthPanel from '../month/MonthPanel';
 import YearPanel from '../year/YearPanel';
 import DecadePanel from '../decade/DecadePanel';
+import dayjs from 'dayjs';
+import localeData from 'dayjs/plugin/localeData';
+
+dayjs.extend(localeData);
 
 export default san.defineComponent({
     dataTypes: {

src/calendar/src/date/DateTable.js

@@ -6,6 +6,11 @@
 import san, {DataTypes} from 'san';
 import dayjs from 'dayjs';
 import {getTitleString, getTodayTime} from '../util/index';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import localeData from 'dayjs/plugin/localeData';
+
+dayjs.extend(weekOfYear);
+dayjs.extend(localeData);
 
 const ROW = 6;
 const COL = 7;

src/calendar/src/locale/ko_KR.js

@@ -1,3 +1,8 @@
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+
+dayjs.extend(advancedFormat);
+
 export default {
     today: '오늘',
     now: '현재 시각',

src/calendar/src/util/index.js

@@ -4,8 +4,10 @@
  **/
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
+import localeData from 'dayjs/plugin/localeData';
 
 dayjs.extend(utc);
+dayjs.extend(localeData);
 
 const defaultDisabledTime = {
     disabledHours() {

src/date-picker/README.md

@@ -72,7 +72,7 @@
 | 参数                 | 说明                                                                                              | 类型                                  | 默认值        |
 | ---                  | ---                                                                                               | ---                                   | ---           |
 | defaultValue         | 默认日期                | [dayjs](https://day.js.org)         | -             |
-| format               | 设置日期格式，配置参考 [dayjs.js](https://day.js.org) | string      | 'YYYY-wo'     |
+| format               | 设置日期格式，配置参考 [dayjs.js](https://day.js.org) | string      | 'gggg-wo'     |
 | renderExtraFooter    | 在面板中添加额外的页脚                                                                            | slot                     | -             |
 | value    | 日期                                                                          | [dayjs](https://day.js.org)                                | -            |
 | on-change          | 时间发生变化的回调                                                                                    | function({date: dayjs, dateString: string}) | -     |

src/date-picker/index.js

@@ -10,12 +10,6 @@ import RangePicker from './RangePicker';
 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(weekYear);
-dayjs.extend(advancedFormat);
 
 const DatePicker = wrapPicker(createPicker(Calendar), 'date');
 

src/date-picker/locale/ar_EG.js

@@ -1,5 +1,12 @@
 import CalendarLocale from '../../calendar/src/locale/ar_EG';
 import TimePickerLocale from '../../time-picker/locale/ar_EG';
+import dayjs from 'dayjs';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+
+dayjs.extend(weekOfYear);
+dayjs.extend(advancedFormat);
+
 
 // Merge into a locale object
 export default {

src/date-picker/wrapPicker.js

@@ -6,6 +6,14 @@
 import san from 'san';
 import {classCreator} from '../core/util/index';
 import localeReceiver from '../localeprovider/receiver';
+import dayjs from 'dayjs';
+import weekYear from 'dayjs/plugin/weekYear';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+
+dayjs.extend(weekYear);
+dayjs.extend(weekOfYear);
+dayjs.extend(advancedFormat);
 
 const prefixCls = classCreator('calendar')();
 const inputPrefixCls = classCreator('input')();