@zat-design/sisyphus-react 3.7.0-beta.6 → 3.7.0-beta.8

package/es/ProForm/components/base/Select/index.js

@@ -58,6 +58,7 @@ var Select = function Select(props) {
   }, initialConfig), {}, {
     options: dataSource
   }, rest), {}, {
+    value: rest.value === '' ? null : rest.value,
     fieldNames: _fieldNames
   }));
 };

package/es/ProSelect/index.js

@@ -268,6 +268,10 @@ export var ProSelect = function ProSelect(props, ref) {
         return option === null || option === void 0 ? void 0 : option[code];
       }
     }
+    // 修复空字符placeholder不显示
+    if (value === '') {
+      return null;
+    }
     return value;
   };
   var newSelectList = selectList;

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

@@ -1,9 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useSetState } from 'ahooks';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
 import copySvg from '../../../assets/copy.svg';
@@ -22,6 +24,12 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+  var _useSetState = useSetState({
+      tooltip: false
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    tooltip = _useSetState2[0].tooltip,
+    setState = _useSetState2[1];
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -82,17 +90,40 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
+    var handleMouseOver = function handleMouseOver(e) {
+      var _e$target, _e$target2;
+      if ((e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.scrollWidth) > (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.offsetWidth)) {
+        setState({
+          tooltip: _objectSpread({
+            getPopupContainer: function getPopupContainer(triggerNode) {
+              return triggerNode.parentNode;
+            },
+            open: true
+          }, toolTipProps)
+        });
+      } else {
+        setState({
+          tooltip: false
+        });
+      }
+    };
+    var handleMouseOut = function handleMouseOut() {
+      setState({
+        tooltip: false
+      });
+    };
+    var _ellipsis = {
+      tooltip: tooltip
+    };
     return value ? _jsx(Text, {
       style: {
         width: width
       },
-      ellipsis: {
-        tooltip: _objectSpread({
-          getPopupContainer: function getPopupContainer(triggerNode) {
-            return triggerNode.parentNode;
-          }
-        }, toolTipProps)
-      },
+      ellipsis: _ellipsis,
+      onMouseOver: handleMouseOver,
+      onFocus: handleMouseOver,
+      onMouseOut: handleMouseOut,
+      onBlur: handleMouseOut,
       children: node
     }) : '-';
   }

package/lib/ProForm/components/base/Select/index.js

@@ -64,6 +64,7 @@ var Select = function Select(props) {
   }, initialConfig), {}, {
     options: dataSource
   }, rest), {}, {
+    value: rest.value === '' ? null : rest.value,
     fieldNames: _fieldNames
   }));
 };

package/lib/ProSelect/index.js

@@ -269,6 +269,10 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         return option === null || option === void 0 ? void 0 : option[code];
       }
     }
+    // 修复空字符placeholder不显示
+    if (value === '') {
+      return null;
+    }
     return value;
   };
   var newSelectList = selectList;

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

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _ahooks = require("ahooks");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
@@ -26,6 +28,12 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+  var _useSetState = (0, _ahooks.useSetState)({
+      tooltip: false
+    }),
+    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    tooltip = _useSetState2[0].tooltip,
+    setState = _useSetState2[1];
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -86,17 +94,40 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
+    var handleMouseOver = function handleMouseOver(e) {
+      var _e$target, _e$target2;
+      if ((e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.scrollWidth) > (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.offsetWidth)) {
+        setState({
+          tooltip: (0, _objectSpread2.default)({
+            getPopupContainer: function getPopupContainer(triggerNode) {
+              return triggerNode.parentNode;
+            },
+            open: true
+          }, toolTipProps)
+        });
+      } else {
+        setState({
+          tooltip: false
+        });
+      }
+    };
+    var handleMouseOut = function handleMouseOut() {
+      setState({
+        tooltip: false
+      });
+    };
+    var _ellipsis = {
+      tooltip: tooltip
+    };
     return value ? (0, _jsxRuntime.jsx)(Text, {
       style: {
         width: width
       },
-      ellipsis: {
-        tooltip: (0, _objectSpread2.default)({
-          getPopupContainer: function getPopupContainer(triggerNode) {
-            return triggerNode.parentNode;
-          }
-        }, toolTipProps)
-      },
+      ellipsis: _ellipsis,
+      onMouseOver: handleMouseOver,
+      onFocus: handleMouseOver,
+      onMouseOut: handleMouseOut,
+      onBlur: handleMouseOut,
       children: node
     }) : '-';
   }

package/package.json

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