@zat-design/sisyphus-react 3.1.5 → 3.2.0-beta.2

package/es/ProEnum/hooks/useEnumRequest.js

@@ -6,6 +6,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { diffCode, getEnumData, setEnumData, cacheFieldNames } from '../utils';
+import locale from '../../locale';
 import '../utils/eventCenter';
 var useEnumRequest = function useEnumRequest(props, dispatch) {
   var _ref = props || {},
@@ -34,7 +35,8 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     _ref$dics = _ref.dics,
     dics = _ref$dics === void 0 ? {} : _ref$dics;
   if (_typeof(dataSource) === 'object' && dataSource === null) {
-    throw new Error('请传入有效的数据源');
+    var _locale$ProEnum;
+    throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
   }
   var logDebug = function logDebug(msg) {
     if (props.debugger) {
@@ -49,7 +51,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       setCache: function () {
         var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-          var response, _useRequest$options, ignoreCodes, cacheData;
+          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -66,7 +68,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   _context.next = 9;
                   break;
                 }
-                throw new Error('请返回正确的数据类型!');
+                throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
               case 9:
                 res.data = response;
               case 10:
@@ -98,8 +100,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 });
                 if (main) {
                   setTimeout(function () {
+                    var _locale$ProEnum3;
                     window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug('主应用初始化触发从接口读取数据更新');
+                    logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
                   }, 10000);
                 }
                 return _context.abrupt("return", res);
@@ -124,8 +127,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         });
         if (main) {
           setTimeout(function () {
+            var _locale$ProEnum4;
             window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug('主应用初始化触发从缓存读取数据更新');
+            logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
           }, 10000);
         }
         return res;
@@ -135,14 +139,15 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
           status = _res$status === void 0 ? 200 : _res$status,
           msg = res.message;
         if (status !== 200) {
-          throw new Error('请求失败');
+          var _locale$ProEnum5;
+          throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
         }
       }
     })),
     run = _useRequestFunc.run;
   var mergeData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res;
+      var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -182,7 +187,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               _context2.next = 18;
               break;
             }
-            throw new Error('请返回正确的数据类型!');
+            throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
           case 18:
             _context2.next = 21;
             break;
