@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/es/ProForm/components/render/ChangedWrapper.js

@@ -2,15 +2,16 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _get from "lodash/get";
 var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Space, Tooltip } from 'antd';
 import classNames from 'classnames';
+import { get } from 'lodash';
 import React, { useMemo } from 'react';
-import { diffOriginal } from '../../utils/diffOriginal';
-import { useProConfig } from '../../../ProConfigProvider';
-import { isEmpty } from '../../../utils';
+import { diffOriginal } from "../../utils/diffOriginal";
+import { useProConfig } from "../../../ProConfigProvider";
+import { isEmpty } from "../../../utils";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
@@ -37,16 +38,18 @@ var ChangedWrapper = function ChangedWrapper(props) {
     scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return _get(originalValues, name);
-  }) : _get(originalValues, name);
+  var originalValue = names !== null && names !== void 0 && names.length ? names.map(function (name) {
+    return get(originalValues, name);
+  }) : get(originalValues, name);
   var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
+
     // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
     var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+
     // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
     if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
       return 'same';
@@ -55,8 +58,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      onDiff: onDiff
-      // name: namesStr || name,
+      onDiff: onDiff,
+      type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
   var isAdd = diffType === 'add';
@@ -82,9 +85,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
       originalValues: isNestedField ? originalValues : undefined
     }, children.props), rest));
   }
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
+
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
     return isChanged ? undefined : false;
   };
@@ -92,6 +97,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     '--zaui-contract-bg': changeTipColor,
     '--zaui-contract-bg-add': addTipColor
   };
+
   // @ts-ignore
   var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   var diffClassName = classNames({
@@ -102,7 +108,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
     scrollFollowParent: scrollFollowParent
   } : {};
-  return _jsx(Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
@@ -112,21 +118,21 @@ var ChangedWrapper = function ChangedWrapper(props) {
     },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: _jsxs(Space, {
+    title: /*#__PURE__*/_jsxs(Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [_jsxs(Space, {
+      children: [/*#__PURE__*/_jsxs(Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && _jsxs(Space, {
+      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true
         })) : undefined]
       })]
     }),
-    children: _jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
       style: style,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -1,15 +1,14 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
 var _excluded = ["onChange", "children", "confirm", "otherProps"];
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { isFunction, isObject } from 'lodash';
 import React from 'react';
 import { Modal } from 'antd';
-import ProForm from '../../index';
+import ProForm from "../../index";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
@@ -23,26 +22,25 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(value) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
       var _len,
         other,
         _key,
         _value,
         confirmProps,
-        _args2 = arguments,
-        _t;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               other[_key - 1] = _args2[_key];
             }
-            _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-            if (!_isFunction(confirm)) {
-              _context2.n = 2;
+            _value = value !== null && value !== void 0 && value.target ? value.target.value : value;
+            if (!isFunction(confirm)) {
+              _context2.next = 8;
               break;
             }
-            _context2.n = 1;
+            _context2.next = 5;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form: form,
@@ -51,17 +49,17 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               index: otherProps.index,
               preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
-          case 1:
-            _t = _context2.v;
-            _context2.n = 3;
+          case 5:
+            _context2.t0 = _context2.sent;
+            _context2.next = 9;
             break;
-          case 2:
-            _t = confirm;
-          case 3:
-            confirmProps = _t;
+          case 8:
+            _context2.t0 = confirm;
+          case 9:
+            confirmProps = _context2.t0;
             // 只处理 false, true 和 对象的情况
             if (confirmProps === false) {
-              onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+              onChange === null || onChange === void 0 || onChange.apply(void 0, [_value].concat(other));
             }
             if (confirmProps === true) {
               Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
@@ -70,27 +68,28 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                 }
               }));
             }
-            if (_isObject(confirmProps)) {
+            if (isObject(confirmProps)) {
               Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
-                  var _onOk = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+                  var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                     var _confirmProps$onOk;
                     var _len2,
                       arg,
                       _key2,
                       _args = arguments;
-                    return _regenerator().w(function (_context) {
-                      while (1) switch (_context.n) {
+                    return _regeneratorRuntime().wrap(function _callee$(_context) {
+                      while (1) switch (_context.prev = _context.next) {
                         case 0:
                           for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
                             arg[_key2] = _args[_key2];
                           }
-                          _context.n = 1;
+                          _context.next = 3;
                           return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                        case 1:
-                          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                        case 2:
-                          return _context.a(2);
+                        case 3:
+                          onChange === null || onChange === void 0 || onChange.apply(void 0, [_value].concat(other));
+                        case 4:
+                        case "end":
+                          return _context.stop();
                       }
                     }, _callee);
                   }));
@@ -101,8 +100,9 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                 }()
               }));
             }
-          case 4:
-            return _context2.a(2);
+          case 13:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
@@ -110,7 +110,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return _ref.apply(this, arguments);
     };
   }();
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, rest), {}, {
       // @ts-ignore
       value: rest.value === undefined ? null : rest.value,