@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

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

@@ -1,92 +1,68 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProEditTable/components/RenderField/ListChangedWrapper.tsx
-var ListChangedWrapper_exports = {};
-__export(ListChangedWrapper_exports, {
-  default: () => ListChangedWrapper_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(ListChangedWrapper_exports);
-var import_react = __toESM(require("react"));
-var import_antd = require("antd");
-var import_classnames = __toESM(require("classnames"));
-var import_lodash = require("lodash");
-var import_diffOriginal = require("../../utils/diffOriginal");
-var import_ProConfigProvider = require("../../../ProConfigProvider");
-var import_utils = require("../../../utils");
-var toNamePath = (name) => {
+exports.default = void 0;
+require("antd/es/tooltip/style");
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+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 _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _lodash = require("lodash");
+var _diffOriginal = require("../../utils/diffOriginal");
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
+var toNamePath = name => {
   if (Array.isArray(name)) {
     return name;
   }
   return [name];
 };
-var toNamePaths = (names) => {
-  return names.map((name) => toNamePath(name));
+var toNamePaths = names => {
+  return names.map(name => toNamePath(name));
 };
-var getOriginalValue = ({
-  namePath,
-  // 表格内变动字段的name
-  originalName,
-  // 原始值中对应值的name
-  originalNames,
-  // names时 原始值中对应值的name
-  originalValues,
-  // 原始值
-  rowKeyPath,
-  // 可编辑表格场景下需要根据rowKey对比行数据
-  form
-}) => {
+var getOriginalValue = _ref => {
+  var namePath = _ref.namePath,
+    originalName = _ref.originalName,
+    originalNames = _ref.originalNames,
+    originalValues = _ref.originalValues,
+    rowKeyPath = _ref.rowKeyPath,
+    form = _ref.form;
   if (!originalValues) {
-    return void 0;
+    return undefined;
   }
-  let originRecord;
+  var originRecord;
   if (rowKeyPath) {
-    const rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1);
-    const rowKeyName = rowKeyPath[rowKeyPath.length - 1];
-    const rowValue = form.getFieldValue(rowValueNamePath);
-    if (!rowValue)
-      return void 0;
-    const keyValue = rowValue[rowKeyName];
-    if (!keyValue)
-      return void 0;
-    const originalValueList = (0, import_lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originRecord = originalValueList == null ? void 0 : originalValueList.find((item) => {
+    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 = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(item => {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    let originalValue;
-    if (originalNames == null ? void 0 : originalNames.length) {
-      const originalNamesValue = originalNames.map((originalName2) => {
-        return (0, import_lodash.get)(originRecord, originalName2.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames !== null && originalNames !== void 0 && originalNames.length) {
+      var originalNamesValue = originalNames.map(originalName => {
+        return (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
-      const fillUndefined = originalNamesValue.every((valItem) => valItem === void 0);
-      originalValue = fillUndefined ? void 0 : originalNamesValue;
+
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(valItem => valItem === undefined);
+      originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = (0, import_lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
+      originalValue = (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue,
@@ -94,41 +70,47 @@ var getOriginalValue = ({
       record: rowValue
     };
   }
+
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return {
-    originalValue: (originalNames == null ? void 0 : originalNames.length) ? originalNames.map((originalName2) => (0, import_lodash.get)(originalValues, originalName2)) : (0, import_lodash.get)(originalValues, originalName),
+    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(originalName => (0, _lodash.get)(originalValues, originalName)) : (0, _lodash.get)(originalValues, originalName),
     originRecord
   };
 };
-var ListChangedWrapper = (props) => {
-  var _a, _b, _c;
-  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 } = (0, import_ProConfigProvider.useProConfig)("ProEditTable") || {};
-  const { scrollFollowParent = true } = diffConfig || {};
-  const namePath = toNamePath(namesStr || name);
-  const originalNamePath = toNamePath(originalName);
-  const originalNamePaths = originalNames && toNamePaths(originalNames);
-  const toolTip = (diffConfig == null ? void 0 : diffConfig.toolTip) ?? true;
-  const isWatch = Boolean(originalValues);
-  const originalDTO = getOriginalValue({
+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 = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref2 = (0, _ProConfigProvider.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({
     namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -136,93 +118,120 @@ var ListChangedWrapper = (props) => {
     rowKeyPath,
     form
   });
-  const originalValue = isWatch ? originalDTO == null ? void 0 : originalDTO.originalValue : void 0;
-  const noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, import_utils.isEmpty)(originalValue));
-  const diffType = (0, import_react.useMemo)(() => {
-    if (!isWatch || noChange)
-      return "same";
-    const _value = normalize ? normalize(props[valuePropName], void 0, void 0, true) : props[valuePropName];
-    const _originalValue = normalize && ["DatePicker"].includes(props.type) ? normalize(originalValue, void 0, void 0, true) : originalValue;
-    if (["InputNumber"].includes(props.type) && normalize && _value === Number(originalValue)) {
-      return "same";
+  var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  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';
     }
-    return (0, import_diffOriginal.diffOriginal)({
+    return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: _originalValue,
       form,
       onDiff,
-      originRecord: originalDTO == null ? void 0 : originalDTO.originRecord,
-      record: originalDTO == null ? void 0 : originalDTO.record,
-      index
+      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
+      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
-  const isAdd = diffType === "add";
-  const isChanged = diffType === "changed";
-  const tipContent = (0, import_react.useMemo)(() => {
-    var _a2;
-    if (!isWatch || noChange)
-      return void 0;
-    const orgValue = getValueProps ? (_a2 = getValueProps(originalValue, true)) == null ? void 0 : _a2[valuePropName] : originalValue;
-    let _children = children;
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  var tipContent = (0, _react.useMemo)(() => {
+    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) {
-      if (!import_react.default.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO == null ? void 0 : originalDTO.originRecord) || {}, { form, name, index });
+      if (! /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
+          form,
+          name,
+          index
+        });
       }
       _children = viewRender;
     }
-    return import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
-      ...children,
+
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(item => {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
+    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children), {}, {
       // @ts-ignore
       isView: true,
-      [valuePropName]: orgValue,
-      checked: type === "Switch" ? originalValue : void 0
-    }) : void 0;
+      [valuePropName]: processedValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    })) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return import_react.default.isValidElement(children) && import_react.default.cloneElement(children, { ...children.props, ...rest });
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
   }
-  const tipOpenCalc = () => {
-    if (!toolTip)
-      return false;
-    return isChanged ? void 0 : false;
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const isFocus = useFocus(contentRef.current);
+  var tipOpenCalc = () => {
+    if (!toolTip) return false;
+
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
   };
-  const _showEllipse = ((_a = children.props) == null ? void 0 : _a.showEllipse) || ((_b = children.props) == null ? void 0 : _b.tooltip);
-  const classNames = (0, import_classnames.default)({
-    "original-value-tooltip": true,
-    "original-value-tooltip-fixed": true
+
+  // @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 = (0, _classnames.default)({
+    'original-value-tooltip': true,
+    'original-value-tooltip-fixed': true
   });
-  const diffClassName = (0, import_classnames.default)({
-    "pro-form-item-changed": isChanged,
-    "pro-form-item-add": isAdd
+  var diffClassName = (0, _classnames.default)({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
   });
-  const open = tipOpenCalc();
-  return /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Tooltip,
-    {
-      open,
-      getPopupContainer: (trigger) => scrollFollowParent ? trigger.parentElement : document.body,
-      classNames: {
-        root: classNames
-      },
-      placement: "topLeft",
-      autoAdjustOverflow: false,
-      title: /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical", className: "changed-tooltip" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { align: "start", className: "original-value-container" }, "初始值：", tipContent), _showEllipse && /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "current-value-container" }, "当前值：", import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
-        // @ts-ignore
-        ...children.props,
-        ...rest,
-        isView: true
-      }) : void 0))
+  var open = tipOpenCalc();
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+    open: open,
+    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
+    classNames: {
+      root: classNames
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: diffClassName }, import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
-      // @ts-ignore
-      ...children.props,
-      ...rest,
-      otherProps: {
-        // @ts-ignore
-        ...(_c = children.props) == null ? void 0 : _c.otherProps,
-        isDiffChange: isChanged
-      }
-    }) : void 0)
-  );
+    placement: "topLeft",
+    autoAdjustOverflow: false,
+    title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      direction: "vertical",
+      className: "changed-tooltip",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+        align: "start",
+        className: "original-value-container",
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _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, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
+          isView: true
+        })) : undefined]
+      })]
+    }),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: diffClassName,
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
+        otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
+    })
+  });
 };
-var ListChangedWrapper_default = ListChangedWrapper;
+var _default = exports.default = ListChangedWrapper;