@chaoswise/ui 3.0.16 → 3.0.18
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/lib/CWMessage/MessageContent/TabList/index.js +2 -2
- package/lib/CWRangePicker/DropdownMenu/index.js +2 -1
- package/lib/CWRangePicker/Refresh/index.js +1 -1
- package/lib/CWRangePicker/TimeSpan/index.js +1 -1
- package/lib/CWRangePicker/index.js +64 -34
- package/lib/CWRangePicker/utils/generate/dayjs.js +697 -0
- package/lib/CWRangePicker/utils/{index.js → generate/moment.js} +2 -1
- package/lib/ConfigProvider/ConfigProvider.js +12 -11
- package/lib/ConfigProvider/generate/dayjs.js +14 -0
- package/lib/ConfigProvider/generate/moment.js +14 -0
- package/lib/Modal/confirmGlobalStyle.js +2 -3
- package/lib/RangePicker/index.js +14 -15
- package/lib/RangePicker/index.style.js +1 -0
- package/lib/RangePicker/utils/generate/dayjs.js +172 -0
- package/lib/RangePicker/utils/{index.js → generate/moment.js} +5 -4
- package/lib/ThemeProvider/main.js +0 -1
- package/lib/TimeRangeSlider/Refresh/index.js +1 -1
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/components/BottomSlider/BottomPlaceholder.js +1 -1
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/components/BottomSlider/BottomTimeDateProcess.js +1 -1
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/components/TopSlider/TopDateProcess.js +1 -1
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/hooks/useMouse.js +5 -6
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/utils/generate/dayjs.js +260 -0
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/utils/{index.js → generate/moment.js} +2 -1
- package/lib/TimeRangeSlider/TimeSpan/index.js +1 -1
- package/lib/TimeRangeSlider/index.js +15 -12
- package/lib/TimeRangeSlider/utils/generate/dayjs.js +729 -0
- package/lib/TimeRangeSlider/utils/{index.js → generate/moment.js} +23 -53
- package/lib/antd-style/factories/createStyles/index.js +4 -6
- package/lib/locales/en_US.json +1 -0
- package/lib/locales/zh_CN.json +1 -0
- package/lib/locales/zh_TW.json +1 -0
- package/lib/utils/generate/dayjs.js +2 -0
- package/lib/utils/generate/moment.js +2 -0
- package/package.json +1 -3
- package/lib/CWRangePicker/locale/en_US.js +0 -29
- package/lib/CWRangePicker/locale/index.js +0 -11
- package/lib/CWRangePicker/locale/zh_CN.js +0 -29
- package/lib/CWRangePicker/locale/zh_TW.js +0 -29
- package/lib/Formily/FieldList/index.js +0 -43
- package/lib/Formily/Form/index.js +0 -2
- package/lib/Formily/FormButtonGroup/index.js +0 -2
- package/lib/Formily/FormItem/index.js +0 -90
- package/lib/Formily/FormItem/items/Checkbox.js +0 -13
- package/lib/Formily/FormItem/items/DatePicker.js +0 -121
- package/lib/Formily/FormItem/items/Input.js +0 -13
- package/lib/Formily/FormItem/items/NumberPicker.js +0 -9
- package/lib/Formily/FormItem/items/Password.js +0 -70
- package/lib/Formily/FormItem/items/Radio.js +0 -13
- package/lib/Formily/FormItem/items/Range.js +0 -82
- package/lib/Formily/FormItem/items/Rating.js +0 -8
- package/lib/Formily/FormItem/items/Select.js +0 -8
- package/lib/Formily/FormItem/items/Switch.js +0 -9
- package/lib/Formily/FormItem/items/Tansfer.js +0 -9
- package/lib/Formily/FormItem/items/TimePicker.js +0 -44
- package/lib/Formily/FormItem/items/Upload.js +0 -260
- package/lib/Formily/FormItem/items/formItemWrapper.js +0 -17
- package/lib/Formily/FormItem/items/shared.js +0 -140
- package/lib/Formily/FormPath/index.js +0 -2
- package/lib/Formily/MegaLayout/index.js +0 -24
- package/lib/Formily/Reset/index.js +0 -2
- package/lib/Formily/Submit/index.js +0 -2
- package/lib/Formily/context.js +0 -3
- package/lib/Formily/formily/index.js +0 -22
- package/lib/Formily/index.js +0 -5
- package/lib/Formily/subscribeFields/index.js +0 -46
|
@@ -23,7 +23,7 @@ import chaoswiseUICustomTheme from "./customToken";
|
|
|
23
23
|
import "../Antd5/style/reset.css";
|
|
24
24
|
import { merge } from "lodash-es";
|
|
25
25
|
import intlContext from "./intlContext";
|
|
26
|
-
import
|
|
26
|
+
import { getDateLocal } from "./generate/dayjs";
|
|
27
27
|
import { legacyLogicalPropertiesTransformer, StyleProvider } from "@ant-design/cssinjs";
|
|
28
28
|
var Provider = intlContext.Provider;
|
|
29
29
|
var CWConfigProvider = function CWConfigProvider(_ref) {
|
|
@@ -52,20 +52,18 @@ var CWConfigProvider = function CWConfigProvider(_ref) {
|
|
|
52
52
|
import("../Antd5/locale/zh_CN").then(function (res) {
|
|
53
53
|
setAntdLocale(res["default"]);
|
|
54
54
|
});
|
|
55
|
-
|
|
56
|
-
moment.locale('zh-cn');
|
|
55
|
+
getDateLocal("zh_CN");
|
|
57
56
|
}
|
|
58
57
|
if (currentLocale === "en_US") {
|
|
59
58
|
import("../Antd5/locale/en_US").then(function (res) {
|
|
60
59
|
setAntdLocale(res["default"]);
|
|
61
|
-
|
|
60
|
+
getDateLocal("en_US");
|
|
62
61
|
});
|
|
63
62
|
}
|
|
64
63
|
if (currentLocale === "zh_TW") {
|
|
65
64
|
import("../Antd5/locale/zh_TW").then(function (res) {
|
|
66
65
|
setAntdLocale(res["default"]);
|
|
67
|
-
|
|
68
|
-
moment.locale('zh-tw');
|
|
66
|
+
getDateLocal("zh_TW");
|
|
69
67
|
});
|
|
70
68
|
}
|
|
71
69
|
};
|
|
@@ -94,12 +92,15 @@ var CWConfigProvider = function CWConfigProvider(_ref) {
|
|
|
94
92
|
}
|
|
95
93
|
}, /*#__PURE__*/React.createElement(ThemeProvider, _extends({
|
|
96
94
|
locale: antdLocale,
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
wave: {
|
|
95
|
+
theme: mergeTheme
|
|
96
|
+
}, resProps, {
|
|
97
|
+
wave: merge({}, {
|
|
100
98
|
disabled: true
|
|
101
|
-
}
|
|
102
|
-
|
|
99
|
+
}, resProps.wave || {}),
|
|
100
|
+
button: merge({}, {
|
|
101
|
+
autoInsertSpace: false
|
|
102
|
+
}, resProps.button || {})
|
|
103
|
+
}), /*#__PURE__*/React.createElement(StyleProvider, {
|
|
103
104
|
hashPriority: "high",
|
|
104
105
|
transformers: [legacyLogicalPropertiesTransformer]
|
|
105
106
|
}, hasAppHolder ? /*#__PURE__*/React.createElement(_App, null, /*#__PURE__*/React.createElement(_AppHolder, null), children) : children)));
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import dayjs from "dayjs";
|
|
2
|
+
export var getDateLocal = function getDateLocal(currentLocale) {
|
|
3
|
+
if (currentLocale === "zh_CN") {
|
|
4
|
+
import("dayjs/locale/zh-cn");
|
|
5
|
+
dayjs.locale("zh-cn");
|
|
6
|
+
}
|
|
7
|
+
if (currentLocale === "en_US") {
|
|
8
|
+
dayjs.locale("en");
|
|
9
|
+
}
|
|
10
|
+
if (currentLocale === "zh_TW") {
|
|
11
|
+
import("dayjs/locale/zh-tw");
|
|
12
|
+
dayjs.locale("zh-tw");
|
|
13
|
+
}
|
|
14
|
+
};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import moment from "moment";
|
|
2
|
+
export var getDateLocal = function getDateLocal(currentLocale) {
|
|
3
|
+
if (currentLocale === "zh_CN") {
|
|
4
|
+
import("moment/locale/zh-cn");
|
|
5
|
+
moment.locale("zh-cn");
|
|
6
|
+
}
|
|
7
|
+
if (currentLocale === "en_US") {
|
|
8
|
+
moment.locale("en");
|
|
9
|
+
}
|
|
10
|
+
if (currentLocale === "zh_TW") {
|
|
11
|
+
import("moment/locale/zh-tw");
|
|
12
|
+
moment.locale("zh-tw");
|
|
13
|
+
}
|
|
14
|
+
};
|
|
@@ -13,13 +13,12 @@ var genModalConfirmStyle = function genModalConfirmStyle(token) {
|
|
|
13
13
|
borderRadius: token.borderRadius
|
|
14
14
|
}), "".concat(componentCls, "-body"), {
|
|
15
15
|
padding: "24px 32px"
|
|
16
|
-
}), "".concat(confirmComponentCls, "-body"), _defineProperty(_defineProperty({}, iconCls, {
|
|
16
|
+
}), "".concat(confirmComponentCls, "-body"), _defineProperty(_defineProperty({}, "> ".concat(iconCls), {
|
|
17
17
|
display: "inline-flex",
|
|
18
18
|
justifyContent: "center",
|
|
19
19
|
alignItems: "center",
|
|
20
20
|
fontSize: "18px !important",
|
|
21
|
-
marginRight: "10px"
|
|
22
|
-
marginTop: "1px"
|
|
21
|
+
marginRight: "10px"
|
|
23
22
|
}), "".concat(confirmComponentCls, "-paragraph"), _defineProperty(_defineProperty({}, "".concat(confirmComponentCls, "-title"), {
|
|
24
23
|
fontSize: "14px",
|
|
25
24
|
lineHeight: "22px"
|
package/lib/RangePicker/index.js
CHANGED
|
@@ -17,9 +17,8 @@ import React, { useState, useEffect, useMemo, forwardRef, useRef, useCallback, u
|
|
|
17
17
|
var RangePicker = _DatePicker.RangePicker;
|
|
18
18
|
import ExtraQuickSelect from "./components/ExtraQuickSelect";
|
|
19
19
|
import ExtraTimeFooter from "./components/ExtraTimeFooter";
|
|
20
|
-
import { formatMomentToString, formatMomentToSplit, byTimeMomentToDateMoment, disabledAllTimeFunc } from "./utils/
|
|
20
|
+
import dayjs, { formatMomentToString, formatMomentToSplit, byTimeMomentToDateMoment, disabledAllTimeFunc } from "./utils/generate/dayjs";
|
|
21
21
|
import classnames from "classnames";
|
|
22
|
-
import moment from "moment";
|
|
23
22
|
import useConfigContext from "../useConfigContext";
|
|
24
23
|
import useStyle from "./index.style";
|
|
25
24
|
var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
@@ -83,9 +82,9 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
83
82
|
hashId = _useStyle2[1],
|
|
84
83
|
cssVarCls = _useStyle2[2];
|
|
85
84
|
var _defaultTimeOption$st = defaultTimeOption.startTimeOption,
|
|
86
|
-
startTimeOption = _defaultTimeOption$st === void 0 ?
|
|
85
|
+
startTimeOption = _defaultTimeOption$st === void 0 ? dayjs("00:00:00", timeFormat.current) : _defaultTimeOption$st,
|
|
87
86
|
_defaultTimeOption$en = defaultTimeOption.endTimeOption,
|
|
88
|
-
endTimeOption = _defaultTimeOption$en === void 0 ?
|
|
87
|
+
endTimeOption = _defaultTimeOption$en === void 0 ? dayjs("00:00:00", timeFormat.current) : _defaultTimeOption$en;
|
|
89
88
|
//监听外部控制面板的显示隐藏状态
|
|
90
89
|
useEffect(function () {
|
|
91
90
|
if ("open" in props) {
|
|
@@ -178,7 +177,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
178
177
|
if (dateValue[0]) {
|
|
179
178
|
var leftDateTime = byTimeMomentToDateMoment(newStartTime, dateValue[0]);
|
|
180
179
|
var rightDateTime = dateValue[1];
|
|
181
|
-
if (
|
|
180
|
+
if (dayjs(leftDateTime).isAfter(dateValue[1])) {
|
|
182
181
|
rightDateTime = leftDateTime;
|
|
183
182
|
setEndTimeParams(newStartTime);
|
|
184
183
|
}
|
|
@@ -214,7 +213,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
214
213
|
var handleSetRange = function handleSetRange(startDateTime, endDateTime, quickKey) {
|
|
215
214
|
if (!showTime) {
|
|
216
215
|
if (startDateTime && endDateTime) {
|
|
217
|
-
var dateVal = [
|
|
216
|
+
var dateVal = [dayjs(startDateTime), dayjs(endDateTime)];
|
|
218
217
|
_onChange(dateVal, ["", ""], quickKey);
|
|
219
218
|
recordQuickActiveKey.current = quickKey;
|
|
220
219
|
_onOk(dateVal, ["", ""], quickKey);
|
|
@@ -227,11 +226,11 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
227
226
|
return;
|
|
228
227
|
}
|
|
229
228
|
if (startDateTime && endDateTime) {
|
|
230
|
-
var _dateVal = [
|
|
229
|
+
var _dateVal = [dayjs(startDateTime), dayjs(endDateTime)];
|
|
231
230
|
var startDateTimeString = formatMomentToString(startDateTime, formatRef.current);
|
|
232
231
|
var endDateTimeString = formatMomentToString(endDateTime, formatRef.current);
|
|
233
|
-
setStartTimeParams(
|
|
234
|
-
setEndTimeParams(
|
|
232
|
+
setStartTimeParams(dayjs(startDateTime));
|
|
233
|
+
setEndTimeParams(dayjs(endDateTime));
|
|
235
234
|
_onCalendarChange(_dateVal, [startDateTimeString, endDateTimeString], {
|
|
236
235
|
range: "end"
|
|
237
236
|
});
|
|
@@ -283,7 +282,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
283
282
|
if (info.range == "start") {
|
|
284
283
|
if (startTimeParams) {
|
|
285
284
|
var TimeStr = formatMomentToString(startTimeParams, timeFormat.current);
|
|
286
|
-
var StartDateTime =
|
|
285
|
+
var StartDateTime = dayjs(CalendarDateStr + " " + TimeStr, formatRef.current);
|
|
287
286
|
dateTimeValue = StartDateTime;
|
|
288
287
|
_onCalendarChange([StartDateTime, null], [TimeStr, ""], info);
|
|
289
288
|
}
|
|
@@ -292,7 +291,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
292
291
|
} else if (info.range == "end") {
|
|
293
292
|
if (endTimeParams) {
|
|
294
293
|
var _TimeStr = formatMomentToString(endTimeParams, timeFormat.current);
|
|
295
|
-
var EndDateTime =
|
|
294
|
+
var EndDateTime = dayjs(CalendarDateStr + " " + _TimeStr, formatRef.current);
|
|
296
295
|
dateTimeValue = EndDateTime;
|
|
297
296
|
_onCalendarChange([null, EndDateTime], [_TimeStr, ""], info);
|
|
298
297
|
}
|
|
@@ -308,14 +307,14 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
308
307
|
var endTimeStr = dateStrings[1];
|
|
309
308
|
if (startTimeParams) {
|
|
310
309
|
leftTimeStr = formatMomentToString(startTimeParams, timeFormat.current);
|
|
311
|
-
startDateTime =
|
|
310
|
+
startDateTime = dayjs(leftCalendarDateStr + " " + leftTimeStr, formatRef.current);
|
|
312
311
|
}
|
|
313
312
|
if (endTimeParams) {
|
|
314
313
|
endTimeStr = formatMomentToString(endTimeParams, timeFormat.current);
|
|
315
|
-
endDateTime =
|
|
314
|
+
endDateTime = dayjs(rightCalendarDateStr + " " + endTimeStr, formatRef.current);
|
|
316
315
|
}
|
|
317
316
|
// 若开始时间晚于结束时间,结束时间同步为开始时间
|
|
318
|
-
if (
|
|
317
|
+
if (dayjs(startDateTime).isAfter(endDateTime)) {
|
|
319
318
|
endTimeStr = leftTimeStr;
|
|
320
319
|
endDateTime = startDateTime;
|
|
321
320
|
if (startTimeParams) {
|
|
@@ -404,7 +403,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
404
403
|
}
|
|
405
404
|
}
|
|
406
405
|
if (startDate && endDate && name) {
|
|
407
|
-
newRanges[name] = [
|
|
406
|
+
newRanges[name] = [dayjs(startDate), dayjs(endDate)];
|
|
408
407
|
}
|
|
409
408
|
});
|
|
410
409
|
_ranges = newRanges;
|
|
@@ -18,6 +18,7 @@ var genCustomRangePickerStyle = function genCustomRangePickerStyle(token) {
|
|
|
18
18
|
position: "absolute",
|
|
19
19
|
top: "0",
|
|
20
20
|
width: "100px",
|
|
21
|
+
height: "100%",
|
|
21
22
|
borderRight: "".concat(unit(token.lineWidth), " ").concat(token.lineType, " ").concat(token.colorBorderSecondary),
|
|
22
23
|
overflowY: "auto",
|
|
23
24
|
display: "flex",
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
2
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
4
|
+
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
5
|
+
function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
|
|
6
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
7
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
8
|
+
import dayjs from "dayjs";
|
|
9
|
+
var timeFormat = "HH:mm:ss";
|
|
10
|
+
var dateFormat = "YYYY-MM-DD HH:mm:ss";
|
|
11
|
+
// 符合禁用规则的时间集合
|
|
12
|
+
export function range(start, end) {
|
|
13
|
+
var result = [];
|
|
14
|
+
for (var i = start; i <= end; i++) {
|
|
15
|
+
result.push(i);
|
|
16
|
+
}
|
|
17
|
+
return result;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
//格式化时间为字符串
|
|
21
|
+
export function formatMomentToString(dateTime, format) {
|
|
22
|
+
return dayjs(dateTime).format(format);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
//格式化时间为字符串,并将其切割date time的一个数组
|
|
26
|
+
export function formatMomentToSplit(dateTime, format) {
|
|
27
|
+
var sp = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : " ";
|
|
28
|
+
return formatMomentToString(dateTime, format).split(sp);
|
|
29
|
+
}
|
|
30
|
+
export function dateStringToSplit(dateTimeString) {
|
|
31
|
+
var sp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : " ";
|
|
32
|
+
return dateTimeString.split(sp);
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* 时间选择器变换后包装到最终显示时间上
|
|
36
|
+
*/
|
|
37
|
+
export function byTimeMomentToDateMoment(currentTime, currentDate) {
|
|
38
|
+
var DateStr = formatMomentToSplit(currentDate, dateFormat)[0];
|
|
39
|
+
var TimeStr = formatMomentToString(currentTime, timeFormat);
|
|
40
|
+
var leftDateTimeStr = DateStr + " " + TimeStr;
|
|
41
|
+
return dayjs(leftDateTimeStr, dateFormat);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
//是否是对象
|
|
45
|
+
export function isObj(obj) {
|
|
46
|
+
return obj !== null && _typeof(obj) === "object";
|
|
47
|
+
}
|
|
48
|
+
//是否是空对象
|
|
49
|
+
export function isEmptyObj(obj) {
|
|
50
|
+
return isObj(obj) && Reflect.ownKeys(obj).length === 0;
|
|
51
|
+
}
|
|
52
|
+
// 是否点击了级联输入框
|
|
53
|
+
export var isCalendarInput = function isCalendarInput(el, node) {
|
|
54
|
+
var isCalendarInput = false;
|
|
55
|
+
if (node) {
|
|
56
|
+
if (node.contains(el)) {
|
|
57
|
+
isCalendarInput = true;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return isCalendarInput;
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
//设置禁用时间,结束时间不能小于开始时间
|
|
64
|
+
export var disabledAllTimeFunc = function disabledAllTimeFunc(dateValue, startTimeParams, endTimeParams, startDisabled, endDisabled) {
|
|
65
|
+
// 禁用开始时分秒
|
|
66
|
+
var disabledStartHours = function disabledStartHours() {
|
|
67
|
+
return [];
|
|
68
|
+
};
|
|
69
|
+
var diabledStartMinutes = function diabledStartMinutes() {
|
|
70
|
+
return [];
|
|
71
|
+
};
|
|
72
|
+
var disabledStartSeconds = function disabledStartSeconds() {
|
|
73
|
+
return [];
|
|
74
|
+
};
|
|
75
|
+
// 禁用结束时分秒
|
|
76
|
+
var disabledEndHours = function disabledEndHours() {
|
|
77
|
+
return [];
|
|
78
|
+
};
|
|
79
|
+
var diabledEndMinutes = function diabledEndMinutes() {
|
|
80
|
+
return [];
|
|
81
|
+
};
|
|
82
|
+
var disabledEndSeconds = function disabledEndSeconds() {
|
|
83
|
+
return [];
|
|
84
|
+
};
|
|
85
|
+
if (dateValue && dateValue.length === 2) {
|
|
86
|
+
var hoursStart = dayjs(dateValue[0]).hour(); //0~23
|
|
87
|
+
var minutesStart = dayjs(dateValue[0]).minute(); //0~59
|
|
88
|
+
var secondsStart = dayjs(dateValue[0]).second(); //0~59;
|
|
89
|
+
var dayRes = dayjs(dateValue[0]).isSame(dateValue[1], "day"); // 是否同一天
|
|
90
|
+
var hourRes = dayjs(startTimeParams).isSame(endTimeParams, "hour"); // 是否同一小时
|
|
91
|
+
var minRes = dayjs(startTimeParams).isSame(endTimeParams, "minute"); // 是否同一分钟
|
|
92
|
+
disabledEndHours = dayRes ? function () {
|
|
93
|
+
return range(0, hoursStart - 1);
|
|
94
|
+
} : function () {
|
|
95
|
+
return [];
|
|
96
|
+
};
|
|
97
|
+
diabledEndMinutes = dayRes && hourRes ? function () {
|
|
98
|
+
return range(0, minutesStart - 1);
|
|
99
|
+
} : function () {
|
|
100
|
+
return [];
|
|
101
|
+
};
|
|
102
|
+
disabledEndSeconds = dayRes && hourRes && minRes ? function () {
|
|
103
|
+
return range(0, secondsStart - 1);
|
|
104
|
+
} : function () {
|
|
105
|
+
return [];
|
|
106
|
+
};
|
|
107
|
+
if (isObj(startDisabled) && !isEmptyObj(startDisabled)) {
|
|
108
|
+
disabledStartHours = function disabledStartHours() {
|
|
109
|
+
var _startDisabled$disabl = startDisabled.disabledHours,
|
|
110
|
+
disabledHours = _startDisabled$disabl === void 0 ? function () {
|
|
111
|
+
return [];
|
|
112
|
+
} : _startDisabled$disabl;
|
|
113
|
+
return disabledHours();
|
|
114
|
+
};
|
|
115
|
+
diabledStartMinutes = function diabledStartMinutes() {
|
|
116
|
+
var _startDisabled$disabl2 = startDisabled.disabledMinutes,
|
|
117
|
+
disabledMinutes = _startDisabled$disabl2 === void 0 ? function () {
|
|
118
|
+
return [];
|
|
119
|
+
} : _startDisabled$disabl2;
|
|
120
|
+
return disabledMinutes();
|
|
121
|
+
};
|
|
122
|
+
disabledStartSeconds = function disabledStartSeconds() {
|
|
123
|
+
var _startDisabled$disabl3 = startDisabled.disabledSeconds,
|
|
124
|
+
disabledSeconds = _startDisabled$disabl3 === void 0 ? function () {
|
|
125
|
+
return [];
|
|
126
|
+
} : _startDisabled$disabl3;
|
|
127
|
+
return disabledSeconds();
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
if (isObj(endDisabled) && !isEmptyObj(endDisabled)) {
|
|
131
|
+
disabledEndHours = function disabledEndHours() {
|
|
132
|
+
var _endDisabled$disabled = endDisabled.disabledHours,
|
|
133
|
+
disabledHours = _endDisabled$disabled === void 0 ? function () {
|
|
134
|
+
return [];
|
|
135
|
+
} : _endDisabled$disabled;
|
|
136
|
+
var result = dayRes ? range(0, hoursStart - 1) : [];
|
|
137
|
+
return Array.from(new Set([].concat(_toConsumableArray(result), _toConsumableArray(disabledHours()))));
|
|
138
|
+
};
|
|
139
|
+
diabledEndMinutes = function diabledEndMinutes() {
|
|
140
|
+
var _endDisabled$disabled2 = endDisabled.disabledMinutes,
|
|
141
|
+
disabledMinutes = _endDisabled$disabled2 === void 0 ? function () {
|
|
142
|
+
return [];
|
|
143
|
+
} : _endDisabled$disabled2;
|
|
144
|
+
var result = dayRes && hourRes ? range(0, minutesStart - 1) : [];
|
|
145
|
+
return Array.from(new Set([].concat(_toConsumableArray(result), _toConsumableArray(disabledMinutes()))));
|
|
146
|
+
};
|
|
147
|
+
disabledEndSeconds = function disabledEndSeconds() {
|
|
148
|
+
var _endDisabled$disabled3 = endDisabled.disabledSeconds,
|
|
149
|
+
disabledSeconds = _endDisabled$disabled3 === void 0 ? function () {
|
|
150
|
+
return [];
|
|
151
|
+
} : _endDisabled$disabled3;
|
|
152
|
+
var result = dayRes && hourRes && minRes ? range(0, secondsStart - 1) : [];
|
|
153
|
+
return Array.from(new Set([].concat(_toConsumableArray(result), _toConsumableArray(disabledSeconds()))));
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
var startDisabledTime = {
|
|
158
|
+
disabledHours: disabledStartHours,
|
|
159
|
+
disabledMinutes: diabledStartMinutes,
|
|
160
|
+
disabledSeconds: disabledStartSeconds
|
|
161
|
+
};
|
|
162
|
+
var endDisabledTime = {
|
|
163
|
+
disabledHours: disabledEndHours,
|
|
164
|
+
disabledMinutes: diabledEndMinutes,
|
|
165
|
+
disabledSeconds: disabledEndSeconds
|
|
166
|
+
};
|
|
167
|
+
return {
|
|
168
|
+
startDisabledTime: startDisabledTime,
|
|
169
|
+
endDisabledTime: endDisabledTime
|
|
170
|
+
};
|
|
171
|
+
};
|
|
172
|
+
export default dayjs;
|
|
@@ -83,9 +83,9 @@ export var disabledAllTimeFunc = function disabledAllTimeFunc(dateValue, startTi
|
|
|
83
83
|
return [];
|
|
84
84
|
};
|
|
85
85
|
if (dateValue && dateValue.length === 2) {
|
|
86
|
-
var hoursStart = moment(dateValue[0]).
|
|
87
|
-
var minutesStart = moment(dateValue[0]).
|
|
88
|
-
var secondsStart = moment(dateValue[0]).
|
|
86
|
+
var hoursStart = moment(dateValue[0]).hour(); //0~23
|
|
87
|
+
var minutesStart = moment(dateValue[0]).minute(); //0~59
|
|
88
|
+
var secondsStart = moment(dateValue[0]).second(); //0~59;
|
|
89
89
|
var dayRes = moment(dateValue[0]).isSame(dateValue[1], "day"); // 是否同一天
|
|
90
90
|
var hourRes = moment(startTimeParams).isSame(endTimeParams, "hour"); // 是否同一小时
|
|
91
91
|
var minRes = moment(startTimeParams).isSame(endTimeParams, "minute"); // 是否同一分钟
|
|
@@ -168,4 +168,5 @@ export var disabledAllTimeFunc = function disabledAllTimeFunc(dateValue, startTi
|
|
|
168
168
|
startDisabledTime: startDisabledTime,
|
|
169
169
|
endDisabledTime: endDisabledTime
|
|
170
170
|
};
|
|
171
|
-
};
|
|
171
|
+
};
|
|
172
|
+
export default moment;
|
|
@@ -169,7 +169,6 @@ export function ThemeSwitcherProvider(_ref) {
|
|
|
169
169
|
themeVars: useMultipleTheme ? themeVars[currentTheme] ? _objectSpread(_objectSpread({}, defaultThemeVars), themeVars[currentTheme]) : defaultThemeVars : _objectSpread(_objectSpread({}, defaultThemeVars), themeVars)
|
|
170
170
|
};
|
|
171
171
|
}, [switcher, status, currentTheme, themeMap, themeVars, defaultThemeVars]);
|
|
172
|
-
console.log(value, "value");
|
|
173
172
|
if (showLoading && status !== "loaded" && isFirstLoaded.current && useMultipleTheme) {
|
|
174
173
|
return loadingPage;
|
|
175
174
|
}
|
|
@@ -20,7 +20,7 @@ import classnames from "classnames";
|
|
|
20
20
|
import Refresh1Svg from "../assets/Refresh1";
|
|
21
21
|
import Refresh2Svg from "../assets/Refresh2";
|
|
22
22
|
import Refresh3Svg from "../assets/Refresh3";
|
|
23
|
-
import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils";
|
|
23
|
+
import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils/generate/dayjs";
|
|
24
24
|
import useConfigContext from "../../useConfigContext";
|
|
25
25
|
import { useIntl } from "../../locales";
|
|
26
26
|
import useStyle from "../styles/refresh.style";
|
|
@@ -6,7 +6,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
|
|
|
6
6
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
7
7
|
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
8
8
|
import React, { useMemo, useRef, useEffect } from "react";
|
|
9
|
-
import { computeTimeSpan } from "../../utils/
|
|
9
|
+
import { computeTimeSpan } from "../../utils/generate/dayjs";
|
|
10
10
|
import Limit from "../../assets/Limit";
|
|
11
11
|
import classnames from "classnames";
|
|
12
12
|
var BottomPlaceholder = function BottomPlaceholder(props) {
|
package/lib/TimeRangeSlider/TimeRangeSliderCmp/components/BottomSlider/BottomTimeDateProcess.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useMemo } from "react";
|
|
2
|
-
import { getAllTimeDates, getConvertedTimeDateDataByEndDate } from "../../utils";
|
|
2
|
+
import { getAllTimeDates, getConvertedTimeDateDataByEndDate } from "../../utils/generate/dayjs";
|
|
3
3
|
import classnames from "classnames";
|
|
4
4
|
var BottomTimeDateProcess = function BottomTimeDateProcess(props) {
|
|
5
5
|
var recordTimeDateWrapper = props.recordTimeDateWrapper,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { getAllDates, getConvertedDateData } from "../../utils";
|
|
2
|
+
import { getAllDates, getConvertedDateData } from "../../utils/generate/dayjs";
|
|
3
3
|
import classnames from "classnames";
|
|
4
4
|
var TopDateProcess = function TopDateProcess(props) {
|
|
5
5
|
var currentMomentRef = props.currentMomentRef,
|
|
@@ -11,10 +11,9 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
|
|
|
11
11
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
12
12
|
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
13
13
|
import React, { useState, useEffect, useRef } from "react";
|
|
14
|
-
import { getCorrectValue } from "../../utils";
|
|
15
|
-
import { getPositionInfoByDateInfo, getDateInfoByPositionInfo, getPositionInfoByTimeDateInfo, getTimeDateInfoByPositionInfo, isSameOrAfter, getOffsetLeft, getBottomSliderHoverInfo } from "../utils";
|
|
14
|
+
import { getCorrectValue } from "../../utils/generate/dayjs";
|
|
15
|
+
import dayjs, { getPositionInfoByDateInfo, getDateInfoByPositionInfo, getPositionInfoByTimeDateInfo, getTimeDateInfoByPositionInfo, isSameOrAfter, getOffsetLeft, getBottomSliderHoverInfo } from "../utils/generate/dayjs";
|
|
16
16
|
import useHover from "./useHover";
|
|
17
|
-
import moment from "moment";
|
|
18
17
|
var useMouse = function useMouse(_ref) {
|
|
19
18
|
var timeBoundary = _ref.timeBoundary,
|
|
20
19
|
isHandleClickRef = _ref.isHandleClickRef,
|
|
@@ -62,7 +61,7 @@ var useMouse = function useMouse(_ref) {
|
|
|
62
61
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
63
62
|
recordTimeDateWrapper = _useState10[0],
|
|
64
63
|
setRecordTimeDateWrapper = _useState10[1]; // 记录时间日期用于时间滑块外层容器渲染
|
|
65
|
-
var currentMomentRef = useRef(
|
|
64
|
+
var currentMomentRef = useRef(dayjs()); // 保存当前时间,用于计算时间滑块位置(下部分滑块),每次打开弹窗时更新
|
|
66
65
|
var recordEndTimeDateWrapper = useRef([]); // 保存最后一次时间日期用于时间滑块外层容器渲染(拖拽结束后)(下部分滑块)
|
|
67
66
|
var dragableRef = useRef({
|
|
68
67
|
status: false,
|
|
@@ -88,7 +87,7 @@ var useMouse = function useMouse(_ref) {
|
|
|
88
87
|
canDrag: true
|
|
89
88
|
});
|
|
90
89
|
var isHoverBottomWrapper = useHover(TimeRangeSliderBottomWrapperRef);
|
|
91
|
-
var millisecondsOfTheDay =
|
|
90
|
+
var millisecondsOfTheDay = dayjs.duration(1, "days").valueOf(); // 一天的毫秒数 86400000
|
|
92
91
|
var minWidth = min / millisecondsOfTheDay * timeSliderWidth;
|
|
93
92
|
var maxWidth = max / millisecondsOfTheDay * timeSliderWidth;
|
|
94
93
|
useEffect(function () {
|
|
@@ -105,7 +104,7 @@ var useMouse = function useMouse(_ref) {
|
|
|
105
104
|
return;
|
|
106
105
|
}
|
|
107
106
|
if (Array.isArray(recordDate) && recordDate.length) {
|
|
108
|
-
currentMomentRef.current =
|
|
107
|
+
currentMomentRef.current = dayjs();
|
|
109
108
|
var endDate = recordDate[1].clone();
|
|
110
109
|
var startDate = recordDate[1].clone().subtract(1, "days");
|
|
111
110
|
var startLeft = getPositionInfoByDateInfo(startDate, timeSliderWidth, currentMomentRef.current, days);
|