@chaoswise/ui 3.0.21 → 3.0.23
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/Alert/index.js +48 -2
- package/lib/Alert/index.style.js +36 -0
- package/lib/Button/index.style.js +1 -3
- package/lib/CWMessage/MessageContent/TabList/index.js +14 -14
- package/lib/CWMessage/MessageContent/index.js +2 -2
- package/lib/CWMessage/index.js +6 -7
- package/lib/CWMessage/utils/generate/dayjs.js +12 -0
- package/lib/CWMessage/utils/generate/moment.js +2 -0
- package/lib/CWRangePicker/DropdownMenu/index.js +0 -1
- package/lib/CWRangePicker/utils/generate/dayjs.js +24 -12
- package/lib/ConfigProvider/customTheme.js +3 -2
- package/lib/Header/index.style.js +0 -1
- package/lib/IconSelect/components/SearchIcon/index.js +0 -1
- package/lib/LayoutWrapper/style/index.js +7 -2
- package/lib/QuickTransfer/index.js +16 -6
- package/lib/RangePicker/components/ExtraQuickSelect.js +1 -4
- package/lib/RangePicker/index.js +55 -43
- package/lib/RangePicker/utils/generate/dayjs.js +29 -15
- package/lib/RangePicker/utils/generate/moment.js +13 -11
- package/lib/ScrollLoad/index.js +0 -1
- package/lib/SiderMenu/index.js +7 -16
- package/lib/SiderMenu/index.style.js +19 -3
- package/lib/SingleSpa/import-html/process-tpl.js +5 -5
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/hooks/useMouse.js +1 -1
- package/lib/TimeRangeSlider/TimeRangeSliderCmp/utils/generate/dayjs.js +20 -9
- package/lib/TimeRangeSlider/utils/generate/dayjs.js +42 -35
- package/lib/TimeRangeSlider/utils/generate/moment.js +25 -0
- package/lib/TimeZoneSelect/index.js +127 -0
- package/lib/utils/generate/dayjs.js +5 -0
- package/lib/utils/generate/moment.js +2 -1
- package/lib/utils/index.js +35 -0
- package/package.json +4 -1
package/lib/Alert/index.js
CHANGED
|
@@ -1,2 +1,48 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
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); }
|
|
2
|
+
var _excluded = ["isPageTop", "className"];
|
|
3
|
+
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
4
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
5
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
6
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
+
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
8
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
+
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; } }
|
|
10
|
+
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; }
|
|
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
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
13
|
+
function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
|
|
14
|
+
function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
|
|
15
|
+
import React, { forwardRef } from "react";
|
|
16
|
+
import Alert from "../Antd5/alert";
|
|
17
|
+
import { ExclamationCircleFilled } from "@ant-design/icons";
|
|
18
|
+
import PropTypes from "prop-types";
|
|
19
|
+
import classnames from "classnames";
|
|
20
|
+
import useConfigContext from "../useConfigContext";
|
|
21
|
+
import { cloneComProps } from "../utils";
|
|
22
|
+
import useStyle from "./index.style";
|
|
23
|
+
var CWAlert = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
24
|
+
var isPageTop = props.isPageTop,
|
|
25
|
+
className = props.className,
|
|
26
|
+
resProps = _objectWithoutProperties(props, _excluded);
|
|
27
|
+
var _useConfigContext = useConfigContext(),
|
|
28
|
+
getPrefixCls = _useConfigContext.getPrefixCls;
|
|
29
|
+
var prefixCls = getPrefixCls("alert");
|
|
30
|
+
var _useStyle = useStyle(prefixCls),
|
|
31
|
+
_useStyle2 = _slicedToArray(_useStyle, 3),
|
|
32
|
+
wrapCSSVar = _useStyle2[0],
|
|
33
|
+
hashId = _useStyle2[1],
|
|
34
|
+
cssVarCls = _useStyle2[2];
|
|
35
|
+
return wrapCSSVar(/*#__PURE__*/React.createElement(Alert, _extends({
|
|
36
|
+
ref: ref,
|
|
37
|
+
className: classnames("".concat(prefixCls, "-wrapper"), _defineProperty({}, "".concat(prefixCls, "-page-top"), isPageTop && !resProps.banner), className),
|
|
38
|
+
icon: resProps.type === "error" && /*#__PURE__*/React.createElement(ExclamationCircleFilled, null)
|
|
39
|
+
}, resProps)));
|
|
40
|
+
});
|
|
41
|
+
CWAlert.propTypes = {
|
|
42
|
+
/**
|
|
43
|
+
* 样式状态和页面内一致,内容padding有变化。与banner的区别是:banner不带边框,isPageTop带边框
|
|
44
|
+
*/
|
|
45
|
+
isPageTop: PropTypes.bool
|
|
46
|
+
};
|
|
47
|
+
cloneComProps(Alert, CWAlert);
|
|
48
|
+
export default CWAlert;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
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); }
|
|
2
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
3
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
4
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
5
|
+
import { genStyleHooks } from "../Antd5/theme/internal";
|
|
6
|
+
var genCustomAlertStyle = function genCustomAlertStyle(token) {
|
|
7
|
+
var prefixCls = token.antCls;
|
|
8
|
+
var componentCls = "".concat(prefixCls, "-alert");
|
|
9
|
+
return _defineProperty({}, "".concat(componentCls).concat(componentCls, "-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
|
|
10
|
+
fontSize: '14px',
|
|
11
|
+
lineHeight: "22px"
|
|
12
|
+
}, "&".concat(componentCls, "-banner"), {
|
|
13
|
+
padding: "9px 16px" // 无边框
|
|
14
|
+
}), "&".concat(componentCls, "-page-top"), {
|
|
15
|
+
padding: "8px 15px" // 有边框
|
|
16
|
+
}), "".concat(componentCls, "-content"), _defineProperty({}, "".concat(componentCls, "-message,").concat(componentCls, "-description"), {
|
|
17
|
+
lineHeight: "22px"
|
|
18
|
+
})), "".concat(componentCls, "-icon"), {
|
|
19
|
+
alignSelf: "flex-start",
|
|
20
|
+
height: "22px",
|
|
21
|
+
lineHeight: "22px"
|
|
22
|
+
}), "".concat(componentCls, "-close-icon"), _defineProperty({
|
|
23
|
+
alignSelf: "flex-start",
|
|
24
|
+
height: "22px",
|
|
25
|
+
lineHeight: "22px",
|
|
26
|
+
fontSize: "16px"
|
|
27
|
+
}, "".concat(token.iconCls, "-close"), {
|
|
28
|
+
color: token.colorTextSecondary
|
|
29
|
+
})));
|
|
30
|
+
};
|
|
31
|
+
// ============================== Export ==============================
|
|
32
|
+
export default genStyleHooks("CWAlert", function (token) {
|
|
33
|
+
return [
|
|
34
|
+
//
|
|
35
|
+
genCustomAlertStyle(token)];
|
|
36
|
+
});
|
|
@@ -3,7 +3,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
|
|
|
3
3
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
4
4
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
5
5
|
import { genStyleHooks } from "../Antd5/theme/internal";
|
|
6
|
-
import { prepareToken } from "../Antd5/button/style/token";
|
|
7
6
|
var prepareComponentToken = function prepareComponentToken(token) {
|
|
8
7
|
return {
|
|
9
8
|
btnMainPadding: token.Button.btnMainPadding
|
|
@@ -36,6 +35,5 @@ var genCustomButtonStyle = function genCustomButtonStyle(token) {
|
|
|
36
35
|
};
|
|
37
36
|
// ============================== Export ==============================
|
|
38
37
|
export default genStyleHooks("CWButton", function (token) {
|
|
39
|
-
|
|
40
|
-
return [genCustomButtonStyle(buttonToken)];
|
|
38
|
+
return [genCustomButtonStyle(token)];
|
|
41
39
|
}, prepareComponentToken);
|
|
@@ -9,11 +9,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
9
9
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
10
10
|
function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
|
|
11
11
|
function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
|
|
12
|
-
import React from
|
|
13
|
-
import dayjs from
|
|
14
|
-
import classnames from
|
|
15
|
-
import { readInnerMessageApi } from
|
|
16
|
-
import { useIntl } from
|
|
12
|
+
import React from "react";
|
|
13
|
+
import dayjs from "../../utils/generate/dayjs";
|
|
14
|
+
import classnames from "classnames";
|
|
15
|
+
import { readInnerMessageApi } from "../../service";
|
|
16
|
+
import { useIntl } from "../../../locales";
|
|
17
17
|
var TabList = function TabList(props) {
|
|
18
18
|
var _props$messages = props.messages,
|
|
19
19
|
messages = _props$messages === void 0 ? [] : _props$messages,
|
|
@@ -29,7 +29,7 @@ var TabList = function TabList(props) {
|
|
|
29
29
|
code = props.code,
|
|
30
30
|
onTabListAllRead = props.onTabListAllRead,
|
|
31
31
|
messagePrefixCls = props.messagePrefixCls,
|
|
32
|
-
|
|
32
|
+
renderMessageDateFormat = props.renderMessageDateFormat;
|
|
33
33
|
var intl = useIntl();
|
|
34
34
|
var _readInnerMessageApi = requestOption.readInnerMessageApi;
|
|
35
35
|
var onHandleMessage = function onHandleMessage(message) {
|
|
@@ -42,7 +42,7 @@ var TabList = function TabList(props) {
|
|
|
42
42
|
};
|
|
43
43
|
readInnerMessage(params);
|
|
44
44
|
// 撤回消息不操作
|
|
45
|
-
if (showMode ===
|
|
45
|
+
if (showMode === "invalid") return;
|
|
46
46
|
var _isClose = onTabListItem(message);
|
|
47
47
|
if (isClose || _isClose) {
|
|
48
48
|
setVisible(false);
|
|
@@ -70,7 +70,7 @@ var TabList = function TabList(props) {
|
|
|
70
70
|
return resRequestApi(params, gatewayPrefix);
|
|
71
71
|
case 3:
|
|
72
72
|
res = _context.sent;
|
|
73
|
-
if (res.status ==
|
|
73
|
+
if (res.status == "success") {
|
|
74
74
|
_params = {};
|
|
75
75
|
if (pageInfo.current > 1 && messages.length === 1) {
|
|
76
76
|
_params = {
|
|
@@ -98,24 +98,24 @@ var TabList = function TabList(props) {
|
|
|
98
98
|
var messageList = messages.map(function (message) {
|
|
99
99
|
var _message$title, _message$summary;
|
|
100
100
|
return /*#__PURE__*/React.createElement("div", {
|
|
101
|
-
className: classnames("".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty({}, "".concat(messagePrefixCls, "-content-tabs-list-invalid"), message.showMode ===
|
|
101
|
+
className: classnames("".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty({}, "".concat(messagePrefixCls, "-content-tabs-list-invalid"), message.showMode === "invalid")),
|
|
102
102
|
key: message.userMessageId
|
|
103
103
|
}, /*#__PURE__*/React.createElement("div", {
|
|
104
104
|
className: "".concat(messagePrefixCls, "-content-tabs-list-title"),
|
|
105
105
|
onClick: function onClick() {
|
|
106
106
|
return onHandleMessage(message);
|
|
107
107
|
}
|
|
108
|
-
}, message.showMode ===
|
|
108
|
+
}, message.showMode === "top" && /*#__PURE__*/React.createElement(_Tag, {
|
|
109
109
|
className: "".concat(messagePrefixCls, "-content-tabs-list-title-top")
|
|
110
|
-
}, intl.get(
|
|
110
|
+
}, intl.get("5cc44ee5-8da3-446b-b962-3fe7f77d4f38").d("置顶")), (_message$title = message.title) !== null && _message$title !== void 0 ? _message$title : ""), /*#__PURE__*/React.createElement("div", {
|
|
111
111
|
className: "".concat(messagePrefixCls, "-content-tabs-list-desc")
|
|
112
|
-
}, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary :
|
|
112
|
+
}, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ""), /*#__PURE__*/React.createElement("div", {
|
|
113
113
|
className: "".concat(messagePrefixCls, "-content-tabs-list-date")
|
|
114
|
-
}, message.time ? dayjs(Number(message.time)).format(
|
|
114
|
+
}, message.time ? renderMessageDateFormat ? renderMessageDateFormat(Number(message.time)) : dayjs(Number(message.time)).format("YYYY-MM-DD HH:mm:ss") : ""));
|
|
115
115
|
});
|
|
116
116
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
|
|
117
117
|
className: "".concat(messagePrefixCls, "-content-all-read"),
|
|
118
118
|
onClick: onHandleReadAllMessage
|
|
119
|
-
}, intl.get(
|
|
119
|
+
}, intl.get("58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61").d("全部已读")), messageList);
|
|
120
120
|
};
|
|
121
121
|
export default TabList;
|
|
@@ -50,7 +50,7 @@ var MessageContent = function MessageContent(props) {
|
|
|
50
50
|
onTabListAllRead = props.onTabListAllRead,
|
|
51
51
|
conditionsRef = props.conditionsRef,
|
|
52
52
|
messagePrefixCls = props.messagePrefixCls,
|
|
53
|
-
|
|
53
|
+
renderMessageDateFormat = props.renderMessageDateFormat;
|
|
54
54
|
var intl = useIntl();
|
|
55
55
|
var token = useTheme();
|
|
56
56
|
var history = useHistory();
|
|
@@ -243,7 +243,7 @@ var MessageContent = function MessageContent(props) {
|
|
|
243
243
|
code: item.code,
|
|
244
244
|
onTabListAllRead: onTabListAllRead,
|
|
245
245
|
messagePrefixCls: messagePrefixCls,
|
|
246
|
-
|
|
246
|
+
renderMessageDateFormat: renderMessageDateFormat
|
|
247
247
|
}) : /*#__PURE__*/React.createElement(_Empty, {
|
|
248
248
|
description: emptyDescription
|
|
249
249
|
}), /*#__PURE__*/React.createElement("div", {
|
package/lib/CWMessage/index.js
CHANGED
|
@@ -59,8 +59,8 @@ function Message(props) {
|
|
|
59
59
|
strongMessageOption = _props$strongMessageO === void 0 ? {} : _props$strongMessageO,
|
|
60
60
|
_props$onSocketChange = props.onSocketChange,
|
|
61
61
|
onSocketChange = _props$onSocketChange === void 0 ? function () {} : _props$onSocketChange,
|
|
62
|
-
_props$
|
|
63
|
-
|
|
62
|
+
_props$renderMessageD = props.renderMessageDateFormat,
|
|
63
|
+
renderMessageDateFormat = _props$renderMessageD === void 0 ? function () {} : _props$renderMessageD;
|
|
64
64
|
var _useConfigContext = useConfigContext(),
|
|
65
65
|
getPrefixCls = _useConfigContext.getPrefixCls;
|
|
66
66
|
var prefixCls = getPrefixCls();
|
|
@@ -392,7 +392,7 @@ function Message(props) {
|
|
|
392
392
|
closable: closable,
|
|
393
393
|
conditionsRef: conditionsRef,
|
|
394
394
|
messagePrefixCls: messagePrefixCls,
|
|
395
|
-
|
|
395
|
+
renderMessageDateFormat: renderMessageDateFormat
|
|
396
396
|
}))));
|
|
397
397
|
}
|
|
398
398
|
Message.defaultProps = {
|
|
@@ -403,8 +403,7 @@ Message.defaultProps = {
|
|
|
403
403
|
isClose: false,
|
|
404
404
|
timeout: 3000,
|
|
405
405
|
socketPathPrefix: "",
|
|
406
|
-
closable: false
|
|
407
|
-
format: "YYYY-MM-DD HH:mm:ss"
|
|
406
|
+
closable: false
|
|
408
407
|
};
|
|
409
408
|
Message.propTypes = {
|
|
410
409
|
/**
|
|
@@ -460,8 +459,8 @@ Message.propTypes = {
|
|
|
460
459
|
*/
|
|
461
460
|
strongMessageOption: PropTypes.object,
|
|
462
461
|
/**
|
|
463
|
-
*
|
|
462
|
+
* 渲染消息时间格式,function(时间戳)=>{},
|
|
464
463
|
*/
|
|
465
|
-
|
|
464
|
+
renderMessageDateFormat: PropTypes.func
|
|
466
465
|
};
|
|
467
466
|
export default Message;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import originalDayjs from "dayjs";
|
|
2
|
+
import utc from "dayjs/plugin/utc";
|
|
3
|
+
import timezone from "dayjs/plugin/timezone";
|
|
4
|
+
// 扩展 dayjs 支持时区
|
|
5
|
+
originalDayjs.extend(utc);
|
|
6
|
+
originalDayjs.extend(timezone);
|
|
7
|
+
// 封装 dayjs 函数,使其每次调用时自动应用当前的全局时区
|
|
8
|
+
var dayjs = function dayjs() {
|
|
9
|
+
var instance = originalDayjs.apply(void 0, arguments);
|
|
10
|
+
return instance.tz();
|
|
11
|
+
};
|
|
12
|
+
export default dayjs;
|
|
@@ -107,7 +107,6 @@ var DropdownMenu = function DropdownMenu(props) {
|
|
|
107
107
|
// 点击切换为日历
|
|
108
108
|
var onClickSelectCalendar = function onClickSelectCalendar(e) {
|
|
109
109
|
e.nativeEvent.stopImmediatePropagation();
|
|
110
|
-
console.log(222, "22");
|
|
111
110
|
setIsCalendar(true);
|
|
112
111
|
};
|
|
113
112
|
// 存在历史记录点击tag回显时间
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
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); }
|
|
2
|
+
var _originalDayjs$tz;
|
|
2
3
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
4
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
5
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
@@ -10,11 +11,22 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
|
|
|
10
11
|
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; }
|
|
11
12
|
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
13
|
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
13
|
-
import
|
|
14
|
+
import originalDayjs from "dayjs";
|
|
14
15
|
import duration from "dayjs/plugin/duration";
|
|
15
|
-
dayjs
|
|
16
|
+
import utc from "dayjs/plugin/utc";
|
|
17
|
+
import timezone from "dayjs/plugin/timezone";
|
|
18
|
+
originalDayjs.extend(duration);
|
|
19
|
+
// 扩展 dayjs 支持时区
|
|
20
|
+
originalDayjs.extend(utc);
|
|
21
|
+
originalDayjs.extend(timezone);
|
|
16
22
|
var _require = require("uuid"),
|
|
17
23
|
uuidv4 = _require.v4;
|
|
24
|
+
var timeZone = ((_originalDayjs$tz = originalDayjs.tz()) === null || _originalDayjs$tz === void 0 || (_originalDayjs$tz = _originalDayjs$tz.$x) === null || _originalDayjs$tz === void 0 ? void 0 : _originalDayjs$tz.$timezone) || originalDayjs.tz.guess();
|
|
25
|
+
// 封装 dayjs 函数,使其每次调用时自动应用当前的全局时区
|
|
26
|
+
var dayjs = function dayjs() {
|
|
27
|
+
var instance = originalDayjs.apply(void 0, arguments);
|
|
28
|
+
return instance.tz();
|
|
29
|
+
};
|
|
18
30
|
// 枚举时间单位
|
|
19
31
|
var ENUM_TimeUnit = {
|
|
20
32
|
s: ["Second", "Seconds", "秒", "seconds"],
|
|
@@ -203,7 +215,7 @@ export var computeTimeSpan = function computeTimeSpan(value, timeSpanBoundary) {
|
|
|
203
215
|
if (timeDiff >= 60) {
|
|
204
216
|
timeDiff = Number(timeDiff + 1);
|
|
205
217
|
}
|
|
206
|
-
var duration =
|
|
218
|
+
var duration = originalDayjs.duration(timeDiff, "s");
|
|
207
219
|
var _duration$$d = duration.$d,
|
|
208
220
|
years = _duration$$d.years,
|
|
209
221
|
months = _duration$$d.months,
|
|
@@ -291,7 +303,7 @@ export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate
|
|
|
291
303
|
if (_maxTimeDiff <= 0) {
|
|
292
304
|
// 当前时间已经是极限了
|
|
293
305
|
// 已经是极限直接当前时间向前推进timeSpanBoundary即可
|
|
294
|
-
cloneCurrentDate_0 = dayjs().subtract(
|
|
306
|
+
cloneCurrentDate_0 = dayjs().subtract(originalDayjs.duration(timeSpanBoundary, "s"));
|
|
295
307
|
cloneCurrentDate_1 = dayjs();
|
|
296
308
|
switchInitial = true;
|
|
297
309
|
} else {
|
|
@@ -300,27 +312,27 @@ export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate
|
|
|
300
312
|
var initialTimeDiff = computeTimeDiff([clone0, clone1], "s");
|
|
301
313
|
if (timeSpanBoundary > initialTimeDiff) {
|
|
302
314
|
var needChangeTimeDiff = Math.ceil(timeSpanBoundary - initialTimeDiff) / 2;
|
|
303
|
-
cloneCurrentDate_0 = clone0.subtract(
|
|
304
|
-
cloneCurrentDate_1 = clone1.add(
|
|
315
|
+
cloneCurrentDate_0 = clone0.subtract(originalDayjs.duration(needChangeTimeDiff, "s"));
|
|
316
|
+
cloneCurrentDate_1 = clone1.add(originalDayjs.duration(needChangeTimeDiff, "s"));
|
|
305
317
|
// 计算最大值的时间差
|
|
306
318
|
var _maxTimeDiff2 = computeTimeDiff([cloneCurrentDate_1, dayjs()]);
|
|
307
319
|
if (_maxTimeDiff2 <= 0) {
|
|
308
320
|
// 当前时间已经是极限了
|
|
309
321
|
// 已经是极限直接当前时间向前推进timeSpanBoundary即可
|
|
310
|
-
cloneCurrentDate_0 = dayjs().subtract(
|
|
322
|
+
cloneCurrentDate_0 = dayjs().subtract(originalDayjs.duration(timeSpanBoundary, "s"));
|
|
311
323
|
cloneCurrentDate_1 = dayjs();
|
|
312
324
|
switchInitial = true;
|
|
313
325
|
}
|
|
314
326
|
} else {
|
|
315
|
-
cloneCurrentDate_1 = clone1.add(
|
|
327
|
+
cloneCurrentDate_1 = clone1.add(originalDayjs.duration(timeSpanBoundary, "s"));
|
|
316
328
|
var clone = cloneCurrentDate_1.clone();
|
|
317
|
-
cloneCurrentDate_0 = clone.subtract(
|
|
329
|
+
cloneCurrentDate_0 = clone.subtract(originalDayjs.duration(timeSpanBoundary, "s"));
|
|
318
330
|
// 计算最大值的时间差
|
|
319
331
|
var _maxTimeDiff3 = computeTimeDiff([cloneCurrentDate_1, dayjs()]);
|
|
320
332
|
if (_maxTimeDiff3 <= 0) {
|
|
321
333
|
// 当前时间已经是极限了
|
|
322
334
|
// 已经是极限直接当前时间向前推进timeSpanBoundary即可
|
|
323
|
-
cloneCurrentDate_0 = dayjs().subtract(
|
|
335
|
+
cloneCurrentDate_0 = dayjs().subtract(originalDayjs.duration(timeSpanBoundary, "s"));
|
|
324
336
|
cloneCurrentDate_1 = dayjs();
|
|
325
337
|
switchInitial = true;
|
|
326
338
|
}
|
|
@@ -379,7 +391,7 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
|
|
|
379
391
|
value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]][3]);
|
|
380
392
|
}
|
|
381
393
|
var timeDiff = value[1].diff(value[0]);
|
|
382
|
-
var duration =
|
|
394
|
+
var duration = originalDayjs.duration(timeDiff);
|
|
383
395
|
var _cloneChangeDate = cloneChangeDate(value[0], value[1], direction, growSize, duration, timeSpanBoundary),
|
|
384
396
|
_value = _cloneChangeDate.value,
|
|
385
397
|
switchInitial = _cloneChangeDate.switchInitial;
|
|
@@ -609,7 +621,7 @@ var parseInputDate = function parseInputDate(text) {
|
|
|
609
621
|
var finalFormat = "";
|
|
610
622
|
for (var i = 0; i < FORMATS.length; i += 1) {
|
|
611
623
|
var format = FORMATS[i];
|
|
612
|
-
var date =
|
|
624
|
+
var date = originalDayjs(text, format, true).tz(timeZone, true); // tz参数设置为undefined:使用设置后的全局时区, true:2023-01-01 02:02:02 切换到对应时区仍然是 2023-01-01 02:02:02
|
|
613
625
|
if (date.isValid()) {
|
|
614
626
|
finalDate = date;
|
|
615
627
|
finalFormat = format;
|
|
@@ -146,8 +146,9 @@ export default {
|
|
|
146
146
|
Alert: {
|
|
147
147
|
// 组件内部需要调整符合UI规范的样式
|
|
148
148
|
// 1.自定义样式调整
|
|
149
|
-
defaultPadding: "4px
|
|
150
|
-
|
|
149
|
+
defaultPadding: "4px 15px",
|
|
150
|
+
withDescriptionIconSize: 14,
|
|
151
|
+
withDescriptionPadding: "4px 15px",
|
|
151
152
|
fontSize: 14
|
|
152
153
|
},
|
|
153
154
|
Notification: {
|
|
@@ -10,7 +10,6 @@ var prepareComponentToken = function prepareComponentToken(token) {
|
|
|
10
10
|
headerBgLayout: token.Layout.headerBg,
|
|
11
11
|
headerColorLayout: token.Layout.headerColor,
|
|
12
12
|
headerHeightLayout: token.Layout.headerHeight,
|
|
13
|
-
// headerPaddingLayout: token.Layout.headerPadding,
|
|
14
13
|
divisionBgLayout: token.Layout.divisionBg,
|
|
15
14
|
topNavMenuBgLayout: token.Layout.topNavMenuBg
|
|
16
15
|
};
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { genStyleHooks } from "../../Antd5/theme/internal";
|
|
2
|
+
var prepareComponentToken = function prepareComponentToken(token) {
|
|
3
|
+
return {
|
|
4
|
+
bodyBgLayout: token.Layout.bodyBg
|
|
5
|
+
};
|
|
6
|
+
};
|
|
2
7
|
var genCustomLayoutWrapperStyle = function genCustomLayoutWrapperStyle(token) {
|
|
3
8
|
var prefixCls = token.antCls;
|
|
4
9
|
return {
|
|
@@ -37,7 +42,7 @@ var genCustomLayoutWrapperStyle = function genCustomLayoutWrapperStyle(token) {
|
|
|
37
42
|
}
|
|
38
43
|
},
|
|
39
44
|
".cw-layout-wrapper-box-no-background": {
|
|
40
|
-
background: token.
|
|
45
|
+
background: token.bodyBgLayout
|
|
41
46
|
},
|
|
42
47
|
".cw-layout-wrapper-box-hasfooter": {
|
|
43
48
|
paddingBottom: "52px"
|
|
@@ -55,4 +60,4 @@ export default genStyleHooks("LayoutWrapper", function (token) {
|
|
|
55
60
|
return [
|
|
56
61
|
//
|
|
57
62
|
genCustomLayoutWrapperStyle(token)];
|
|
58
|
-
});
|
|
63
|
+
}, prepareComponentToken);
|
|
@@ -231,11 +231,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
231
231
|
useEffect(function () {
|
|
232
232
|
// 设置数据源
|
|
233
233
|
setData(dataSource);
|
|
234
|
-
if (type === "list") {
|
|
235
|
-
if (targetKeys) {
|
|
236
|
-
setListCheckedStyle(targetKeys, dataSource);
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
234
|
}, [dataSource]);
|
|
240
235
|
useEffect(function () {
|
|
241
236
|
//传入的当前选中的key
|
|
@@ -261,6 +256,21 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
261
256
|
return !i.disabled;
|
|
262
257
|
}));
|
|
263
258
|
setCheckValue(finalCheckValue);
|
|
259
|
+
var newData = [];
|
|
260
|
+
var listCheckedKeys_ = [];
|
|
261
|
+
dataSource.forEach(function (item, index) {
|
|
262
|
+
if (isMath(item.title, saveSearchValueLeft)) {
|
|
263
|
+
newData.push(dataSource[index]);
|
|
264
|
+
}
|
|
265
|
+
});
|
|
266
|
+
listCheckedKeys_ = newData.filter(function (item) {
|
|
267
|
+
return finalCheckValue.find(function (i) {
|
|
268
|
+
return i.key == item.key;
|
|
269
|
+
});
|
|
270
|
+
}).map(function (item) {
|
|
271
|
+
return item.key;
|
|
272
|
+
});
|
|
273
|
+
setListCheckedStyle(listCheckedKeys_, newData);
|
|
264
274
|
}
|
|
265
275
|
//回显table
|
|
266
276
|
if (type === "table") {
|
|
@@ -276,7 +286,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
276
286
|
}
|
|
277
287
|
}
|
|
278
288
|
}
|
|
279
|
-
}, [targetKeys, dataSource]);
|
|
289
|
+
}, [targetKeys, dataSource, saveSearchValueLeft]);
|
|
280
290
|
//触发前端自定义搜索
|
|
281
291
|
useEffect(function () {
|
|
282
292
|
if (searchValueLeft !== undefined) {
|
|
@@ -6,16 +6,13 @@ export default function ExtraQuickSelect(props) {
|
|
|
6
6
|
ranges = _props$ranges === void 0 ? {} : _props$ranges,
|
|
7
7
|
quickClick = props.quickClick,
|
|
8
8
|
setDateValue = props.setDateValue,
|
|
9
|
-
setStartTimeParams = props.setStartTimeParams,
|
|
10
|
-
setEndTimeParams = props.setEndTimeParams,
|
|
11
9
|
recordBeforeDateRef = props.recordBeforeDateRef,
|
|
12
10
|
setAllDateTimeValue = props.setAllDateTimeValue,
|
|
13
11
|
recordQuickActiveKey = props.recordQuickActiveKey;
|
|
14
12
|
var rangesToArray = Object.entries(ranges);
|
|
15
13
|
var _onMouseEnter = function onMouseEnter(startDate, endDate) {
|
|
16
14
|
setDateValue([startDate, endDate]);
|
|
17
|
-
|
|
18
|
-
setEndTimeParams(endDate);
|
|
15
|
+
setAllDateTimeValue([startDate, endDate]);
|
|
19
16
|
};
|
|
20
17
|
var onMouseLeave = function onMouseLeave() {
|
|
21
18
|
setDateValue(recordBeforeDateRef.current);
|