@zat-design/sisyphus-react 3.3.0-beta.1 → 3.3.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/es/ProForm/components/base/DatePicker/index.d.ts +2 -2
- package/es/ProForm/components/base/DatePicker/index.js +5 -5
- package/es/ProForm/components/base/RangePicker/index.d.ts +3 -2
- package/es/ProForm/components/base/RangePicker/index.js +3 -5
- package/es/ProForm/components/base/TimePicker/index.js +3 -3
- package/es/ProForm/components/combination/ProRangeLimit/index.d.ts +2 -2
- package/es/ProForm/components/combination/ProRangeLimit/index.js +6 -6
- package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts +2 -2
- package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js +2 -2
- package/es/ProForm/components/combination/ProTimeLimit/index.d.ts +2 -2
- package/es/ProForm/components/combination/ProTimeLimit/index.js +4 -4
- package/es/ProForm/components/old/ProCertValidity/index.js +16 -16
- package/es/ProForm/components/old/ProCertValidity/propsType.d.ts +4 -4
- package/es/ProLayout/components/ProHeader/index.js +4 -4
- package/es/ProTable/utils.js +14 -14
- package/es/locale/index.js +2 -2
- package/es/old/ProCertValidity/index.js +16 -16
- package/es/old/ProCertValidity/propsType.d.ts +4 -4
- package/es/old/ProEditableTable/utils.d.ts +5 -5
- package/es/old/ProEditableTable/utils.js +5 -5
- package/lib/ProForm/components/base/DatePicker/index.d.ts +2 -2
- package/lib/ProForm/components/base/DatePicker/index.js +5 -5
- package/lib/ProForm/components/base/RangePicker/index.d.ts +3 -2
- package/lib/ProForm/components/base/RangePicker/index.js +4 -4
- package/lib/ProForm/components/base/TimePicker/index.js +3 -3
- package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts +2 -2
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +6 -6
- package/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts +2 -2
- package/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js +2 -2
- package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts +2 -2
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +4 -4
- package/lib/ProForm/components/old/ProCertValidity/index.js +16 -16
- package/lib/ProForm/components/old/ProCertValidity/propsType.d.ts +4 -4
- package/lib/ProLayout/components/ProHeader/index.js +4 -4
- package/lib/ProTable/utils.js +14 -14
- package/lib/locale/index.js +2 -2
- package/lib/old/ProCertValidity/index.js +16 -16
- package/lib/old/ProCertValidity/propsType.d.ts +4 -4
- package/lib/old/ProEditableTable/utils.d.ts +5 -5
- package/lib/old/ProEditableTable/utils.js +5 -5
- package/package.json +3 -2
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DatePickerProps, TimePickerProps } from 'antd';
|
|
2
|
-
import {
|
|
2
|
+
import { Dayjs } from 'dayjs';
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
|
|
5
5
|
export type Props = DatePickerProps & TimePickerProps & {
|
|
6
6
|
isView?: boolean;
|
|
7
7
|
viewEmpty?: React.ReactNode;
|
|
8
8
|
format?: string;
|
|
9
|
-
showTime?: PickerPanelDateProps<
|
|
9
|
+
showTime?: PickerPanelDateProps<Dayjs>['showTime'];
|
|
10
10
|
showNow?: boolean;
|
|
11
11
|
};
|
|
12
12
|
declare const DatePicker: React.FC<Props>;
|
|
@@ -7,7 +7,7 @@ var _excluded = ["className", "format"];
|
|
|
7
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
8
8
|
import { isFunction, isString } from 'lodash';
|
|
9
9
|
import classNames from 'classnames';
|
|
10
|
-
import
|
|
10
|
+
import dayjs from 'dayjs';
|
|
11
11
|
import { useProConfig } from '../../../../ProConfigProvider';
|
|
12
12
|
import ProForm from '../../../../ProForm';
|
|
13
13
|
import Container from '../../Container';
|
|
@@ -30,12 +30,12 @@ var DatePicker = function DatePicker(props) {
|
|
|
30
30
|
var viewChildren = null;
|
|
31
31
|
if (!value) {
|
|
32
32
|
viewChildren = null;
|
|
33
|
-
} else if (typeof format === 'string' &&
|
|
33
|
+
} else if (typeof format === 'string' && dayjs.isDayjs(value)) {
|
|
34
34
|
viewChildren = value.format(format);
|
|
35
35
|
} else if (isFunction(format)) {
|
|
36
36
|
viewChildren = format(value);
|
|
37
37
|
} else if (isString(value)) {
|
|
38
|
-
viewChildren =
|
|
38
|
+
viewChildren = dayjs(value).format(format);
|
|
39
39
|
}
|
|
40
40
|
return _jsx(Container, {
|
|
41
41
|
viewEmpty: viewEmpty,
|
|
@@ -48,11 +48,11 @@ var DatePicker = function DatePicker(props) {
|
|
|
48
48
|
});
|
|
49
49
|
// 字符串时间格式兼容
|
|
50
50
|
if (isString(_rest.value)) {
|
|
51
|
-
_rest.value =
|
|
51
|
+
_rest.value = dayjs(_rest.value);
|
|
52
52
|
}
|
|
53
53
|
if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
|
|
54
54
|
_rest.showTime = {
|
|
55
|
-
value:
|
|
55
|
+
value: dayjs(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
|
|
56
56
|
disabled: true
|
|
57
57
|
};
|
|
58
58
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import type { RangePickerProps } from 'antd/es/date-picker';
|
|
2
1
|
import React from 'react';
|
|
2
|
+
import { Dayjs } from 'dayjs';
|
|
3
|
+
import { RangePickerProps } from 'antd/lib/date-picker/generatePicker';
|
|
3
4
|
import { ProFormOtherProps } from '../../../propsType';
|
|
4
5
|
export type Props = {
|
|
5
6
|
otherProps?: ProFormOtherProps;
|
|
6
7
|
separator?: any;
|
|
7
8
|
showTime?: any;
|
|
8
9
|
isView?: boolean;
|
|
9
|
-
} & Omit<RangePickerProps
|
|
10
|
+
} & Omit<RangePickerProps<Dayjs>, 'separator'>;
|
|
10
11
|
declare const RangePicker: React.FC<Props>;
|
|
11
12
|
export default RangePicker;
|
|
@@ -4,10 +4,8 @@ import "antd/es/date-picker/style";
|
|
|
4
4
|
import _DatePicker from "antd/es/date-picker";
|
|
5
5
|
var _excluded = ["format", "otherProps", "separator"];
|
|
6
6
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
7
|
-
// @ts-check
|
|
8
|
-
|
|
9
7
|
import { isFunction, isString, omit } from 'lodash';
|
|
10
|
-
import
|
|
8
|
+
import dayjs from 'dayjs';
|
|
11
9
|
import { useProConfig } from '../../../../ProConfigProvider';
|
|
12
10
|
import ProForm from '../../../../ProForm';
|
|
13
11
|
import Container from '../../Container';
|
|
@@ -52,9 +50,9 @@ var RangePicker = function RangePicker(props) {
|
|
|
52
50
|
var _res = _objectSpread(_objectSpread({}, rest), {}, {
|
|
53
51
|
showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
|
|
54
52
|
});
|
|
55
|
-
// 字符串时间格式兼容
|
|
53
|
+
// // 字符串时间格式兼容
|
|
56
54
|
if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
|
|
57
|
-
_res.value = [
|
|
55
|
+
_res.value = [dayjs(_res.value[0]), dayjs(_res.value[1])];
|
|
58
56
|
}
|
|
59
57
|
return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
|
|
60
58
|
};
|
|
@@ -4,7 +4,7 @@ import _TimePicker from "antd/es/time-picker";
|
|
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
5
5
|
var _excluded = ["format", "onChange", "value", "otherProps"];
|
|
6
6
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
7
|
-
import
|
|
7
|
+
import dayjs from 'dayjs';
|
|
8
8
|
import { useProConfig } from '../../../../ProConfigProvider';
|
|
9
9
|
import Container from '../../Container';
|
|
10
10
|
import ProForm from '../../../../ProForm';
|
|
@@ -25,7 +25,7 @@ var TimePicker = function TimePicker(props) {
|
|
|
25
25
|
var initialConfig = useProConfig('AntTimePicker');
|
|
26
26
|
var handleChange = function handleChange(value) {
|
|
27
27
|
if (valueType === 'dateTime') {
|
|
28
|
-
onChange && onChange(value ?
|
|
28
|
+
onChange && onChange(value ? dayjs(value).format(format) : undefined);
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
if (isView) {
|
|
@@ -35,7 +35,7 @@ var TimePicker = function TimePicker(props) {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
return _jsx(_TimePicker, _objectSpread(_objectSpread(_objectSpread({
|
|
38
|
-
value: value ?
|
|
38
|
+
value: value ? dayjs(value, format) : undefined
|
|
39
39
|
}, initialConfig), rest), {}, {
|
|
40
40
|
format: format,
|
|
41
41
|
onChange: handleChange
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { RangePickerProps } from 'antd/es/date-picker';
|
|
3
|
-
import {
|
|
3
|
+
import { Dayjs } from 'dayjs';
|
|
4
4
|
export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
|
|
5
5
|
disabled?: boolean;
|
|
6
6
|
foreverText?: string;
|
|
@@ -12,7 +12,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
|
|
|
12
12
|
separator?: any;
|
|
13
13
|
isView?: boolean;
|
|
14
14
|
};
|
|
15
|
-
type Value = [
|
|
15
|
+
type Value = [Dayjs?, Dayjs?, boolean?];
|
|
16
16
|
type ValueStr = [string?, string?, string?];
|
|
17
17
|
type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
|
|
18
18
|
declare const ProRangeLimit: React.FC<Props>;
|
|
@@ -12,12 +12,12 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
12
12
|
import { useMemo, useState } from 'react';
|
|
13
13
|
import { omit } from 'lodash';
|
|
14
14
|
import classNames from 'classnames';
|
|
15
|
-
import
|
|
15
|
+
import dayjs from 'dayjs';
|
|
16
16
|
import { useProConfig } from '../../../../ProConfigProvider';
|
|
17
17
|
import Container from '../../Container';
|
|
18
18
|
import locale from '../../../../locale';
|
|
19
19
|
import ProForm from '../../../../ProForm';
|
|
20
|
-
var defaultPickerValue = [
|
|
20
|
+
var defaultPickerValue = [dayjs(), dayjs()];
|
|
21
21
|
var useControlled = function useControlled(props) {
|
|
22
22
|
var _useState = useState(),
|
|
23
23
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -25,7 +25,7 @@ var useControlled = function useControlled(props) {
|
|
|
25
25
|
setValue = _useState2[1];
|
|
26
26
|
if ('value' in props) {
|
|
27
27
|
var _props$value, _props$value2;
|
|
28
|
-
var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) &&
|
|
28
|
+
var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && dayjs(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && dayjs(props.value[1], props.format)];
|
|
29
29
|
var handleChange = function handleChange(value, other) {
|
|
30
30
|
var _value = _slicedToArray(value, 2),
|
|
31
31
|
start = _value[0],
|
|
@@ -74,10 +74,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
|
74
74
|
'forever-checkbox': true
|
|
75
75
|
});
|
|
76
76
|
var _isForever = useMemo(function () {
|
|
77
|
-
return
|
|
77
|
+
return dayjs(foreverDate, format).isSame(endDate);
|
|
78
78
|
}, [value]);
|
|
79
79
|
var foreverMoment = useMemo(function () {
|
|
80
|
-
return
|
|
80
|
+
return dayjs(foreverDate, format);
|
|
81
81
|
}, [foreverDate, format]);
|
|
82
82
|
if (isView) {
|
|
83
83
|
var _props$value3, _props$value4;
|
|
@@ -115,7 +115,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
|
115
115
|
start = _ref9[0],
|
|
116
116
|
end = _ref9[1];
|
|
117
117
|
if (e.target.checked) {
|
|
118
|
-
start = start ||
|
|
118
|
+
start = start || dayjs().startOf('day');
|
|
119
119
|
end = foreverMoment;
|
|
120
120
|
} else {
|
|
121
121
|
start = undefined;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import dayjs, { Dayjs } from 'dayjs';
|
|
2
2
|
interface Props<T = any> {
|
|
3
3
|
value?: T;
|
|
4
4
|
onChange?: (value: T, ...rest: any[]) => void;
|
|
5
5
|
format?: string;
|
|
6
6
|
}
|
|
7
|
-
declare const useControlled: (props: Props) => [
|
|
7
|
+
declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | undefined) => void];
|
|
8
8
|
export default useControlled;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
-
import
|
|
2
|
+
import dayjs from 'dayjs';
|
|
3
3
|
import { useState } from 'react';
|
|
4
4
|
var useControlled = function useControlled(props) {
|
|
5
5
|
var value = props.value,
|
|
@@ -18,7 +18,7 @@ var useControlled = function useControlled(props) {
|
|
|
18
18
|
onChange(_value, value);
|
|
19
19
|
};
|
|
20
20
|
if ('value' in props) {
|
|
21
|
-
return [value &&
|
|
21
|
+
return [value && dayjs(value, format).startOf('day'), handleChange];
|
|
22
22
|
}
|
|
23
23
|
return [valueState, handleChange];
|
|
24
24
|
};
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DatePickerProps } from 'antd';
|
|
2
|
-
import {
|
|
2
|
+
import { Dayjs } from 'dayjs';
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { ProFormOtherProps } from '../../../propsType';
|
|
5
5
|
import { Props as ProRangeLimitProps } from '../ProRangeLimit';
|
|
6
6
|
export type DateType = DatePickerProps['value'];
|
|
7
7
|
export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
|
|
8
8
|
value?: string;
|
|
9
|
-
onChange?: (value: ProTimeLimitProps['value'] | null, valueData:
|
|
9
|
+
onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => void;
|
|
10
10
|
disabled?: boolean;
|
|
11
11
|
foreverTime?: string;
|
|
12
12
|
foreverText?: string;
|
|
@@ -12,7 +12,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
|
|
|
12
12
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
13
13
|
import classNames from 'classnames';
|
|
14
14
|
import { omit } from 'lodash';
|
|
15
|
-
import
|
|
15
|
+
import dayjs, { isDayjs } from 'dayjs';
|
|
16
16
|
import { useMemo } from 'react';
|
|
17
17
|
import { useProConfig } from '../../../../ProConfigProvider';
|
|
18
18
|
import Container from '../../Container';
|
|
@@ -37,7 +37,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
|
37
37
|
viewEmpty = _ref.viewEmpty;
|
|
38
38
|
var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
|
|
39
39
|
var _useMemo = useMemo(function () {
|
|
40
|
-
var foreverMoment = foreverTime ?
|
|
40
|
+
var foreverMoment = foreverTime ? dayjs(foreverTime, format) : dayjs('9999-01-01', 'YYYY-MM-DD');
|
|
41
41
|
var foreverString = foreverTime || foreverMoment.format(format);
|
|
42
42
|
return [foreverString, foreverMoment];
|
|
43
43
|
}, [format, foreverTime]),
|
|
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
|
53
53
|
onChange = _useControlled2[1];
|
|
54
54
|
var initialConfig = useProConfig('ProTimeLimit');
|
|
55
55
|
var isForever = useMemo(function () {
|
|
56
|
-
if (
|
|
56
|
+
if (isDayjs(value)) {
|
|
57
57
|
return foreverMoment.format(format) === value.format(format);
|
|
58
58
|
}
|
|
59
59
|
return false;
|
|
@@ -61,7 +61,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
|
61
61
|
var foreverChange = function foreverChange(e) {
|
|
62
62
|
var checkedForever = e.target.checked;
|
|
63
63
|
if (checkedForever) {
|
|
64
|
-
onChange(
|
|
64
|
+
onChange(dayjs(foreverString, format));
|
|
65
65
|
} else {
|
|
66
66
|
onChange(null);
|
|
67
67
|
}
|
|
@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
|
|
|
10
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
11
|
// @ts-nocheck
|
|
12
12
|
|
|
13
|
-
import
|
|
13
|
+
import dayjs from 'dayjs';
|
|
14
14
|
import { forwardRef, useMemo, useRef } from 'react';
|
|
15
15
|
var RangePicker = _DatePicker.RangePicker;
|
|
16
16
|
var defaultFormatDate = 'YYYY-MM-DD';
|
|
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
50
50
|
forever = _value2.forever;
|
|
51
51
|
if (forever === 'Y') {
|
|
52
52
|
return {
|
|
53
|
-
range: [
|
|
53
|
+
range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
|
|
54
54
|
forever: true
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
if (startTime && endTime) {
|
|
58
|
-
var tempStartDate =
|
|
59
|
-
var tempEndDate =
|
|
58
|
+
var tempStartDate = dayjs(startTime).format(defaultFormatDate);
|
|
59
|
+
var tempEndDate = dayjs(endTime).format(defaultFormatDate);
|
|
60
60
|
if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
|
|
61
61
|
return {
|
|
62
|
-
range: [
|
|
62
|
+
range: [dayjs(startTime), dayjs(endTime)],
|
|
63
63
|
forever: false
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
|
|
67
67
|
return {
|
|
68
|
-
range: [
|
|
68
|
+
range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
|
|
69
69
|
forever: true
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
} else {
|
|
74
74
|
if (typeof value === 'string' || value._isAMomentObject) {
|
|
75
|
-
var tempDate =
|
|
75
|
+
var tempDate = dayjs(value).format(defaultFormatDate);
|
|
76
76
|
if (tempDate && tempDate === '9999-01-01') {
|
|
77
77
|
return {
|
|
78
|
-
range:
|
|
78
|
+
range: dayjs('9999-01-01'),
|
|
79
79
|
forever: true
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
82
|
return {
|
|
83
|
-
range:
|
|
83
|
+
range: dayjs(value),
|
|
84
84
|
forever: false
|
|
85
85
|
};
|
|
86
86
|
}
|
|
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
89
89
|
_forever = _value3.forever;
|
|
90
90
|
if (_forever === 'Y') {
|
|
91
91
|
return {
|
|
92
|
-
range:
|
|
92
|
+
range: dayjs('9999-01-01'),
|
|
93
93
|
forever: true
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
96
|
if (dateTime) {
|
|
97
|
-
var _tempDate =
|
|
97
|
+
var _tempDate = dayjs(dateTime).format(defaultFormatDate);
|
|
98
98
|
if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
|
|
99
99
|
return {
|
|
100
|
-
range:
|
|
100
|
+
range: dayjs(dateTime),
|
|
101
101
|
forever: false
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
|
|
105
105
|
return {
|
|
106
|
-
range:
|
|
106
|
+
range: dayjs('9999-01-01'),
|
|
107
107
|
forever: true
|
|
108
108
|
};
|
|
109
109
|
}
|
|
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
113
113
|
}, [value, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.dateTime]);
|
|
114
114
|
var changeRangeTime = function changeRangeTime(values) {
|
|
115
115
|
onChange({
|
|
116
|
-
startTime: values ?
|
|
117
|
-
endTime: values ?
|
|
116
|
+
startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
|
|
117
|
+
endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
|
|
118
118
|
forever: 'N'
|
|
119
119
|
});
|
|
120
120
|
};
|
|
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
142
142
|
if (rangeTime.forever) {
|
|
143
143
|
_value = '长期';
|
|
144
144
|
} else {
|
|
145
|
-
_value = rangeTime.range ?
|
|
145
|
+
_value = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
|
|
146
146
|
}
|
|
147
147
|
return _jsx(_Input, {
|
|
148
148
|
value: _value,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
|
|
2
|
-
import
|
|
2
|
+
import dayjs from 'dayjs';
|
|
3
3
|
interface ICertValidityValuePropsType {
|
|
4
|
-
dateTime?:
|
|
4
|
+
dateTime?: dayjs.Dayjs | string;
|
|
5
5
|
forever?: string;
|
|
6
6
|
}
|
|
7
7
|
interface ICertValidityRangeValuePropsType {
|
|
8
|
-
startTime?:
|
|
9
|
-
endTime?:
|
|
8
|
+
startTime?: dayjs.Dayjs | string;
|
|
9
|
+
endTime?: dayjs.Dayjs | string;
|
|
10
10
|
forever?: string;
|
|
11
11
|
}
|
|
12
12
|
interface IProCertValidityExtraPropsType {
|
|
@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
17
17
|
import { memo, useEffect, useState } from 'react';
|
|
18
18
|
import { tools } from '@zat-design/utils';
|
|
19
19
|
import classnames from 'classnames';
|
|
20
|
-
import
|
|
20
|
+
import dayjs from 'dayjs';
|
|
21
21
|
import { useToggle } from 'ahooks';
|
|
22
22
|
import { isFunction, isEmpty, isNumber, isString } from 'lodash';
|
|
23
23
|
import { ReactSVG } from 'react-svg';
|
|
@@ -157,7 +157,7 @@ var ProHeader = function ProHeader(props) {
|
|
|
157
157
|
* 次级描述数据渲染
|
|
158
158
|
*/
|
|
159
159
|
var subDescribeRender = function subDescribeRender(describeData) {
|
|
160
|
-
var
|
|
160
|
+
var _dayjs, _dayjs2;
|
|
161
161
|
var value = describeData.value,
|
|
162
162
|
type = describeData.type,
|
|
163
163
|
valueType = describeData.valueType,
|
|
@@ -188,11 +188,11 @@ var ProHeader = function ProHeader(props) {
|
|
|
188
188
|
break;
|
|
189
189
|
case 'date':
|
|
190
190
|
// 年月日
|
|
191
|
-
result = value ? (
|
|
191
|
+
result = value ? (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format('YYYY-MM-DD') : '-';
|
|
192
192
|
break;
|
|
193
193
|
case 'dateTime':
|
|
194
194
|
// 年月日 时分秒
|
|
195
|
-
result = value ? (
|
|
195
|
+
result = value ? (_dayjs2 = dayjs(value)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format('YYYY-MM-DD HH:mm:ss') : '-';
|
|
196
196
|
break;
|
|
197
197
|
default:
|
|
198
198
|
result = String(value).includes('undefined') || !value ? '-' : value;
|
package/es/ProTable/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ import _Space from "antd/es/space";
|
|
|
3
3
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
4
4
|
/* eslint-disable react-hooks/rules-of-hooks */
|
|
5
5
|
import { isValidElement } from 'react';
|
|
6
|
-
import
|
|
6
|
+
import dayjs from 'dayjs';
|
|
7
7
|
import { get, isEqual, isFunction, isString } from 'lodash';
|
|
8
8
|
import { tools } from '@zat-design/utils';
|
|
9
9
|
import classnames from 'classnames';
|
|
@@ -156,30 +156,30 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
156
156
|
};
|
|
157
157
|
} else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
|
|
158
158
|
column.render = function (value, record, index) {
|
|
159
|
-
var
|
|
160
|
-
var renderValue = (
|
|
159
|
+
var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
|
|
160
|
+
var renderValue = (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
|
|
161
161
|
var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
|
|
162
|
-
var originalRenderValue = (
|
|
162
|
+
var originalRenderValue = (_dayjs2 = dayjs(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
|
|
163
163
|
switch (valueType) {
|
|
164
164
|
case 'date':
|
|
165
|
-
renderValue = (
|
|
166
|
-
originalRenderValue = (
|
|
165
|
+
renderValue = (_dayjs3 = dayjs(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
|
|
166
|
+
originalRenderValue = (_dayjs4 = dayjs(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
|
|
167
167
|
break;
|
|
168
168
|
case 'dateTime':
|
|
169
|
-
renderValue = (
|
|
170
|
-
originalRenderValue = (
|
|
169
|
+
renderValue = (_dayjs5 = dayjs(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
|
|
170
|
+
originalRenderValue = (_dayjs6 = dayjs(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
|
|
171
171
|
break;
|
|
172
172
|
case 'dateStartTime':
|
|
173
|
-
renderValue = "".concat((
|
|
174
|
-
originalRenderValue = "".concat((
|
|
173
|
+
renderValue = "".concat((_dayjs7 = dayjs(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD'), " 00:00:00");
|
|
174
|
+
originalRenderValue = "".concat((_dayjs8 = dayjs(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD'), " 00:00:00");
|
|
175
175
|
break;
|
|
176
176
|
case 'dateEndTime':
|
|
177
|
-
renderValue = "".concat((
|
|
178
|
-
originalRenderValue = "".concat((
|
|
177
|
+
renderValue = "".concat((_dayjs9 = dayjs(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD'), " 23:59:59");
|
|
178
|
+
originalRenderValue = "".concat((_dayjs10 = dayjs(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD'), " 23:59:59");
|
|
179
179
|
break;
|
|
180
180
|
case 'dateStartEndTime':
|
|
181
|
-
renderValue = "".concat((
|
|
182
|
-
originalRenderValue = "".concat((
|
|
181
|
+
renderValue = "".concat((_dayjs11 = dayjs(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs12 = dayjs(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD'), " 23:59:59");
|
|
182
|
+
originalRenderValue = "".concat((_dayjs13 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs14 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD'), " 23:59:59");
|
|
183
183
|
break;
|
|
184
184
|
}
|
|
185
185
|
if (!value) {
|
package/es/locale/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import dayjs from 'dayjs';
|
|
2
2
|
import zhCN from './zh_CN';
|
|
3
3
|
import enUS from './en_US';
|
|
4
4
|
var activeLang = localStorage.getItem('locale') || 'zh-CN';
|
|
@@ -13,7 +13,7 @@ var langMap = {
|
|
|
13
13
|
export var setLanguage = function setLanguage(lang, isReload) {
|
|
14
14
|
activeLang = lang;
|
|
15
15
|
localStorage.setItem('locale', lang);
|
|
16
|
-
|
|
16
|
+
dayjs.locale(lang.toLowerCase());
|
|
17
17
|
if (isReload) {
|
|
18
18
|
window.location.reload();
|
|
19
19
|
}
|
|
@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
|
|
|
10
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
11
|
// @ts-nocheck
|
|
12
12
|
|
|
13
|
-
import
|
|
13
|
+
import dayjs from 'dayjs';
|
|
14
14
|
import { forwardRef, useMemo, useRef } from 'react';
|
|
15
15
|
var RangePicker = _DatePicker.RangePicker;
|
|
16
16
|
var defaultFormatDate = 'YYYY-MM-DD';
|
|
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
50
50
|
forever = _value.forever;
|
|
51
51
|
if (forever === 'Y') {
|
|
52
52
|
return {
|
|
53
|
-
range: [
|
|
53
|
+
range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
|
|
54
54
|
forever: true
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
if (startTime && endTime) {
|
|
58
|
-
var tempStartDate =
|
|
59
|
-
var tempEndDate =
|
|
58
|
+
var tempStartDate = dayjs(startTime).format(defaultFormatDate);
|
|
59
|
+
var tempEndDate = dayjs(endTime).format(defaultFormatDate);
|
|
60
60
|
if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
|
|
61
61
|
return {
|
|
62
|
-
range: [
|
|
62
|
+
range: [dayjs(startTime), dayjs(endTime)],
|
|
63
63
|
forever: false
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
|
|
67
67
|
return {
|
|
68
|
-
range: [
|
|
68
|
+
range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
|
|
69
69
|
forever: true
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
} else {
|
|
74
74
|
if (typeof value === 'string' || value._isAMomentObject) {
|
|
75
|
-
var tempDate =
|
|
75
|
+
var tempDate = dayjs(value).format(defaultFormatDate);
|
|
76
76
|
if (tempDate && tempDate === '9999-01-01') {
|
|
77
77
|
return {
|
|
78
|
-
range:
|
|
78
|
+
range: dayjs('9999-01-01'),
|
|
79
79
|
forever: true
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
82
|
return {
|
|
83
|
-
range:
|
|
83
|
+
range: dayjs(value),
|
|
84
84
|
forever: false
|
|
85
85
|
};
|
|
86
86
|
}
|
|
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
89
89
|
_forever = _value2.forever;
|
|
90
90
|
if (_forever === 'Y') {
|
|
91
91
|
return {
|
|
92
|
-
range:
|
|
92
|
+
range: dayjs('9999-01-01'),
|
|
93
93
|
forever: true
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
96
|
if (dateTime) {
|
|
97
|
-
var _tempDate =
|
|
97
|
+
var _tempDate = dayjs(dateTime).format(defaultFormatDate);
|
|
98
98
|
if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
|
|
99
99
|
return {
|
|
100
|
-
range:
|
|
100
|
+
range: dayjs(dateTime),
|
|
101
101
|
forever: false
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
|
|
105
105
|
return {
|
|
106
|
-
range:
|
|
106
|
+
range: dayjs('9999-01-01'),
|
|
107
107
|
forever: true
|
|
108
108
|
};
|
|
109
109
|
}
|
|
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
113
113
|
}, [value, (_value3 = value) === null || _value3 === void 0 ? void 0 : _value3.dateTime]);
|
|
114
114
|
var changeRangeTime = function changeRangeTime(values) {
|
|
115
115
|
onChange({
|
|
116
|
-
startTime: values ?
|
|
117
|
-
endTime: values ?
|
|
116
|
+
startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
|
|
117
|
+
endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
|
|
118
118
|
forever: 'N'
|
|
119
119
|
});
|
|
120
120
|
};
|
|
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
142
142
|
if (rangeTime.forever) {
|
|
143
143
|
_value4 = '长期';
|
|
144
144
|
} else {
|
|
145
|
-
_value4 = rangeTime.range ?
|
|
145
|
+
_value4 = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
|
|
146
146
|
}
|
|
147
147
|
return _jsx(_Input, {
|
|
148
148
|
value: _value4,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
|
|
2
|
-
import
|
|
2
|
+
import dayjs from 'dayjs';
|
|
3
3
|
interface ICertValidityValuePropsType {
|
|
4
|
-
dateTime?:
|
|
4
|
+
dateTime?: dayjs.Dayjs | string;
|
|
5
5
|
forever?: string;
|
|
6
6
|
}
|
|
7
7
|
interface ICertValidityRangeValuePropsType {
|
|
8
|
-
startTime?:
|
|
9
|
-
endTime?:
|
|
8
|
+
startTime?: dayjs.Dayjs | string;
|
|
9
|
+
endTime?: dayjs.Dayjs | string;
|
|
10
10
|
forever?: string;
|
|
11
11
|
}
|
|
12
12
|
interface IProCertValidityExtraPropsType {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Dayjs } from 'dayjs';
|
|
2
2
|
import { IRowDataPropsType } from './propsType';
|
|
3
3
|
export declare const rangePickerTransform: (formatter?: string) => {
|
|
4
|
-
normalize: (value: [
|
|
4
|
+
normalize: (value: [Dayjs, Dayjs]) => {
|
|
5
5
|
from?: undefined;
|
|
6
6
|
to?: undefined;
|
|
7
7
|
} | {
|
|
@@ -13,15 +13,15 @@ export declare const rangePickerTransform: (formatter?: string) => {
|
|
|
13
13
|
to: string;
|
|
14
14
|
}) => {
|
|
15
15
|
format: string;
|
|
16
|
-
value:
|
|
16
|
+
value: Dayjs[];
|
|
17
17
|
};
|
|
18
18
|
getValueFromEvent: (rawDate?: any) => any;
|
|
19
19
|
};
|
|
20
20
|
export declare const datePickerTransform: (formatter?: string) => {
|
|
21
|
-
normalize: (value:
|
|
21
|
+
normalize: (value: Dayjs) => string;
|
|
22
22
|
getValueProps: (value: string) => {
|
|
23
23
|
format: string;
|
|
24
|
-
value:
|
|
24
|
+
value: Dayjs;
|
|
25
25
|
};
|
|
26
26
|
};
|
|
27
27
|
export declare const transformColumns: (columns: any[], form: any, disabled: Boolean) => any[];
|