@zat-design/sisyphus-react 3.7.1 → 3.7.2

package/es/ProEditTable/components/RenderField/index.js

@@ -24,9 +24,10 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
+import { getDefaultProps } from '../../utils/getDefaultProps';
 import ListChanged from './ListChanged';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -154,8 +155,14 @@ var RenderField = function RenderField(_ref) {
   });
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = _objectSpread({}, _fieldProps);
+  var defaultProps = getDefaultProps({
+    name: name,
+    namePath: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
+    type: column === null || column === void 0 ? void 0 : column.type,
+    fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
+  });
   // 允许formItem的属性放在column最外层
-  var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
+  var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
@@ -530,55 +537,65 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty({}, className, className));
-  var FormItem = null;
-  var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
-  if (originalValues) {
-    FieldComponent = _jsx(ListChanged, {
-      name: cellName,
-      names: names,
-      namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith,
-      type: type,
-      onChange: _onChange,
+  var getFieldItem = function getFieldItem() {
+    var _componentProps;
+    var FormItem = null;
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    if (originalValues) {
+      FieldComponent = _jsx(ListChanged, {
+        name: cellName,
+        names: names,
+        namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+        rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
+        originalName: originalName,
+        originalNames: originalNames,
+        originalValues: originalValues,
+        form: form,
+        equalWith: equalWith,
+        type: type,
+        onChange: _onChange,
+        children: FieldComponent
+      });
+    }
+    if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
+      FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+        children: FieldComponent
+      }));
+    }
+    FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+      validateFirst: true
+    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      className: _className,
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
+    })) : _jsx(Container, {
+      viewEmpty: viewEmpty
     });
-  }
-  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-    FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
-      children: FieldComponent
-    }));
-  }
-  FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
-    validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
-    className: _className,
-    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: FieldComponent
-  })) : _jsx(Container, {
-    viewEmpty: viewEmpty
-  });
-  if (type === 'FormList') {
-    FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
-      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-      children: function children(fields, operation, meta) {
-        return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
-          otherProps: otherProps,
-          fields: fields,
-          operation: operation,
-          meta: meta
-        }));
-      }
-    }));
-  }
+    if (type === 'FormList') {
+      FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
+        name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+      }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+        children: function children(fields, operation, meta) {
+          return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+            otherProps: otherProps,
+            fields: fields,
+            operation: operation,
+            meta: meta
+          }));
+        }
+      }));
+    }
+    return FormItem;
+  };
   return _jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: FormItem
+    children: _formItemProps.shouldUpdate ? _jsx(_Form.Item, {
+      noStyle: true,
+      shouldUpdate: _formItemProps.shouldUpdate,
+      children: function children() {
+        return getFieldItem();
+      }
+    }) : getFieldItem()
   });
 };
 export default RenderField;

package/es/ProEditTable/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/es/ProEditTable/utils/getDefaultProps.js

