@zat-design/sisyphus-react 3.13.19-beta.5 → 3.13.19-beta.7

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

@@ -6,24 +6,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 require("antd/es/tooltip/style");
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+require("antd/es/space/style");
+var _space = _interopRequireDefault(require("antd/es/space"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _lodash = require("lodash");
 var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
 var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
-var ChangedWrapper = function ChangedWrapper(props) {
+var ChangedWrapper = props => {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
@@ -48,16 +46,16 @@ 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 (0, _get2.default)(originalValues, name);
-  }) : (0, _get2.default)(originalValues, name);
+  var originalValue = names !== null && names !== void 0 && names.length ? names.map(name => (0, _lodash.get)(originalValues, name)) : (0, _lodash.get)(originalValues, name);
   var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
-  var diffType = (0, _react.useMemo)(function () {
+  var diffType = (0, _react.useMemo)(() => {
     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';
@@ -65,37 +63,40 @@ var ChangedWrapper = function ChangedWrapper(props) {
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: _originalValue,
-      form: form,
-      onDiff: onDiff,
+      form,
+      onDiff,
       type: props.type
     });
-  }, [isWatch, noChange, props[valuePropName], originalValue, (0, _typeof2.default)(onDiff)]);
+  }, [isWatch, noChange, props[valuePropName], originalValue, typeof onDiff]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var tipContent = (0, _react.useMemo)(function () {
+  var tipContent = (0, _react.useMemo)(() => {
     if (!isWatch || noChange) return undefined;
     var valueProps = getValueProps ? getValueProps(originalValue, true) : {
       value: originalValue
     };
     if (viewRender) {
       return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
-        form: form
+        form
       });
     }
-    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
-      isView: true
-    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
-  }, [(0, _typeof2.default)(viewRender), originalValue, children]);
+    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), {}, {
+      isView: true,
+      [valuePropName]: valueProps === null || valueProps === void 0 ? void 0 : valueProps.value
+    })) : undefined;
+  }, [typeof viewRender, originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
     var isNestedField = ['ProEditTable'].includes(type);
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       originalValues: isNestedField ? originalValues : undefined
     }, children.props), rest));
   }
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  var tipOpenCalc = function tipOpenCalc() {
+  var tipOpenCalc = () => {
     if (!toolTip) return false;
+
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
     return isChanged ? undefined : false;
   };
@@ -103,6 +104,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 = (0, _classnames.default)({
@@ -111,35 +113,33 @@ var ChangedWrapper = function ChangedWrapper(props) {
   });
   var open = tipOpenCalc();
   var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
-    scrollFollowParent: scrollFollowParent
+    scrollFollowParent
   } : {};
-  return (0, _jsxRuntime.jsx)(_tooltip.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
     open: open,
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    },
+    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
     overlayClassName: "original-value-tooltip",
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: (0, _jsxRuntime.jsxs)(_space.default, {
+    title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [(0, _jsxRuntime.jsxs)(_space.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && (0, _jsxRuntime.jsxs)(_space.default, {
+      }), _showEllipse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true
         })) : undefined]
       })]
     }),
-    children: (0, _jsxRuntime.jsx)("div", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
-        otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
+        otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })
       })) : undefined

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

@@ -11,17 +11,16 @@ require("antd/es/modal/style");
 var _modal = _interopRequireDefault(require("antd/es/modal"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _jsxRuntime = require("react/jsx-runtime");
+var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _index = _interopRequireDefault(require("../../index"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["onChange", "children", "confirm"];
 var defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
 };
-var ConfirmWrapper = function ConfirmWrapper(props) {
+var ConfirmWrapper = props => {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
@@ -29,7 +28,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var otherProps = _index.default.useFieldProps() || props.otherProps;
   var form = otherProps.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
       var _len,
         other,
         _key,
@@ -42,15 +41,15 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             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 (!(0, _isFunction2.default)(confirm)) {
+            _value = value !== null && value !== void 0 && value.target ? value.target.value : value;
+            if (!(0, _lodash.isFunction)(confirm)) {
               _context2.next = 8;
               break;
             }
             _context2.next = 5;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
-              form: form,
+              form,
               namePath: otherProps.namePath,
               name: otherProps.name,
               index: otherProps.index,
@@ -66,19 +65,17 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             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(_value, ...other);
             }
             if (confirmProps === true) {
               _modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
-                onOk: function onOk() {
-                  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                }
+                onOk: () => onChange === null || onChange === void 0 ? void 0 : onChange(_value, ...other)
               }));
             }
-            if ((0, _isObject2.default)(confirmProps)) {
+            if ((0, _lodash.isObject)(confirmProps)) {
               _modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
-                  var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                  var _onOk = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
                     var _confirmProps$onOk;
                     var _len2,
                       arg,
@@ -91,9 +88,9 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                             arg[_key2] = _args[_key2];
                           }
                           _context.next = 3;
-                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call(confirmProps, ...arg);
                         case 3:
-                          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                          onChange === null || onChange === void 0 || onChange(_value, ...other);
                         case 4:
                         case "end":
                           return _context.stop();
@@ -117,7 +114,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return _ref.apply(this, arguments);
     };
   }();
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
       // @ts-ignore
       value: rest.value === undefined ? null : rest.value,