@zat-design/sisyphus-react 3.4.3 → 3.4.4

package/dist/index.esm.css

@@ -689,7 +689,7 @@
   display: block !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
+  margin-bottom: 16px;
 }
 .pro-collapse .ant-collapse-header {
   -webkit-box-align: center !important;
@@ -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;
 }
@@ -2696,7 +2696,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
@@ -2850,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);
@@ -3864,6 +3878,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4349,7 +4366,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-flex: 0 0 var(--zaui-form-label-width, 130px);
       -ms-flex: 0 0 var(--zaui-form-label-width, 130px);
           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;
@@ -5039,16 +5055,23 @@ input[type='button'] {
   -webkit-flex: 0 0 var(--zaui-form-label-width, 130px);
       -ms-flex: 0 0 var(--zaui-form-label-width, 130px);
           flex: 0 0 var(--zaui-form-label-width, 130px);
-  padding-right: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
+  padding-right: 16px;
   overflow: initial;
   line-height: 1;
   white-space: pre-wrap;
-  text-align: var(--zaui-form-align, left);
 }
-.ant-form .ant-form-item .ant-form-item-label .ant-form-item-required::after,
-.ant-drawer .ant-form-item .ant-form-item-label .ant-form-item-required::after,
-.ant-modal .ant-form-item .ant-form-item-label .ant-form-item-required::after {
-  display: block;
+.ant-form .ant-form-item .ant-form-item-label .ant-form-item-required,
+.ant-drawer .ant-form-item .ant-form-item-label .ant-form-item-required,
+.ant-modal .ant-form-item .ant-form-item-label .ant-form-item-required {
+  position: relative;
+}
+.ant-form .ant-form-item .ant-form-item-label .ant-form-item-required::before,
+.ant-drawer .ant-form-item .ant-form-item-label .ant-form-item-required::before,
+.ant-modal .ant-form-item .ant-form-item-label .ant-form-item-required::before {
+  position: absolute;
+  top: calc(50% - 7px);
+  left: -8px;
+  margin: 0;
 }
 .ant-form .ant-form-item .ant-form-item-label > label,
 .ant-drawer .ant-form-item .ant-form-item-label > label,
@@ -5059,31 +5082,12 @@ input[type='button'] {
 .ant-drawer .ant-form-item .ant-form-item-label > label::after,
 .ant-modal .ant-form-item .ant-form-item-label > label::after {
   display: none;
-  margin: 0;
-}
-.ant-form .ant-form-item .ant-form-item-label .ant-form-item-required::before,
-.ant-drawer .ant-form-item .ant-form-item-label .ant-form-item-required::before,
-.ant-modal .ant-form-item .ant-form-item-label .ant-form-item-required::before {
-  display: inline-block;
 }
 .ant-form .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
 .ant-drawer .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
 .ant-modal .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before {
-  display: none;
-}
-.ant-form .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::after,
-.ant-drawer .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::after,
-.ant-modal .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::after {
-  margin-top: 1px;
-  color: #ff4d4f;
-  font-size: var(--zaui-font-size, 14px);
-  line-height: 1;
-  content: '*';
-}
-.ant-form .ant-form-item .ant-form-item-label:not(.ant-form-item-label-left) > .ant-form-item-required::after,
-.ant-drawer .ant-form-item .ant-form-item-label:not(.ant-form-item-label-left) > .ant-form-item-required::after,
-.ant-modal .ant-form-item .ant-form-item-label:not(.ant-form-item-label-left) > .ant-form-item-required::after {
-  display: none;
+  right: -10px;
+  left: unset;
 }
 .ant-form .ant-form-item .ant-form-item-explain-error,
 .ant-drawer .ant-form-item .ant-form-item-explain-error,

package/dist/less.esm.css

@@ -689,7 +689,7 @@
   display: block !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
+  margin-bottom: 16px;
 }
 .pro-collapse .ant-collapse-header {
   -webkit-box-align: center !important;
@@ -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;
 }
@@ -2696,7 +2696,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
@@ -2850,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);
@@ -3864,6 +3878,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4349,7 +4366,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-flex: 0 0 var(--zaui-form-label-width, 130px);
       -ms-flex: 0 0 var(--zaui-form-label-width, 130px);
           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/es/ProConfigProvider/index.d.ts

@@ -21,7 +21,7 @@ export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
 export declare function useContextForms(): Record<string, FormInstance<any>>;
