@zat-design/sisyphus-react 3.4.12-beta.1 → 3.4.12-beta.3

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 (5) hide show
  1. package/es/ProForm/components/combination/Group/component/ComRender.js +1 -1
  2. package/es/ProForm/components/combination/ProRangeLimit/index.js +7 -10
  3. package/lib/ProForm/components/combination/Group/component/ComRender.js +1 -1
  4. package/lib/ProForm/components/combination/ProRangeLimit/index.js +7 -10
  5. package/package.json +1 -1
package/es/ProForm/components/combination/Group/component/ComRender.js CHANGED
@@ -45,7 +45,7 @@ var ComRender = function ComRender(props) {
45
45
  var mergedGetValueProps = getValueProps || function (val) {
46
46
  return _defineProperty({}, valuePropName, val);
47
47
  };
48
- var _props = mergedGetValueProps(props.value);
48
+ var _props = mergedGetValueProps(fieldProps.value);
49
49
  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
50
50
  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
51
51
  var Com = getComRender(Component, props, componentProps);
package/es/ProForm/components/combination/ProRangeLimit/index.js CHANGED
@@ -119,18 +119,15 @@ var ProRangeLimit = function ProRangeLimit(props) {
119
119
  var handleForeverChange = function handleForeverChange(e) {
120
120
  var foreverStr = e.target.checked ? 'Y' : 'N';
121
121
  var _ref8 = value || [],
122
- _ref9 = _slicedToArray(_ref8, 2),
123
- start = _ref9[0],
124
- end = _ref9[1];
122
+ _ref9 = _slicedToArray(_ref8, 1),
123
+ start = _ref9[0];
124
+ var _ref10 = value || [],
125
+ _ref11 = _slicedToArray(_ref10, 2),
126
+ end = _ref11[1];
125
127
  if (e.target.checked) {
126
- var _rest$allowEmpty, _start, _end;
127
- if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
128
- start = null;
129
- } else {
130
- start = start || moment().startOf('day');
131
- }
128
+ var _end;
132
129
  end = foreverMoment;
133
- onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
130
+ onChange([start, end, e.target.checked], [start === null || start === void 0 ? void 0 : start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
134
131
  } else {
135
132
  // 不清除起期时间
136
133
  onChange([start, null]);
package/lib/ProForm/components/combination/Group/component/ComRender.js CHANGED
@@ -53,7 +53,7 @@ var ComRender = function ComRender(props) {
53
53
  var mergedGetValueProps = getValueProps || function (val) {
54
54
  return (0, _defineProperty2.default)({}, valuePropName, val);
55
55
  };
56
- var _props = mergedGetValueProps(props.value);
56
+ var _props = mergedGetValueProps(fieldProps.value);
57
57
  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
58
58
  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
59
59
  var Com = getComRender(Component, props, componentProps);
package/lib/ProForm/components/combination/ProRangeLimit/index.js CHANGED
@@ -121,18 +121,15 @@ var ProRangeLimit = function ProRangeLimit(props) {
121
121
  var handleForeverChange = function handleForeverChange(e) {
122
122
  var foreverStr = e.target.checked ? 'Y' : 'N';
123
123
  var _ref8 = value || [],
124
- _ref9 = (0, _slicedToArray2.default)(_ref8, 2),
125
- start = _ref9[0],
126
- end = _ref9[1];
124
+ _ref9 = (0, _slicedToArray2.default)(_ref8, 1),
125
+ start = _ref9[0];
126
+ var _ref10 = value || [],
127
+ _ref11 = (0, _slicedToArray2.default)(_ref10, 2),
128
+ end = _ref11[1];
127
129
  if (e.target.checked) {
128
- var _rest$allowEmpty, _start, _end;
129
- if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
130
- start = null;
131
- } else {
132
- start = start || (0, _moment.default)().startOf('day');
133
- }
130
+ var _end;
134
131
  end = foreverMoment;
135
- onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
132
+ onChange([start, end, e.target.checked], [start === null || start === void 0 ? void 0 : start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
136
133
  } else {
137
134
  // 不清除起期时间
138
135
  onChange([start, null]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.12-beta.1",
3
+ "version": "3.4.12-beta.3",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",