@zat-design/sisyphus-react 3.8.2-beta.9 → 3.8.3

package/lib/ProEnum/index.js

@@ -54,8 +54,8 @@ var ProEnum = function ProEnum(props) {
     showCodeName = _ref2.showCodeName,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
-  var label = '';
-  var fieldValue = '';
+  var label = 'label';
+  var fieldValue = 'value';
   var _useState = (0, _react.useState)(dataSource || []),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     dataList = _useState2[0],

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

@@ -86,7 +86,7 @@ var InputNumber = function InputNumber(props) {
   var _parser = function parser(value, precision) {
     if (value === '') return value;
     var num = Number(value.replace(/[\s,]+/g, ''));
-    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
+    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : Number(value) : Number(num.toFixed(precision));
   };
   if (valueType) {
     switch (valueType) {

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -31,6 +31,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -58,9 +59,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
       isView: true
-    }, valuePropName, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
@@ -92,9 +94,13 @@ var ChangedWrapper = function ChangedWrapper(props) {
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       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]

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

@@ -438,6 +438,7 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
         children: child
       });
     }

package/lib/ProForm/style/index.less

@@ -472,3 +472,16 @@
     }
   }
 }
+
+.changed-tooltip {
+  .original-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/ProTable/components/FormatColumn/index.d.ts

@@ -1,12 +1,14 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
     wrapToolTipProps?: any;
+    scroll?: any;
+    onUpdateMinWidth?: any;
 }) => void;
 /**
  * 查找最近的父级className

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

@@ -10,6 +10,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
@@ -18,13 +19,45 @@ var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
-var formatColumn = exports.formatColumn = function formatColumn(_ref) {
-  var column = _ref.column,
-    originalObj = _ref.originalObj,
-    dataSourceObj = _ref.dataSourceObj,
-    rowKey = _ref.rowKey,
-    diffToolTip = _ref.diffToolTip,
-    wrapToolTipProps = _ref.wrapToolTipProps;
+var isReactElement = function isReactElement(element) {
+  return /*#__PURE__*/(0, _react.isValidElement)(element);
+};
+var calcMinWidth = function calcMinWidth(_ref) {
+  var minWidth = _ref.minWidth,
+    width = _ref.width,
+    title = _ref.title,
+    isMaxContentOverFlow = _ref.isMaxContentOverFlow,
+    callback = _ref.callback;
+  if (!minWidth && !width && isMaxContentOverFlow) {
+    var tempEl = document.createElement('div');
+    tempEl.style.display = 'inline-block';
+    document.body.appendChild(tempEl);
+    if ((0, _lodash.isFunction)(title)) {
+      var component = title();
+      _reactDom.default.render(component, tempEl);
+    } else if (isReactElement(title)) {
+      _reactDom.default.render(title, tempEl);
+    } else {
+      tempEl.innerHTML = title;
+    }
+    // 使用 requestAnimationFrame 确保在下一个浏览器重绘周期中获取宽度
+    requestAnimationFrame(function () {
+      var _width = tempEl.offsetWidth;
+      _reactDom.default.unmountComponentAtNode(tempEl);
+      tempEl.remove();
+      callback(_width);
+    });
+  }
+};
+var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
+  var column = _ref2.column,
+    originalObj = _ref2.originalObj,
+    dataSourceObj = _ref2.dataSourceObj,
+    rowKey = _ref2.rowKey,
+    diffToolTip = _ref2.diffToolTip,
+    wrapToolTipProps = _ref2.wrapToolTipProps,
+    scroll = _ref2.scroll,
+    onUpdateMinWidth = _ref2.onUpdateMinWidth;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -43,7 +76,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
     _column$originalDiffT = column.originalDiffTip,
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
-    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
+    minWidth = column.minWidth;
+  // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
+  var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
+  calcMinWidth({
+    minWidth: minWidth,
+    width: width,
+    title: title,
+    isMaxContentOverFlow: isMaxContentOverFlow,
+    callback: onUpdateMinWidth
+  });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
@@ -71,13 +114,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
+    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
+      return;
+    }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
+      var _originalObj$record$r;
       var isFn = (0, _lodash.isFunction)(originalRender);
-      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record, index) : undefined;
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, originalObj, index) : undefined;
+      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
+      var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -87,7 +134,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         node: _value,
         currentValue: _value,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     return;
