@zat-design/sisyphus-react 3.10.1 → 3.10.2-beta.2

package/lib/ProSelect/index.js

@@ -217,7 +217,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
     return props.children;
   };
-  var handleChange = function handleChange(value, option) {
+  var isReactElement = function isReactElement(element) {
+    return /*#__PURE__*/(0, _react.isValidElement)(element);
+  };
+  var handleChange = function handleChange(value, _option) {
+    // option/其第一层子节点是react节点且是labelInValue就拿record
+    var option = _option;
+    if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
+      option = _option === null || _option === void 0 ? void 0 : _option.record;
+    }
     var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
@@ -235,7 +243,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
     }
   };
   /**

package/lib/ProTable/components/FormatColumn/index.js

@@ -347,11 +347,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
-      if (originalObj && renderValue !== originalRenderValue) {
-        otherProps.isChanged = true;
-      } else {
-        otherProps.isChanged = false;
-      }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/lib/ProTable/components/RenderColumn/index.js

@@ -14,7 +14,8 @@ var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
-var _utils = require("../../../utils");
+var _utils = require("../../utils");
+var _utils2 = require("../../../utils");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
 var Paragraph = _antd.Typography.Paragraph,
   Text = _antd.Typography.Text;
@@ -43,6 +44,32 @@ var RenderColumn = function RenderColumn(props) {
     'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged,
     'add-cell': props === null || props === void 0 ? void 0 : props.isAddCell
   });
+  var checkEllipsis = function checkEllipsis(box) {
+    var range = document.createRange();
+    range.setStart(box, 0);
+    range.setEnd(box, box.childNodes.length);
+    var rangeWidth = range.getBoundingClientRect().width;
+    var _getPadding = (0, _utils.getPadding)(box),
+      pLeft = _getPadding.pLeft,
+      pRight = _getPadding.pRight,
+      pTop = _getPadding.pTop,
+      pBottom = _getPadding.pBottom;
+    var horizontalPadding = pLeft + pRight;
+    if (rangeWidth + horizontalPadding > box.clientWidth) {
+      return true;
+    }
+    return false;
+  };
+  var handleMouseOver = function handleMouseOver(e) {
+    setState({
+      tooltip: checkEllipsis(e.target)
+    });
+  };
+  var tooltipProps = (0, _objectSpread2.default)({
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
+  }, toolTipProps);
   // 比对场景走的逻辑
   if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
@@ -60,11 +87,36 @@ var RenderColumn = function RenderColumn(props) {
       }) : (0, _jsxRuntime.jsx)("div", {
         style: {
           minWidth: minWidth,
-          width: width
+          width: width,
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          whiteSpace: 'nowrap'
         },
         children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+        if (ellipsis) {
+          return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+            title: currentValue,
+            onOpenChange: function onOpenChange(open) {
+              setState({
+                tooltip: false
+              });
+            },
+            open: tooltip
+          }, tooltipProps), {}, {
+            children: (0, _jsxRuntime.jsx)(Text, {
+              style: {
+                width: width,
+                minWidth: minWidth
+              },
+              ellipsis: true,
+              onMouseOver: handleMouseOver,
+              onFocus: handleMouseOver,
+              children: renderNode
+            })
+          }));
+        }
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
@@ -74,7 +126,7 @@ var RenderColumn = function RenderColumn(props) {
         if (Array.isArray(originalValue)) {
           return null;
         }
-        return !(0, _utils.isEmpty)(originalValue) ? originalValue : '-';
+        return !(0, _utils2.isEmpty)(originalValue) ? originalValue : '-';
       };
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: cellDiffCls,
@@ -88,7 +140,7 @@ var RenderColumn = function RenderColumn(props) {
         title: (0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) && !(props === null || props === void 0 ? void 0 : props.isAddCell) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
@@ -140,45 +192,6 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    var getPadding = function getPadding(el) {
-      var style = window.getComputedStyle(el, null);
-      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
-      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
-      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
-      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
-      return {
-        pLeft: paddingLeft,
-        pRight: paddingRight,
-        pTop: paddingTop,
-        pBottom: paddingBottom
-      };
-    };
-    var checkEllipsis = function checkEllipsis(box) {
-      var range = document.createRange();
-      range.setStart(box, 0);
-      range.setEnd(box, box.childNodes.length);
-      var rangeWidth = range.getBoundingClientRect().width;
-      var _getPadding = getPadding(box),
-        pLeft = _getPadding.pLeft,
-        pRight = _getPadding.pRight,
-        pTop = _getPadding.pTop,
-        pBottom = _getPadding.pBottom;
-      var horizontalPadding = pLeft + pRight;
-      if (rangeWidth + horizontalPadding > box.clientWidth) {
-        return true;
-      }
-      return false;
-    };
-    var handleMouseOver = function handleMouseOver(e) {
-      setState({
-        tooltip: checkEllipsis(e.target)
-      });
-    };
-    var tooltipProps = (0, _objectSpread2.default)({
-      getPopupContainer: function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      }
-    }, toolTipProps);
     if (!value) {
       return (0, _jsxRuntime.jsx)("div", {
         style: {

package/lib/ProTable/utils/index.d.ts

@@ -33,3 +33,9 @@ export declare const getRowKey: (rowKey: any, record: any) => any;
 export declare const removeEmptyKeys: (obj: any) => {
     [k: string]: unknown;
 };
+export declare const getPadding: (el: HTMLElement) => {
+    pLeft: number;
+    pRight: number;
+    pTop: number;
+    pBottom: number;
+};

package/lib/ProTable/utils/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeEmptyKeys = exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+exports.removeEmptyKeys = exports.isListResult = exports.getRowKey = exports.getPadding = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
@@ -92,4 +92,18 @@ var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
   });
   // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
   return Object.fromEntries(filteredEntries);
+};
+/* 获取边距 */
+var getPadding = exports.getPadding = function getPadding(el) {
+  var style = window.getComputedStyle(el, null);
+  var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+  var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+  var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+  var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+  return {
+    pLeft: paddingLeft,
+    pRight: paddingRight,
+    pTop: paddingTop,
+    pBottom: paddingBottom
+  };
 };

package/package.json

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