@zat-design/sisyphus-react 3.4.3 → 3.4.4

package/lib/ProConfigProvider/index.js

@@ -22,6 +22,9 @@ var initialState = {
   ProEnum: {
     dics: {}
   },
+  ProForm: {
+    labelAlign: 'left'
+  },
   forms: {},
   ProIcon: {
     mode: 'icon',
@@ -55,6 +58,15 @@ var reducer = function reducer(state, action) {
   switch (action.type) {
     case 'set':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), action.payload);
+    // 设置的值会被存入localStorage
+    case 'setWithLocal':
+      {
+        var _state = (0, _merge.default)({}, state, action.payload);
+        var localConfigStr = localStorage.getItem('localConfig');
+        var localConfig = JSON.parse(localConfigStr || '{}');
+        localStorage.setItem('localConfig', JSON.stringify((0, _merge.default)(localConfig, action.payload)));
+        return _state;
+      }
     case 'setProEnum':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         ProEnum: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.ProEnum), action.payload)
@@ -76,6 +88,15 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   (0, _useEnumRequest.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  (0, _react.useEffect)(function () {
+    // 本地配置取出
+    var localConfigStr = localStorage.getItem('localConfig');
+    var localConfig = JSON.parse(localConfigStr || '{}');
+    dispatch({
+      type: 'set',
+      payload: (0, _merge.default)(state, localConfig)
+    });
+  }, []);
   var cacheLang = localStorage.getItem('locale');
   // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
   var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);

package/lib/ProEditLabel/style/index.less

@@ -120,7 +120,6 @@
 
     .@{ant-prefix}-col-10 {
       flex         : 0 0 var(--zaui-form-label-width, 130px);
-      text-align   : var(--zaui-form-align, left);
       white-space  : pre-wrap;
       line-height  : 1;
       overflow     : initial;

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

@@ -35,7 +35,7 @@ var Row = exports.Row = function Row(props) {
     transition: transition
   }, isDragging ? {
     position: 'relative',
-    zIndex: 9999
+    zIndex: 2
   } : {});
   return (0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
     ref: setNodeRef,

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

@@ -75,7 +75,9 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalDiffTip = config.originalDiffTip;
+    formNamePath = config.namePath,
+    _config$originalDiffT = config.originalDiffTip,
+    originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -169,6 +171,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = (0, _react.useCallback)(function () {
+    var _fieldProps5;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -177,7 +180,9 @@ var RenderField = function RenderField(_ref) {
     if (type === 'SwitchCheckbox') {
       valueType = 'switch';
     }
-    var params = (0, _objectSpread2.default)({}, column);
+    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+      mode: (_fieldProps5 = _fieldProps) === null || _fieldProps5 === void 0 ? void 0 : _fieldProps5.mode
+    });
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   }, [valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
@@ -515,7 +520,16 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalDiffTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+  var 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'])), {}, {
+    className: _className,
+    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+  })) : (0, _jsxRuntime.jsx)(_Container.default, {
+    viewEmpty: viewEmpty
+  });
+  var originalTitle = originalDiffTip && originalValues ? (0, _jsxRuntime.jsxs)(_antd.Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
@@ -526,19 +540,11 @@ var RenderField = function RenderField(_ref) {
       checked: type === 'Switch' ? originalValue : undefined
     }))]
   }) : null;
-  var 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'])), {}, {
-    className: _className,
-    name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
-  })) : (0, _jsxRuntime.jsx)(_Container.default, {
-    viewEmpty: viewEmpty
-  });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
+      placement: "topLeft",
       open: changed ? undefined : false,
       getPopupContainer: function getPopupContainer(target) {
         return target.parentElement;

package/lib/ProEditTable/index.js

@@ -11,6 +11,7 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
@@ -21,9 +22,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("./utils");
 var _tools = require("./utils/tools");
 var _components = require("./components");
+var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
@@ -44,8 +46,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     onlyOneLineMsg = _ref.onlyOneLineMsg,
     deletePoConfirmMsg = _ref.deletePoConfirmMsg,
     mulDeletePoConfirmMsg = _ref.mulDeletePoConfirmMsg,
-    _ref$otherProps = _ref.otherProps,
-    otherProps = _ref$otherProps === void 0 ? {} : _ref$otherProps,
     configRequiredAlign = _ref.requiredAlign,
     summary = _ref.summary,
     max = _ref.max,
@@ -57,17 +57,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
-  var form = contentForm || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
-  var name = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
-  var _otherProps$isView = otherProps.isView,
-    isView = _otherProps$isView === void 0 ? false : _otherProps$isView,
-    _otherProps$viewEmpty = otherProps.viewEmpty,
-    viewEmpty = _otherProps$viewEmpty === void 0 ? '-' : _otherProps$viewEmpty;
+  var formFieldProps = _ProForm.default.useFieldProps() || {};
+  var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
+  var name = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
+  var _formFieldProps$isVie = formFieldProps.isView,
+    isView = _formFieldProps$isVie === void 0 ? false : _formFieldProps$isVie,
+    _formFieldProps$viewE = formFieldProps.viewEmpty,
+    viewEmpty = _formFieldProps$viewE === void 0 ? '-' : _formFieldProps$viewE,
+    namePath = formFieldProps.namePath;
+  // 判断是否在formList内
+  if (namePath === null || namePath === void 0 ? void 0 : namePath.length) {
+    name = [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)(name.slice(1)));
+  }
   var tableRef = (0, _react.useRef)(null);
   var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