-type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
 interface Actions {
     type: ActionsType;
     payload: any;

package/es/ProConfigProvider/index.js

@@ -3,7 +3,7 @@ import _ConfigProvider from "antd/es/config-provider";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { useContext, useReducer } from 'react';
+import React, { useContext, useEffect, useReducer } from 'react';
 import zhCN from 'antd/es/locale/zh_CN';
 import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
@@ -13,6 +13,9 @@ var initialState = {
   ProEnum: {
     dics: {}
   },
+  ProForm: {
+    labelAlign: 'left'
+  },
   forms: {},
   ProIcon: {
     mode: 'icon',
@@ -46,6 +49,15 @@ var reducer = function reducer(state, action) {
   switch (action.type) {
     case 'set':
       return _objectSpread(_objectSpread({}, state), action.payload);
+    // 设置的值会被存入localStorage
+    case 'setWithLocal':
+      {
+        var _state = merge({}, state, action.payload);
+        var localConfigStr = localStorage.getItem('localConfig');
+        var localConfig = JSON.parse(localConfigStr || '{}');
+        localStorage.setItem('localConfig', JSON.stringify(merge(localConfig, action.payload)));
+        return _state;
+      }
     case 'setProEnum':
       return _objectSpread(_objectSpread({}, state), {}, {
         ProEnum: _objectSpread(_objectSpread({}, state.ProEnum), action.payload)
@@ -67,6 +79,15 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, 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);
+  useEffect(function () {
+    // 本地配置取出
+    var localConfigStr = localStorage.getItem('localConfig');
+    var localConfig = JSON.parse(localConfigStr || '{}');
+    dispatch({
+      type: 'set',
+      payload: merge(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/es/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/es/ProEditTable/components/DndWrapper/index.js

@@ -28,7 +28,7 @@ export var Row = function Row(props) {
     transition: transition
   }, isDragging ? {
     position: 'relative',
-    zIndex: 9999
+    zIndex: 2
   } : {});
   return _jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,

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

@@ -1,9 +1,9 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -72,7 +72,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;
@@ -166,6 +168,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = useCallback(function () {
+    var _fieldProps5;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -174,7 +177,9 @@ var RenderField = function RenderField(_ref) {
     if (type === 'SwitchCheckbox') {
       valueType = 'switch';
     }
-    var params = _objectSpread({}, column);
+    var params = _objectSpread(_objectSpread({}, column), {}, {
+      mode: (_fieldProps5 = _fieldProps) === null || _fieldProps5 === void 0 ? void 0 : _fieldProps5.mode
+    });
     return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   }, [valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
@@ -512,7 +517,16 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalDiffTip ? _jsxs(_Space, {
+  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+    validateFirst: true
+  }, 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.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+  })) : _jsx(Container, {
+    viewEmpty: viewEmpty
+  });
+  var originalTitle = originalDiffTip && originalValues ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
@@ -523,19 +537,11 @@ var RenderField = function RenderField(_ref) {
       checked: type === 'Switch' ? originalValue : undefined
     }))]
   }) : null;
-  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
-    validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-    className: _className,
-    name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
-  })) : _jsx(Container, {
-    viewEmpty: viewEmpty
-  });
   return _jsx(FieldProvider, {
     value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
+      placement: "topLeft",
       open: changed ? undefined : false,
       getPopupContainer: function getPopupContainer(target) {
         return target.parentElement;

package/es/ProEditTable/index.js

@@ -7,10 +7,11 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -19,6 +20,7 @@ import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
 import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components';
+import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
@@ -41,8 +43,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,
@@ -54,17 +54,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _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.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(_toConsumableArray(namePath), _toConsumableArray(name.slice(1)));
+  }
   var tableRef = useRef(null);
   var _React$useContext = React.useContext(_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 = useLocalStorageState('themeConfig'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
@@ -146,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/ProEnum/components/Group.js

@@ -1,7 +1,5 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx } from "react/jsx-runtime";
 import classNames from 'classnames';
-import { useSetState } from 'ahooks';
 import { useEffect, useRef } from 'react';
 var Group = function Group(props) {
   var value = props.value,
@@ -13,35 +11,20 @@ var Group = function Group(props) {
     _props$allowClear = props.allowClear,
     allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
   var idx = useRef(-1);
-  var _useSetState = useSetState({
-      checked: ''
-    }),
-    _useSetState2 = _slicedToArray(_useSetState, 2),
-    state = _useSetState2[0],
-    setState = _useSetState2[1];
   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);
     }
@@ -60,7 +43,7 @@ var Group = function Group(props) {
             handleClick(item[fieldValue], index);
           }
         },
-        className: classNames('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: classNames('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/es/ProForm/components/base/DatePicker/index.js

@@ -56,7 +56,9 @@ var DatePicker = function DatePicker(props) {
       disabled: true
     };
   }
-  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), _rest), {}, {
+  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
+    format: format
+  }, _rest), {}, {
     className: _className
   }));
 };

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,