@@ -272,12 +277,14 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   };
   useEffect(function () {
     if (main) {
+      var _locale$ProEnum7;
       window.eventCenter.publish('zat-design-pro-component-event', {});
-      logDebug('主应用初始化触发一次');
+      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
     }
     if (!main && share) {
+      var _locale$ProEnum8;
       window.eventCenter.subscribe('zat-design-pro-component-event', shareProEnumDic);
-      logDebug('子应用初始化监听动作');
+      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
     }
     return function () {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);

package/es/ProEnum/index.js

@@ -24,6 +24,7 @@ import Container from '../ProForm/components/Container';
 import { isObject } from './utils';
 import getEnumLabel from './utils/getEnumLabel';
 import useEnum from './hooks/useEnum';
+import locale from '../locale';
 import './style/index.less';
 var ProEnum = function ProEnum(props) {
   var code = props.code,
@@ -87,7 +88,8 @@ var ProEnum = function ProEnum(props) {
         if (transformResponse && typeof transformResponse === 'function') {
           var responseData = transformResponse(res);
           if (_typeof(responseData) !== 'object') {
-            return _message.error('请返回正确的数据类型');
+            var _locale$ProEnum;
+            return _message.error((_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -97,7 +99,8 @@ var ProEnum = function ProEnum(props) {
             data = res.data;
           if (status === 200) {
             if (_typeof(data) !== 'object') {
-              return _message.error('请返回正确的数组类型');
+              var _locale$ProEnum2;
+              return _message.error((_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData(_toConsumableArray(data));
@@ -141,7 +144,8 @@ var ProEnum = function ProEnum(props) {
     if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && transformResponse) {
       list = transformResponse(list);
       if (!Array.isArray(list)) {
-        console.error('请返回有效的数组');
+        var _locale$ProEnum3;
+        console.error((_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.errorArrayMessage);
         list = [];
       }
     }
@@ -203,7 +207,8 @@ var ProEnum = function ProEnum(props) {
     }
   };
   if (!code && !dataSource && !useRequest) {
-    _message.error('请传入枚举类型');
+    var _locale$ProEnum4;
+    _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
     return;
   }
   var transToLabel = function transToLabel(value) {

package/es/ProEnum/style/index.less

@@ -9,7 +9,7 @@
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-    margin-bottom: var(--zaui-space-size-sm);
+     margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);

package/es/ProForm/components/FormFooter/index.js

@@ -6,6 +6,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { useProConfig } from '../../../ProConfigProvider';
+import locale from '../../../locale';
 export var PRO_FORM_CACHE = 'PRO_FORM_CACHE';
 var FormFooter = function FormFooter(props) {
   var initialConfig = useProConfig('FormFooter');
@@ -49,25 +50,20 @@ var FormFooter = function FormFooter(props) {
     }
     onCancel();
   };
-  return (
-    // <div className="ant-form-item">
-    _jsxs(_Space, {
-      children: [_jsx(_Button, _objectSpread(_objectSpread({
-        type: "primary",
-        htmlType: onOk ? 'button' : 'submit',
-        onClick: _onOk,
-        disabled: confirmLoading,
-        loading: confirmLoading
-      }, okButtonProps), {}, {
-        children: okChildren || okText || '查询'
-      })), _jsx(_Button, _objectSpread(_objectSpread({
-        onClick: _onCancel
-      }, cancelButtonProps), {}, {
-        children: cancelChildren || cancelText || '重置'
-      })), children]
-    })
-    // </div>
-  );
+  return _jsxs(_Space, {
+    children: [_jsx(_Button, _objectSpread(_objectSpread({
+      type: "primary",
+      htmlType: onOk ? 'button' : 'submit',
+      onClick: _onOk,
+      disabled: confirmLoading,
+      loading: confirmLoading
+    }, okButtonProps), {}, {
+      children: okChildren || okText || "".concat(locale.ProForm.search)
+    })), _jsx(_Button, _objectSpread(_objectSpread({
+      onClick: _onCancel
+    }, cancelButtonProps), {}, {
+      children: cancelChildren || cancelText || "".concat(locale.ProForm.reset)
+    })), children]
+  });
 };
-
 export default FormFooter;

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

@@ -4,8 +4,10 @@ import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { omit } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
+import locale from '../../../../locale';
 // 参数优先级
 // 组件内默认值 < config默认值 < props
 var Input = function Input(props) {
@@ -28,8 +30,7 @@ var Input = function Input(props) {
   return _jsx(_Input, _objectSpread(_objectSpread({
     allowClear: true,
     autoComplete: "off",
-    placeholder: placeholder || '请输入',
-    title: rest.value
-  }, initialConfig), rest));
+    placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
+  }, omit(initialConfig, ['trim'])), rest));
 };
 export default Input;

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

@@ -16,6 +16,7 @@ import { isNull, isNumber, isUndefined } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import { getDecimalDigits } from '../../../utils/index';
+import locale from '../../../../locale';
 var calc = tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
 /**
@@ -102,9 +103,9 @@ var InputNumber = function InputNumber(props) {
       var _max;
       if (range) {
         if (rest.precision === undefined) {
-          console.warn('使用 "range" 时, 必须传入 "precision"');
+          console.warn('When using [range], you must pass in [precision]');
         } else if (!rangeReg.test(range)) {
-          console.warn('"range" 格式有误, 参考: "(a, b)", "[a, b]", "(a, b]", "[a, b)"');
+          console.warn('" range "format is wrong, the reference:" (a, b) ", "[a, b]", "(a, b] [a, b)", "');
         } else {
           var _range$replace$split = range.replace(' ', '').split(','),
             _range$replace$split2 = _slicedToArray(_range$replace$split, 2),
@@ -240,7 +241,7 @@ var InputNumber = function InputNumber(props) {
   };
   return _jsx(_InputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     autoComplete: "off",
-    placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label !== null && label !== void 0 ? label : ''),
+    placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label !== null && label !== void 0 ? label : ''),
     className: _className
   }, valueProps), initialConfig), rest), {}, {
     onBlur: handleBlur,

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

@@ -50,9 +50,6 @@ var RangePicker = function RangePicker(props) {
   var _res = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  if (_res === null || _res === void 0 ? void 0 : _res.placeholder) {
-    _res === null || _res === void 0 ? true : delete _res.placeholder;
-  }
   // 字符串时间格式兼容
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
     _res.value = [moment(_res.value[0]), moment(_res.value[1])];

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

@@ -6,6 +6,7 @@ var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"]
 import { jsx as _jsx } from "react/jsx-runtime";
 import Container from '../../Container';
 import { useProConfig } from '../../../../ProConfigProvider';
+import locale from '../../../../locale';
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
@@ -59,7 +60,7 @@ var Select = function Select(props) {
     }
   }
   return _jsx(_Select, _objectSpread(_objectSpread(_objectSpread({
-    placeholder: "\u8BF7\u9009\u62E9",
+    placeholder: "".concat(locale.ProForm.selectPlaceHolder),
     allowClear: true,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;

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

@@ -7,6 +7,7 @@ import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
+import locale from '../../../../locale';
 var Switch = function Switch(props) {
   var disabled = props.disabled,
     otherProps = props.otherProps,
@@ -24,13 +25,16 @@ var Switch = function Switch(props) {
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
-      children: res.checked === true ? '是' : '否'
+      children: res.checked === true ? "".concat(locale.ProForm.switchText[0]) : "".concat(locale.ProForm.switchText[1])
     });
   }
-  return _jsx(_Switch, _objectSpread(_objectSpread({
+  return _jsx(_Switch, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
-    checkedChildren: "\u662F",
-    unCheckedChildren: "\u5426"
-  }, config), res));
+    checkedChildren: "".concat(locale.ProForm.switchText[0]),
+    unCheckedChildren: "".concat(locale.ProForm.switchText[1])
+  }, config), res), {}, {
+    id: "switch_only" // 解决点击label联动的问题
+  }));
 };
+
 export default Switch;

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

@@ -6,6 +6,7 @@ var _excluded = ["onChange", "disabled", "value", "otherProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
+import locale from '../../../../locale';
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
     disabled = props.disabled,
@@ -40,7 +41,7 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
         children: restProps.label
       }), _jsx("span", {
         className: "switch-checkbox-view-value",
-        children: restProps.checked === true ? '是' : '否'
+        children: restProps.checked === true ? "".concat(locale.ProForm.switchText[0]) : "".concat(locale.ProForm.switchText[1])
       })]
     });
   }

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

@@ -4,8 +4,10 @@ import "antd/es/input/style";
 import _Input from "antd/es/input";
 var _excluded = ["placeholder", "otherProps", "className"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { omit } from 'lodash';
 import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
+import locale from '../../../../locale';
 import './index.less';
 var TextArea = _Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
@@ -31,11 +33,11 @@ var TextAreaDef = function TextAreaDef(props) {
   return _jsx(TextArea, _objectSpread(_objectSpread(_objectSpread({
     showCount: true,
     autoComplete: "off",
-    placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label || ''),
+    placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label || ''),
     autoSize: {
       minRows: 4
     }
-  }, initialConfig), rest), {}, {
+  }, omit(initialConfig, ['trim'])), rest), {}, {
     disabled: disabled,
     className: _className
   }));

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

@@ -6,6 +6,6 @@ div.pro-textarea-view {
   }
   &::after {
     display: none;
-    padding-bottom: 11px;
+    padding-bottom: 12px;
   }
 }

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

@@ -23,7 +23,6 @@
     min-width       : 0;
     margin-left     : -12px;
     margin-right    : -12px;
-    // margin-bottom: -22px;
 
     &>.ant-col {
       padding-left : 12px;

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

@@ -15,32 +15,31 @@ import { isFunction } from 'lodash';
 import { useMemo } from 'react';
 import { CopyOutlined, DownSquareOutlined, PlusSquareOutlined, UpSquareOutlined } from '@ant-design/icons';
 import ProIcon from '../../../../../ProIcon';
+import locale from '../../../../../locale';
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
     add: {
       onClick: function onClick(record, _ref) {
         var namePath = _ref.namePath,
           index = _ref.index,
-          operation = _ref.operation,
-          form = _ref.form;
+          operation = _ref.operation;
         var add = operation.add;
         add(undefined, index + 1);
       },
       type: 'text',
-      label: '新增',
+      label: "".concat(locale.ProForm.formList_actions[0]),
       icon: _jsx(PlusSquareOutlined, {})
     },
     delete: {
       onClick: function onClick(record, _ref2) {
         var namePath = _ref2.namePath,
           index = _ref2.index,
-          operation = _ref2.operation,
-          form = _ref2.form;
+          operation = _ref2.operation;
         var remove = operation.remove;
         remove(index);
       },
       type: 'text',
-      label: '删除',
+      label: "".concat(locale.ProForm.formList_actions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
         className: "single-delete"
@@ -52,39 +51,36 @@ var getDefaultActions = function getDefaultActions(mode) {
       onClick: function onClick(record, _ref3) {
         var namePath = _ref3.namePath,
           index = _ref3.index,
-          operation = _ref3.operation,
-          form = _ref3.form;
+          operation = _ref3.operation;
         var add = operation.add;
         add(record, index + 1);
       },
       type: 'text',
-      label: '复制',
+      label: "".concat(locale.ProForm.formList_actions[2]),
       icon: _jsx(CopyOutlined, {})
     },
     moveUp: {
       onClick: function onClick(record, _ref4) {
         var namePath = _ref4.namePath,
           index = _ref4.index,
-          operation = _ref4.operation,
-          form = _ref4.form;
+          operation = _ref4.operation;
         var move = operation.move;
         move(index, index - 1);
       },
       type: 'text',
-      label: '上移',
+      label: "".concat(locale.ProForm.formList_actions[3]),
       icon: _jsx(UpSquareOutlined, {})
     },
     moveDown: {
       onClick: function onClick(record, _ref5) {
         var namePath = _ref5.namePath,
           index = _ref5.index,
-          operation = _ref5.operation,
-          form = _ref5.form;
+          operation = _ref5.operation;
         var move = operation.move;
         move(index, index + 1);
       },
       type: 'text',
-      label: '下移',
+      label: "".concat(locale.ProForm.formList_actions[4]),
       icon: _jsx(DownSquareOutlined, {})
     }
   };
@@ -192,7 +188,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
-          title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+          title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -215,7 +211,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 : '您确定要删除该条数据吗?',
+        title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

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

@@ -11,6 +11,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
 import { isFunction } from 'lodash';
 import { useMemo } from 'react';
+import locale from '../../../../../locale';
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
@@ -19,7 +20,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: '新增一行',
+    label: "".concat(locale.ProForm.formList_actions[5]),
     type: 'link',
     icon: _jsx(PlusOutlined, {})
   }

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

@@ -1,17 +1,18 @@
 .pro-form-list-block-title {
-  height: 14px;
-  margin: 3px 0;
-  padding-left: 7px;
-  font-weight: 600;
-  line-height: 14px;
-  border-left: 4px solid #006aff;
+  height      : 14px;
+  margin      : @zaui-space-size-xs 0;
+  padding-left: @zaui-space-size-sm;
+  font-weight : 600;
+  line-height : 14px;
+  border-left : 4px solid @zaui-brand;
 }
 
 .pro-form-list {
-  display: flex;
+  display       : flex;
   padding-bottom: 0;
 
   &.pro-form-list-last {
+
     .pro-form-list-drag-handle,
     .ant-form-item {
       margin-bottom: 0 !important;
@@ -19,12 +20,12 @@
   }
 
   .single-delete {
-    width: 14px !important;
+    width : 14px !important;
     height: 14px !important;
-    color: #939599;
+    color : @zaui-placeholder;
 
     &:hover {
-      color: #8f8c8c;
+      color: @zaui-aide-text;
     }
   }
 
@@ -35,19 +36,19 @@
   .pro-form-list-action {
     padding-bottom: var(--zaui-height-size-md, 16px);
 
-    & > .ant-space-item:first-child > .ant-btn-link {
-      margin-left: 8px;
+    &>.ant-space-item:first-child>.ant-btn-link {
+      margin-left: @zaui-space-size-sm;
     }
   }
 
   .pro-form-list-drag-handle {
-    display: flex;
-    align-items: center;
-    height: @zaui-height-size-lg;
-    margin-bottom: 22px;
-    padding: 0;
+    display      : flex;
+    align-items  : center;
+    height       : 32px;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    padding      : 0;
     padding-right: @zaui-space-size-sm;
-    border: none;
+    border       : none;
   }
 }
 
@@ -62,7 +63,7 @@
 .pro-form-list-toolbar,
 .pro-form-list-action {
   .ant-btn-link {
-    padding: 4px 0;
+    padding: @zaui-space-size-xs 0;
   }
 
   .ant-btn-text:hover {

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

@@ -29,7 +29,7 @@ var Group = function Group(props) {
     var fieldList = [];
     var result = columns.map(function (item) {
       return _objectSpread(_objectSpread({
-        disabled: props === null || props === void 0 ? void 0 : props.disabled
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
         parentNames: _parentNames
@@ -43,7 +43,7 @@ var Group = function Group(props) {
       columns: insertSeparator(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space]);
+  }, [name, columns, space, props]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {