@zat-design/sisyphus-react 3.5.1-beta.4 → 3.5.1-beta.5

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.
Files changed (7) hide show
  1. package/es/ProForm/components/combination/ProRangeLimit/index.js +4 -3
  2. package/es/ProForm/components/combination/ProTimeLimit/index.d.ts +1 -1
  3. package/es/ProForm/components/combination/ProTimeLimit/index.js +16 -8
  4. package/lib/ProForm/components/combination/ProRangeLimit/index.js +4 -3
  5. package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts +1 -1
  6. package/lib/ProForm/components/combination/ProTimeLimit/index.js +16 -8
  7. package/package.json +1 -1
package/es/ProForm/components/combination/ProRangeLimit/index.js CHANGED
@@ -78,12 +78,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
78
78
  'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
79
79
  'forever-checkbox': true
80
80
  });
81
+ var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
81
82
  var _isForever = useMemo(function () {
82
- return moment(foreverDate, format).isSame(endDate);
83
+ return moment(_foreverDate, format).isSame(endDate);
83
84
  }, [value]);
84
85
  var foreverMoment = useMemo(function () {
85
- return moment(foreverDate, format);
86
- }, [foreverDate, format]);
86
+ return moment(_foreverDate, format);
87
+ }, [_foreverDate, format]);
87
88
  if (isView) {
88
89
  var _props$value3, _props$value4;
89
90
  var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';
package/es/ProForm/components/combination/ProTimeLimit/index.d.ts CHANGED
@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
9
9
  value?: string;
10
10
  onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
11
11
  disabled?: boolean;
12
- foreverTime?: string;
12
+ foreverDate?: string;
13
13
  foreverText?: string;
14
14
  viewEmpty?: React.ReactNode;
15
15
  format?: string;
package/es/ProForm/components/combination/ProTimeLimit/index.js CHANGED
@@ -7,7 +7,7 @@ import _Input from "antd/es/input";
7
7
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
8
8
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
9
9
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
10
- var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
10
+ var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
11
11
  _excluded2 = ["mode"];
12
12
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
13
13
  import classNames from 'classnames';
@@ -25,7 +25,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
25
25
  var _props$format = props.format,
26
26
  format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
27
27
  disabled = props.disabled,
28
- foreverTime = props.foreverTime,
28
+ _props$foreverDate = props.foreverDate,
29
+ foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
29
30
  _props$foreverText = props.foreverText,
30
31
  foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
31
32
  _props$valueType = props.valueType,
@@ -35,12 +36,14 @@ export var ProTimeLimit = function ProTimeLimit(props) {
35
36
  var _ref = ProForm.useFieldProps() || {},
36
37
  isViewCon = _ref.isView,
37
38
  viewEmpty = _ref.viewEmpty;
39
+ var initialConfig = useProConfig('ProTimeLimit');
38
40
  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
41
+ var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
39
42
  var _useMemo = useMemo(function () {
40
- var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
41
- var foreverString = foreverTime || foreverMoment.format(format);
43
+ var foreverMoment = moment(_foreverDate, format);
44
+ var foreverString = _foreverDate || foreverMoment.format(format);
42
45
  return [foreverString, foreverMoment];
43
- }, [format, foreverTime]),
46
+ }, [format, _foreverDate]),
44
47
  _useMemo2 = _slicedToArray(_useMemo, 2),
45
48
  foreverString = _useMemo2[0],
46
49
  foreverMoment = _useMemo2[1];