@@ -133,7 +181,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -163,7 +212,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -216,7 +266,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -254,7 +305,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (precision || prefix || suffix) {
@@ -281,7 +333,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (valueType === 'address') {
@@ -337,7 +390,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -358,7 +412,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -381,7 +436,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   }

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -11,6 +11,7 @@ interface Props {
     width?: number | string;
     originalValue?: any;
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
+    minWidth?: number;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -27,7 +27,8 @@ var RenderColumn = function RenderColumn(props) {
     originalValue = props.originalValue,
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
-    toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+    toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
+    minWidth = props.minWidth;
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
@@ -40,7 +41,8 @@ var RenderColumn = function RenderColumn(props) {
       if (ellipsis) {
         renderNode = (0, _jsxRuntime.jsx)(Text, {
           style: {
-            width: currentValue === '-' ? 32.5 : width
+            width: currentValue === '-' ? 32.5 : width,
+            minWidth: minWidth
           },
           ellipsis: {
             tooltip: false
@@ -51,7 +53,8 @@ var RenderColumn = function RenderColumn(props) {
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "varied-cell",
         style: {
-          width: width
+          width: width,
+          minWidth: minWidth
         },
         title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
@@ -66,7 +69,8 @@ var RenderColumn = function RenderColumn(props) {
     return (0, _jsxRuntime.jsx)("span", {
       className: "varied-cell",
       style: {
-        width: width
+        width: width,
+        minWidth: minWidth
       },
       children: renderNode
     });
@@ -137,7 +141,12 @@ var RenderColumn = function RenderColumn(props) {
       }
     }, toolTipProps);
     if (!value) {
-      return '-';
+      return (0, _jsxRuntime.jsx)("div", {
+        style: {
+          minWidth: minWidth
+        },
+        children: "-"
+      });
     }
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: value,
@@ -150,7 +159,8 @@ var RenderColumn = function RenderColumn(props) {
     }, tooltipProps), {}, {
       children: (0, _jsxRuntime.jsx)(Text, {
         style: {
-          width: width
+          width: width,
+          minWidth: minWidth
         },
         ellipsis: true,
         onMouseOver: handleMouseOver,
@@ -159,6 +169,11 @@ var RenderColumn = function RenderColumn(props) {
       })
     }));
   }
-  return value || value === 0 ? node : '-';
+  return (0, _jsxRuntime.jsx)("div", {
+    style: {
+      minWidth: minWidth
+    },
+    children: value || value === 0 ? node : '-'
+  });
 };
 var _default = exports.default = RenderColumn;

package/lib/ProTable/index.js

@@ -211,18 +211,22 @@ function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
+    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
       (0, _FormatColumn.formatColumn)({
         column: item,
         originalObj: originalObj,
         dataSourceObj: dataSourceObj,
         rowKey: 'rowKey',
         diffToolTip: toolTip,
-        wrapToolTipProps: wrapToolTipProps
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        }
       });
     });
     return newColumns;
-  }, [curColumns, handleResize]);
+  }, [curColumns, handleResize, _scroll]);
   var _columns = (0, _react.useMemo)(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
       var show = item.show;
@@ -235,9 +239,10 @@ function ProTable(props) {
       return true;
     });
   }, [columns]);
-  var isExistPercentWidth = !!_columns.find(function (item) {
-    return item.width && typeof item.width === 'string' && item.width.endsWith('%');
-  });
+  var isExistPercentWidth = !!(_columns === null || _columns === void 0 ? void 0 : _columns.find(function (item) {
+    var _item$width;
+    return (item === null || item === void 0 ? void 0 : item.width) && typeof (item === null || item === void 0 ? void 0 : item.width) === 'string' && (item === null || item === void 0 ? void 0 : (_item$width = item.width) === null || _item$width === void 0 ? void 0 : _item$width.endsWith('%'));
+  }));
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }

package/lib/ProTable/style/index.less

@@ -259,11 +259,12 @@
 
   tbody.@{ant-prefix}-table-tbody {
     tr.@{ant-prefix}-table-row.new-cell {
-      background: #d2fff4 !important;
-      background-color: #d2fff4 !important;
+      background: var(--zaui-contract-bg-add; #d2fff4) !important;
+      background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+
       td.@{ant-prefix}-table-cell {
-        background: #d2fff4 !important;
-        background-color: #d2fff4 !important;
+        background: var(--zaui-contract-bg-add; #d2fff4) !important;
+        background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
         border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
       }
     }

package/package.json

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