@zat-design/sisyphus-react 3.7.1 → 3.7.2-beta.10

package/es/ProSelect/utils/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 /* eslint-disable no-restricted-syntax */
 import _ from 'lodash';
@@ -8,7 +9,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     value = _ref.value,
     dataSource = _ref.dataSource,
     labelInValue = _ref.labelInValue,
-    fieldNames = _ref.fieldNames;
+    fieldNames = _ref.fieldNames,
+    mode = _ref.mode;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -27,9 +29,13 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     } finally {
       _iterator.f();
     }
-    selectValues.push(result);
+    if (mode === 'multiple') {
+      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result));
+    } else {
+      selectValues.push(result);
+    }
   });
-  var diffList = _.difference(selectValues, [value]);
+  var diffList = _.difference(selectValues, mode === 'multiple' ? value : [value]);
   return dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
@@ -42,7 +48,8 @@ export var getSelectList = function getSelectList(_ref2) {
     value = _ref2.value,
     dataSource = _ref2.dataSource,
     labelInValue = _ref2.labelInValue,
-    fieldNames = _ref2.fieldNames;
+    fieldNames = _ref2.fieldNames,
+    mode = _ref2.mode;
   if (!otherProps) {
     return null;
   }
@@ -59,6 +66,7 @@ export var getSelectList = function getSelectList(_ref2) {
     value: value,
     dataSource: dataSource,
     labelInValue: labelInValue,
-    fieldNames: fieldNames
+    fieldNames: fieldNames,
+    mode: mode
   });
 };

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

@@ -71,7 +71,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = _objectWithoutProperties(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = useSensor(PointerSensor, {
     activationConstraint: {
       distance: 10

package/es/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
+var _valueType2 = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
@@ -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,
@@ -85,6 +86,7 @@ var RenderField = function RenderField(_ref) {
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
+  var _valueType = valueType;
   var _disabled = false;
   var isCell = mode === 'cell';
   if (isCell) {
@@ -109,11 +111,18 @@ var RenderField = function RenderField(_ref) {
   };
   // 行参数
   var rowParams = [currentValue, rowData, options];
-  if (typeof isEditable === 'function') {
-    isEditable = isEditable.apply(void 0, rowParams);
-    setTimeout(function () {
-      !isEditable && form.validateFields([cellName]);
-    }, 100);
+  // required & rules & fieldProps & disabled & valueType 函数化处理
+  if ((0, _lodash.isFunction)(required)) {
+    _required = required.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(rules)) {
+    _rules = rules.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(valueType)) {
+    _valueType = valueType.apply(void 0, rowParams);
   }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
@@ -124,6 +133,12 @@ var RenderField = function RenderField(_ref) {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
+  if (typeof isEditable === 'function') {
+    isEditable = isEditable.apply(void 0, rowParams);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
+  }
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -137,15 +152,6 @@ var RenderField = function RenderField(_ref) {
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if ((0, _lodash.isFunction)(required)) {
-    _required = required.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(rules)) {
-    _rules = rules.apply(void 0, rowParams);
-  }
   // 设置校验规则
   var internalRule = (0, _useRules.default)({
     names: names,
@@ -161,11 +167,17 @@ 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';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -173,7 +185,7 @@ var RenderField = function RenderField(_ref) {
    */
   var defaultTransform = function defaultTransform() {
     var types = ['DatePicker', 'RangePicker'];
-    if (!valueType && types.includes(type)) {
+    if (!_valueType && types.includes(type)) {
       var _transformMap$type;
       return _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
     }
@@ -186,18 +198,18 @@ var RenderField = function RenderField(_ref) {
   var valueTypeTransform = (0, _react.useCallback)(function () {
     var _fieldProps3;
     // 不存在valueType返回空
-    if (!valueType) {
+    if (!_valueType) {
       return {};
     }
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+      _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
-  }, [valueType]);
+    return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
+  }, [_valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -228,7 +240,7 @@ var RenderField = function RenderField(_ref) {
     }
     var namesStr = [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]);
     var transform = {};
-    if (valueType) {
+    if (_valueType) {
       transform = valueTypeTransform();
     }
     return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
@@ -508,7 +520,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });
@@ -537,55 +549,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/propsType.d.ts

@@ -96,7 +96,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     names?: NamePath[];
     cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
-    valueType?: ProFormValueType;
+    valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({
         icon?: string | ReactNode;
     } & TooltipProps);

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,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultProps = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+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 = (0, _toConsumableArray2.default)(namePath).splice(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/component/ComRender.js

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -48,6 +48,7 @@ var ComRender = function ComRender(props) {
     getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    valueType = props.valueType,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -59,6 +60,7 @@ var ComRender = function ComRender(props) {
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
+      valueType: valueType,
       type: type
     }),
     children: Com

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

@@ -94,7 +94,7 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
     component = params.component,
     fieldProps = params.fieldProps,
     name = params.name;
-  var values = form.getFieldsValue(namePath || undefined);
+  var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
   var _disabled = (0, _lodash.isFunction)(disabled) ? disabled(values, {
     form: form,
     index: index,
@@ -189,7 +189,8 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       mode = _ref.mode,
       onChange = _ref.onChange,
       onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled;
+      comDisabled = _ref.disabled,
+      onBlur = _ref.onBlur;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
     // 响应式字段改变后的回调
@@ -199,7 +200,13 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         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]);
@@ -268,6 +275,19 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         }
       }
     };
+    var handleBlur = function handleBlur() {
+      if (!onBlur) return;
+      var values = form.getFieldValue(namePath);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+    };
     return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       name: columnName
     }, reactiveProps), {}, {
@@ -275,6 +295,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
+        onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]
       })
     });