@zat-design/sisyphus-react 3.8.3-beta.12 → 3.8.3-beta.14

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -3155,10 +3155,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip {
+  max-width: 100%;
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+  z-index: 1;
+}
+.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+  display: block;
+}
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+  word-break: keep-all;
+}
+.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {

package/dist/less.esm.css

@@ -3155,10 +3155,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip {
+  max-width: 100%;
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+  z-index: 1;
+}
+.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+  display: block;
+}
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+  word-break: keep-all;
+}
+.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -66,6 +66,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : get(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -84,12 +85,14 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     viewRender = props.viewRender,
+    diffConfig = props.diffConfig,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = useProConfig('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   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 originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
@@ -133,22 +136,47 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+  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 diffClassName = classNames({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
   return _jsx(_Tooltip, {
     // 传入undefined 鼠标移入显示移出隐藏
-    open: isChanged ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
+    overlayStyle: {
+      zIndex: 99
+    },
     title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      direction: "vertical",
+      className: "changed-tooltip",
+      children: [_jsxs(_Space, {
+        align: "start",
+        className: "original-value-container",
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _showEllipse && _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", {
       className: diffClassName,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
+      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), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
     })
   });
 };

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

@@ -87,18 +87,19 @@ 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({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  // @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);
   return _jsx(_Tooltip, {
     open: tipOpenCalc(),
-    // mouseEnterDelay={1}
+    // open
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
+    overlayClassName: "original-value-tootip",
     title: _jsxs(_Space, {
       direction: "vertical",
       className: "changed-tooltip",

package/es/ProForm/style/index.less

@@ -480,15 +480,29 @@
   }
 }
 
-.changed-tooltip {
-  .original-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+.original-value-tootip{
+  max-width: 100%;
+  width: max-content;
+  z-index: 1;
+  .changed-tooltip {
+    .original-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
+      .pro-group{
+        .ant-space-compact{
+          display: block;
+        }
+        .pro-form-view-container{
+          word-break: keep-all;
+        }
+      }
     }
-  }
-  .current-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+    .current-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
     }
   }
-}
+}
+

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

@@ -17,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -71,6 +71,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : (0, _lodash.get)(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -89,12 +90,14 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     viewRender = props.viewRender,
+    diffConfig = props.diffConfig,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   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 originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
@@ -138,6 +141,13 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
   }
+  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 diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
@@ -146,16 +156,34 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   // 传入undefined 鼠标移入显示移出隐藏
   , {
     // 传入undefined 鼠标移入显示移出隐藏
-    open: isChanged ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
+    overlayStyle: {
+      zIndex: 99
+    },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      direction: "vertical",
+      className: "changed-tooltip",
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "start",
+        className: "original-value-container",
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
+        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)({}, children.props), rest), {}, {
+          isView: true
+        })) : undefined]
+      })]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest)) : undefined
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
     })
   });
 };

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

@@ -92,18 +92,19 @@ 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)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  // @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);
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: tipOpenCalc(),
-    // mouseEnterDelay={1}
+    // open
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
+    overlayClassName: "original-value-tootip",
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",

package/lib/ProForm/style/index.less

@@ -480,15 +480,29 @@
   }
 }
 
-.changed-tooltip {
-  .original-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+.original-value-tootip{
+  max-width: 100%;
+  width: max-content;
+  z-index: 1;
+  .changed-tooltip {
+    .original-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
+      .pro-group{
+        .ant-space-compact{
+          display: block;
+        }
+        .pro-form-view-container{
+          word-break: keep-all;
+        }
+      }
     }
-  }
-  .current-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+    .current-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
     }
   }
-}
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.8.3-beta.12",
+  "version": "3.8.3-beta.14",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",