-  disabled = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.disabled) || disabled;
+  disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled;
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
@@ -149,6 +155,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     virtualKey: virtualKey,
     requiredAlign: requiredAlign,
     name: (0, _lodash.isArray)(name) ? name : [name],
+    namePath: namePath,
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,

package/lib/ProEnum/components/Group.js

@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _ahooks = require("ahooks");
 var _react = require("react");
 var Group = function Group(props) {
   var value = props.value,
@@ -20,35 +18,20 @@ var Group = function Group(props) {
     _props$allowClear = props.allowClear,
     allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
   var idx = (0, _react.useRef)(-1);
-  var _useSetState = (0, _ahooks.useSetState)({
-      checked: ''
-    }),
-    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
-    state = _useSetState2[0],
-    setState = _useSetState2[1];
   (0, _react.useEffect)(function () {
-    setState({
-      checked: value
-    });
     var index = dataSource.findIndex(function (item) {
       return item[fieldValue] === value;
     });
     idx.current = index;
   }, [value]);
   var handleClick = function handleClick(val, index) {
-    if (state.checked === val) {
+    if (value === val) {
       if (!allowClear) {
         return false;
       }
-      setState({
-        checked: ''
-      });
       onChange === null || onChange === void 0 ? void 0 : onChange('');
       idx.current = -1;
     } else {
-      setState({
-        checked: val
-      });
       idx.current = index;
       onChange === null || onChange === void 0 ? void 0 : onChange(val);
     }
@@ -67,7 +50,7 @@ var Group = function Group(props) {
             handleClick(item[fieldValue], index);
           }
         },
-        className: (0, _classnames.default)('pro-enum-group-item', state.checked === item[fieldValue] ? 'pro-enum-group-item-selected' : '', index === idx.current || index + 1 === idx.current ? 'pro-enum-group-item-disabled-after' : '', item.disabled ? 'pro-enum-group-item-disabled' : ''),
+        className: (0, _classnames.default)('pro-enum-group-item', value === item[fieldValue] ? 'pro-enum-group-item-selected' : '', index === idx.current || index + 1 === idx.current ? 'pro-enum-group-item-disabled-after' : '', item.disabled ? 'pro-enum-group-item-disabled' : ''),
         children: item[fieldLabel]
       }, item[fieldValue]);
     })

package/lib/ProForm/components/base/DatePicker/index.js

@@ -62,7 +62,9 @@ var DatePicker = function DatePicker(props) {
       disabled: true
     };
   }
-  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), _rest), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
+    format: format
+  }, _rest), {}, {
     className: _className
   }));
 };

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

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _classnames2 = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -37,11 +38,10 @@ var TextAreaDef = function TextAreaDef(props) {
       children: rest.value
     });
   }
-  var _className = (0, _classnames.default)({
+  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-textarea': true,
-    'pro-textarea-view': isView,
-    className: className
-  });
+    'pro-textarea-view': isView
+  }, className, true));
   return (0, _jsxRuntime.jsx)(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     showCount: true,
     autoComplete: "off",

package/lib/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/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -28,7 +28,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(undefined, index + 1);
       },
       type: 'text',
-      label: "".concat(_locale.default.ProForm.formList_actions[0]),
+      label: "".concat(_locale.default.ProForm.formListActions[0]),
       icon: (0, _jsxRuntime.jsx)(_icons.PlusSquareOutlined, {})
     },
     delete: {
@@ -40,7 +40,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         remove(index);
       },
       type: 'text',
