@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

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

@@ -1,67 +1,66 @@
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _omit from "lodash/omit";
+import _get from "lodash/get";
 import React, { useMemo } from 'react';
 import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
-import { get, omit } from 'lodash';
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
 
 /** 克隆子元素时需从 props 中剔除，避免透传到 div 等 DOM 导致 React 警告 */
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-var OMIT_FROM_DOM_KEYS = ['disabled',
+const OMIT_FROM_DOM_KEYS = ['disabled',
 // div 不支持 disabled，且值可能非 string/number
 'toCSTString', 'toISOString', 'format', 'switchValue', 'precision', 'clearNotShow', 'dependNames'];
-var toNamePath = name => {
+const toNamePath = name => {
   if (Array.isArray(name)) {
     return name;
   }
   return [name];
 };
-var toNamePaths = names => {
+const toNamePaths = names => {
   return names.map(name => toNamePath(name));
 };
-var getOriginalValue = _ref => {
-  var namePath = _ref.namePath,
-    originalName = _ref.originalName,
-    originalNames = _ref.originalNames,
-    originalValues = _ref.originalValues,
-    rowKeyPath = _ref.rowKeyPath,
-    form = _ref.form;
+const getOriginalValue = ({
+  namePath,
+  // 表格内变动字段的name
+  originalName,
+  // 原始值中对应值的name
+  originalNames,
+  // names时 原始值中对应值的name
+  originalValues,
+  // 原始值
+  rowKeyPath,
+  // 可编辑表格场景下需要根据rowKey对比行数据
+  form
+}) => {
   if (!originalValues) {
     return undefined;
   }
-  var originRecord;
+  let originRecord;
   if (rowKeyPath) {
-    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
-    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+    const rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    const rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
 
-    var rowValue = form.getFieldValue(rowValueNamePath);
+    const rowValue = form.getFieldValue(rowValueNamePath);
     if (!rowValue) return undefined;
-    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    const keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
-    var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(item => {
+    const originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    originRecord = originalValueList?.find(item => {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue;
-    if (originalNames !== null && originalNames !== void 0 && originalNames.length) {
-      var originalNamesValue = originalNames.map(originalName => {
-        return get(originRecord, originalName.slice(rowKeyPath.length - 1));
+    let originalValue;
+    if (originalNames?.length) {
+      const originalNamesValue = originalNames.map(originalName => {
+        return _get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
 
       // 有可能出现数组中全是undefined的情况  视为没有值
-      var fillUndefined = originalNamesValue.every(valItem => valItem === undefined);
+      const fillUndefined = originalNamesValue.every(valItem => 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,
@@ -72,44 +71,43 @@ var getOriginalValue = _ref => {
 
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return {
-    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(originalName => get(originalValues, originalName)) : get(originalValues, originalName),
+    originalValue: originalNames?.length ? originalNames.map(originalName => _get(originalValues, originalName)) : _get(originalValues, originalName),
     originRecord
   };
 };
-var ListChangedWrapper = props => {
-  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    _props$originalName = props.originalName,
-    originalName = _props$originalName === void 0 ? name : _props$originalName,
-    _props$originalNames = props.originalNames,
-    originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
-    originalValues = props.originalValues,
-    form = props.form,
-    onDiff = props.onDiff,
-    rowKeyPath = props.rowKeyPath,
-    children = props.children,
-    type = props.type,
-    normalize = props.normalize,
-    getValueProps = props.getValueProps,
-    _props$valuePropName = props.valuePropName,
-    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
-    viewRender = props.viewRender,
-    diffConfig = props.diffConfig,
-    index = props.index,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _ref2 = useProConfig('ProEditTable') || {},
-    isDiffAll = _ref2.isDiffAll;
-  var _ref3 = diffConfig || {},
-    _ref3$scrollFollowPar = _ref3.scrollFollowParent,
-    scrollFollowParent = _ref3$scrollFollowPar === void 0 ? true : _ref3$scrollFollowPar;
-  var namePath = toNamePath(namesStr || name);
-  var originalNamePath = toNamePath(originalName);
-  var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var toolTip = (_diffConfig$toolTip = diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
-  var isWatch = Boolean(originalValues);
-  var originalDTO = getOriginalValue({
+const ListChangedWrapper = props => {
+  const {
+    name,
+    names,
+    namesStr,
+    originalName = name,
+    originalNames = names,
+    originalValues,
+    form,
+    onDiff,
+    rowKeyPath,
+    children,
+    type,
+    normalize,
+    getValueProps,
+    valuePropName = 'value',
+    viewRender,
+    diffConfig,
+    index,
+    ...rest
+  } = props;
+  const {
+    isDiffAll
+  } = useProConfig('ProEditTable') || {};
+  const {
+    scrollFollowParent = true
+  } = diffConfig || {};
+  const namePath = toNamePath(namesStr || name);
+  const originalNamePath = toNamePath(originalName);
+  const originalNamePaths = originalNames && toNamePaths(originalNames);
+  const toolTip = diffConfig?.toolTip ?? true;
+  const isWatch = Boolean(originalValues);
+  const originalDTO = getOriginalValue({
     namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -117,15 +115,15 @@ var ListChangedWrapper = props => {
     rowKeyPath,
     form
   });
-  var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
-  var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
-  var diffType = useMemo(() => {
+  const originalValue = isWatch ? originalDTO?.originalValue : undefined;
+  const noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  const diffType = useMemo(() => {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    const _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;
+    const _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)) {
@@ -136,24 +134,23 @@ var ListChangedWrapper = props => {
       originalValue: _originalValue,
       form,
       onDiff,
-      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
-      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      originRecord: originalDTO?.originRecord,
+      record: originalDTO?.record,
       index,
       type: props.type
     });
   }, [props[valuePropName], originalValue]);
-  var isAdd = diffType === 'add';
-  var isChanged = diffType === 'changed';
-  var tipContent = useMemo(() => {
-    var _getValueProps;
+  const isAdd = diffType === 'add';
+  const isChanged = diffType === 'changed';
+  const tipContent = useMemo(() => {
     if (!isWatch || noChange) return undefined;
-    var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue, true)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+    const orgValue = getValueProps ? getValueProps(originalValue, true)?.[valuePropName] : originalValue;
 
     // 兼容viewRender函数和Element场景
-    var _children = children;
+    let _children = children;
     if (viewRender) {
       if (! /*#__PURE__*/React.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
+        return viewRender(orgValue, originalDTO?.originRecord || {}, {
           form,
           name,
           index
@@ -163,27 +160,31 @@ var ListChangedWrapper = props => {
     }
 
     // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
-    var processedValue = orgValue;
+    let processedValue = orgValue;
     if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
       processedValue = orgValue.map(item => {
-        var num = Number(item);
+        const num = Number(item);
         return Number.isNaN(num) ? item : num;
       });
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+      ...children,
       // @ts-ignore
       isView: true,
       [valuePropName]: processedValue,
       checked: type === 'Switch' ? originalValue : undefined
-    })) : undefined;
+    }) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    var filteredRest = omit(rest, OMIT_FROM_DOM_KEYS);
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), filteredRest));
+    const filteredRest = _omit(rest, OMIT_FROM_DOM_KEYS);
+    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, {
+      ...children.props,
+      ...filteredRest
+    });
   }
 
   // const isFocus = useFocus(contentRef.current);
-  var tipOpenCalc = () => {
+  const tipOpenCalc = () => {
     if (!toolTip) return false;
 
     // 传入undefined 鼠标移入显示移出隐藏
@@ -191,16 +192,16 @@ var ListChangedWrapper = props => {
   };
 
   // @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({
+  const _showEllipse = children.props?.showEllipse || children.props?.tooltip;
+  const classNames = classnames({
     'original-value-tooltip': true,
     'original-value-tooltip-fixed': true
   });
-  var diffClassName = classnames({
+  const diffClassName = classnames({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  var open = tipOpenCalc();
+  const open = tipOpenCalc();
   return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
@@ -218,18 +219,26 @@ var ListChangedWrapper = props => {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _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), omit(rest, OMIT_FROM_DOM_KEYS)), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+          // @ts-ignore
+          ...children.props,
+          ..._omit(rest, OMIT_FROM_DOM_KEYS),
           isView: true
-        })) : undefined]
+        }) : undefined]
       })]
     }),
     children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), omit(rest, OMIT_FROM_DOM_KEYS)), {}, {
-        otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+        // @ts-ignore
+        ...children.props,
+        ..._omit(rest, OMIT_FROM_DOM_KEYS),
+        otherProps: {
+          // @ts-ignore
+          ...children.props?.otherProps,
           isDiffChange: isChanged
-        })
-      })) : undefined
+        }
+      }) : undefined
     })
   });
 };