@@ -0,0 +1,31 @@
+import { get, isEqual } from 'lodash';
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _namePath = namePath.slice(2, namePath.length - 1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var _get, _get$map, _get2, _get2$map;
+        var preListValue = (_get = get(preValues, name)) === null || _get === void 0 ? void 0 : (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
+          return get(item, _namePath);
+        });
+        var curListValue = (_get2 = get(curValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
+          return get(item, _namePath);
+        });
+        return !isEqual(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+export var getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/es/ProForm/components/combination/Group/utils.js

@@ -188,11 +188,17 @@ export var useTransformColumns = function useTransformColumns(params) {
     // 响应式字段改变后的回调
     var changedCallback = function changedCallback(lastDependency, current) {
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && names) {
+      if (clearNotShow !== false) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(function () {
-            form.resetFields([columnName]);
+            if (names) {
+              form.resetFields([columnName]);
+            }
+            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+              value[index] = null;
+              form.setFieldValue(columnName, _toConsumableArray(value));
+            }
           }, 200);
         } else {
           clearInterval(timerRef.current[index]);

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

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      _jsx(_Fragment, {
-        children: _jsx(_Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = _jsxs(_Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    _jsx(_Fragment, {
+      children: _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return _jsx(_Form.Item, {
         hidden: true,
         name: name,

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

@@ -5,6 +5,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from './Render';
+import { getDefaultProps } from '../../utils/getDefaultProps';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
 import { FieldProvider } from '../../utils/useFieldProps';
@@ -76,8 +77,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = getDefaultProps(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });

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

@@ -34,11 +34,11 @@ import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType {
+interface ExtendType extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = RuleObject | ExtendType;
+export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

package/es/ProForm/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/es/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,31 @@
+import { get, isEqual } from 'lodash';
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = get(preValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        var curListValue = get(curValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        return !isEqual(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+export var getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/es/ProForm/utils/useRules.js

@@ -14,7 +14,7 @@ var useRules = function useRules(props) {
     type = props.type;
   var _label = isString(label) ? label : '';
   var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-    return 'required' in rule;
+    return rule.required === true;
   }));
   var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
     return item === true;

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

@@ -90,42 +90,70 @@ 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 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 rangeHeight = range.getBoundingClientRect().height;
+      var contentWidth = rangeWidth - Math.floor(rangeWidth);
+      var _getPadding = getPadding(box),
+        pLeft = _getPadding.pLeft,
+        pRight = _getPadding.pRight,
+        pTop = _getPadding.pTop,
+        pBottom = _getPadding.pBottom;
+      var horizontalPadding = pLeft + pRight;
+      var verticalPadding = pTop + pBottom;
+      if (rangeWidth + horizontalPadding > box.clientWidth) {
+        return true;
       }
+      return false;
     };
-    var handleMouseOut = function handleMouseOut() {
+    var handleMouseOver = function handleMouseOver(e) {
       setState({
-        tooltip: false
+        tooltip: checkEllipsis(e.target)
       });
     };
-    var _ellipsis = {
-      tooltip: tooltip
-    };
-    return value ? _jsx(Text, {
-      style: {
-        width: width
+    var tooltipProps = _objectSpread({
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      }
+    }, toolTipProps);
+    if (!value) {
+      return '-';
+    }
+    return _jsx(_Tooltip, _objectSpread(_objectSpread({
+      title: value,
+      onOpenChange: function onOpenChange(open) {
+        setState({
+          tooltip: false
+        });
       },
-      ellipsis: _ellipsis,
-      onMouseOver: handleMouseOver,
-      onFocus: handleMouseOver,
-      onMouseOut: handleMouseOut,
-      onBlur: handleMouseOut,
-      children: node
-    }) : '-';
+      open: tooltip
+    }, tooltipProps), {}, {
+      children: _jsx(Text, {
+        style: {
+          width: width
+        },
+        ellipsis: true,
+        onMouseOver: handleMouseOver,
+        onFocus: handleMouseOver,
+        children: node
+      })
+    }));
   }
   return value || value === 0 ? node : '-';
 };

package/es/ProTable/index.js

@@ -9,7 +9,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
-import { get, keyBy, assign, isObject } from 'lodash';
+import { get, keyBy, assign, isObject, isFunction, isBoolean } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from '../index';
@@ -192,6 +192,18 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
+  var _columns = useMemo(function () {
+    return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
+      var show = item.show;
+      if (isBoolean(show)) {
+        return show;
+      }
+      if (isFunction(show)) {
+        return show();
+      }
+      return true;
+    });
+  }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -361,7 +373,7 @@ function ProTable(props) {
           tableProps: {
             value: _dataSource,
             headerRender: headerRender,
-            columns: columns,
+            columns: _columns,
             renderRowSelection: renderRowSelection,
             rowClassName: _rowClassName,
             disabled: disabled,

package/es/ProTable/propsType.d.ts

@@ -40,6 +40,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     };
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
+    show?: boolean | (() => boolean);
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProEditTable/components/RenderField/index.js

@@ -28,12 +28,13 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
+var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChanged = _interopRequireDefault(require("./ListChanged"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -161,8 +162,14 @@ var RenderField = function RenderField(_ref) {
   });
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
+  var defaultProps = (0, _getDefaultProps.getDefaultProps)({
+    name: name,
+    namePath: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
+    type: column === null || column === void 0 ? void 0 : column.type,
+    fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
+  });
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
@@ -537,55 +544,65 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)({}, className, className));
-  var FormItem = null;
-  var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
-  if (originalValues) {
-    FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
-      name: cellName,
-      names: names,
-      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith,
-      type: type,
-      onChange: _onChange,
+  var getFieldItem = function getFieldItem() {
+    var _componentProps;
+    var FormItem = null;
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    if (originalValues) {
+      FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
+        name: cellName,
+        names: names,
+        namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
+        rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
+        originalName: originalName,
+        originalNames: originalNames,
+        originalValues: originalValues,
+        form: form,
+        equalWith: equalWith,
+        type: type,
+        onChange: _onChange,
+        children: FieldComponent
+      });
+    }
+    if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
+      FieldComponent = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        children: FieldComponent
+      }));
+    }
+    FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      validateFirst: true
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      className: _className,
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
+    })) : (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty
     });
-  }
-  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-    FieldComponent = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-      children: FieldComponent
-    }));
-  }
-  FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    validateFirst: true
-  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
-    className: _className,
-    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: FieldComponent
-  })) : (0, _jsxRuntime.jsx)(_Container.default, {
-    viewEmpty: viewEmpty
-  });
-  if (type === 'FormList') {
-    FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-      children: function children(fields, operation, meta) {
-        return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-          otherProps: otherProps,
-          fields: fields,
-          operation: operation,
-          meta: meta
-        }));
-      }
-    }));
-  }
+    if (type === 'FormList') {
+      FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+      }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+        children: function children(fields, operation, meta) {
+          return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+            otherProps: otherProps,
+            fields: fields,
+            operation: operation,
+            meta: meta
+          }));
+        }
+      }));
+    }
+    return FormItem;
+  };
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: FormItem
+    children: _formItemProps.shouldUpdate ? (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+      noStyle: true,
+      shouldUpdate: _formItemProps.shouldUpdate,
+      children: function children() {
+        return getFieldItem();
+      }
+    }) : getFieldItem()
   });
 };
 var _default = exports.default = RenderField;

