@zat-design/sisyphus-react 3.13.1 → 3.13.2-beta.1

package/es/utils/index.d.ts

@@ -3,4 +3,12 @@
  * 空值 或者 仅包含空值的数组视为空
  */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
+/**
+ * 判断一个元素是否触发了省略号（文本溢出）
+ * 如果元素设置为单行（white-space: nowrap）则比较 scrollWidth 与 clientWidth，
+ * 如果是多行文本（例如使用 -webkit-line-clamp 实现多行截断）则比较 scrollHeight 与 clientHeight。
+ * @param {HTMLElement} element 要检测的元素
+ * @returns {boolean} 如果内容溢出返回 true，否则返回 false
+ */
+export declare const isEllipsisActive: (element: Element) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -19,6 +19,23 @@ export var isEmpty = function isEmpty(value, emptyValue) {
   }
   return false;
 };
+/**
+ * 判断一个元素是否触发了省略号（文本溢出）
+ * 如果元素设置为单行（white-space: nowrap）则比较 scrollWidth 与 clientWidth，
+ * 如果是多行文本（例如使用 -webkit-line-clamp 实现多行截断）则比较 scrollHeight 与 clientHeight。
+ * @param {HTMLElement} element 要检测的元素
+ * @returns {boolean} 如果内容溢出返回 true，否则返回 false
+ */
+export var isEllipsisActive = function isEllipsisActive(element) {
+  if (!element) return false;
+  var computedStyle = window.getComputedStyle(element);
+  // 如果使用单行显示（nowrap），则判断宽度是否足够
+  if (computedStyle.whiteSpace === 'nowrap') {
+    return element.scrollWidth > element.clientWidth;
+  }
+  // 多行情况下，判断高度是否足够
+  return element.scrollHeight > element.clientHeight;
+};
 export var useFocus = function useFocus(element) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -17,6 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
