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

package/lib/ProForm/utils/transformValue.js

@@ -27,13 +27,17 @@ var transformValue = exports.transformValue = function transformValue(names, for
       });
       return _value;
     },
-    getValueProps: function getValueProps(value) {
+    getValueProps: function getValueProps(value, isOrg) {
       var _curValue;
       var _value = [];
-      names.forEach(function (name, index) {
-        var value = form.getFieldValue(name);
-        _value[index] = value;
-      });
+      if (!isOrg) {
+        names.forEach(function (name, index) {
+          var value = form.getFieldValue(name);
+          _value[index] = value;
+        });
+      } else {
+        _value = value;
+      }
       // 支持外部传入转换函数
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value

package/lib/ProForm/utils/valueType.d.ts

@@ -66,11 +66,5 @@ declare const _default: {
             value: any;
         };
     };
-    /**  脱敏 转换 */
-    desensitization: (props: any) => {
-        getValueProps: (value: any) => {
-            value: any;
-        };
-    };
 };
 export default _default;

package/lib/ProForm/utils/valueType.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.maskStringRangeWithRegex = exports.default = void 0;
-var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _big = _interopRequireDefault(require("big.js"));
@@ -199,6 +198,7 @@ var dateTransform = function dateTransform(_ref2) {
 };
 /** 脱敏处理函数 */
 var maskStringRangeWithRegex = exports.maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _input$replace;
   var _ref3 = range || [],
     _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
     start = _ref4[0],
@@ -206,13 +206,13 @@ var maskStringRangeWithRegex = exports.maskStringRangeWithRegex = function maskS
   if (start < 0) {
     throw new Error('脱敏数据: start index cannot be negative');
   }
-  var adjustedEnd = Math.min(end, input.length - 1);
-  if (start >= input.length) {
+  var adjustedEnd = Math.min(end, (input === null || input === void 0 ? void 0 : input.length) - 1);
+  if (start >= (input === null || input === void 0 ? void 0 : input.length)) {
     return '';
   }
   var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
   var regex = new RegExp(regexPattern);
-  var maskedValue = input.replace(regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  var maskedValue = input === null || input === void 0 ? void 0 : (_input$replace = input.replace) === null || _input$replace === void 0 ? void 0 : _input$replace.call(input, regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
   return maskedValue;
 };
 var _default = exports.default = {
@@ -310,51 +310,5 @@ var _default = exports.default = {
   switch: function _switch(_ref12) {
     var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
-  },
-  /**  脱敏 转换 */
-  desensitization: function desensitization(props) {
-    var desensitization = props.desensitization,
-      type = props.type,
-      mode = props.mode,
-      names = props.names;
-    // 判断是否是地址控件，并带地址详情场景
-    if (type === 'ProCascader' && mode === 'address' && (names === null || names === void 0 ? void 0 : names.length) === 4) {
-      return {
-        getValueProps: function getValueProps(value) {
-          try {
-            if (value === null || value === void 0 ? void 0 : value.length) {
-              var _value = (0, _slicedToArray2.default)(value, 4),
-                province = _value[0],
-                city = _value[1],
-                county = _value[2],
-                address = _value[3];
-              return {
-                value: [province, city, county, maskStringRangeWithRegex(address, desensitization)]
-              };
-            }
-            return {
-              value: value
-            };
-          } catch (error) {
-            return {
-              value: value
-            }; // 如果发生错误，返回原始值
-          }
-        }
-      };
-    }
-    return {
-      getValueProps: function getValueProps(value) {
-        try {
-          return {
-            value: maskStringRangeWithRegex(value, desensitization)
-          };
-        } catch (error) {
-          return {
-            value: value
-          }; // 如果发生错误，返回原始值
-        }
-      }
-    };
   }
 };

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/RenderColumn/index.js

@@ -43,6 +43,45 @@ 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 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 (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
@@ -60,11 +99,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: renderNode,
+            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)) {
@@ -88,7 +152,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 +204,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/package.json

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