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

package/dist/index.esm.css

@@ -560,7 +560,7 @@
   position: fixed;
   top: 48px;
   left: 0;
-  z-index: 1;
+  z-index: 99;
   width: 48px;
   height: 100vh;
   min-height: 100%;
@@ -668,8 +668,18 @@
   width: 12px;
   margin-right: 0;
 }
-.pro-collapse {
-  background: #f6f8fc;
+.pro-collapse.pro-collapse-card {
+  border-radius: var(--zaui-border-radius, 8px);
+}
+.pro-collapse.pro-collapse-card.pro-collapse-no-title .pro-collapse-content {
+  border-radius: var(--zaui-border-radius, 8px) !important;
+}
+.pro-collapse.pro-collapse-card .ant-collapse-header {
+  border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+}
+.pro-collapse.pro-collapse-card .pro-collapse-content {
+  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-no-title .ant-collapse-header {
   display: none !important;
@@ -698,7 +708,6 @@
 }
 .pro-collapse .ant-collapse-content-box {
   padding: 0;
-  background: var(--zaui-base-bg, #ffffff);
 }
 .pro-collapse .ant-collapse-content-box .pro-collapse-content {
   padding: var(--zaui-space-size-md, 16px);
@@ -726,7 +735,7 @@
   width: 4px;
   height: 14px;
   background: var(--zaui-brand);
-  border-radius: var(--zaui-border-radius-card, 2px);
+  border-radius: var(--zaui-border-radius-card, 4px);
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
   content: '';
@@ -787,7 +796,7 @@
   width: 4px;
   height: 14px;
   background: var(--zaui-brand);
-  border-radius: var(--zaui-border-radius-card, 2px);
+  border-radius: var(--zaui-border-radius-card, 4px);
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
   content: '';
@@ -894,7 +903,7 @@
   line-height: 16px;
   white-space: pre;
   background: var(--ant-primary-1, #e6f4ff);
-  border-radius: var(--zaui-border-radius-card, 2px);
+  border-radius: var(--zaui-border-radius-card, 4px);
 }
 .pro-header .pro-header-title {
   padding: 0 var(--zaui-space-size-md, 16px);
@@ -1011,7 +1020,7 @@
   font-style: initial;
   line-height: 24px;
   background: var(--ant-primary-1, #e6f4ff);
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-header .pro-header-top .pro-header-left ul li.hidden {
   display: none;
@@ -1209,7 +1218,7 @@
 }
 .pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active::before {
   content: '';
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
   background-color: var(--zaui-brand, #006aff);
   height: 38px;
   position: absolute;
@@ -1223,7 +1232,7 @@
 }
 .pro-layout.pro-layout-light .pro-layout-menu-fold-list li:hover::before {
   content: '';
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
   background-color: var(--zaui-brand, #006aff);
   height: 38px;
   position: absolute;
@@ -1236,7 +1245,7 @@
   color: var(--zaui-text, #343434);
 }
 .pro-layout.pro-layout-light .pro-layout-menu-fold-list li.active {
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-layout.pro-layout-light .pro-layout-menu-collapsed {
   position: relative;
@@ -1279,7 +1288,7 @@
 .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, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
   background-color: var(--zaui-brand, #006aff);
   opacity: 0.08;
   height: 38px;
@@ -1651,7 +1660,7 @@
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
   background: var(--zaui-contract-bg, #fffaa1);
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .ant-table-body .varied-cell.empty-cell {
   width: 24.5px;
@@ -1868,7 +1877,7 @@
 .pro-table .ant-pagination .ant-pagination-item-active a {
   color: #ffffff;
   background: var(--zaui-brand, #006aff) !important;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .pro-table-footer.no-page {
   margin-top: var(--zaui-space-size-md, 16px);
@@ -2297,6 +2306,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
           margin-inline-start: -1px;
   border-start-start-radius: 0;
   border-end-start-radius: 0;
+  padding: 0 12px;
+  background-color: #fff;
+  cursor: default;
 }
 .pro-group .ant-space-compact .pro-modal-select {
   margin-left: -1px;
@@ -2319,13 +2331,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, 4px);
-  border-end-start-radius: var(--zaui-border-radius, 4px);
+  border-start-start-radius: var(--zaui-border-radius, 8px);
+  border-end-start-radius: var(--zaui-border-radius, 8px);
 }
 .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, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: var(--zaui-border-radius, 8px);
+  border-end-end-radius: var(--zaui-border-radius, 8px);
 }
 .pro-group .ant-space-compact .ant-select .ant-select-selector {
   border-start-end-radius: 0;
@@ -2334,12 +2346,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, 4px);
-  border-end-start-radius: var(--zaui-border-radius, 4px);
+  border-start-start-radius: var(--zaui-border-radius, 8px);
+  border-end-start-radius: var(--zaui-border-radius, 8px);
 }
 .pro-group .ant-space-compact .ant-select:last-child .ant-select-selector {
-  border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: var(--zaui-border-radius, 8px);
+  border-end-end-radius: var(--zaui-border-radius, 8px);
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper-status-error ~ .group-separator {
   color: var(--ant-error-color);
@@ -2749,7 +2761,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-upload .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);
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box .ant-upload.ant-upload-drag {
@@ -2920,7 +2932,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   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;
 }
 .pro-upload .pro-upload-image .file-item-image {
@@ -3084,93 +3096,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .proupload-modal-preview .ant-modal {
   width: 600px;
 }
-.pro-tree-select .ant-select-selector .check-mark-icon {
-  display: none;
-}
-.pro-tree-select .ant-select.ant-select-single.ant-select-show-arrow:not(.ant-select-show-search).ant-select-open .ant-select-arrow {
-  -webkit-transition: -webkit-transform 300ms ease-in-out;
-  transition: -webkit-transform 300ms ease-in-out;
-  transition: transform 300ms ease-in-out;
-  transition: transform 300ms ease-in-out, -webkit-transform 300ms ease-in-out;
-  -webkit-transform: rotate(180deg);
-          transform: rotate(180deg);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown .highlight-search-text {
-  color: var(--zaui-brand, #006aff);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-list-holder-inner {
-  position: relative!important;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.ant-tree-select-dropdown {
-  width: auto!important;
-  padding: 0px;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .ant-select-tree .ant-select-tree-treenode,
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
-  padding-top: var(--zaui-space-size-xs);
-  padding-bottom: var(--zaui-space-size-xs);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .highlight,
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .highlight {
-  color: red;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode {
-  position: relative;
-  padding-right: 50px;
-  padding-left: 7px;
-  z-index: 0;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:after {
-  content: '';
-  display: none;
-  position: absolute;
-  z-index: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: var(--zaui-brand, #006aff);
-  opacity: 0.1;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode.ant-select-tree-treenode-selected:after {
-  display: block;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
-  background-color: transparent;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected .check-mark-icon {
-  display: block;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:hover {
-  background-color: #f5f5f5;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .check-option-text .check-mark-icon {
-  position: absolute;
-  right: -34px;
-  top: 2px;
-  display: none;
-  color: var(--zaui-list-item-selected-bg);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
-  padding-left: 7px;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode:hover {
-  background-color: #f5f5f5;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
-  padding-right: var(--zaui-space-size-md);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper:hover {
-  background-color: transparent;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-checkbox {
-  margin-top: var(--zaui-space-size-xs);
-  -webkit-align-self: stretch;
-      -ms-flex-item-align: stretch;
-          align-self: stretch;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.ten-count-tree-node .ant-select-tree-switcher-noop {
-  width: var(--zaui-space-size-xs);
-}
 .pro-tree-modal-container .ant-modal-content .ant-modal-body {
   max-height: 498px;
 }
@@ -3228,7 +3153,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   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);
   /* 修改滚动条样式 */
 }
 .pro-tree-modal-box:first-child {
@@ -3447,6 +3372,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item {
   margin: var(--zaui-space-size-sm, 8px) 0;
 }
+.pro-transfer-right .checked-item.dragable .ant-tag > span:first-child {
+  padding: 8px 0;
+  cursor: move;
+}
 .pro-transfer-right .checked-item:first-child {
   margin-top: 0;
 }
@@ -3470,7 +3399,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   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-transfer-right .checked-item .ant-tag .pro-tooltip {
   -webkit-box-flex: 1;
@@ -4056,7 +3985,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .is-cell .ant-form-item .ant-form-item-row .ant-form-item-control .ant-form-item-control-input:hover {
   border: 1px solid #DEE0E3;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
   text-indent: 5px;
 }
 .pro-edit-table .drag-wrapper {
@@ -4267,7 +4196,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-label .anticon-edit:active {
   background: #E3E8F0;
-  border-radius: var(--zaui-border-radius-card, 2px);
+  border-radius: var(--zaui-border-radius-card, 4px);
 }
 .pro-edit-label.pro-edit-label-small {
   height: 24px;
@@ -4386,7 +4315,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 4px;
   height: 14px;
   background: var(--zaui-brand, #006aff);
-  border-radius: var(zaui-border-radius-card, 2px);
+  border-radius: var(zaui-border-radius-card, 4px);
 }
 .pro-theme-prd-tools-drawer .pro-theme-color {
   display: -webkit-box;
@@ -4938,8 +4867,8 @@ input[type='button'] {
   --zaui-table-nested-bg: #fafcfe;
   --zaui-contract-bg: #fffaa1;
   --zaui-form-label-width: 130px;
-  --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;
@@ -5306,7 +5235,7 @@ input[type='button'] {
   line-height: 32px;
   background-color: #f7f9fa;
   border: 0;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .ant-pagination .ant-pagination-item a {
   color: var(--zaui-text, #464646);
@@ -5320,7 +5249,7 @@ input[type='button'] {
 .ant-pagination .ant-pagination-item-active a {
   color: #fff;
   background: var(--zaui-brand, #006aff);
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .ant-pagination .ant-pagination-item-active:focus-visible a,
 .ant-pagination .ant-pagination-item-active:hover a {
@@ -5335,7 +5264,7 @@ input[type='button'] {
   line-height: 30px;
   background-color: #f7f9fa;
   border: 0;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .ant-pagination .ant-pagination-prev svg,
 .ant-pagination .ant-pagination-next svg {
@@ -5353,7 +5282,7 @@ input[type='button'] {
   line-height: 32px;
   background-color: #fafafa;
   border: 0;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .ant-pagination .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
   color: var(--zaui-text, #464646);
@@ -5366,7 +5295,7 @@ input[type='button'] {
   position: relative;
   background-color: #fafafa;
   border: 0;
-  border-radius: var(--zaui-border-radius, 4px);
+  border-radius: var(--zaui-border-radius, 8px);
 }
 .ant-pagination .ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-link-icon,
 .ant-pagination .ant-pagination-jump-next .ant-pagination-item-container .ant-pagination-item-link-icon {

package/es/ProConfigProvider/index.js

@@ -13,7 +13,14 @@ var initialState = {
   ProEnum: {
     dics: {}
   },
-  forms: {}
+  forms: {},
+  ProIcon: {
+    mode: 'icon',
+    mapList: [{
+      type: 'view',
+      text: '查看'
+    }]
+  }
 };
 export var ProConfigContext = /*#__PURE__*/React.createContext({
   state: initialState,

package/es/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/es/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/es/ProEditTable/utils/index.js

@@ -202,7 +202,9 @@ export var transformColumns = function transformColumns() {
       ellipsis = item.ellipsis,
       key = item.key,
       tooltip = item.tooltip,
-      suffix = item.suffix;
+      suffix = item.suffix,
+      before = item.before,
+      after = item.after;
     // column设置label时，权重最高
     var columnTitle = label || title;
     if (typeof columnTitle === 'string') {
@@ -214,7 +216,7 @@ export var transformColumns = function transformColumns() {
           resetProps = _objectWithoutProperties(_ref2, _excluded2);
         item.title = _jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
+          children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
             children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
@@ -223,12 +225,12 @@ export var transformColumns = function transformColumns() {
               className: "icon-tip",
               src: tipSvg
             })
-          })), suffix]
+          })), suffix || after]
         });
       } else {
         item.title = _jsxs("span", {
           className: "pro-edit-table-title",
-          children: [columnTitle, suffix]
+          children: [before, columnTitle, suffix || after]
         });
       }
     }

package/es/ProEnum/style/index.less

@@ -42,6 +42,7 @@
       padding: var(--zaui-space-size-sm) var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
+      border: 1px solid transparent;
       cursor: pointer;
 
       &::after {
@@ -64,7 +65,7 @@
         border-top-right-radius: var(--zaui-space-size-xs);
         border-bottom-right-radius: var(--zaui-space-size-xs);
         &::after {
-          width: 0;
+          background: transparent;
         }
       }
     }
@@ -73,12 +74,12 @@
       color: var(--zaui-brand);
       border: 1px solid var(--zaui-brand);
       &::after {
-        width: 0;
+        background: transparent;
       }
     }
 
     .pro-enum-group-item-disabled-after::after {
-      width: 0 !important;
+      background: transparent;
     }
 
     .pro-enum-group-item-disabled {

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

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { isFunction, isString } from 'lodash';
+import { isFunction, isString, isObject } from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -30,7 +30,7 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && moment.isMoment(value)) {
+    } else if (typeof format === 'string' && isObject(value)) {
       viewChildren = value.format(format);
     } else if (isFunction(format)) {
       viewChildren = format(value);

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

@@ -73,6 +73,9 @@ var InputNumber = function InputNumber(props) {
           },
           parser: function parser(value) {
             var num = Number(value.replace(/[\s,]+/g, ''));
+            if (value === '') {
+              return value;
+            }
             return Number.isNaN(num) ? value : num.toFixed((props === null || props === void 0 ? void 0 : props.precision) || 2);
           }
         };

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

@@ -4,9 +4,11 @@ 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 } from 'lodash';
+import { omit, isFunction } from 'lodash';
+import { useDeepCompareEffect, useCounter } from 'ahooks';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
 import { insertSeparator } from './utils';
@@ -19,7 +21,13 @@ var Group = function Group(props) {
     space = _props$space === void 0 ? {
       size: 12
     } : _props$space,
-    id = props.id;
+    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,
@@ -56,6 +64,15 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
+  useDeepCompareEffect(function () {
+    // 模拟change,初始化不执行onFieldChange
+    if (isFunction(onFieldChange) && num >= 1) {
+      onFieldChange(value, form.getFieldsValue(), {
+        form: form
+      });
+    }
+    inc();
+  }, [value]);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -22,4 +23,7 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+    }) => any;
 }

package/es/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: var(--zaui-border-radius, 8px);
+  border-end-start-radius: var(--zaui-border-radius, 8px);
 }
 
 .end-radius() {
-  border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: var(--zaui-border-radius, 8px);
+  border-end-end-radius: var(--zaui-border-radius, 8px);
 }
 
 .pro-group {
@@ -74,6 +74,9 @@
       margin-inline-start: -1px;
       border-start-start-radius: 0;
       border-end-start-radius: 0;
+      padding: 0 12px;
+      background-color: #fff;
+      cursor: default;
     }
     .pro-modal-select {
       margin-left: -1px;

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

@@ -11,7 +11,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
-import { omit } from 'lodash';
+import { omit, isObject } from 'lodash';
 import moment from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (moment.isMoment(value)) {
+    if (isObject(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -73,6 +73,12 @@ export var ProTimeLimit = function ProTimeLimit(props) {
         children: foreverText
       });
     }
+    if (isObject(value)) {
+      return _jsx(Container, {
+        viewEmpty: viewEmpty,
+        children: value.format(format)
+      });
+    }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: props.value

package/es/ProForm/components/index.d.ts

@@ -24,7 +24,6 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/es/ProForm/components/index.js

@@ -26,7 +26,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
+// export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 // footer组件