-      label: "".concat(_locale.default.ProForm.formList_actions[1]),
+      label: "".concat(_locale.default.ProForm.formListActions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
         className: "single-delete"
@@ -57,7 +57,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(record, index + 1);
       },
       type: 'text',
-      label: "".concat(_locale.default.ProForm.formList_actions[2]),
+      label: "".concat(_locale.default.ProForm.formListActions[2]),
       icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
     },
     moveUp: {
@@ -69,7 +69,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index - 1);
       },
       type: 'text',
-      label: "".concat(_locale.default.ProForm.formList_actions[3]),
+      label: "".concat(_locale.default.ProForm.formListActions[3]),
       icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
     },
     moveDown: {
@@ -81,13 +81,14 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index + 1);
       },
       type: 'text',
-      label: "".concat(_locale.default.ProForm.formList_actions[4]),
+      label: "".concat(_locale.default.ProForm.formListActions[4]),
       icon: (0, _jsxRuntime.jsx)(_icons.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') {
@@ -116,7 +117,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 = (0, _react.useMemo)(function () {
     var _props$actionProps;
@@ -167,7 +169,7 @@ var ActionButton = function ActionButton(props) {
       var _onClick = onClick || onHandle;
       if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
         // 禁用状态默认隐藏内置操作按钮
-        if (disabled) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _defaultActions$actio = defaultActions[actionType],
           internalOnClick = _defaultActions$actio.onClick,
           defaultLabel = _defaultActions$actio.label,
@@ -189,7 +191,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
+          title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formListConfirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -212,7 +214,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       return needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
+        title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formListConfirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

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

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
 var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _ActionButton = _interopRequireDefault(require("./ActionButton"));
 var _RenderFields = _interopRequireDefault(require("../../../render/RenderFields"));
 var _ProCollapse = _interopRequireDefault(require("../../../../../ProLayout/components/ProCollapse"));
@@ -38,8 +40,10 @@ var BlockFields = function BlockFields(props) {
     }
     return title;
   }, [title, index]);
+  var cls = (0, _classnames.default)((0, _defineProperty2.default)({}, "pro-form-list-mode-".concat(mode), mode === 'block' || mode === 'line' || mode === 'less'));
   return (0, _jsxRuntime.jsx)(_antd.Space, {
     direction: "vertical",
+    className: cls,
     children: (0, _jsxRuntime.jsx)(_ProCollapse.default, {
       title: _title,
       index: index,
@@ -59,7 +63,8 @@ var BlockFields = function BlockFields(props) {
         fields: fields,
         actionProps: actionProps,
         mode: mode,
-        disabled: disabled
+        disabled: disabled,
+        isView: isView
       }),
       children: (0, _jsxRuntime.jsx)(_antd.Row, {
         gutter: 24,

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

@@ -24,7 +24,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: "".concat(_locale.default.ProForm.formList_actions[5]),
+    label: "".concat(_locale.default.ProForm.formListActions[5]),
     type: 'link',
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
   }
@@ -63,9 +63,6 @@ var ToolbarButton = function ToolbarButton(props) {
       operation.add(data);
     }
   };
-  if (disabled || isView) {
-    return null;
-  }
   return (0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-toolbar",
@@ -84,7 +81,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = (0, _objectWithoutProperties2.default)(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (['add'].includes(actionType)) {
-        if (disabled) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _actions$actionType = actions[actionType],
           internalOnClick = _actions$actionType.onClick,
           defaultLabel = _actions$actionType.label,

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

@@ -90,13 +90,14 @@ var Group = function Group(props) {
       });
     }
   }, [value]);
+  var _otherProps = (0, _lodash.omit)(otherProps, ['colProps', 'required']);
   return (0, _jsxRuntime.jsx)("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
         columns: data.columns,
         form: form
-      }, (0, _lodash.omit)(otherProps, ['colProps'])))
+      }, _otherProps))
     }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
@@ -104,7 +105,7 @@ var Group = function Group(props) {
         return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
           columns: [column],
           form: form
-        }, (0, _lodash.omit)(otherProps, ['colProps'])), (column === null || column === void 0 ? void 0 : column.name) || index);
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
       })
     }))
   });

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

@@ -56,7 +56,8 @@ 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 = (0, _react.useState)(),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),