@@ -51,7 +54,6 @@ export var ProTimeLimit = function ProTimeLimit(props) {
51
54
  _useControlled2 = _slicedToArray(_useControlled, 2),
52
55
  value = _useControlled2[0],
53
56
  onChange = _useControlled2[1];
54
- var initialConfig = useProConfig('ProTimeLimit');
55
57
  var isForever = useMemo(function () {
56
58
  if (isObject(value)) {
57
59
  return foreverMoment.format(format) === value.format(format);
@@ -112,9 +114,15 @@ var LimitPick = function LimitPick(props) {
112
114
  var _props$mode = props.mode,
113
115
  mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
114
116
  rest = _objectWithoutProperties(props, _excluded2);
117
+ var _ref2 = useProConfig('ProTimeLimit') || {},
118
+ foreverDate = _ref2.foreverDate;
115
119
  if (mode === 'RangePicker') {
116
- return _jsx(ProRangeLimit, _objectSpread({}, rest));
120
+ return _jsx(ProRangeLimit, _objectSpread({
121
+ foreverDate: foreverDate
122
+ }, rest));
117
123
  }
118
- return _jsx(ProTimeLimit, _objectSpread({}, rest));
124
+ return _jsx(ProTimeLimit, _objectSpread({
125
+ foreverDate: foreverDate
126
+ }, rest));
119
127
  };
120
128
  export default LimitPick;
package/lib/ProForm/components/combination/ProRangeLimit/index.js CHANGED
@@ -80,12 +80,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
80
80
  'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
81
81
  'forever-checkbox': true
82
82
  });
83
+ var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
83
84
  var _isForever = (0, _react.useMemo)(function () {
84
- return (0, _moment.default)(foreverDate, format).isSame(endDate);
85
+ return (0, _moment.default)(_foreverDate, format).isSame(endDate);
85
86
  }, [value]);
86
87
  var foreverMoment = (0, _react.useMemo)(function () {
87
- return (0, _moment.default)(foreverDate, format);
88
- }, [foreverDate, format]);
88
+ return (0, _moment.default)(_foreverDate, format);
89
+ }, [_foreverDate, format]);
89
90
  if (isView) {
90
91
  var _props$value3, _props$value4;
91
92
  var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';
package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts CHANGED
@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
9
9
  value?: string;
10
10
  onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
11
11
  disabled?: boolean;
12
- foreverTime?: string;
12
+ foreverDate?: string;
13
13
  foreverText?: string;
14
14
  viewEmpty?: React.ReactNode;
15
15
  format?: string;
package/lib/ProForm/components/combination/ProTimeLimit/index.js CHANGED
@@ -20,14 +20,15 @@ var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
20
20
  var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
21
21
  var _locale = _interopRequireDefault(require("../../../../locale"));
22
22
  var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
23
- var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
23
+ var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
24
24
  _excluded2 = ["mode"];
25
25
  // 永久有效默认值
26
26
  var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
27
27
  var _props$format = props.format,
28
28
  format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
29
29
  disabled = props.disabled,
30
- foreverTime = props.foreverTime,
30
+ _props$foreverDate = props.foreverDate,
31
+ foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
31
32
  _props$foreverText = props.foreverText,
32
33
  foreverText = _props$foreverText === void 0 ? _locale.default.ProTimeLimit.foreverText : _props$foreverText,
33
34
  _props$valueType = props.valueType,
@@ -37,12 +38,14 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
37
38
  var _ref = _ProForm.default.useFieldProps() || {},
38
39
  isViewCon = _ref.isView,
39
40
  viewEmpty = _ref.viewEmpty;
41
+ var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
40
42
  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
43
+ var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
41
44
  var _useMemo = (0, _react.useMemo)(function () {
42
- var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
43
- var foreverString = foreverTime || foreverMoment.format(format);
45
+ var foreverMoment = (0, _moment.default)(_foreverDate, format);
46
+ var foreverString = _foreverDate || foreverMoment.format(format);
44
47
  return [foreverString, foreverMoment];
45
- }, [format, foreverTime]),
48
+ }, [format, _foreverDate]),
46
49
  _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
47
50
  foreverString = _useMemo2[0],
48
51
  foreverMoment = _useMemo2[1];
@@ -53,7 +56,6 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
53
56
  _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
54
57
  value = _useControlled2[0],
55
58
  onChange = _useControlled2[1];
56
- var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
57
59
  var isForever = (0, _react.useMemo)(function () {
58
60
  if ((0, _lodash.isObject)(value)) {
59
61
  return foreverMoment.format(format) === value.format(format);
@@ -114,9 +116,15 @@ var LimitPick = function LimitPick(props) {
114
116
  var _props$mode = props.mode,
115
117
  mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
116
118
  rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
119
+ var _ref2 = (0, _ProConfigProvider.useProConfig)('ProTimeLimit') || {},
120
+ foreverDate = _ref2.foreverDate;
117
121
  if (mode === 'RangePicker') {
118
- return (0, _jsxRuntime.jsx)(_ProRangeLimit.default, (0, _objectSpread2.default)({}, rest));
122
+ return (0, _jsxRuntime.jsx)(_ProRangeLimit.default, (0, _objectSpread2.default)({
123
+ foreverDate: foreverDate
124
+ }, rest));
119
125
  }
120
- return (0, _jsxRuntime.jsx)(ProTimeLimit, (0, _objectSpread2.default)({}, rest));
126
+ return (0, _jsxRuntime.jsx)(ProTimeLimit, (0, _objectSpread2.default)({
127
+ foreverDate: foreverDate
128
+ }, rest));
121
129
  };
122
130
  var _default = exports.default = LimitPick;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.5.1-beta.4",
3
+ "version": "3.5.1-beta.5",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",