package/lib/ProEditTable/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/lib/ProEditTable/utils/getDefaultProps.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultProps = void 0;
+var _lodash = require("lodash");
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _namePath = namePath.slice(2, namePath.length - 1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var _get, _get$map, _get2, _get2$map;
+        var preListValue = (_get = (0, _lodash.get)(preValues, name)) === null || _get === void 0 ? void 0 : (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        var curListValue = (_get2 = (0, _lodash.get)(curValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        return !(0, _lodash.isEqual)(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/lib/ProForm/components/combination/Group/utils.js

@@ -195,11 +195,17 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
     // 响应式字段改变后的回调
     var changedCallback = function changedCallback(lastDependency, current) {
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && names) {
+      if (clearNotShow !== false) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(function () {
-            form.resetFields([columnName]);
+            if (names) {
+              form.resetFields([columnName]);
+            }
+            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+              value[index] = null;
+              form.setFieldValue(columnName, (0, _toConsumableArray2.default)(value));
+            }
           }, 200);
         } else {
           clearInterval(timerRef.current[index]);

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

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
         hidden: true,
         name: name,

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

@@ -12,6 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
+var _getDefaultProps = require("../../utils/getDefaultProps");
 var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
@@ -84,8 +85,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemProps), otherFormItemProps), {}, {
+    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
     });

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

@@ -34,11 +34,11 @@ import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType {
+interface ExtendType extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = RuleObject | ExtendType;
+export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

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

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/lib/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultProps = void 0;
+var _lodash = require("lodash");
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = (0, _lodash.get)(preValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        var curListValue = (0, _lodash.get)(curValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        return !(0, _lodash.isEqual)(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/lib/ProForm/utils/useRules.js

@@ -21,7 +21,7 @@ var useRules = function useRules(props) {
     type = props.type;
   var _label = (0, _lodash.isString)(label) ? label : '';
   var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-    return 'required' in rule;
+    return rule.required === true;
   }));
   var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
     return item === true;

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

@@ -94,42 +94,70 @@ 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 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 rangeHeight = range.getBoundingClientRect().height;
+      var contentWidth = rangeWidth - Math.floor(rangeWidth);
+      var _getPadding = getPadding(box),
+        pLeft = _getPadding.pLeft,
+        pRight = _getPadding.pRight,
+        pTop = _getPadding.pTop,
+        pBottom = _getPadding.pBottom;
+      var horizontalPadding = pLeft + pRight;
+      var verticalPadding = pTop + pBottom;
+      if (rangeWidth + horizontalPadding > box.clientWidth) {
+        return true;
       }
+      return false;
     };
-    var handleMouseOut = function handleMouseOut() {
+    var handleMouseOver = function handleMouseOver(e) {
       setState({
-        tooltip: false
+        tooltip: checkEllipsis(e.target)
       });
     };
-    var _ellipsis = {
-      tooltip: tooltip
-    };
-    return value ? (0, _jsxRuntime.jsx)(Text, {
-      style: {
-        width: width
+    var tooltipProps = (0, _objectSpread2.default)({
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      }
+    }, toolTipProps);
+    if (!value) {
+      return '-';
+    }
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      title: value,
+      onOpenChange: function onOpenChange(open) {
+        setState({
+          tooltip: false
+        });
       },
-      ellipsis: _ellipsis,
-      onMouseOver: handleMouseOver,
-      onFocus: handleMouseOver,
-      onMouseOut: handleMouseOut,
-      onBlur: handleMouseOut,
-      children: node
-    }) : '-';
+      open: tooltip
+    }, tooltipProps), {}, {
+      children: (0, _jsxRuntime.jsx)(Text, {
+        style: {
+          width: width
+        },
+        ellipsis: true,
+        onMouseOver: handleMouseOver,
+        onFocus: handleMouseOver,
+        children: node
+      })
+    }));
   }
   return value || value === 0 ? node : '-';
 };

package/lib/ProTable/index.js

@@ -199,6 +199,18 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
+  var _columns = (0, _react.useMemo)(function () {
+    return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
+      var show = item.show;
+      if ((0, _lodash.isBoolean)(show)) {
+        return show;
+      }
+      if ((0, _lodash.isFunction)(show)) {
+        return show();
+      }
+      return true;
+    });
+  }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -368,7 +380,7 @@ function ProTable(props) {
           tableProps: {
             value: _dataSource,
             headerRender: headerRender,
-            columns: columns,
+            columns: _columns,
             renderRowSelection: renderRowSelection,
             rowClassName: _rowClassName,
             disabled: disabled,

package/lib/ProTable/propsType.d.ts

@@ -40,6 +40,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     };
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
+    show?: boolean | (() => boolean);
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/package.json

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