@zat-design/sisyphus-react 3.4.1-beta.1 → 3.4.1-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.
Files changed (6) hide show
  1. package/dist/index.esm.css +1 -1
  2. package/es/ProForm/components/render/ConfirmWrapper.js +15 -23
  3. package/es/ProForm/style/index.less +1 -1
  4. package/lib/ProForm/components/render/ConfirmWrapper.js +15 -23
  5. package/lib/ProForm/style/index.less +1 -1
  6. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -2626,7 +2626,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2626
2626
  width: 100%;
2627
2627
  }
2628
2628
  .pro-form .ant-form-item .pro-number-range .ant-input-number {
2629
- width: calc(50% - 20px);
2629
+ width: calc(50% - 16px);
2630
2630
  }
2631
2631
  .pro-form .ant-form-item .pro-number-range .range-right .ant-input-number {
2632
2632
  border-left: none;
package/es/ProForm/components/render/ConfirmWrapper.js CHANGED
@@ -8,7 +8,8 @@ import { isFunction, isObject } from 'lodash';
8
8
  import React from 'react';
9
9
  import ProForm from '../../index';
10
10
  var defaultConfirmProps = {
11
- title: '点击确定完成修改'
11
+ title: '操作提示',
12
+ content: '确定要修改该字段吗？'
12
13
  };
13
14
  var ConfirmWrapper = function ConfirmWrapper(props) {
14
15
  var onChange = props.onChange,
@@ -22,7 +23,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
22
23
  other[_key - 1] = arguments[_key];
23
24
  }
24
25
  var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
25
- if (confirm === true) {
26
+ var confirmProps = isFunction(confirm) ? confirm(form.getFieldsValue()) : confirm;
27
+ if (confirmProps === true) {
26
28
  _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
27
29
  onOk: function onOk() {
28
30
  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
@@ -30,28 +32,18 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
30
32
  }));
31
33
  return;
32
34
  }
33
- if (isFunction(confirm)) {
34
- var confirmProps = isFunction(confirm) && confirm(form.getFieldsValue());
35
- if (confirmProps === true) {
36
- _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
37
- onOk: function onOk() {
38
- return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
39
- }
40
- }));
41
- return;
42
- }
43
- if (isObject(confirmProps)) {
44
- _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
45
- onOk: function onOk() {
46
- for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
47
- arg[_key2] = arguments[_key2];
48
- }
49
- confirmProps === null || confirmProps === void 0 ? void 0 : confirmProps.onOk.apply(confirmProps, arg);
50
- onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
35
+ if (isObject(confirmProps)) {
36
+ _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
37
+ onOk: function onOk() {
38
+ var _confirmProps$onOk;
39
+ for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
40
+ arg[_key2] = arguments[_key2];
51
41
  }
52
- }));
53
- return;
54
- }
42
+ (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
43
+ onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
44
+ }
45
+ }));
46
+ return;
55
47
  }
56
48
  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
57
49
  };
package/es/ProForm/style/index.less CHANGED
@@ -178,7 +178,7 @@
178
178
 
179
179
  .pro-number-range {
180
180
  .@{ant-prefix}-input-number {
181
- width: calc(50% - 20px);
181
+ width: calc(50% - 16px);
182
182
  }
183
183
 
184
184
  .range-right {
package/lib/ProForm/components/render/ConfirmWrapper.js CHANGED
@@ -14,7 +14,8 @@ var _antd = require("antd");
14
14
  var _index = _interopRequireDefault(require("../../index"));
15
15
  var _excluded = ["onChange", "children", "confirm"];
16
16
  var defaultConfirmProps = {
17
- title: '点击确定完成修改'
17
+ title: '操作提示',
18
+ content: '确定要修改该字段吗？'
18
19
  };
19
20
  var ConfirmWrapper = function ConfirmWrapper(props) {
20
21
  var onChange = props.onChange,
@@ -28,7 +29,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
28
29
  other[_key - 1] = arguments[_key];
29
30
  }
30
31
  var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
31
- if (confirm === true) {
32
+ var confirmProps = (0, _lodash.isFunction)(confirm) ? confirm(form.getFieldsValue()) : confirm;
33
+ if (confirmProps === true) {
32
34
  _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
33
35
  onOk: function onOk() {
34
36
  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
@@ -36,28 +38,18 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
36
38
  }));
37
39
  return;
38
40
  }
39
- if ((0, _lodash.isFunction)(confirm)) {
40
- var confirmProps = (0, _lodash.isFunction)(confirm) && confirm(form.getFieldsValue());
41
- if (confirmProps === true) {
42
- _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
43
- onOk: function onOk() {
44
- return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
45
- }
46
- }));
47
- return;
48
- }
49
- if ((0, _lodash.isObject)(confirmProps)) {
50
- _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
51
- onOk: function onOk() {
52
- for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
53
- arg[_key2] = arguments[_key2];
54
- }
55
- confirmProps === null || confirmProps === void 0 ? void 0 : confirmProps.onOk.apply(confirmProps, arg);
56
- onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
41
+ if ((0, _lodash.isObject)(confirmProps)) {
42
+ _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
43
+ onOk: function onOk() {
44
+ var _confirmProps$onOk;
45
+ for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
46
+ arg[_key2] = arguments[_key2];
57
47
  }
58
- }));
59
- return;
60
- }
48
+ (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
49
+ onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
50
+ }
51
+ }));
52
+ return;
61
53
  }
62
54
  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
63
55
  };
package/lib/ProForm/style/index.less CHANGED
@@ -178,7 +178,7 @@
178
178
 
179
179
  .pro-number-range {
180
180
  .@{ant-prefix}-input-number {
181
- width: calc(50% - 20px);
181
+ width: calc(50% - 16px);
182
182
  }
183
183
 
184
184
  .range-right {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.1-beta.1",
3
+ "version": "3.4.1-beta.2",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",