shineout 1.7.1 → 1.8.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/css/DatePicker/utils.js +1 -1
- package/css/Form/Field.js +8 -4
- package/css/Form/Form.js +3 -0
- package/css/Form/Item.js +1 -1
- package/css/Form/index.d.ts +1 -0
- package/css/Form/inputable.js +1 -1
- package/css/Pagination/Jumper.js +3 -0
- package/css/index.d.ts +1 -1
- package/css/index.js +1 -1
- package/dist/shineout.js +24 -14
- package/dist/shineout.js.map +1 -1
- package/dist/shineout.min.js +1 -1
- package/es/Alert/index.js +127 -107
- package/es/Alert/styles/index.js +3 -4
- package/es/AnimationList/AbsoluteList.js +257 -193
- package/es/AnimationList/LazyList.js +120 -92
- package/es/AnimationList/List.js +43 -23
- package/es/AnimationList/index.js +19 -14
- package/es/AnimationList/styles/index.js +3 -4
- package/es/Breadcrumb/index.js +77 -69
- package/es/Breadcrumb/styles/index.js +3 -4
- package/es/Button/Button.js +91 -74
- package/es/Button/Group.js +42 -28
- package/es/Button/Once.js +39 -23
- package/es/Button/index.js +7 -10
- package/es/Button/styles/index.js +3 -4
- package/es/Card/Accordion.js +58 -45
- package/es/Card/Body.js +55 -42
- package/es/Card/Card.js +85 -79
- package/es/Card/Footer.js +38 -15
- package/es/Card/Header.js +52 -34
- package/es/Card/Submit.js +51 -33
- package/es/Card/context.js +22 -16
- package/es/Card/index.js +16 -19
- package/es/Card/styles/index.js +3 -4
- package/es/CardGroup/CardGroup.js +93 -69
- package/es/CardGroup/Item.js +61 -43
- package/es/CardGroup/context.js +12 -10
- package/es/CardGroup/index.js +7 -10
- package/es/CardGroup/styles/index.js +3 -4
- package/es/Carousel/Item.js +31 -17
- package/es/Carousel/index.js +156 -123
- package/es/Carousel/styles/index.js +3 -4
- package/es/Cascader/Cascader.js +397 -346
- package/es/Cascader/FilterList.js +185 -142
- package/es/Cascader/Input.js +102 -79
- package/es/Cascader/List.js +66 -41
- package/es/Cascader/Node.js +153 -110
- package/es/Cascader/Result.js +289 -232
- package/es/Cascader/filter.js +92 -61
- package/es/Cascader/index.js +13 -18
- package/es/Cascader/styles/index.js +3 -4
- package/es/Checkbox/CheckItem.js +168 -154
- package/es/Checkbox/Checkbox.js +2 -3
- package/es/Checkbox/Group.js +106 -85
- package/es/Checkbox/context.js +12 -10
- package/es/Checkbox/index.js +14 -21
- package/es/Checkbox/styles/index.js +3 -4
- package/es/DataList/BaseItem.js +39 -21
- package/es/DataList/Extra.js +33 -17
- package/es/DataList/List.js +166 -140
- package/es/DataList/Meta.js +109 -74
- package/es/DataList/Pagination.js +9 -10
- package/es/DataList/index.js +13 -19
- package/es/DataList/styles/index.js +3 -4
- package/es/DatePicker/Container.js +468 -449
- package/es/DatePicker/Day.js +265 -258
- package/es/DatePicker/Icon.js +34 -20
- package/es/DatePicker/Month.js +101 -79
- package/es/DatePicker/Picker.js +110 -83
- package/es/DatePicker/Quick.js +52 -39
- package/es/DatePicker/Range.js +241 -192
- package/es/DatePicker/Text.js +103 -91
- package/es/DatePicker/Time.js +165 -147
- package/es/DatePicker/TimeScroll.js +148 -116
- package/es/DatePicker/Year.js +74 -53
- package/es/DatePicker/index.js +16 -18
- package/es/DatePicker/paramUtils.js +92 -58
- package/es/DatePicker/styles/index.js +3 -4
- package/es/DatePicker/utils.js +189 -198
- package/es/DatePicker/value.js +139 -98
- package/es/Datum/Form.js +333 -282
- package/es/Datum/List.js +319 -201
- package/es/Datum/Tree.js +298 -239
- package/es/Datum/hoc.js +104 -69
- package/es/Datum/index.js +7 -8
- package/es/Datum/types.js +20 -25
- package/es/Divider/index.js +50 -32
- package/es/Divider/styles/index.js +3 -4
- package/es/Drawer/index.js +14 -9
- package/es/Dropdown/Item.js +56 -43
- package/es/Dropdown/index.js +273 -259
- package/es/Dropdown/styles/index.js +3 -4
- package/es/EditableArea/EditableArea.js +157 -136
- package/es/EditableArea/index.js +8 -15
- package/es/EditableArea/styles/index.js +3 -4
- package/es/Form/Block.js +83 -57
- package/es/Form/BlockField.js +32 -17
- package/es/Form/Field.js +59 -35
- package/es/Form/FieldError.js +27 -21
- package/es/Form/FieldSet.js +214 -156
- package/es/Form/Flow.js +51 -32
- package/es/Form/Form.js +181 -144
- package/es/Form/Item.js +181 -166
- package/es/Form/Loop.js +202 -146
- package/es/Form/formButton.js +58 -42
- package/es/Form/formContext.js +104 -95
- package/es/Form/index.d.ts +1 -0
- package/es/Form/index.js +40 -45
- package/es/Form/inputable.js +368 -292
- package/es/Form/mode.js +15 -9
- package/es/Form/styles/index.js +4 -5
- package/es/Gap/index.js +71 -47
- package/es/Gap/styles/index.js +3 -4
- package/es/Gap/support.js +11 -14
- package/es/Grid/index.js +88 -58
- package/es/Grid/utils.js +57 -58
- package/es/Icon/Icon.js +43 -42
- package/es/Icon/index.js +39 -22
- package/es/Icon/styles/index.js +3 -4
- package/es/Image/Gallery.js +128 -113
- package/es/Image/Group.js +60 -36
- package/es/Image/Image.js +227 -153
- package/es/Image/Magnify.js +123 -94
- package/es/Image/events.js +29 -26
- package/es/Image/index.js +6 -9
- package/es/Image/styles/index.js +3 -4
- package/es/Input/Group.js +17 -11
- package/es/Input/Input.js +158 -134
- package/es/Input/Number.js +199 -175
- package/es/Input/Password.js +54 -31
- package/es/Input/clear.js +41 -25
- package/es/Input/index.js +23 -35
- package/es/Input/styles/index.js +3 -4
- package/es/Lazyload/index.js +63 -42
- package/es/Lazyload/styles/index.js +3 -4
- package/es/Menu/Item.js +275 -236
- package/es/Menu/List.js +75 -67
- package/es/Menu/Root.js +372 -334
- package/es/Menu/context.js +18 -12
- package/es/Menu/index.js +3 -5
- package/es/Menu/styles/index.js +3 -4
- package/es/Message/Container.js +155 -119
- package/es/Message/index.js +42 -30
- package/es/Message/messager.js +29 -33
- package/es/Message/styles/index.js +3 -4
- package/es/Modal/Modal.js +80 -60
- package/es/Modal/Panel.js +258 -234
- package/es/Modal/context.js +15 -15
- package/es/Modal/events.js +213 -182
- package/es/Modal/index.js +12 -14
- package/es/Modal/styles/index.js +3 -4
- package/es/Pagination/Item.js +46 -32
- package/es/Pagination/Jumper.js +79 -66
- package/es/Pagination/Links.js +110 -82
- package/es/Pagination/Next.js +52 -31
- package/es/Pagination/PageSizeList.js +57 -40
- package/es/Pagination/Pagination.js +78 -54
- package/es/Pagination/Prev.js +49 -30
- package/es/Pagination/Simple.js +32 -18
- package/es/Pagination/index.js +68 -41
- package/es/Pagination/styles/index.js +3 -4
- package/es/Popover/Confirm.js +107 -64
- package/es/Popover/Panel.js +284 -231
- package/es/Popover/context.js +15 -12
- package/es/Popover/events.js +80 -86
- package/es/Popover/index.js +12 -14
- package/es/Popover/styles/index.js +3 -4
- package/es/Progress/Circle.js +70 -59
- package/es/Progress/Line.js +51 -39
- package/es/Progress/Popup.js +42 -24
- package/es/Progress/analyzeColor.js +18 -9
- package/es/Progress/index.js +13 -15
- package/es/Progress/styles/index.js +3 -4
- package/es/Radio/Group.js +105 -94
- package/es/Radio/Radio.js +2 -3
- package/es/Radio/index.js +15 -17
- package/es/Radio/styles/index.js +1 -1
- package/es/Rate/Rate.js +216 -167
- package/es/Rate/index.js +17 -10
- package/es/Rate/styles/index.js +3 -4
- package/es/Rule/convert.js +48 -57
- package/es/Rule/index.js +63 -40
- package/es/Rule/length.js +53 -38
- package/es/Rule/regExp.js +23 -14
- package/es/Rule/required.js +26 -18
- package/es/Rule/styles/index.js +1 -1
- package/es/Rule/type.js +26 -18
- package/es/Scroll/Bar.js +145 -117
- package/es/Scroll/Scroll.js +277 -217
- package/es/Scroll/context.js +20 -13
- package/es/Scroll/fixedLength.js +33 -24
- package/es/Scroll/index.js +89 -55
- package/es/Scroll/styles/index.js +3 -4
- package/es/Select/BoxList.js +218 -189
- package/es/Select/BoxOption.js +64 -38
- package/es/Select/FlexBox.js +107 -75
- package/es/Select/FlexResult.js +65 -49
- package/es/Select/Input.js +137 -113
- package/es/Select/More.js +124 -121
- package/es/Select/Option.js +73 -52
- package/es/Select/OptionList.js +236 -200
- package/es/Select/OptionTree.js +111 -96
- package/es/Select/Result.js +297 -271
- package/es/Select/Select.js +517 -491
- package/es/Select/filter.js +221 -148
- package/es/Select/group.js +74 -45
- package/es/Select/index.js +32 -31
- package/es/Select/styles/index.js +3 -4
- package/es/Slider/Container.js +145 -132
- package/es/Slider/Indicator.js +28 -13
- package/es/Slider/Slider.js +132 -103
- package/es/Slider/index.js +5 -8
- package/es/Slider/styles/index.js +3 -4
- package/es/Slider/utils.js +26 -30
- package/es/Spin/Multiple.js +153 -109
- package/es/Spin/Simple.js +33 -22
- package/es/Spin/Spin.js +29 -29
- package/es/Spin/index.js +66 -84
- package/es/Spin/styles/index.js +27 -30
- package/es/Sticky/context.js +12 -10
- package/es/Sticky/index.js +255 -194
- package/es/Sticky/styles/index.js +1 -1
- package/es/Switch/Switch.js +2 -3
- package/es/Switch/index.js +8 -14
- package/es/Table/Checkbox.js +68 -39
- package/es/Table/CheckboxAll.js +121 -64
- package/es/Table/Colgroup.js +72 -47
- package/es/Table/Expand.js +63 -43
- package/es/Table/SeperateTable.js +594 -444
- package/es/Table/SimpleTable.js +215 -136
- package/es/Table/Sorter.js +83 -62
- package/es/Table/Table.js +157 -157
- package/es/Table/Tbody.js +240 -176
- package/es/Table/Td.js +169 -130
- package/es/Table/Thead.js +206 -177
- package/es/Table/Tr.js +249 -205
- package/es/Table/TreeExpand.js +151 -116
- package/es/Table/context.js +15 -15
- package/es/Table/fixedAuto.js +82 -59
- package/es/Table/index.js +309 -228
- package/es/Table/resizable.js +89 -56
- package/es/Table/select.js +238 -215
- package/es/Table/styles/index.js +3 -4
- package/es/Tabs/Header.js +203 -160
- package/es/Tabs/Link.js +46 -28
- package/es/Tabs/Panel.js +49 -33
- package/es/Tabs/Tab.js +97 -79
- package/es/Tabs/Tabs.js +211 -177
- package/es/Tabs/Wrapper.js +37 -17
- package/es/Tabs/index.js +7 -10
- package/es/Tabs/styles/index.js +3 -4
- package/es/Tag/Input.js +70 -54
- package/es/Tag/Tag.js +198 -156
- package/es/Tag/index.js +5 -8
- package/es/Tag/styles/index.js +3 -4
- package/es/Textarea/Textarea.js +139 -118
- package/es/Textarea/index.js +10 -19
- package/es/Tooltip/Container.js +140 -127
- package/es/Tooltip/events.js +49 -55
- package/es/Tooltip/index.js +5 -8
- package/es/Tooltip/styles/index.js +3 -4
- package/es/Transfer/Card.js +212 -177
- package/es/Transfer/Transfer.js +160 -153
- package/es/Transfer/btns.js +97 -80
- package/es/Transfer/context.js +2 -3
- package/es/Transfer/filter.js +65 -35
- package/es/Transfer/index.js +9 -13
- package/es/Transfer/item.js +66 -41
- package/es/Transfer/select.js +15 -16
- package/es/Transfer/styles/index.js +3 -4
- package/es/Tree/Checkbox.js +72 -50
- package/es/Tree/Content.js +136 -95
- package/es/Tree/List.js +82 -53
- package/es/Tree/Node.js +237 -202
- package/es/Tree/Root.js +23 -19
- package/es/Tree/Tree.js +262 -197
- package/es/Tree/index.js +6 -9
- package/es/Tree/styles/index.js +3 -4
- package/es/Tree/toggle.js +89 -51
- package/es/TreeSelect/Input.js +73 -60
- package/es/TreeSelect/Result.js +213 -181
- package/es/TreeSelect/TreeSelect.js +327 -312
- package/es/TreeSelect/datum.js +56 -44
- package/es/TreeSelect/filter.js +134 -96
- package/es/TreeSelect/index.js +15 -23
- package/es/TreeSelect/styles/index.js +3 -4
- package/es/TreeSelect/tiled.js +143 -106
- package/es/Upload/Dragger.js +63 -39
- package/es/Upload/Drop.js +79 -57
- package/es/Upload/File.js +61 -48
- package/es/Upload/FileInput.js +53 -40
- package/es/Upload/Image.js +158 -115
- package/es/Upload/ImageFile.js +63 -43
- package/es/Upload/ImageResult.js +139 -114
- package/es/Upload/Progress.js +117 -105
- package/es/Upload/RemoveConfirm.js +58 -42
- package/es/Upload/Result.js +73 -58
- package/es/Upload/Upload.js +649 -490
- package/es/Upload/accept.js +33 -13
- package/es/Upload/context.js +12 -10
- package/es/Upload/index.js +16 -20
- package/es/Upload/request.js +48 -46
- package/es/Upload/styles/index.js +3 -4
- package/es/component.js +45 -24
- package/es/config.js +27 -19
- package/es/context/implementation.js +132 -94
- package/es/context/index.js +3 -4
- package/es/hoc/coin.js +118 -81
- package/es/hoc/config.js +31 -17
- package/es/hoc/delay.js +99 -55
- package/es/hoc/draggable.js +90 -80
- package/es/hoc/fetch.js +56 -33
- package/es/hoc/hidable.js +119 -98
- package/es/hoc/inputBorder.js +158 -158
- package/es/hoc/moveable.js +124 -96
- package/es/hoc/pagable.js +74 -55
- package/es/hoc/resizable.js +132 -100
- package/es/hoc/styles/index.js +7 -8
- package/es/hoc/trim.js +54 -32
- package/es/icons/Caret.js +14 -15
- package/es/icons/index.js +31 -85
- package/es/index.d.ts +1 -1
- package/es/index.js +58 -57
- package/es/locale/en_US.js +9 -30
- package/es/locale/index.js +13 -14
- package/es/locale/zh-CN.js +9 -17
- package/es/styles/expose.js +3 -4
- package/es/styles/index.js +1 -1
- package/es/utils/accept.js +15 -12
- package/es/utils/classname.js +23 -12
- package/es/utils/cleanProps.js +9 -21
- package/es/utils/clone.js +34 -27
- package/es/utils/color.js +310 -276
- package/es/utils/css-accessors.js +94 -45
- package/es/utils/dom/detect.js +29 -29
- package/es/utils/dom/document.js +23 -19
- package/es/utils/dom/element.js +139 -105
- package/es/utils/dom/getDataset.js +9 -9
- package/es/utils/dom/isDOMElement.js +3 -5
- package/es/utils/dom/normalizeWheel.js +32 -28
- package/es/utils/dom/popContainer.js +12 -13
- package/es/utils/dom/popover.js +79 -59
- package/es/utils/dom/ready.js +5 -6
- package/es/utils/dom/translate.js +10 -12
- package/es/utils/errors.js +47 -28
- package/es/utils/expose.js +97 -58
- package/es/utils/flat.js +122 -107
- package/es/utils/func.js +38 -20
- package/es/utils/hash.js +24 -20
- package/es/utils/index.js +24 -49
- package/es/utils/is.js +91 -70
- package/es/utils/lazyload.js +104 -86
- package/es/utils/notification.js +34 -20
- package/es/utils/numbers.js +61 -51
- package/es/utils/objects.js +221 -140
- package/es/utils/proptypes.js +21 -34
- package/es/utils/shallowEqual.js +46 -42
- package/es/utils/strings.js +50 -32
- package/es/utils/transform.js +24 -9
- package/es/utils/tree.js +78 -63
- package/es/utils/uid.js +14 -17
- package/es/utils/validate/index.js +71 -50
- package/es/utils/validate/isJson.js +7 -10
- package/es/utils/validate/nullable.js +10 -9
- package/es/utils/validate/range.js +22 -19
- package/es/utils/validate/rangeLength.js +19 -16
- package/es/utils/validate/regExp.js +10 -10
- package/es/utils/validate/required.js +11 -8
- package/es/utils/validate/type.js +56 -59
- package/es/utils/vars-inject.js +3420 -4248
- package/lib/DatePicker/utils.js +1 -1
- package/lib/Form/Field.js +8 -4
- package/lib/Form/Form.js +3 -0
- package/lib/Form/Item.js +1 -1
- package/lib/Form/index.d.ts +1 -0
- package/lib/Form/inputable.js +1 -1
- package/lib/Pagination/Jumper.js +3 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/package.json +3 -2
package/es/DatePicker/utils.js
CHANGED
|
@@ -1,303 +1,294 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/objectSpread";
|
|
2
|
+
import dayjs from 'dayjs';
|
|
3
|
+
import advancedFormat from 'dayjs/plugin/advancedFormat';
|
|
4
|
+
import isoWeek from 'dayjs/plugin/isoWeek';
|
|
5
|
+
import weekday from 'dayjs/plugin/weekday';
|
|
6
|
+
import weekYear from 'dayjs/plugin/weekYear';
|
|
7
|
+
import weekOfYear from 'dayjs/plugin/weekOfYear';
|
|
8
|
+
import customParseFormat from 'dayjs/plugin/customParseFormat';
|
|
9
|
+
import relativeTime from 'dayjs/plugin/relativeTime';
|
|
10
|
+
import enLocale from 'dayjs/locale/en';
|
|
11
|
+
import { getLocale } from '../locale';
|
|
12
|
+
|
|
13
|
+
var en2Locate = _objectSpread({}, enLocale, {
|
|
14
14
|
name: 'en2',
|
|
15
|
-
weekStart: 1
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
dayjs.locale(en2Locate, null, true)
|
|
19
|
-
dayjs.extend(advancedFormat)
|
|
20
|
-
dayjs.extend(isoWeek)
|
|
21
|
-
dayjs.extend(relativeTime)
|
|
22
|
-
dayjs.extend(weekday)
|
|
23
|
-
dayjs.extend(weekOfYear)
|
|
24
|
-
dayjs.extend(weekYear)
|
|
25
|
-
dayjs.extend(customParseFormat)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const trans = {
|
|
15
|
+
weekStart: 1
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
dayjs.locale(en2Locate, null, true);
|
|
19
|
+
dayjs.extend(advancedFormat);
|
|
20
|
+
dayjs.extend(isoWeek);
|
|
21
|
+
dayjs.extend(relativeTime);
|
|
22
|
+
dayjs.extend(weekday);
|
|
23
|
+
dayjs.extend(weekOfYear);
|
|
24
|
+
dayjs.extend(weekYear);
|
|
25
|
+
dayjs.extend(customParseFormat);
|
|
26
|
+
var TIME_FORMAT = 'HH:mm:ss';
|
|
27
|
+
|
|
28
|
+
var compatibleFmt = function compatibleFmt(fmt) {
|
|
29
|
+
if (typeof fmt !== 'string') return fmt;
|
|
30
|
+
var trans = {
|
|
32
31
|
yy: 'YY',
|
|
33
32
|
d: 'D',
|
|
34
33
|
a: 'A',
|
|
35
34
|
t: 'X',
|
|
36
35
|
T: 'x',
|
|
37
36
|
RRRR: 'GGGG',
|
|
38
|
-
II: 'WW'
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
Object.keys(trans).forEach(key
|
|
42
|
-
result = result.replace(new RegExp(key, 'g'), trans[key])
|
|
43
|
-
})
|
|
44
|
-
return result
|
|
45
|
-
}
|
|
37
|
+
II: 'WW'
|
|
38
|
+
};
|
|
39
|
+
var result = fmt;
|
|
40
|
+
Object.keys(trans).forEach(function (key) {
|
|
41
|
+
result = result.replace(new RegExp(key, 'g'), trans[key]);
|
|
42
|
+
});
|
|
43
|
+
return result;
|
|
44
|
+
};
|
|
46
45
|
|
|
47
46
|
function getDayJsLocate(options) {
|
|
48
|
-
if (options && options.weekStartsOn === 1) return 'en2'
|
|
49
|
-
return 'en'
|
|
47
|
+
if (options && options.weekStartsOn === 1) return 'en2';
|
|
48
|
+
return 'en';
|
|
50
49
|
}
|
|
51
50
|
|
|
52
51
|
function addDays(date, offset) {
|
|
53
|
-
return dayjs(date)
|
|
54
|
-
.add(offset, 'day')
|
|
55
|
-
.toDate()
|
|
52
|
+
return dayjs(date).add(offset, 'day').toDate();
|
|
56
53
|
}
|
|
57
54
|
|
|
58
55
|
function addMonths(date, offset) {
|
|
59
|
-
return dayjs(date)
|
|
60
|
-
.add(offset, 'month')
|
|
61
|
-
.toDate()
|
|
56
|
+
return dayjs(date).add(offset, 'month').toDate();
|
|
62
57
|
}
|
|
63
58
|
|
|
64
59
|
function addSeconds(date, offset) {
|
|
65
|
-
return dayjs(date)
|
|
66
|
-
.add(offset, 'second')
|
|
67
|
-
.toDate()
|
|
60
|
+
return dayjs(date).add(offset, 'second').toDate();
|
|
68
61
|
}
|
|
69
62
|
|
|
70
63
|
function addYears(date, offset) {
|
|
71
|
-
return dayjs(date)
|
|
72
|
-
.add(offset, 'year')
|
|
73
|
-
.toDate()
|
|
64
|
+
return dayjs(date).add(offset, 'year').toDate();
|
|
74
65
|
}
|
|
75
66
|
|
|
76
67
|
function compareAsc(dateA, dateB) {
|
|
77
|
-
if (!dateA || !dateB) return NaN
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
if (!a || !b) return NaN
|
|
81
|
-
if (a === b) return 0
|
|
82
|
-
return a > b ? 1 : -1
|
|
68
|
+
if (!dateA || !dateB) return NaN;
|
|
69
|
+
var a = dayjs(dateA).valueOf();
|
|
70
|
+
var b = dayjs(dateB).valueOf();
|
|
71
|
+
if (!a || !b) return NaN;
|
|
72
|
+
if (a === b) return 0;
|
|
73
|
+
return a > b ? 1 : -1;
|
|
83
74
|
}
|
|
84
75
|
|
|
85
76
|
function format(date, fmt, options) {
|
|
86
|
-
if (!date) return 'Invalid Date'
|
|
87
|
-
|
|
88
|
-
return dayjs(date)
|
|
89
|
-
.locale(getDayJsLocate(options))
|
|
90
|
-
.format(fmt2)
|
|
77
|
+
if (!date) return 'Invalid Date';
|
|
78
|
+
var fmt2 = compatibleFmt(fmt);
|
|
79
|
+
return dayjs(date).locale(getDayJsLocate(options)).format(fmt2);
|
|
91
80
|
}
|
|
92
81
|
|
|
93
82
|
function isSameMonth(date1, date2) {
|
|
94
|
-
return (
|
|
95
|
-
date1 &&
|
|
96
|
-
date2 &&
|
|
97
|
-
date1.getFullYear() &&
|
|
98
|
-
date2.getFullYear &&
|
|
99
|
-
date1.getFullYear() === date2.getFullYear() &&
|
|
100
|
-
date1.getMonth() === date2.getMonth()
|
|
101
|
-
)
|
|
83
|
+
return date1 && date2 && date1.getFullYear() && date2.getFullYear && date1.getFullYear() === date2.getFullYear() && date1.getMonth() === date2.getMonth();
|
|
102
84
|
}
|
|
103
85
|
|
|
104
86
|
function isSameDay(date1, date2) {
|
|
105
|
-
return isSameMonth(date1, date2) && date1.getDate() === date2.getDate()
|
|
87
|
+
return isSameMonth(date1, date2) && date1.getDate() === date2.getDate();
|
|
106
88
|
}
|
|
107
89
|
|
|
108
90
|
function isSameWeek(date1, date2, options) {
|
|
109
|
-
if (!date1 || !date2) return false
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return dateA.weekYear() === dateB.weekYear() && dateA.week() === dateB.week()
|
|
91
|
+
if (!date1 || !date2) return false;
|
|
92
|
+
var dateA = dayjs(date1).locale(getDayJsLocate(options));
|
|
93
|
+
var dateB = dayjs(date2).locale(getDayJsLocate(options));
|
|
94
|
+
return dateA.weekYear() === dateB.weekYear() && dateA.week() === dateB.week();
|
|
113
95
|
}
|
|
114
96
|
|
|
115
97
|
function isValid(date) {
|
|
116
|
-
if (!date) return false
|
|
117
|
-
if (!(date instanceof Date)) return false
|
|
118
|
-
return dayjs(date).isValid()
|
|
98
|
+
if (!date) return false;
|
|
99
|
+
if (!(date instanceof Date)) return false;
|
|
100
|
+
return dayjs(date).isValid();
|
|
119
101
|
}
|
|
120
102
|
|
|
121
103
|
function parse(date, fmt, options) {
|
|
122
|
-
if (!date) return new Date('')
|
|
123
|
-
|
|
104
|
+
if (!date) return new Date('');
|
|
105
|
+
var fmt2 = compatibleFmt(fmt); // handle IOS Year Week
|
|
106
|
+
|
|
107
|
+
var index = fmt2.indexOf('GGGG');
|
|
124
108
|
|
|
125
|
-
// handle IOS Year Week
|
|
126
|
-
const index = fmt2.indexOf('GGGG')
|
|
127
109
|
if (index >= 0) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
.isoWeek(week)
|
|
134
|
-
.toDate()
|
|
135
|
-
return result
|
|
110
|
+
var year = date.slice(index, index + 5);
|
|
111
|
+
var weekIndex = fmt2.indexOf('WW');
|
|
112
|
+
var week = weekIndex >= 0 ? date.slice(weekIndex, weekIndex + 3) : 1;
|
|
113
|
+
var result = dayjs(year + "-06-15", 'YYYY-MM-dd').locale(getDayJsLocate(options)).isoWeek(Number(week)).toDate();
|
|
114
|
+
return result;
|
|
136
115
|
}
|
|
137
|
-
|
|
116
|
+
|
|
117
|
+
return dayjs(date, fmt2, getDayJsLocate(options)).toDate();
|
|
138
118
|
}
|
|
139
119
|
|
|
140
120
|
function startOfMonth(day) {
|
|
141
|
-
return new Date(day.getFullYear(), day.getMonth(), 1)
|
|
121
|
+
return new Date(day.getFullYear(), day.getMonth(), 1);
|
|
142
122
|
}
|
|
143
123
|
|
|
144
124
|
function startOfWeek(day, options) {
|
|
145
|
-
|
|
146
|
-
return day1.startOf('week').toDate()
|
|
125
|
+
var day1 = dayjs(day).locale(getDayJsLocate(options));
|
|
126
|
+
return day1.startOf('week').toDate();
|
|
147
127
|
}
|
|
148
128
|
|
|
149
129
|
function toDate(day) {
|
|
150
|
-
if (!day) return new Date('')
|
|
151
|
-
if (day instanceof Date) return dayjs(day).toDate()
|
|
152
|
-
return dayjs(day).toDate()
|
|
130
|
+
if (!day) return new Date('');
|
|
131
|
+
if (day instanceof Date) return dayjs(day).toDate();
|
|
132
|
+
return dayjs(day).toDate();
|
|
153
133
|
}
|
|
154
134
|
|
|
155
135
|
function getDaysOfMonth(dirtyDate) {
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
weekStartsOn: getLocale('startOfWeek')
|
|
159
|
-
})
|
|
160
|
-
current.setHours(dirtyDate.getHours())
|
|
161
|
-
current.setMinutes(dirtyDate.getMinutes())
|
|
162
|
-
current.setSeconds(dirtyDate.getSeconds())
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
let index = 0
|
|
136
|
+
var date = toDate(dirtyDate);
|
|
137
|
+
var current = startOfWeek(startOfMonth(date), {
|
|
138
|
+
weekStartsOn: getLocale('startOfWeek')
|
|
139
|
+
});
|
|
140
|
+
current.setHours(dirtyDate.getHours());
|
|
141
|
+
current.setMinutes(dirtyDate.getMinutes());
|
|
142
|
+
current.setSeconds(dirtyDate.getSeconds());
|
|
143
|
+
var days = [];
|
|
144
|
+
var index = 0;
|
|
166
145
|
|
|
167
146
|
while (index < 42) {
|
|
168
|
-
days.push(current)
|
|
169
|
-
current = addDays(current, 1)
|
|
170
|
-
index += 1
|
|
147
|
+
days.push(current);
|
|
148
|
+
current = addDays(current, 1);
|
|
149
|
+
index += 1;
|
|
171
150
|
}
|
|
172
151
|
|
|
173
|
-
return days
|
|
152
|
+
return days;
|
|
174
153
|
}
|
|
175
154
|
|
|
176
155
|
function isInvalid(date) {
|
|
177
156
|
// eslint-disable-next-line
|
|
178
|
-
return isNaN(date)
|
|
157
|
+
return isNaN(date);
|
|
179
158
|
}
|
|
180
159
|
|
|
181
160
|
function toDateWithFormat(dirtyDate, fmt, def) {
|
|
182
|
-
|
|
161
|
+
var date;
|
|
162
|
+
|
|
183
163
|
if (typeof dirtyDate === 'string') {
|
|
184
164
|
date = parse(dirtyDate, fmt, new Date(), {
|
|
185
|
-
weekStartsOn: getLocale('startOfWeek')
|
|
186
|
-
})
|
|
187
|
-
|
|
188
|
-
weekStartsOn: getLocale('startOfWeek')
|
|
189
|
-
})
|
|
165
|
+
weekStartsOn: getLocale('startOfWeek')
|
|
166
|
+
});
|
|
167
|
+
var str = format(date, fmt, {
|
|
168
|
+
weekStartsOn: getLocale('startOfWeek')
|
|
169
|
+
});
|
|
170
|
+
|
|
190
171
|
if (str !== dirtyDate) {
|
|
191
|
-
date = toDate(dirtyDate)
|
|
172
|
+
date = toDate(dirtyDate);
|
|
192
173
|
}
|
|
193
|
-
} else date = toDate(dirtyDate)
|
|
194
|
-
|
|
195
|
-
|
|
174
|
+
} else date = toDate(dirtyDate);
|
|
175
|
+
|
|
176
|
+
if (isInvalid(date)) date = def;
|
|
177
|
+
return date;
|
|
196
178
|
}
|
|
197
179
|
|
|
198
|
-
function compareMonth(dateLeft, dateRight, pad
|
|
199
|
-
if (
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
180
|
+
function compareMonth(dateLeft, dateRight, pad) {
|
|
181
|
+
if (pad === void 0) {
|
|
182
|
+
pad = 0;
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
if (!dateLeft || !dateRight) return 0;
|
|
186
|
+
var left = new Date(dateLeft.getFullYear(), dateLeft.getMonth(), 1);
|
|
187
|
+
var right = new Date(dateRight.getFullYear(), dateRight.getMonth() + pad, 1);
|
|
188
|
+
return compareAsc(left, right);
|
|
203
189
|
}
|
|
204
190
|
|
|
205
191
|
function newDate(defaultDate) {
|
|
206
|
-
|
|
207
|
-
return new Date(date.getFullYear(), date.getMonth(), date.getDate())
|
|
192
|
+
var date = defaultDate ? toDate(defaultDate) : new Date();
|
|
193
|
+
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
|
|
208
194
|
}
|
|
209
195
|
|
|
210
196
|
function setTime(date, old) {
|
|
211
|
-
date.setHours(old.getHours())
|
|
212
|
-
date.setMinutes(old.getMinutes())
|
|
213
|
-
date.setSeconds(old.getSeconds())
|
|
214
|
-
|
|
215
|
-
return date
|
|
197
|
+
date.setHours(old.getHours());
|
|
198
|
+
date.setMinutes(old.getMinutes());
|
|
199
|
+
date.setSeconds(old.getSeconds());
|
|
200
|
+
return date;
|
|
216
201
|
}
|
|
217
202
|
|
|
218
203
|
function cloneTime(date, old, fmt) {
|
|
219
|
-
if (!date) return date
|
|
220
|
-
old = toDateWithFormat(old, fmt)
|
|
221
|
-
if (isInvalid(old)) return date
|
|
222
|
-
return setTime(date, old)
|
|
204
|
+
if (!date) return date;
|
|
205
|
+
old = toDateWithFormat(old, fmt);
|
|
206
|
+
if (isInvalid(old)) return date;
|
|
207
|
+
return setTime(date, old);
|
|
223
208
|
}
|
|
224
209
|
|
|
225
210
|
function formatDateWithDefaultTime(date, value, defaultTime, fmt) {
|
|
226
|
-
if (!date) return date
|
|
227
|
-
if (value) return setTime(date, value)
|
|
228
|
-
if (!defaultTime) return date
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
const nDate = cloneTime(date, defaultTime, TIME_FORMAT)
|
|
234
|
-
return format(nDate, fmt)
|
|
211
|
+
if (!date) return date;
|
|
212
|
+
if (value) return setTime(date, value);
|
|
213
|
+
if (!defaultTime) return date;
|
|
214
|
+
var dateHMS = toDateWithFormat(defaultTime, TIME_FORMAT);
|
|
215
|
+
if (isInvalid(dateHMS)) return date;
|
|
216
|
+
var nDate = cloneTime(date, defaultTime, TIME_FORMAT);
|
|
217
|
+
return format(nDate, fmt);
|
|
235
218
|
}
|
|
236
219
|
|
|
237
220
|
function clearHMS(date) {
|
|
238
|
-
if (!isValid(date)) return date
|
|
239
|
-
return new Date(new Date(date.toDateString()).getTime())
|
|
221
|
+
if (!isValid(date)) return date;
|
|
222
|
+
return new Date(new Date(date.toDateString()).getTime());
|
|
240
223
|
}
|
|
241
224
|
|
|
242
|
-
function compareDateArray(arr1, arr2, type
|
|
243
|
-
if (
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
225
|
+
function compareDateArray(arr1, arr2, type) {
|
|
226
|
+
if (type === void 0) {
|
|
227
|
+
type = 'date';
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
if (!arr1 || !arr2 || arr1.length !== arr2.length) return false;
|
|
231
|
+
return arr1.every(function (v, i) {
|
|
232
|
+
if (!v || !arr2[i]) return false;
|
|
233
|
+
if (type === 'week') return format(v, 'RRRR II') === format(arr2[i], 'RRRR II');
|
|
234
|
+
return v.getTime() === arr2[i].getTime();
|
|
235
|
+
});
|
|
249
236
|
}
|
|
250
237
|
|
|
251
238
|
function getFormat(fo) {
|
|
252
|
-
|
|
253
|
-
|
|
239
|
+
var defaultFormat = 'yyyy-MM-dd HH:mm:ss.SSS';
|
|
240
|
+
['H', 'm', 's', 'S', 'h'].map(function (v) {
|
|
254
241
|
if (fo.indexOf(v) <= -1) {
|
|
255
|
-
|
|
256
|
-
defaultFormat = defaultFormat.replace(reg, '0')
|
|
242
|
+
var reg = new RegExp("" + v, 'g');
|
|
243
|
+
defaultFormat = defaultFormat.replace(reg, '0');
|
|
257
244
|
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
245
|
+
|
|
246
|
+
return v;
|
|
247
|
+
});
|
|
248
|
+
return defaultFormat;
|
|
261
249
|
}
|
|
262
250
|
|
|
263
251
|
function resetTimeByFormat(value, fo) {
|
|
264
|
-
if (!value) return null
|
|
265
|
-
|
|
266
|
-
return toDate(
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
})
|
|
270
|
-
)
|
|
252
|
+
if (!value) return null;
|
|
253
|
+
var date = toDate(value);
|
|
254
|
+
return toDate(format(date, getFormat(fo), {
|
|
255
|
+
weekStartsOn: getLocale('startOfWeek')
|
|
256
|
+
}));
|
|
271
257
|
}
|
|
272
258
|
|
|
273
|
-
function formatted(date, fmt
|
|
274
|
-
if (typeof fmt === 'function') return fmt(date)
|
|
275
|
-
|
|
259
|
+
function formatted(date, fmt) {
|
|
260
|
+
if (typeof fmt === 'function') return fmt(date);
|
|
261
|
+
|
|
262
|
+
for (var _len = arguments.length, options = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
|
|
263
|
+
options[_key - 2] = arguments[_key];
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
return format.apply(void 0, [date, fmt].concat(options));
|
|
276
267
|
}
|
|
277
268
|
|
|
278
269
|
export default {
|
|
279
|
-
clearHMS,
|
|
280
|
-
addDays,
|
|
281
|
-
addMonths,
|
|
282
|
-
addYears,
|
|
283
|
-
addSeconds,
|
|
284
|
-
cloneTime,
|
|
285
|
-
compareAsc,
|
|
286
|
-
compareMonth,
|
|
287
|
-
getDaysOfMonth,
|
|
270
|
+
clearHMS: clearHMS,
|
|
271
|
+
addDays: addDays,
|
|
272
|
+
addMonths: addMonths,
|
|
273
|
+
addYears: addYears,
|
|
274
|
+
addSeconds: addSeconds,
|
|
275
|
+
cloneTime: cloneTime,
|
|
276
|
+
compareAsc: compareAsc,
|
|
277
|
+
compareMonth: compareMonth,
|
|
278
|
+
getDaysOfMonth: getDaysOfMonth,
|
|
288
279
|
format: formatted,
|
|
289
|
-
isInvalid,
|
|
290
|
-
isSameDay,
|
|
291
|
-
isSameMonth,
|
|
292
|
-
isSameWeek,
|
|
293
|
-
isValid,
|
|
294
|
-
newDate,
|
|
295
|
-
setTime,
|
|
296
|
-
parse,
|
|
297
|
-
toDate,
|
|
298
|
-
toDateWithFormat,
|
|
299
|
-
formatDateWithDefaultTime,
|
|
300
|
-
compareDateArray,
|
|
301
|
-
TIME_FORMAT,
|
|
302
|
-
resetTimeByFormat
|
|
303
|
-
}
|
|
280
|
+
isInvalid: isInvalid,
|
|
281
|
+
isSameDay: isSameDay,
|
|
282
|
+
isSameMonth: isSameMonth,
|
|
283
|
+
isSameWeek: isSameWeek,
|
|
284
|
+
isValid: isValid,
|
|
285
|
+
newDate: newDate,
|
|
286
|
+
setTime: setTime,
|
|
287
|
+
parse: parse,
|
|
288
|
+
toDate: toDate,
|
|
289
|
+
toDateWithFormat: toDateWithFormat,
|
|
290
|
+
formatDateWithDefaultTime: formatDateWithDefaultTime,
|
|
291
|
+
compareDateArray: compareDateArray,
|
|
292
|
+
TIME_FORMAT: TIME_FORMAT,
|
|
293
|
+
resetTimeByFormat: resetTimeByFormat
|
|
294
|
+
};
|