@zat-design/sisyphus-react 3.4.3-beta.9 → 3.4.4

package/dist/index.esm.css

@@ -2322,7 +2322,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-modal-select .viewSvg,
 .pro-tree-modal .viewSvg {
-  height: 24px;
+  height: 20px;
   cursor: pointer;
   fill: #c5c7cd;
 }
@@ -2851,6 +2851,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .delete-icon {
   width: 18px;
 }
+.pro-form .pro-form-list-tool-btn {
+  margin-left: 8px;
+  padding: 0;
+  cursor: pointer;
+}
+.pro-form .pro-form-list-tool-btn .anticon {
+  color: var(--zaui-text-weak, #a0a0a0);
+  font-size: 16px;
+  vertical-align: middle;
+}
+.pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
+  width: auto;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   background: #F8F9FA;
   border-radius: var(--zaui-border-radius, 8px);

package/dist/less.esm.css

@@ -2322,7 +2322,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-modal-select .viewSvg,
 .pro-tree-modal .viewSvg {
-  height: 24px;
+  height: 20px;
   cursor: pointer;
   fill: #c5c7cd;
 }
@@ -2851,6 +2851,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .delete-icon {
   width: 18px;
 }
+.pro-form .pro-form-list-tool-btn {
+  margin-left: 8px;
+  padding: 0;
+  cursor: pointer;
+}
+.pro-form .pro-form-list-tool-btn .anticon {
+  color: var(--zaui-text-weak, #a0a0a0);
+  font-size: 16px;
+  vertical-align: middle;
+}
+.pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
+  width: auto;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   background: #F8F9FA;
   border-radius: var(--zaui-border-radius, 8px);

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

@@ -72,6 +72,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
+    formNamePath = config.namePath,
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT;
   var _fieldProps = fieldProps || formItemProps || {};
@@ -520,7 +521,7 @@ var RenderField = function RenderField(_ref) {
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
-    name: cellName,
+    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
     children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty

package/es/ProEditTable/index.js

@@ -152,6 +152,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     virtualKey: virtualKey,
     requiredAlign: requiredAlign,
     name: isArray(name) ? name : [name],
+    namePath: namePath,
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,

package/es/ProForm/components/base/TextArea/index.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
@@ -31,11 +32,10 @@ var TextAreaDef = function TextAreaDef(props) {
       children: rest.value
     });
   }
-  var _className = classnames({
+  var _className = classnames(_defineProperty({
     'pro-textarea': true,
-    'pro-textarea-view': isView,
-    className: className
-  });
+    'pro-textarea-view': isView
+  }, className, true));
   return _jsx(TextArea, _objectSpread(_objectSpread(_objectSpread({
     showCount: true,
     autoComplete: "off",

package/es/ProForm/components/combination/FormList/components/ActionButton.d.ts

@@ -17,6 +17,7 @@ export interface Props {
     fields: FormListFieldData[];
     mode: FormListMode;
     disabled?: boolean;
+    isView?: boolean;
 }
 declare const ActionButton: React.FC<Props>;
 export default ActionButton;

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -27,7 +27,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(undefined, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[0]),
+      label: "".concat(locale.ProForm.formListActions[0]),
       icon: _jsx(PlusSquareOutlined, {})
     },
     delete: {
@@ -39,7 +39,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         remove(index);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[1]),
+      label: "".concat(locale.ProForm.formListActions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
         className: "single-delete"
@@ -56,7 +56,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(record, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[2]),
+      label: "".concat(locale.ProForm.formListActions[2]),
       icon: _jsx(CopyOutlined, {})
     },
     moveUp: {
@@ -68,7 +68,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index - 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[3]),
+      label: "".concat(locale.ProForm.formListActions[3]),
       icon: _jsx(UpSquareOutlined, {})
     },
     moveDown: {
@@ -80,13 +80,14 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[4]),
+      label: "".concat(locale.ProForm.formListActions[4]),
       icon: _jsx(DownSquareOutlined, {})
     }
   };
   if (mode === 'block') {
     Object.keys(originActions).forEach(function (key) {
-      originActions[key].type = 'default';
+      originActions[key].type = 'text';
+      originActions[key].className = 'pro-form-list-tool-btn';
     });
   }
   if (mode === 'line') {
@@ -115,7 +116,8 @@ var ActionButton = function ActionButton(props) {
     fields = props.fields,
     min = props.min,
     max = props.max,
-    mode = props.mode;
+    mode = props.mode,
+    isView = props.isView;
   // 默认显示一个delete
   var actionProps = useMemo(function () {
     var _props$actionProps;
@@ -166,7 +168,7 @@ var ActionButton = function ActionButton(props) {
       var _onClick = onClick || onHandle;
       if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
         // 禁用状态默认隐藏内置操作按钮
-        if (disabled) return _jsx(_Fragment, {});
+        if (disabled || isView) return _jsx(_Fragment, {});
         var _defaultActions$actio = defaultActions[actionType],
           internalOnClick = _defaultActions$actio.onClick,
           defaultLabel = _defaultActions$actio.label,
@@ -188,7 +190,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
-          title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
+          title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -211,7 +213,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       return needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
-        title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
+        title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -2,9 +2,11 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { isFunction } from 'lodash';
+import classNames from 'classnames';
 import ActionButton from './ActionButton';
 import RenderFields from '../../../render/RenderFields';
 import ProCollapse from '../../../../../ProLayout/components/ProCollapse';
@@ -34,8 +36,10 @@ var BlockFields = function BlockFields(props) {
     }
     return title;
   }, [title, index]);
+  var cls = classNames(_defineProperty({}, "pro-form-list-mode-".concat(mode), mode === 'block' || mode === 'line' || mode === 'less'));
   return _jsx(_Space, {
     direction: "vertical",
+    className: cls,
     children: _jsx(ProCollapse, {
       title: _title,
       index: index,
@@ -55,7 +59,8 @@ var BlockFields = function BlockFields(props) {
         fields: fields,
         actionProps: actionProps,
         mode: mode,
-        disabled: disabled
+        disabled: disabled,
+        isView: isView
       }),
       children: _jsx(_Row, {
         gutter: 24,

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -20,7 +20,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: "".concat(locale.ProForm.formList_actions[5]),
+    label: "".concat(locale.ProForm.formListActions[5]),
     type: 'link',
     icon: _jsx(PlusOutlined, {})
   }
@@ -59,9 +59,6 @@ var ToolbarButton = function ToolbarButton(props) {
       operation.add(data);
     }
   };
-  if (disabled || isView) {
-    return null;
-  }
   return _jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
@@ -80,7 +77,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (['add'].includes(actionType)) {
-        if (disabled) return _jsx(_Fragment, {});
+        if (disabled || isView) return _jsx(_Fragment, {});
         var _actions$actionType = actions[actionType],
           internalOnClick = _actions$actionType.onClick,
           defaultLabel = _actions$actionType.label,

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -47,7 +47,8 @@ export function useRequestList(service, options, useRequestOptions) {
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse;
-  var defaultParams = useRequestOptions.defaultParams;
+  var _ref2 = useRequestOptions || {},
+    defaultParams = _ref2.defaultParams;
   // 搜索表单里的值
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -1,7 +1,11 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/message/style";
 import _message from "antd/es/message";
@@ -16,12 +20,13 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { CloseOutlined, SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@ant-design/icons';
 import { useMount, useSetState } from 'ahooks';
-import { cloneDeep, isArray, isEqual, isFunction, omit } from 'lodash';
+import { useRequest as useUmiRequest } from 'umi';
+import { cloneDeep, debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
-import { ProForm, ProDrawerForm, ProTable, useProConfig } from '../../../../index';
+import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
@@ -49,7 +54,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
     defaultOne = props.defaultOne,
-    restInputProps = _objectWithoutProperties(props, _excluded);
+    restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -102,6 +107,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOff: false,
       visible: false,
       open: false,
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
       selectedRowKeys: []
     }),
@@ -112,6 +118,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onOff = _useSetState2$.onOff,
     visible = _useSetState2$.visible,
     open = _useSetState2$.open,
+    options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
@@ -120,13 +127,23 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
   var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
+  var _useUmiRequest = useUmiRequest(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+      manual: true,
+      onSuccess: function onSuccess(data) {
+        var list = withPagination ? data === null || data === void 0 ? void 0 : data.list : data;
+        setState({
+          options: list
+        });
+      }
+    })),
+    run = _useUmiRequest.run;
   var _useRequestList = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible || defaultOne
+      ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList.data,
     loading = _useRequestList.loading,
@@ -207,14 +224,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   };
-  // 清空表单项
-  var handleClearValue = function handleClearValue() {
-    onChange(undefined, {});
-    setState({
-      _value: undefined,
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+  var handleSelectValue = function handleSelectValue(val, option) {
+    onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -317,7 +328,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
               // 更新内部展示值
               setState({
-                _value: _data
+                _value: _data,
+                options: isArray(_data) ? _data : [_data]
               });
               handleClose();
             }
@@ -586,9 +598,30 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [onOff, visible, value]);
   useEffect(function () {
     if (value && !visible && isInit) {
-      getInitValues();
+      if (readOnly) {
+        // 加定时器 修复依赖数据同步更新未取到问题
+        setTimeout(function () {
+          var _useRequest$options7, _useRequest$options8;
+          var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+          if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+            var _contentForm$getField2;
+            initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
+          }
+          var params = withPagination ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+          run(params);
+          setState({
+            isInit: false
+          });
+        }, 300);
+      } else {
+        getInitValues();
+      }
     }
-  }, [value, visible, isInit]);
+  }, [value, visible, isInit, useRequest]);
   useEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -601,59 +634,79 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (labelInValue && _value && !isEqual(value, _value)) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
-    }
-    if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+    if (!readOnly) {
+      if (labelInValue && _value && !isEqual(value, _value)) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
+      if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
   }, [value, _value]);
-  var defaultAddonAfter = _jsxs("div", {
-    className: "pro-enum-input-addonAfter",
-    children: [value && !disabled && _jsx("span", {
-      className: "close-icon",
-      children: _jsx(CloseOutlined, {
-        onClick: handleClearValue
-      })
-    }), _jsx(ReactSVG, {
-      className: "viewSvg",
-      src: viewSvg,
-      onClick: handleClick
-    })]
-  });
-  var forceAddonAfterRender = function forceAddonAfterRender() {
-    if (isView || disabled) {
-      return;
-    }
-    if (addonAfter) {
-      return _jsx("div", {
-        onClick: handleClick,
-        children: addonAfter
-      });
-    }
-    return defaultAddonAfter;
-  };
   // 加个中间状态Input
-  var initRender = _jsxs(_Fragment, {
-    children: [_jsx(_Input, _objectSpread({
+  var initRender = _jsxs(_Space.Compact, {
+    style: {
+      width: '100%'
+    },
+    block: true,
+    children: [readOnly ? _jsx(ProSelect, _objectSpread({
+      value: value,
+      onChange: handleSelectValue,
+      disabled: disabled,
+      fieldNames: fieldNames,
+      showCodeName: showCodeName,
+      labelInValue: labelInValue,
+      dataSource: options,
+      scrollFollowParent: false,
+      onClick: function onClick() {
+        // 没有值的时候，初始化点击默认查询前五十条
+        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+          var _useRequest$options9;
+          var queryBean = useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams;
+          var params = withPagination ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: queryBean
+          } : queryBean;
+          run(params);
+          setState({
+            isInit: false
+          });
+        }
+      },
+      onSearch: debounce(function (val) {
+        var _useRequest$options10;
+        var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, _defineProperty({}, labelKey, val));
+        var params = withPagination ? {
+          pageNum: 1,
+          pageSize: 50,
+          queryBean: queryBean
+        } : queryBean;
+        run(params);
+      }, 800),
+      style: {
+        width: isView || disabled ? '100%' : 'calc(100% - 30px)'
+      }
+    }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
       value: viewText,
-      readOnly: readOnly,
-      onClick: readOnly ? handleClick : undefined,
       onChange: handleChangeValue,
       disabled: disabled,
-      addonAfter: forceAddonAfterRender(),
-      autoComplete: "off"
-    }, omit(restInputProps, ['otherProps']))), _jsx(_Input, {
-      type: "hidden",
-      value: value
+      autoComplete: "off",
+      allowClear: true
+    }, omit(restProps, ['otherProps']))), isView || disabled ? null : _jsx(_Button, {
+      icon: _jsx(ReactSVG, {
+        className: "viewSvg",
+        src: viewSvg,
+        onClick: handleClick
+      })
     })]
   });
   if (customRender && /*#__PURE__*/React.isValidElement(customRender)) {

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -1,4 +1,4 @@
-import { FormInstance, InputProps, ModalProps } from 'antd';
+import { FormInstance, InputProps, SelectProps, ModalProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import React from 'react';
 import { ProColumnProps } from '../../render/propsType';
@@ -43,5 +43,5 @@ interface ProModalPropsType {
     showCodeName?: boolean;
     searchForm?: FormInstance;
 }
-export declare type ProModalSelectPropsType = InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -88,7 +88,7 @@
   }
 
   .viewSvg {
-    height: 24px;
+    height: 20px;
     cursor: pointer;
     fill: #c5c7cd;
   }

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

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isObject } from 'lodash';
 import React from 'react';
@@ -15,6 +15,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
@@ -23,7 +24,12 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    var confirmProps = isFunction(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    var confirmProps = isFunction(confirm) ? confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form: form,
+      namePath: otherProps.namePath,
+      index: otherProps.index
+    }) : confirm;
     if (confirmProps === true) {
       _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
         onOk: function onOk() {

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

@@ -155,7 +155,9 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, {
-    required: typeof labelRequired === 'boolean' ? labelRequired : _required
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
+      return item === null || item === void 0 ? void 0 : item.required;
+    }))
   }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的

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

@@ -52,12 +52,12 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;
     [key: string]: any;
-}) => any;
+}) => R;
 type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | ((values: Values) => boolean | ModalFuncProps);
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/style/index.less

@@ -347,4 +347,21 @@
   .delete-icon {
     width: 18px;
   }
+  .pro-form-list-tool-btn {
+    margin-left: 8px;
+    padding: 0;
+    cursor: pointer;
+    .anticon {
+      color: var(--zaui-text-weak, #a0a0a0);
+      font-size: 16px;
+      vertical-align: middle;
+    }
+  }
+  .pro-form-list-mode-block{
+    .pro-collapse-content{
+      .@{ant-prefix}-row{
+        width: auto;
+      }
+    }
+  }
 }