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

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -1,15 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _get from "lodash/get";
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
-import { diffOriginal } from '../../utils/diffOriginal';
-import { useProConfig } from '../../../ProConfigProvider';
-import { isEmpty } from '../../../utils';
+import { get } from 'lodash';
+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 toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -35,26 +36,28 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+
     var rowValue = form.getFieldValue(rowValueNamePath);
     if (!rowValue) return undefined;
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
-    var originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
     originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
-    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+    if (originalNames !== null && originalNames !== void 0 && originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+        return get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
+
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
         return valItem === undefined;
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+      originalValue = get(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
@@ -62,11 +65,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       record: rowValue
     };
   }
+
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return {
-    originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return _get(originalValues, originalName);
-    }) : _get(originalValues, originalName),
+    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(function (originalName) {
+      return get(originalValues, originalName);
+    }) : get(originalValues, originalName),
     originRecord: originRecord
   };
 };
@@ -117,8 +121,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     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';
@@ -130,7 +136,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
-      index: index
+      index: index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -139,6 +146,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
     var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue, true)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+
     // 兼容viewRender函数和Element场景
     var _children = children;
     if (viewRender) {
@@ -151,21 +159,33 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }
       _children = viewRender;
     }
+
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(function (item) {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
       // @ts-ignore
       isView: true
-    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+    }, valuePropName, processedValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
+
     // 传入undefined 鼠标移入显示移出隐藏
     return isChanged ? undefined : false;
   };
+
   // @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 classNames = classnames({
@@ -177,7 +197,9 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return _jsx(Tooltip, {
+  // debugger;
+
+  return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
@@ -187,21 +209,21 @@ var ListChangedWrapper = function ListChangedWrapper(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({}, children.props), rest), {}, {
           isView: true
         })) : undefined]
       })]
     }),
-    children: _jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {