@zat-design/sisyphus-react 3.4.2-beta.2 → 3.4.2-beta.3

package/dist/index.esm.css

@@ -273,7 +273,7 @@
   padding-left: 16px !important;
 }
 .pro-layout-open-menu .ant-menu-root > .ant-menu-submenu .ant-menu-sub {
-  background: #1A202D;
+  background: #1a202d;
 }
 .pro-layout-open-menu .ant-menu-root > .ant-menu-submenu > .ant-menu-sub > .ant-menu-submenu > .ant-menu-submenu-title,
 .pro-layout-open-menu .ant-menu-root > .ant-menu-submenu > .ant-menu-item-only-child,
@@ -281,15 +281,15 @@
   padding-left: 16px !important;
 }
 .pro-layout-open-menu .ant-menu-root > .ant-menu-item-only-child {
+  height: auto;
   min-height: 48px;
+  margin: 0;
   padding-top: 12px;
   padding-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1) - var(--zaui-space-size-xs, 4px) * var(--zaui-size, 1));
-  margin: 0;
-  height: auto;
 }
 .pro-layout-open-menu .ant-menu-root > .ant-menu-item-only-child h2 {
-  line-height: initial !important;
   height: auto !important;
+  line-height: initial !important;
   white-space: pre-wrap;
 }
 .pro-layout-open-menu .ant-menu-root .ant-menu-item {
@@ -310,8 +310,8 @@
   color: #fff;
 }
 .pro-layout-open-menu .ant-menu.ant-menu-dark {
-  background: #1A202D;
   overflow-x: hidden;
+  background: #1a202d;
 }
 .pro-layout-open-menu .ant-menu.ant-menu-dark .ant-menu-item-only-child:hover {
   background: var(--ant-primary-8, #003eb3);
@@ -327,12 +327,12 @@
 }
 .pro-layout-open-menu .ant-menu-sub.ant-menu-inline > .ant-menu-item,
 .pro-layout-open-menu .ant-menu-submenu-title {
-  white-space: pre-wrap;
-  line-height: initial !important;
   height: auto !important;
+  min-height: 48px;
   margin: 0;
   padding: 12px 0;
-  min-height: 48px;
+  line-height: initial !important;
+  white-space: pre-wrap;
 }
 .pro-layout-open-menu .ant-menu-title-content div {
   display: -webkit-box;
@@ -355,62 +355,67 @@
           flex: 0 0 20px;
   width: 20px;
   height: 20px;
-  color: #CACACA;
+  color: #cacaca;
 }
 .pro-layout-open-menu .ant-menu-title-content div h2 {
+  display: inline-block;
   -webkit-box-flex: 1;
   -webkit-flex-grow: 1;
       -ms-flex-positive: 1;
           flex-grow: 1;
   margin-bottom: 0;
-  opacity: 1;
-  -webkit-transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
-  transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
-  display: inline-block;
   padding-left: 12px;
-  color: #CACACA;
+  color: #cacaca;
   font-weight: 400;
   font-size: var(--zaui-font-size-md, 14px);
+  opacity: 1;
+  -webkit-transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
+  transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
 }
 .pro-layout-open-menu .anticon-caret-down {
-  color: #CACACA;
+  top: auto;
+  color: #cacaca;
   -webkit-transform: rotateZ(0deg);
           transform: rotateZ(0deg);
-  top: auto;
   -webkit-transition: all 0.1s ease-in;
   transition: all 0.1s ease-in;
 }
 .pro-layout-open-menu .ant-menu-submenu-open .anticon-caret-down {
+  color: #fff;
   -webkit-transform: rotateZ(180deg);
           transform: rotateZ(180deg);
-  color: #fff;
 }
 .pro-layout-open-menu .ant-menu-submenu-open .ant-menu-submenu-inline .anticon-caret-down {
+  color: #cacaca;
   -webkit-transform: rotateZ(0deg);
           transform: rotateZ(0deg);
-  color: #CACACA;
 }
 .pro-layout-open-menu .ant-menu-submenu-open .ant-menu-submenu-inline.ant-menu-submenu-open .anticon-caret-down {
+  color: #fff;
   -webkit-transform: rotateZ(180deg);
           transform: rotateZ(180deg);
-  color: #fff;
 }
 .pro-layout-open-menu .ant-menu-submenu:hover > .ant-menu-submenu-title > .ant-menu-submenu-expand-icon {
   color: #fff;
 }
+.pro-layout-open-menu .ant-menu-item-selected {
+  background: #000 !important;
+}
+.pro-layout-open-menu .ant-menu-item-selected .ant-menu-title-content h2 {
+  font-weight: bold !important;
+}
 .pro-layout-open-menu .ant-menu-submenu-selected > .ant-menu-submenu-title .ant-menu-title-content div .pro-layout-icon {
   color: #fff;
 }
 .pro-layout-open-menu .ant-menu-submenu-selected > .ant-menu-submenu-title .ant-menu-title-content div h2 {
-  font-weight: bold;
   color: #fff;
 }
 .pro-layout-open-menu .ant-menu-submenu-selected .ant-menu-item-only-child .ant-menu-title-content div .pro-layout-icon {
-  color: #CACACA;
+  color: #cacaca;
 }
 .pro-layout-open-menu .ant-menu-submenu-selected .ant-menu-item-only-child .ant-menu-title-content div h2 {
+  color: #cacaca;
   font-weight: 400;
-  color: #CACACA;
 }
 .pro-layout-sider-menu {
   width: 220px;
@@ -501,12 +506,12 @@
 .pro-layout-row .pro-layout-arrow {
   width: 10px;
   height: 10px;
+  margin-left: -5px;
   background-color: transparent;
   /* 模块背景为透明 */
   border-color: #fff;
   border-style: solid;
   border-width: 2px 2px 0 0;
-  margin-left: -5px;
   -webkit-transform: rotate(45deg);
           transform: rotate(45deg);
 }
@@ -575,10 +580,6 @@
   width: 220px;
 }
 .pro-layout-row .pro-layout-content {
-  margin-left: 48px;
-  padding: 0 var(--zaui-space-size-md, 16px);
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
   z-index: 1;
   -webkit-box-flex: 1;
   -webkit-flex: auto;
@@ -586,6 +587,10 @@
           flex: auto;
   min-height: calc(100vh - 48px);
   margin-top: 48px;
+  margin-left: 48px;
+  padding: 0 var(--zaui-space-size-md, 16px);
+  -webkit-transition: all 0.3s ease-in-out;
+  transition: all 0.3s ease-in-out;
 }
 .pro-layout-row .pro-layout-menu.pro-layout-menu-open .pro-layout-menu-collapsed {
   left: 0;
@@ -614,9 +619,9 @@
           justify-content: center;
   width: 48px;
   height: 48px;
+  background: #292f3b;
   -webkit-transition: all 0.25s ease;
   transition: all 0.25s ease;
-  background: #292f3b;
 }
 .pro-layout-row .pro-layout-menu .pro-layout-menu-collapsed:hover {
   background-color: rgba(185, 185, 189, 0.1);
@@ -681,6 +686,9 @@
   border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
   padding-bottom: var(--zaui-space-size-sm, 8px) !important;
 }
+.pro-collapse.pro-collapse-card .pro-collapse-panel .ant-collapse-header {
+  border-radius: var(--zaui-border-radius, 8px) !important;
+}
 .pro-collapse.pro-collapse-no-title .ant-collapse-header {
   display: none !important;
 }
@@ -748,7 +756,7 @@
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-header {
   padding: 0 8px 6px !important;
-  border-bottom: 2px solid #dee0e3;
+  border-bottom: 1px solid #dee0e3;
   margin: 0 -8px;
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-header .ant-collapse-arrow {
@@ -1199,77 +1207,91 @@
           box-shadow: 2px 0px 5px 0px rgba(0, 55, 93, 0.1);
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-title-content div .pro-layout-icon {
-  color: var(--zaui-text, #343434);
   position: relative;
   z-index: 1;
+  color: var(--zaui-text, #343434);
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list {
+  border-right: 1px solid #f0f0f0;
+}
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li {
   position: relative;
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li > div {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li > div {
   position: relative;
   z-index: 1;
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li.active {
   background: transparent;
+  border-radius: var(--zaui-border-radius, 8px);
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active div .pro-layout-icon {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li.active div .pro-layout-icon {
   color: #fff;
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active::before {
-  content: '';
-  border-radius: var(--zaui-border-radius, 8px);
-  background-color: var(--zaui-brand, #006aff);
-  height: 38px;
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li.active::before {
   position: absolute;
-  left: 5px;
   top: 4px;
+  left: 5px;
   width: calc(100% - 10px);
+  height: 38px;
+  background-color: var(--zaui-brand, #006aff);
+  border-radius: var(--zaui-border-radius, 8px);
   opacity: 1 !important;
+  content: '';
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li:hover {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li:hover {
   background: transparent;
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li:hover::before {
-  content: '';
-  border-radius: var(--zaui-border-radius, 8px);
-  background-color: var(--zaui-brand, #006aff);
-  height: 38px;
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li:hover::before {
   position: absolute;
-  left: 5px;
   top: 4px;
+  left: 5px;
   width: calc(100% - 10px);
+  height: 38px;
+  background-color: var(--zaui-brand, #006aff);
+  border-radius: var(--zaui-border-radius, 8px);
   opacity: 0.08;
+  content: '';
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li div .pro-layout-icon {
+.pro-layout.pro-layout-light .pro-layout-menu-fold .pro-layout-menu-fold-list li div .pro-layout-icon {
   color: var(--zaui-text, #343434);
 }
-.pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active {
-  border-radius: var(--zaui-border-radius, 8px);
-}
 .pro-layout.pro-layout-light .pro-layout-menu-collapsed {
   position: relative;
+  background: var(--zaui-base-bg, #fff);
+  border-right: 1px solid #f0f0f0;
 }
-.pro-layout.pro-layout-light .pro-layout-menu-collapsed::before {
+.pro-layout.pro-layout-light .pro-layout-menu-collapsed:hover {
+  background: transparent !important;
+}
+.pro-layout.pro-layout-light .pro-layout-menu-collapsed:hover::after {
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  width: calc(100% - 10px);
+  height: 40px;
+  background-color: var(--zaui-brand, #006aff);
+  border-radius: var(--zaui-border-radius, 8px);
+  opacity: 0.08;
   content: '';
-  height: 1px;
-  background: #DEE0E3;
-  width: calc(100% - 16px);
+}
+.pro-layout.pro-layout-light .pro-layout-menu-collapsed::before {
   position: absolute;
   top: 0;
   left: var(--zaui-space-size-sm, 8px);
+  width: calc(100% - 16px);
+  height: 1px;
+  background: #dee0e3;
+  content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-row .pro-layout-arrow {
   border-color: var(--zaui-text, #343434);
 }
-.pro-layout.pro-layout-light .pro-layout-menu-collapsed {
-  background: var(--zaui-base-bg, #fff);
-}
 .pro-layout.pro-layout-light .ant-menu-root {
   overflow-x: hidden !important;
 }
 .pro-layout.pro-layout-light .anticon-caret-down {
-  color: #CACACA !important;
+  color: #cacaca !important;
 }
 .pro-layout.pro-layout-light .pro-layout-row .pro-layout-menu {
   background: var(--zaui-base-bg, #ffffff);
@@ -1282,19 +1304,19 @@
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item:hover,
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-submenu-title:hover {
-  background: transparent;
   position: relative;
+  background: transparent;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item:hover:before,
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-submenu-title:hover:before {
-  content: '';
-  border-radius: var(--zaui-border-radius, 8px);
-  background-color: var(--zaui-brand, #006aff);
-  opacity: 0.08;
-  height: 38px;
   position: absolute;
   left: var(--zaui-space-size-sm, 8px);
   width: calc(100% - 16px);
+  height: 38px;
+  background-color: var(--zaui-brand, #006aff);
+  border-radius: var(--zaui-border-radius, 8px);
+  opacity: 0.08;
+  content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected {
   background: transparent !important;
@@ -1309,10 +1331,6 @@
   min-height: calc(100vh - 80px);
 }
 .pro-layout .pro-layout-content {
-  margin-left: 48px;
-  padding: 0 var(--zaui-space-size-lg, 32px);
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
   z-index: 1;
   -webkit-box-flex: 1;
   -webkit-flex: auto;
@@ -1320,10 +1338,14 @@
           flex: auto;
   min-height: calc(100vh - 48px);
   margin-top: 48px;
+  margin-left: 48px;
+  padding: 0 var(--zaui-space-size-lg, 32px);
+  -webkit-transition: all 0.3s ease-in-out;
+  transition: all 0.3s ease-in-out;
 }
 .pro-layout .pro-layout-content.pro-layout-has-notice {
-  margin-top: 80px;
   min-height: calc(100vh - 80px);
+  margin-top: 80px;
 }
 .pro-layout .pro-layout-row-pure .pro-layout-content {
   margin: 0 !important;
@@ -2331,13 +2353,13 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper:first-child,
 .pro-group .ant-space-compact .ant-select:first-child {
-  border-start-start-radius: var(--zaui-border-radius, 8px);
-  border-end-start-radius: var(--zaui-border-radius, 8px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper:last-child,
 .pro-group .ant-space-compact .ant-select:last-child {
-  border-start-end-radius: var(--zaui-border-radius, 8px);
-  border-end-end-radius: var(--zaui-border-radius, 8px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 .pro-group .ant-space-compact .ant-select .ant-select-selector {
   border-start-end-radius: 0;
@@ -2346,12 +2368,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-end-start-radius: 0;
 }
 .pro-group .ant-space-compact .ant-select:first-child .ant-select-selector {
-  border-start-start-radius: var(--zaui-border-radius, 8px);
-  border-end-start-radius: var(--zaui-border-radius, 8px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 .pro-group .ant-space-compact .ant-select:last-child .ant-select-selector {
-  border-start-end-radius: var(--zaui-border-radius, 8px);
-  border-end-end-radius: var(--zaui-border-radius, 8px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper-status-error ~ .group-separator {
   color: var(--ant-error-color);
@@ -4462,15 +4484,48 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  width: 34px;
+  height: 34px;
+  background: #d8e6ff;
+  border-radius: var(--zaui-border-radius, 8px);
+  cursor: pointer;
+}
+.pro-theme-tools .setting-icon {
+  margin-top: -1px;
+}
+.pro-theme-tools .setting-icon div {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+}
+.pro-theme-tools.pro-theme-tools-follow {
+  background: var(--ant-primary-1);
 }
 .pro-theme-tools.pro-theme-tools-follow svg {
   color: var(--zaui-brand, #006aff);
 }
 .pro-theme-tools .anticon {
-  color: var(--zaui-brand, #006aff);
+  color: var(--zaui-text, #343434);
 }
 .pro-theme-tools .anticon svg {
-  font-size: var(--zaui-font-size-lg-title, 24px);
+  font-size: 20px;
 }
 .pro-theme-tools-drawer .ant-drawer-body {
   padding: 32px;
@@ -4483,23 +4538,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-theme-tools-drawer .copy-btn {
   position: absolute;
-  width: calc(100% - 64px);
   bottom: 20px;
   left: 32px;
   z-index: 10;
+  width: calc(100% - 64px);
 }
 .pro-theme-tools-drawer .pro-theme-tools-box {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+          flex-wrap: wrap;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
-  -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-          flex-wrap: wrap;
 }
 .pro-theme-tools-drawer .pro-theme-tools-space {
   margin-bottom: var(--zaui-space-size-md, 16px);

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction, isString } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference } from '../../utils/tools';
@@ -28,9 +28,8 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
-import locale from '../../../locale';
 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,
@@ -141,7 +140,7 @@ var RenderField = function RenderField(_ref) {
   var formItemChildProps = _objectSpread({}, _fieldProps);
   // 允许formItem的属性放在column最外层
   var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
-  if (['Switch', 'Checkbox'].includes(type)) {
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
   }
@@ -241,8 +240,6 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = viewRender;
     }
   }
-  var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangePicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "".concat(locale.ProEditTable.select).concat(isString(label) ? label || title : '') : "".concat(locale.ProEditTable.enter).concat(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;
@@ -303,7 +300,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath);
+          row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -355,7 +352,9 @@ var RenderField = function RenderField(_ref) {
               return [].concat(_toConsumableArray(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              form.validateFields(validateFieldKeys);
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
             }
           }
           setState({
@@ -468,8 +467,7 @@ var RenderField = function RenderField(_ref) {
     originalValue = _useListChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
-    name: cellName,
-    placeholder: _placeholder
+    name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
     disabled: _disabled,
     onChange: _onchange,
@@ -487,7 +485,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';
   }
   useEffect(function () {

package/es/ProEditTable/utils/tools.js

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

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

@@ -4,14 +4,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { omit, isFunction } from 'lodash';
-import { useDeepCompareEffect, useCounter } from 'ahooks';
+import { useDeepCompareEffect } from 'ahooks';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
-import { insertSeparator } from './utils';
+import { insertSeparator, transformNamesString } from './utils';
 import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
@@ -24,10 +23,6 @@ var Group = function Group(props) {
     id = props.id,
     value = props.value,
     onFieldChange = props.onFieldChange;
-  var _useCounter = useCounter(0),
-    _useCounter2 = _slicedToArray(_useCounter, 2),
-    num = _useCounter2[0],
-    inc = _useCounter2[1].inc;
   var _ref = ProForm.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -65,13 +60,15 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   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 (isFunction(onFieldChange) && num >= 1) {
+    if (isFunction(onFieldChange) && form.isFieldsTouched(names) && transformNamesString(names).includes(touchName)) {
       onFieldChange(value, form.getFieldsValue(), {
         form: form
       });
     }
-    inc();
   }, [value]);
   return _jsx("div", {
     className: _className,

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

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

package/es/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/es/ProForm/components/combination/Group/utils.js

@@ -33,4 +33,14 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     }
     return result;
   }, []);
+};
+/** 转换names */
+export var transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
 };