@zat-design/sisyphus-react 3.4.2-beta.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);
@@ -2322,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;
@@ -2337,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);
@@ -2752,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 {
@@ -2923,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 {
@@ -3144,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 {
@@ -3390,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;
@@ -3976,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 {
@@ -4187,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;
@@ -4306,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;
@@ -4858,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;
@@ -5226,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);
@@ -5240,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 {
@@ -5255,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 {
@@ -5273,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);
@@ -5286,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/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/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/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 {

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/ProLayout/components/Layout/Menu/style/index.less

@@ -84,7 +84,7 @@
     position        : fixed;
     top             : 48px;
     left            : 0;
-    z-index         : 1;
+    z-index         : 99;
     width           : 48px;
     height          : 100vh;
     min-height      : 100%;

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -15,6 +15,11 @@ export interface TitleListProps {
 }
 export interface ProCollapseProps {
     /**
+   * @description       折叠头部模式
+   * @default           default
+   */
+    mode?: 'default' | 'card';
+    /**
     * @description       折叠头部标题
     * @default           -
     */

package/es/ProLayout/components/ProCollapse/index.js

@@ -26,10 +26,13 @@ var ProCollapse = function ProCollapse(props) {
     _props$folding = props.folding,
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'default' : _props$mode,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
+    'pro-collapse-card': mode === 'card',
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
     'pro-collapse-no-title': !title

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -2,7 +2,23 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
-  background: #f6f8fc;
+  
+  &.pro-collapse-card {
+    border-radius:  var(--zaui-border-radius, 8px);
+    &.pro-collapse-no-title{
+      .pro-collapse-content{
+        border-radius:  var(--zaui-border-radius, 8px) !important;
+      }
+    }
+    .@{ant-prefix}-collapse-header{
+      border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+    }
+    .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-no-title {
     .@{ant-prefix}-collapse-header {
@@ -41,7 +57,6 @@
 
   .@{ant-prefix}-collapse-content-box {
     padding: 0;
-    background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
       padding: var(--zaui-space-size-md, 16px);
@@ -71,7 +86,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);
           transform: translateY(-50%);
           content: '';
         }
@@ -163,7 +178,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);
           transform: translateY(-50%);
           content: '';
         }

package/es/ProLayout/components/ProHeader/style/index.less

@@ -88,7 +88,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-title {
@@ -184,7 +184,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);
           }
 
           &.hidden {

package/es/ProLayout/style/index.less

@@ -53,7 +53,7 @@
 
           &::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;
@@ -69,7 +69,7 @@
 
           &::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;
@@ -89,7 +89,7 @@
 
 
     .pro-layout-menu-fold-list li.active {
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
     }
 
     .pro-layout-menu-collapsed {
@@ -144,7 +144,7 @@
 
       &: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;

package/es/ProTable/style/index.less

@@ -177,7 +177,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);
     }
 
     .varied-cell.empty-cell {
@@ -432,7 +432,7 @@
   .@{ant-prefix}-pagination .@{ant-prefix}-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-footer {

package/es/ProThemeTools/component/PrdTools/style/index.less

@@ -29,7 +29,7 @@
       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);
     }
   }
 

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/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/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/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/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/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 {

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/ProLayout/components/Layout/Menu/style/index.less

@@ -84,7 +84,7 @@
     position        : fixed;
     top             : 48px;
     left            : 0;
-    z-index         : 1;
+    z-index         : 99;
     width           : 48px;
     height          : 100vh;
     min-height      : 100%;

package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -15,6 +15,11 @@ export interface TitleListProps {
 }
 export interface ProCollapseProps {
     /**
+   * @description       折叠头部模式
+   * @default           default
+   */
+    mode?: 'default' | 'card';
+    /**
     * @description       折叠头部标题
     * @default           -
     */

package/lib/ProLayout/components/ProCollapse/index.js

@@ -30,10 +30,13 @@ var ProCollapse = function ProCollapse(props) {
     _props$folding = props.folding,
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'default' : _props$mode,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className;
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
+    'pro-collapse-card': mode === 'card',
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
     'pro-collapse-no-title': !title

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -2,7 +2,23 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
-  background: #f6f8fc;
+  
+  &.pro-collapse-card {
+    border-radius:  var(--zaui-border-radius, 8px);
+    &.pro-collapse-no-title{
+      .pro-collapse-content{
+        border-radius:  var(--zaui-border-radius, 8px) !important;
+      }
+    }
+    .@{ant-prefix}-collapse-header{
+      border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+    }
+    .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-no-title {
     .@{ant-prefix}-collapse-header {
@@ -41,7 +57,6 @@
 
   .@{ant-prefix}-collapse-content-box {
     padding: 0;
-    background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
       padding: var(--zaui-space-size-md, 16px);
@@ -71,7 +86,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);
           transform: translateY(-50%);
           content: '';
         }
@@ -163,7 +178,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);
           transform: translateY(-50%);
           content: '';
         }

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -88,7 +88,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-title {
@@ -184,7 +184,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);
           }
 
           &.hidden {

package/lib/ProLayout/style/index.less

@@ -53,7 +53,7 @@
 
           &::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;
@@ -69,7 +69,7 @@
 
           &::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;
@@ -89,7 +89,7 @@
 
 
     .pro-layout-menu-fold-list li.active {
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
     }
 
     .pro-layout-menu-collapsed {
@@ -144,7 +144,7 @@
 
       &: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;

package/lib/ProTable/style/index.less

@@ -177,7 +177,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);
     }
 
     .varied-cell.empty-cell {
@@ -432,7 +432,7 @@
   .@{ant-prefix}-pagination .@{ant-prefix}-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-footer {

package/lib/ProThemeTools/component/PrdTools/style/index.less

@@ -29,7 +29,7 @@
       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);
     }
   }
 

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/tokens.js

@@ -59,8 +59,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.2-beta.1",
+  "version": "3.4.2-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",