+var _processDependencies = _interopRequireDefault(require("../../utils/processDependencies"));
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
@@ -88,10 +89,13 @@ var RenderFields = function RenderFields(props) {
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
     var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
+    // 处理dependencies，支持namesPaths格式
+    var processedDeps = (0, _processDependencies.default)(column.dependencies);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
     var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
-      clearNotShow: clearNotShow
+      clearNotShow: clearNotShow,
+      dependencies: processedDeps
     });
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
     if (type && component) {

package/lib/ProForm/components/render/propsType.d.ts

@@ -31,6 +31,7 @@ import type { GroupType as GroupCopyProps } from '../combination/Group/propsType
 import type { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 import type { DistributiveOmit, DiffConfigType } from '../../propsType';
 import type { DiffOriginalParams } from '../../utils/diffOriginal';
+import { NamePathsDependencyType } from '../../utils/processDependencies';
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
 export interface ProRule extends Omit<RuleObject, 'type'> {
@@ -230,7 +231,11 @@ export interface ProFormColumn<Values = any> extends Omit<FormItemProps<Values>,
     /** 脱敏数据位置下标 */
     desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 }
-export type ProFormColumnType<T = any> = ProFormColumn<T> & ColumnTypeMap<T, 'ProForm'>;
+export interface ProFormColumnWithExtendedDeps<Values = any> extends Omit<ProFormColumn<Values>, 'dependencies'> {
+    /** 表单项依赖关系，扩展支持namesPaths类型 */
+    dependencies?: NamePath[] | (NamePath | NamePathsDependencyType)[];
+}
+export type ProFormColumnType<T = any> = ProFormColumnWithExtendedDeps<T> & ColumnTypeMap<T, 'ProForm'>;
 /**
  * 表单渲染类型
  */

package/lib/ProForm/propsType.d.ts

@@ -65,6 +65,10 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     /** 全局控制优先 */
     globalControl?: boolean;
     mode?: ModeEnum;
+    /**
+     * 如果有formKey，则会在全局中查找或创建表单实例
+     * 可以不需要手动传入form实例 且formKey的优先级高于form
+     */
     formKey?: string;
     /** 是否查看 */
     isView?: boolean;

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

@@ -0,0 +1,29 @@
+import type { NamePath } from 'antd/es/form/interface';
+/**
+ * 定义支持多字段依赖的类型
+ */
+export interface NamePathsDependencyType {
+    type: 'namesPaths';
+    paths: NamePath[][];
+}
+/**
+ * dependencies支持的类型
+ */
+export type Dependencies = NamePath[] | NamePathsDependencyType;
+/**
+ * 处理表单依赖项
+ *
+ * 将常规的依赖项数组与namesPaths类型的依赖项进行处理
+ * 对于namesPaths类型，将其转换为特定格式的字符串：
+ * - 同一路径内的多级通过下划线(_)连接
+ * - 不同路径之间通过连字符(-)连接
+ *
+ * 例如:
+ * { type: 'namesPaths', paths: [['a', 'b'], ['c', 'd']] }
+ * 会被转换成: ['a_b-c_d']
+ *
+ * @param dependencies 依赖项配置
+ * @returns 处理后的依赖项数组
+ */
+export declare function processDependencies(dependencies?: any): any;
+export default processDependencies;

package/lib/ProForm/utils/processDependencies.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.processDependencies = processDependencies;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+/**
+ * 处理表单依赖项
+ *
+ * 将常规的依赖项数组与namesPaths类型的依赖项进行处理
+ * 对于namesPaths类型，将其转换为特定格式的字符串：
+ * - 同一路径内的多级通过下划线(_)连接
+ * - 不同路径之间通过连字符(-)连接
+ *
+ * 例如:
+ * { type: 'namesPaths', paths: [['a', 'b'], ['c', 'd']] }
+ * 会被转换成: ['a_b-c_d']
+ *
+ * @param dependencies 依赖项配置
+ * @returns 处理后的依赖项数组
+ */
+function processDependencies(dependencies) {
+  /**
+   * 1、没有 dependencies，直接返回
+   */
+  if (!dependencies) return undefined;
+  /**
+   * 2、如果是数组，处理可能包含多种类型的元素
+   */
+  if (Array.isArray(dependencies)) {
+    return dependencies.map(function (item) {
+      // 处理数组中的namesPaths类型元素
+      if ((0, _typeof2.default)(item) === 'object' && item !== null && 'type' in item && item.type === 'namesPaths') {
+        // 安全类型转换
+        var itemWithPaths = item;
+        var paths = itemWithPaths.paths;
+        return paths.map(function (path) {
+          return Array.isArray(path) ? path.join('_') : String(path);
+        }).join('-');
+      }
+      // 其他类型元素保持不变
+      return item;
+    });
+  }
+  /**
+   * 3、如果是单个namesPaths对象，转换为特定的字符串形式
+   * 例如：[['a','b','c'], ['a','b','d']] => 'a_b_c-a_b_d'
+   */
+  if ('type' in dependencies && dependencies.type === 'namesPaths') {
+    var paths = dependencies.paths;
+    return [paths.map(function (path) {
+      return Array.isArray(path) ? path.join('_') : String(path);
+    }).join('-')];
+  }
+  /**
+   * 4、如果是普通的 dependencies，直接返回
+   */
+  return dependencies;
+}
+var _default = exports.default = processDependencies;

package/lib/ProIcon/index.js

@@ -137,6 +137,9 @@ var ProIcon = function ProIcon(props) {
     }, rotateStyle), style)
   };
   var icon = !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+    style: (0, _objectSpread2.default)({
+      color: color
+    }, svgProps === null || svgProps === void 0 ? void 0 : svgProps.style),
     onClick: onClick,
     "aria-hidden": "true",
     children: (0, _jsxRuntime.jsx)("use", {
@@ -153,13 +156,13 @@ var ProIcon = function ProIcon(props) {
         actionMap: actionMap,
         primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
       });
+      if (color) {
+        svg.setAttribute('fill', color);
+      }
     }
   }));
   var RenderIcon = (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: "anticon",
-    style: {
-      color: color
-    }
+    className: "anticon"
   }, reset), {}, {
     children: (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: iconText,

package/lib/ProLayout/components/ProCollapse/index.js

@@ -141,6 +141,8 @@ var ProCollapse = function ProCollapse(props) {
       var rect = proCollapseNoTitles[0].getBoundingClientRect();
       if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
         proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
+      } else {
+        proCollapseNoTitles[0].style.minHeight = 'auto';
       }
       if (proFooterNode) {
         proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + proFooterNode.offsetHeight + 16, "px)");

package/lib/ProStepTab/index.js

@@ -257,7 +257,7 @@ function useStepTab() {
         case 0:
           handler = handlesState[activeKey];
           if (!handler) {
-            _context4.next = 14;
+            _context4.next = 15;
             break;
           }
           _context4.next = 4;
@@ -265,29 +265,33 @@ function useStepTab() {
         case 4:
           result = _context4.sent;
           if (!(result && autoNext)) {
-            _context4.next = 11;
+            _context4.next = 12;
             break;
           }
           // 只有当activeKey能转换为数字时才执行自动跳转
           currentKeyNum = Number(activeKey);
           if ((0, _lodash.isNaN)(currentKeyNum)) {
-            _context4.next = 11;
+            _context4.next = 12;
             break;
           }
-          nextKey = String(currentKeyNum + 1); // 自动跳转到下一个tab
-          _context4.next = 11;
+          nextKey = String(currentKeyNum + 1);
+          if (Number(nextKey) > queueSteps) {
+            nextKey = String(queueSteps);
+          }
+          // 自动跳转到下一个tab
+          _context4.next = 12;
           return setCheckActiveKey(nextKey, false);
-        case 11:
+        case 12:
           if (!(result === false)) {
-            _context4.next = 13;
+            _context4.next = 14;
             break;
           }
           return _context4.abrupt("return", Promise.reject());
-        case 13:
-          return _context4.abrupt("return", result);
         case 14:
-          return _context4.abrupt("return", Promise.resolve(true));
+          return _context4.abrupt("return", result);
         case 15:
+          return _context4.abrupt("return", Promise.resolve(true));
+        case 16:
         case "end":
           return _context4.stop();
       }

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

@@ -8,6 +8,7 @@ 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 _react = require("react");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
@@ -34,35 +35,33 @@ var RenderColumn = function RenderColumn(props) {
     minWidth = props.minWidth,
     isInNewRowFlag = props.isInNewRowFlag,
     scroll = props.scroll;
+  var textRef = (0, _react.useRef)(null);
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
+  // 计算并更新宽度
+  var updateCalculatedWidth = function updateCalculatedWidth(element) {
+    if (!element) return null;
+    if (!textRef.current) return;
+    // 使用closest方法查找最近的tr
+    var tr = element.closest('tr');
+    if (!tr) return;
+    // 获取tr的宽度
+    var trWidth = tr.getBoundingClientRect().width;
+    // 计算实际宽度
+    var newWidth = (0, _utils.parseWidth)(width, trWidth);
+    return newWidth;
+  };
   var cellDiffCls = (0, _classnames.default)({
     '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)
+      tooltip: (0, _utils2.isEllipsisActive)(e.target)
     });
   };
   var tooltipProps = (0, _objectSpread2.default)({
@@ -135,6 +134,7 @@ var RenderColumn = function RenderColumn(props) {
           minWidth: minWidth
         },
         overlayClassName: "original-value-tooltip",
+        destroyTooltipOnHide: true,
         placement: "topLeft",
         autoAdjustOverflow: false,
         title: (0, _jsxRuntime.jsx)(_antd.Space, {
@@ -152,10 +152,7 @@ var RenderColumn = function RenderColumn(props) {
               }) : null
             })]
           }) : node
-        }),
-        getPopupContainer: function getPopupContainer(triggerNode) {
-          return triggerNode.parentNode;
-        }
+        })
       }, toolTipProps), {}, {
         children: renderNode
       }));
