@zat-design/sisyphus-react 3.8.2 → 3.8.3

package/lib/ProForm/utils/useShouldUpdate.js

@@ -27,7 +27,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     index = formItemProps.index,
     namePath = formItemProps.namePath,
     names = formItemProps.names,
-    dependencies = formItemProps.dependencies;
+    dependNames = formItemProps.dependNames;
   var timerRef = (0, _react.useRef)();
   var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
@@ -36,13 +36,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var rulesRef = (0, _react.useRef)();
   var fieldPropsRef = (0, _react.useRef)();
   var originComponentRef = (0, _react.useRef)();
+  var dependNamesRef = (0, _react.useRef)();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -126,9 +127,22 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
+  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map(function (name) {
+      return (0, _lodash.get)(values, name);
+    });
+  }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+        var curDependNamesValue = dependNames.map(function (name) {
+          return (0, _lodash.get)(currentValues, name);
+        });
+        var dependNamesChanged = !(0, _lodash.isEqualWith)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
+        dependNamesRef.current = curDependNamesValue;
+        if (!dependNamesChanged) return false;
+      }
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -189,11 +203,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
       var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes
       // 值变更，需要同步更新函数式的fieldProps
       // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
+      // equalDependencies(dependencies, prevValues, _currentValues)
+      ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

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,6 +114,30 @@ 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 !== 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,
+        ellipsis: ellipsis,
+        width: width,
+        value: _value,
+        node: _value,
+        currentValue: _value,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
+      });
+    };
     return;
   }
   if (tooltip) {
@@ -114,7 +181,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -144,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)) {
@@ -197,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)) {
@@ -235,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) {
@@ -262,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') {
@@ -318,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)]
       });
     };
@@ -339,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)]
       });
     };
@@ -362,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

@@ -37,7 +37,7 @@ var defaultPage = exports.defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK;
+  var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = (0, _index.useProConfig)('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = (0, _index.useProConfig)('ProTable') || {},
@@ -65,6 +65,9 @@ function ProTable(props) {
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var _scroll = (_props$scroll = props === null || props === void 0 ? void 0 : props.scroll) !== null && _props$scroll !== void 0 ? _props$scroll : {
+    x: 'max-content'
+  };
   var wrapToolTipProps = {
     getPopupContainer: scrollFollowParent ? function (triggerNode) {
       return triggerNode.parentNode;
@@ -208,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;
@@ -232,6 +239,13 @@ function ProTable(props) {
       return true;
     });
   }, [columns]);
+  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;
+  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -422,7 +436,8 @@ function ProTable(props) {
             summary: summary,
             dataSource: _dataSource
           },
-          dataSource: _dataSource
+          dataSource: _dataSource,
+          scroll: _scroll
         })), (0, _jsxRuntime.jsx)("span", {
           className: "pro-table-resizable-line",
           style: {

package/lib/ProTable/style/index.less

@@ -257,12 +257,14 @@
     }
   }
 
-  .@{ant-prefix}-table-body {
-    .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
-      background: #d2fff4 !important;
-
-      td {
-        background: #d2fff4 !important;
+  tbody.@{ant-prefix}-table-tbody {
+    tr.@{ant-prefix}-table-row.new-cell {
+      background: var(--zaui-contract-bg-add; #d2fff4) !important;
+      background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+
+      td.@{ant-prefix}-table-cell {
+        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",
+  "version": "3.8.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -49,7 +49,8 @@
     "Android >= 4"
   ],
   "resolutions": {
-    "@types/react": "^17.0.53"
+    "@types/react": "^17.0.53",
+    "mockjs/commander": "9.2.0"
   },
   "dependencies": {
     "@ant-design/icons": "^4.2.2",
@@ -58,7 +59,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.32",
+    "@zat-design/utils": "1.1.35",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",

package/.vscode/extensions.json

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