@zat-design/sisyphus-react 3.4.2-beta.1 → 3.4.2-beta.10

package/es/ProThemeTools/style/index.less

@@ -5,18 +5,35 @@
 
 .pro-theme-tools {
   display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 34px;
+  height: 34px;
+  background: #d8e6ff;
+  border-radius: var(--zaui-border-radius, 8px);
+  cursor: pointer;
+
+  .setting-icon {
+    margin-top: -1px;
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
 
   &.pro-theme-tools-follow {
+    background: var(--ant-primary-1);
     svg {
       color: var(--zaui-brand, #006aff);
     }
   }
 
   .anticon {
-    color: var(--zaui-brand, #006aff);
+    color: var(--zaui-text, #343434);
 
     svg {
-      font-size: var(--zaui-font-size-lg-title, 24px)
+      font-size: 20px;
     }
   }
 }
@@ -36,16 +53,16 @@
 
   .copy-btn {
     position: absolute;
-    width   : calc(100% - 64px);
-    bottom  : 20px;
-    left    : 32px;
-    z-index : 10;
+    bottom: 20px;
+    left: 32px;
+    z-index: 10;
+    width: calc(100% - 64px);
   }
 
   .pro-theme-tools-box {
-    display        : flex;
+    display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
-    flex-wrap      : wrap;
   }
 
   .pro-theme-tools-space {

package/es/ProTreeModal/style/index.less

@@ -53,7 +53,7 @@
     font-size: var(--zaui-font-size, 14px);
     line-height: 20px;
     border: 1px solid #e6e6e6;
-    border-radius: var(--zaui-border-radius, 4px);
+    border-radius: var(--zaui-border-radius, 8px);
 
     &:first-child {
       margin-right: var(--zaui-space-size-md, 16px);
@@ -246,7 +246,7 @@
       font-size: var(--zaui-font-size, 14px);
       background: #f2f2f2;
       border: none;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
 
       .pro-tooltip {
         flex: 1;

package/es/ProUpload/style/fileItem.less

@@ -12,7 +12,7 @@
       line-height: 16px;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
         color: var(--zaui-brand);
         .file-actions-wrap {
           .file-actions{
@@ -93,7 +93,7 @@
       justify-content: center;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
       }
       &:hover,&.file-box-error {
         .file-actions-wrap {

package/es/ProUpload/style/index.less

@@ -8,7 +8,7 @@
   .pro-upload-dragger {
     .pro-upload-handle-box {
       background   : #F8F9FA;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       padding      : var(--zaui-space-size-sm, 8px);
 
       .@{ant-prefix}-upload.@{ant-prefix}-upload-drag {
@@ -178,7 +178,7 @@
       text-align   : center;
       line-height  : 32px;
       background   : #FFFFFF;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       border       : 1px solid #DCDCDC;
 
     }

package/es/assets/setting.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 22 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-settings</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-1223, -14)" fill="#231F20" fill-rule="nonzero" stroke="#333333" stroke-width="0.3">
+            <g id="编组-2" transform="translate(1209.2372, 0)">
+                <g id="icon-settings" transform="translate(14.4202, 15)">
+                    <path d="M20.3848055,7.53659573 C20.2624144,6.90517801 19.8656126,6.49687157 19.3574341,6.49687157 L19.2693187,6.49687157 C17.8961096,6.49687157 16.7791849,5.40670117 16.7791849,4.0659785 C16.7791849,3.64243545 16.9874064,3.15949962 16.9954426,3.14030349 C17.2488001,2.58384094 17.0543916,1.90192685 16.5418484,1.55193559 L13.9650884,0.151544503 L13.9272182,0.133451014 C13.4117224,-0.0847484644 12.7061572,0.0549122231 12.3217819,0.445776738 C12.0436226,0.725799811 11.0846741,1.52424401 10.3529464,1.52424401 C9.61169334,1.52424401 8.65061387,0.709786336 8.37104252,0.424450467 C7.98733476,0.0307290821 7.28906108,-0.117076194 6.76773716,0.100747395 L4.09924158,1.52780256 L4.05918911,1.55268737 C3.54659457,1.90127525 3.35146717,2.5831643 3.60341257,3.13749673 C3.61211629,3.15777047 3.82110799,3.63677181 3.82110799,4.06600356 C3.82110799,5.40672622 2.70418334,6.49689663 1.33099995,6.49689663 L1.2268892,6.49689663 C0.73468034,6.49689663 0.337852817,6.90517801 0.215538765,7.53662079 C0.206424254,7.58105259 0,8.64957096 0,9.50630527 C0,10.3619369 0.206424254,11.4300794 0.215538765,11.4741603 C0.337852842,12.105979 0.73468034,12.5146363 1.24288452,12.5146363 L1.33099995,12.5146363 C2.70418336,12.5146363 3.82110799,13.6048318 3.82110799,14.9451535 C3.82110799,15.3715534 3.61214195,15.8526849 3.60413145,15.8711543 C3.35149282,16.4286944 3.54518244,17.1095309 4.05628784,17.457768 L6.58426601,18.8421957 L6.62285501,18.8592617 C7.1456424,19.0838515 7.85261977,18.9374246 8.23488975,18.5295191 C8.58799332,18.1570989 9.54475946,17.3838403 10.2473465,17.3838403 C11.0089339,17.3838403 11.9897315,18.249471 12.2722554,18.5536271 C12.5328788,18.8322217 12.9333521,19 13.3432737,19 C13.5347553,19 13.7160441,18.962986 13.8820564,18.8933687 L16.5032593,17.4834046 L16.5418483,17.4591713 C17.0543915,17.109556 17.2495446,16.4287195 16.9969316,15.8740362 C16.9881766,15.8534116 16.7792105,15.3743852 16.7792105,14.9451785 C16.7792105,13.6048568 17.8961352,12.5146614 19.2693442,12.5146614 L19.3720429,12.5146614 C19.8649193,12.5146614 20.26244,12.1060041 20.3848054,11.4741854 C20.3935348,11.4301045 20.6002928,10.361962 20.6002928,9.50633035 C20.6002928,8.64954589 20.3935349,7.58102751 20.3848055,7.53659573 M19.1062589,9.50628019 C19.1062589,10.0598859 18.9933931,10.7712959 18.9416844,11.0683599 C16.8818579,11.2332312 15.2851253,12.9132945 15.2851253,14.9451284 C15.2851253,15.518657 15.471549,16.0680024 15.5705761,16.3206848 L13.3345445,17.5259819 C13.2245799,17.413712 12.8998469,17.0938682 12.457909,16.7726211 C11.6817384,16.2111966 10.9375841,15.9244072 10.2473209,15.9244072 C9.56291156,15.9244072 8.82463676,16.2040795 8.05211198,16.7584119 C7.61233077,17.0711135 7.29198807,17.3823867 7.17984115,17.4975135 L5.0290237,16.3220881 C5.13387902,16.056625 5.31519344,15.5143716 5.31519344,14.9451284 C5.31519344,12.9132945 3.71846079,11.2332312 1.65937889,11.0683599 C1.60695125,10.7712959 1.49408545,10.0599109 1.49408545,9.50628019 C1.49408545,8.95157185 1.60695125,8.23983608 1.65937889,7.94277203 C3.71846079,7.77825158 5.31519344,6.09783742 5.31519344,4.06600356 C5.31519344,3.4956827 5.12879543,2.94455798 5.02976827,2.69225151 L7.32112879,1.46312209 C7.42087485,1.56050617 7.74779025,1.8728319 8.1948374,2.18340342 C8.95645045,2.71392862 9.68168251,2.98257437 10.3529721,2.98257437 C11.0177147,2.98257437 11.7378118,2.71891561 12.4943156,2.19869017 C12.9450086,1.8895471 13.2712051,1.58148161 13.3658419,1.49442234 L15.5712693,2.69012142 C15.4715233,2.94099944 15.2850996,3.4903449 15.2850996,4.06600358 C15.2850996,6.09783744 16.8818322,7.7782516 18.9416587,7.94277205 C18.9933931,8.2405127 19.1062589,8.95513042 19.1062589,9.50628019" id="形状"></path>
+                    <path d="M10.3001356,6.5 C8.59640655,6.5 7.21010249,7.84598945 7.21010249,9.50014713 C7.21010249,11.1545781 8.5964282,12.5 10.3001356,12.5 C12.0038646,12.5 13.3901903,11.1545781 13.3901903,9.50014713 C13.3901903,7.84598945 12.0038646,6.5 10.3001356,6.5 M12.1303626,9.50014713 C12.1303626,10.4798072 11.3095002,11.276765 10.3001356,11.276765 C9.29079259,11.276765 8.47053634,10.4798072 8.47053634,9.50014713 C8.47053634,8.52105462 9.29079259,7.72378156 10.3001356,7.72378156 C11.3095002,7.72378156 12.1303626,8.52105462 12.1303626,9.50014713" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/es/style/components.less

@@ -11,7 +11,6 @@
 // 表单
 @import '../ProForm/style/index';
 @import '../ProUpload/style/index';
-// @import '../ProTreeSelect/style/index';
 @import '../ProTreeModal/style/index';
 @import '../ProTree/style/index';
 

package/es/style/theme/antd.less

@@ -673,7 +673,6 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      // background: #fff;
     }
   }
 }

package/es/style/theme/index.less

@@ -56,8 +56,8 @@
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
-  --zaui-border-radius              : 4px;
-  --zaui-border-radius-card         : 2px;
+  --zaui-border-radius              : 8px;
+  --zaui-border-radius-card         : 4px;
   --zaui-font-size-title            : 16px;
   --zaui-font-size-card-title       : var(--zaui-font-size-title);
   --zaui-font-size                  : 14px;

package/es/style/theme/tokens.less

@@ -56,8 +56,8 @@
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);
-@zaui-border-radius: var(--zaui-border-radius; 4px);
-@zaui-border-radius-card: var(--zaui-border-radius-card; 2px);
+@zaui-border-radius: var(--zaui-border-radius; 8px);
+@zaui-border-radius-card: var(--zaui-border-radius-card; 4px);
 @zaui-font-size-title:
   calc(var(--zaui-font-size-title; 16px) + var(--zaui-base-font-size; 0px));
 @zaui-font-size-card-title:

package/es/tokens.js

@@ -53,8 +53,8 @@ var tokens = {
   '@zaui-form-required-after': 'var(--zaui-form-required-after, inline)',
   '@zaui-form-required-before': 'var(--zaui-form-required-before, none)',
   '@zaui-form-label-width': 'var(--zaui-form-label-width, 130px)',
-  '@zaui-border-radius': 'var(--zaui-border-radius, 4px)',
-  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 2px)',
+  '@zaui-border-radius': 'var(--zaui-border-radius, 8px)',
+  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 4px)',
   '@zaui-font-size-title': 'calc(var(--zaui-font-size-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size-card-title': 'calc(var(--zaui-font-size-card-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size': 'calc(var(--zaui-font-size, 14px) + var(--zaui-base-font-size, 0px))',

package/lib/ProEditLabel/style/index.less

@@ -39,7 +39,7 @@
 
     &:active {
       background   : #E3E8F0;
-      border-radius: var(--zaui-border-radius-card, 2px);
+      border-radius: var(--zaui-border-radius-card, 4px);
     }
   }
 

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

@@ -28,12 +28,11 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -76,7 +75,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalDiffTip = config.originalDiffTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -89,7 +88,7 @@ var RenderField = function RenderField(_ref) {
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
-  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
+  var rowData = (0, _lodash.get)(form.getFieldsValue(), [].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {
@@ -144,7 +143,7 @@ var RenderField = function RenderField(_ref) {
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
   var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
-  if (['Switch', 'Checkbox'].includes(type)) {
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
   }
@@ -244,8 +243,6 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = viewRender;
     }
   }
-  var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangePicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "".concat(_locale.default.ProEditTable.select).concat((0, _lodash.isString)(label) ? label || title : '') : "".concat(_locale.default.ProEditTable.enter).concat((0, _lodash.isString)(label) ? label || title : '');
-  var _placeholder = (_formItemChildProps$p = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.placeholder) !== null && _formItemChildProps$p !== void 0 ? _formItemChildProps$p : defaultPlaceholder;
   var onChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onChange;
   var onFieldChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onFieldChange;
   var onBlur = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onBlur;
@@ -306,7 +303,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = form.getFieldValue(rowPath);
+          row = form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -358,7 +355,9 @@ var RenderField = function RenderField(_ref) {
               return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              form.validateFields(validateFieldKeys);
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
             }
           }
           setState({
@@ -471,8 +470,7 @@ var RenderField = function RenderField(_ref) {
     originalValue = _useListChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
-    name: cellName,
-    placeholder: _placeholder
+    name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
     disabled: _disabled,
     onChange: _onchange,
@@ -490,7 +488,7 @@ var RenderField = function RenderField(_ref) {
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
   }
-  if (['Switch', 'Checkbox'].includes(type)) {
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
   }
   (0, _react.useEffect)(function () {
@@ -510,7 +508,7 @@ 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 = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+  var originalTitle = originalDiffTip ? (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)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -532,7 +530,7 @@ var RenderField = function RenderField(_ref) {
   });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
       children: FormItem

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _tools = require("./utils/tools");
 var _components = require("./components");
 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", "originalTip", "rowKey"];
+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 ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
@@ -52,7 +52,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalTip = _ref.originalTip,
+    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
@@ -154,7 +154,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip,
+    originalDiffTip: originalDiffTip,
     prefixCls: prefixCls
   };
   // 编辑行设置下样式

package/lib/ProEditTable/propsType.d.ts

@@ -130,7 +130,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
      * @default           false

package/lib/ProEditTable/style/index.less

@@ -55,7 +55,7 @@
 
     &:hover {
       border       : 1px solid #DEE0E3;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       text-indent  : 5px;
     }
   }

package/lib/ProEditTable/utils/index.js

@@ -89,40 +89,54 @@ var getActionColumn = function getActionColumn(config) {
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  errorDom.scrollIntoViewIfNeeded(true);
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -132,11 +146,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
@@ -284,7 +298,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey);
+      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);

package/lib/ProEditTable/utils/tools.js

@@ -12,7 +12,9 @@ var getRandom = exports.getRandom = function getRandom() {
 var difference = exports.difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (!(0, _lodash.isEqual)(value, base[key])) {
+      if (key.indexOf('-') > -1) {
+        result[key] = true;
+      } else if (!(0, _lodash.isEqual)(value, base[key])) {
         result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
       }
     });

package/lib/ProEnum/style/index.less

@@ -38,8 +38,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
-      padding: var(--zaui-space-size-sm) var(--zaui-space-border);
+      padding: 6px var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
       border: 1px solid transparent;
@@ -73,6 +72,7 @@
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
       border: 1px solid var(--zaui-brand);
+      background: #fff;
       &::after {
         background: transparent;
       }

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

@@ -36,7 +36,7 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && _moment.default.isMoment(value)) {
+    } else if (typeof format === 'string' && (0, _lodash.isObject)(value)) {
       viewChildren = value.format(format);
     } else if ((0, _lodash.isFunction)(format)) {
       viewChildren = format(value);

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
@@ -28,10 +27,6 @@ var Group = function Group(props) {
     id = props.id,
     value = props.value,
     onFieldChange = props.onFieldChange;
-  var _useCounter = (0, _ahooks.useCounter)(0),
-    _useCounter2 = (0, _slicedToArray2.default)(_useCounter, 2),
-    num = _useCounter2[0],
-    inc = _useCounter2[1].inc;
   var _ref = _ProForm.default.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -69,13 +64,15 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   (0, _ahooks.useDeepCompareEffect)(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
     // 模拟change,初始化不执行onFieldChange
-    if ((0, _lodash.isFunction)(onFieldChange) && num >= 1) {
+    if ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(names) && (0, _utils.transformNamesString)(names).includes(touchName)) {
       onFieldChange(value, form.getFieldsValue(), {
         form: form
       });
     }
-    inc();
   }, [value]);
   return (0, _jsxRuntime.jsx)("div", {
     className: _className,

package/lib/ProForm/components/combination/Group/style/index.less

@@ -9,13 +9,13 @@
 }
 
 .start-radius() {
-  border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius: var(--zaui-border-radius, 4px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 
 .end-radius() {
-  border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 
 .pro-group {

package/lib/ProForm/components/combination/Group/utils.d.ts

@@ -6,3 +6,5 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.insertSeparator = void 0;
+exports.transformNamesString = exports.insertSeparator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 /**
 * 插入间隔符
@@ -40,4 +40,14 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
     }
     return result;
   }, []);
+};
+/** 转换names */
+var transformNamesString = exports.transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
 };

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

@@ -55,7 +55,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
-    if (_moment.default.isMoment(value)) {
+    if ((0, _lodash.isObject)(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -75,6 +75,12 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
         children: foreverText
       });
     }
+    if ((0, _lodash.isObject)(value)) {
+      return (0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty,
+        children: value.format(format)
+      });
+    }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: props.value

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

@@ -50,7 +50,7 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
     globalControl = props.globalControl;
   var colProps = props.colProps;
@@ -432,7 +432,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = (0, _jsxRuntime.jsxs)(_antd.Space, {

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -17,7 +17,7 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;