@@ -200,18 +197,24 @@ var RenderColumn = function RenderColumn(props) {
         children: "-"
       });
     }
+    var calculatedWidth = updateCalculatedWidth(textRef.current);
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: value,
-      onOpenChange: function onOpenChange(open) {
+      destroyTooltipOnHide: true,
+      onOpenChange: function onOpenChange() {
         setState({
           tooltip: false
         });
       },
       open: tooltip
     }, tooltipProps), {}, {
+      getPopupContainer: function getPopupContainer() {
+        return document.body;
+      },
       children: (0, _jsxRuntime.jsx)(Text, {
+        ref: textRef,
         style: {
-          width: width,
+          width: calculatedWidth,
           minWidth: minWidth
         },
         ellipsis: true,

package/lib/ProTable/hooks/useAntdTable.js

@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
   var _useSetState = (0, _ahooks.useSetState)({
       data: [],
       total: 0,
@@ -110,12 +110,6 @@ function useAntdTable(service, options, useRequestOptions) {
       allSelected: false
     }, values));
   };
-  var params = (0, _react.useMemo)(function () {
-    var newQueryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, searchValues), extraFilter);
-    return getTransformParams((0, _objectSpread2.default)({
-      page: page
-    }, newQueryBean));
-  }, [page, searchValues, extraFilter]);
   var curService = (0, _react.useMemo)(function () {
     return service.toString();
   }, [service]);
@@ -254,7 +248,7 @@ function useAntdTable(service, options, useRequestOptions) {
       onPageChange(newPage);
     }
     // 减少查询按钮的渲染，只有需要重置值时才需要调用
-    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) && !(0, _lodash.isEqual)(previousSearchValues, _values)) {
+    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
         searchValues: _values,
@@ -484,7 +478,7 @@ function useAntdTable(service, options, useRequestOptions) {
   };
   var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
     data: data,
-    params: params,
+    params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
     searchValues: searchValues,
     allSelected: allSelected,

package/lib/ProTable/style/index.less

@@ -28,6 +28,9 @@
 
   .@{ant-prefix}-table-content {
     > table {
+      .@{ant-prefix}-table-cell-fix-left-last:after{
+        width: 8px;
+      }
       .@{ant-prefix}-table-summary {
         color: var(--zaui-text, #343434);
         font-weight: 600;

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

@@ -33,11 +33,7 @@ export declare const getRowKey: (rowKey: any, record: any) => any;
 export declare const removeEmptyKeys: (obj?: Record<string, any>) => {
     [k: string]: any;
 };
-export declare const getPadding: (el: HTMLElement) => {
-    pLeft: number;
-    pRight: number;
-    pTop: number;
-    pBottom: number;
-};
 /** 判断是有值的对象 */
 export declare const isNonEmptyObject: (obj: any) => obj is Record<string, any>;
+/** 解析宽度值 */
+export declare const parseWidth: (widthValue: number | string | undefined, trWidth: number) => 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.isNonEmptyObject = exports.isListResult = exports.getRowKey = exports.getPadding = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+exports.removeEmptyKeys = exports.parseWidth = exports.isNonEmptyObject = exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
@@ -95,21 +95,27 @@ 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
-  };
-};
 /** 判断是有值的对象 */
 var isNonEmptyObject = exports.isNonEmptyObject = function isNonEmptyObject(obj) {
   return obj !== null && (0, _typeof2.default)(obj) === 'object' && !Array.isArray(obj) && Object.keys(obj).length > 0;
+};
+/** 解析宽度值 */
+var parseWidth = exports.parseWidth = function parseWidth(widthValue, trWidth) {
+  // 如果是数字，直接返回
+  if (typeof widthValue === 'number') return widthValue;
+  // 如果是字符串，检查是否是百分比
+  if (typeof widthValue === 'string') {
+    if (widthValue.endsWith('%')) {
+      // 计算百分比
+      var percentage = parseFloat(widthValue) / 100;
+      return Math.max(trWidth * percentage, 0);
+    }
+    // 尝试解析为数字（处理如'300px'这样的情况）
+    var numericValue = parseFloat(widthValue);
+    if (!Number.isNaN(numericValue)) {
+      return numericValue;
+    }
+  }
+  // 所有其他情况，返回默认值
+  return null;
 };

package/lib/ProTooltip/index.d.ts

@@ -1,4 +1,3 @@
 import type { ProTooltipType } from './propsType';
-import './style/index.less';
 declare const ProTooltip: (props: ProTooltipType) => import("react/jsx-runtime").JSX.Element;
 export default ProTooltip;