acud 0.0.66 → 0.0.69

package/lib/date-picker/style/panel.less

@@ -20,6 +20,7 @@
             line-height: 8*@P;
             color: @G2;
             > li {
+                .basic-tp-config(@date-picker-header-tp);
                 margin-right: 6*@P;
                 display: inline-block;
                 cursor: pointer;
@@ -28,7 +29,7 @@
 
         &.@{picker-prefix-cls}-panel-has-range {
             .@{picker-prefix-cls}-date-panel .@{picker-prefix-cls}-content td:not(.@{picker-prefix-cls}-cell-range-hover-start):not(.@{picker-prefix-cls}-cell-range-hover-end):not(.@{picker-prefix-cls}-cell-range-start):not(.@{picker-prefix-cls}-cell-range-end):not(.@{picker-prefix-cls}-cell-today):hover {
-                background-color: @G10 !important;
+                // background-color: @G10 !important;
 
                 .@{picker-prefix-cls}-cell-inner {
                     background-color: @G10 !important;
@@ -53,7 +54,7 @@
         width: @date-picker-panel-width;
     }
 
-    &-month-panel {
+    &-month-panel, &-year-panel {
         .@{picker-prefix-cls}-cell-in-range, .@{picker-prefix-cls}-cell-range-hover {
             &:not(:first-child)::before {
                 width: 3*@P;
@@ -62,17 +63,21 @@
             }
         }
         .@{picker-prefix-cls}-cell-in-view {
-            &.@{picker-prefix-cls}-cell-in-range {
+            &.@{picker-prefix-cls}-cell-in-range { 
                 &.@{picker-prefix-cls}-cell-range-hover-end, &.@{picker-prefix-cls}-cell-range-hover-start {
                     &:hover {
-                        background-color: @B2;
+                        .@{picker-prefix-cls}-cell-inner {
+                            background-color: @B2;
+                        }
                     }
                 }
             }
 
             &.@{picker-prefix-cls}-cell-range-hover-end, &.@{picker-prefix-cls}-cell-range-hover-start {
-                &:hover {
-                    background: @picker-basic-cell-active-with-range-color;
+                &:not(.@{picker-prefix-cls}-cell-in-range):not(.@{picker-prefix-cls}-cell-selected):not(.@{picker-prefix-cls}-cell-range-end):not(.@{picker-prefix-cls}-cell-range-start):hover {
+                    .@{picker-prefix-cls}-cell-inner {
+                        background: @picker-basic-cell-active-with-range-color;
+                    }
                 }
             }
         }
@@ -123,8 +128,10 @@
             .basic-tp-config(@date-picker-date-tp);
 
             button {
+                font-size: @T2;
                 color: inherit;
-                font-weight: inherit;
+                font-weight: 400;
+                .basic-tp-config(@date-picker-header-tp);
 
                 &:not(:first-child) {
                     margin-left: 2*@P;
@@ -227,7 +234,7 @@
         }
 
         td {
-            .basic-p-config(@date-picker-date-p);
+            // .basic-p-config(@date-picker-date-p);
         }
     }
 
@@ -279,7 +286,7 @@
             }
         }
 
-        &-today:not(&-in-range):not(&-range-hover):not(&-range-end):not(&-selected):not(&-range-start) {
+        &-today:not(&-in-range):not(&-range-hover):not(&-range-end):not(&-selected):not(&-range-start):not(&-disabled) {
             background-color: transparent !important;
             .@{picker-prefix-cls}-cell-inner {
                 background-color: transparent !important;
@@ -344,6 +351,12 @@
             }
         }
 
+        &-in-view&-range-start&-range-end {
+            &::before {
+                background: transparent;
+            }
+        }
+
         &-in-view&-range-start&-range-end&-selected, &-in-view&-range-start&-range-hover-start&-range-hover-end {
             &::before {
                 background: transparent !important;
@@ -421,6 +434,10 @@
             left: 0;
         }
 
+        .@{picker-prefix-cls}-date-panel &-in-view&-range-hover:not(:first-child)::before {
+            left: -3*@P + 3;
+        }
+
         // Hover with range start & end
         &-range-hover&-range-start::after {
             right: 50%;
@@ -529,7 +546,7 @@
 
     &-date-panel {
         .@{picker-prefix-cls}-content td:hover {
-            border-radius: @R2;
+            // border-radius: @R2;
 
             // &:not(.@{picker-prefix-cls}-cell-in-range) {
             //     background-color: transparent;
@@ -569,9 +586,11 @@
         }
 
         .@{picker-prefix-cls}-cell-in-view {
-            &.@{picker-prefix-cls}-cell-range-hover-end, &.@{picker-prefix-cls}-cell-range-hover-start {
+            &.@{picker-prefix-cls}-cell-range-hover-end:not(.@{picker-prefix-cls}-cell-range-end), &.@{picker-prefix-cls}-cell-range-hover-start:not(.@{picker-prefix-cls}-cell-range-start) {
                 &:hover {
-                    background-color: @picker-basic-cell-active-with-range-color;
+                    .@{picker-prefix-cls}-cell-inner {
+                        background-color: @picker-basic-cell-active-with-range-color;
+                    }
                 }
             }
         }
@@ -584,6 +603,9 @@
         // line-height: @picker-text-height - 2 * @border-width-base;
         text-align: center;
         border-top: 1px solid @G8;
+        font-size: @T2;
+        line-height: 24px;
+        cursor: pointer;
         // border-bottom: @border-width-base @border-style-base transparent;
 
         .@{picker-prefix-cls}-panel & {
@@ -628,8 +650,23 @@
 
     // ===================== Decade Panel =====================
     &-decade-panel {
-        .@{picker-cell-inner-cls} {
-            padding: 0 (@padding-xs / 2);
+        tr {
+            display: block;
+            margin: 3*@P 0;
+
+            td {
+                display: inline-block;
+                margin-right: 3*@P;
+                width: 79px;
+
+                &:last-child {
+                    margin-right: 0;
+                }
+            }
+
+            .@{picker-cell-inner-cls} {
+                width: 100%;
+            }
         }
 
         .@{picker-prefix-cls}-cell::before {
@@ -650,7 +687,7 @@
             td {
                 display: inline-block;
                 margin-right: 3*@P;
-                border-radius: @R2;
+                // border-radius: @R2;
 
                 &:last-child {
                     margin-right: 0;
@@ -695,6 +732,14 @@
         .@{picker-prefix-cls}-date-panel {
             width: 234px;
         }
+
+        .@{picker-prefix-cls}-decade-panel {
+            width: 285px;
+
+            .@{picker-prefix-cls}-header, .@{picker-prefix-cls}-body {
+                padding-right: 12px !important;
+            }
+        }
     }
 
     // ====================== Week Panel ======================
@@ -741,7 +786,7 @@
         }
     }
 
-    &-date-panel, &-month-panel {
+    &-date-panel, &-month-panel, &-year-panel {
         tr {
             td.@{picker-prefix-cls}-cell-in-view.@{picker-prefix-cls}-cell-in-range, td.@{picker-prefix-cls}-cell-range-hover {
                 &:first-child {
@@ -753,8 +798,28 @@
                 }
             }
 
-            td.@{picker-prefix-cls}-cell-range-hover-end {
-                border-radius: 0 @R2 @R2 0;
+            td.@{picker-prefix-cls}-cell-range-hover-end:not(.@{picker-prefix-cls}-cell-range-end):not(.@{picker-prefix-cls}-cell-in-range) {
+                .@{picker-prefix-cls}-cell-inner {
+                    border-radius: 0 @R2 @R2 0;
+                }
+
+                &:first-child, &.@{picker-prefix-cls}-cell-selected {
+                    .@{picker-prefix-cls}-cell-inner {
+                        border-radius: @R2;
+                    }
+                }
+            }
+
+            td.@{picker-prefix-cls}-cell-range-hover-start:not(.@{picker-prefix-cls}-cell-selected):not(.@{picker-prefix-cls}-cell-range-start):not(.@{picker-prefix-cls}-cell-in-range) {
+                .@{picker-prefix-cls}-cell-inner {
+                    border-radius: @R2 0 0 @R2;
+                }
+
+                &:last-child, &.@{picker-prefix-cls}-cell-selected {
+                    .@{picker-prefix-cls}-cell-inner {
+                        border-radius: @R2;
+                    }
+                }
             }
         }
     }

package/lib/dropdown/dropdown.js

@@ -140,12 +140,11 @@ var Dropdown = function Dropdown(props) {
     return fixedModeOverlay;
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_rcDropdown.RcDropdown, (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement(_rcDropdown.RcDropdown, (0, _extends2["default"])({}, rest, {
     prefixCls: prefixCls,
     trigger: triggerActions,
     onVisibleChange: onVisibleChange,
-    visible: mergedVisible
-  }, rest, {
+    visible: mergedVisible,
     overlay: function overlay() {
       return renderOverlay();
     },

package/lib/dropdown/rc-dropdown/Dropdown.js

@@ -94,6 +94,7 @@ function Dropdown(props, ref) {
     var onOverlayClick = props.onOverlayClick;
     var overlayProps = getOverlayElement().props;
     setTriggerVisible(false);
+    onVisibleChange(false);
 
     if (onOverlayClick) {
       onOverlayClick(e);

package/lib/form/style/horizontal.less

@@ -9,6 +9,8 @@
     .@{form-item-prefix-cls}-label {
         flex-grow: 0;
         line-height: @form-line-height-base;
+        padding-left: ~"calc(.5em + @{P})";
+        box-sizing: content-box;
 
         &:not([class*=~"' @{acud-prefix}-col-'"]) {
             margin-right: 4 * @P;
@@ -17,7 +19,7 @@
         > label {
             &.@{form-item-prefix-cls}-required:not(.@{form-item-prefix-cls}-required-mark-optional)::before {
                 text-indent: -.5em;
-                margin-left: -4px;
+                margin-left: -@P;
             }
         }
     }

package/lib/form/style/index.css

@@ -111,6 +111,8 @@
 .acud-form-horizontal .acud-form-item-label {
   flex-grow: 0;
   line-height: 1.6667;
+  padding-left: calc(.5em + 4px);
+  box-sizing: content-box;
 }
 .acud-form-horizontal .acud-form-item-label:not([class*=' acud-col-']) {
   margin-right: 16px;

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export { default as Button } from './button';
 export { default as Carousel } from './carousel';
 export { default as Cascader } from './cascader';
 export { default as Checkbox } from './checkbox';
+export { default as Clear } from './clear';
 export { default as Col } from './col';
 export { default as Collapse } from './collapse';
 export { default as ConfigProvider } from './config-provider';

package/lib/index.js

@@ -71,6 +71,12 @@ Object.defineProperty(exports, "Checkbox", {
     return _checkbox["default"];
   }
 });
+Object.defineProperty(exports, "Clear", {
+  enumerable: true,
+  get: function get() {
+    return _clear["default"];
+  }
+});
 Object.defineProperty(exports, "Col", {
   enumerable: true,
   get: function get() {
@@ -324,6 +330,8 @@ var _cascader = _interopRequireDefault(require("./cascader"));
 
 var _checkbox = _interopRequireDefault(require("./checkbox"));
 
+var _clear = _interopRequireDefault(require("./clear"));
+
 var _col = _interopRequireDefault(require("./col"));
 
 var _collapse = _interopRequireDefault(require("./collapse"));

package/lib/menu/menu.d.ts

@@ -8,8 +8,9 @@ import { MenuItemInterface } from './MenuItem';
 import { SubMenuInterface } from './SubMenu';
 import { MenuHeadInterface } from './MenuHead';
 import { HeaderMenuProps } from './header';
+import { GlobalSiderBarProps } from './globalSilderBar';
 import { BaseMenuProps } from './baseMenu';
-export interface MenuProps extends RcMenuProps, HeaderMenuProps, BaseMenuProps {
+export interface MenuProps extends RcMenuProps, HeaderMenuProps, BaseMenuProps, GlobalSiderBarProps {
     iconList?: React.ReactNode[];
     scope?: 'global' | 'local';
     mode?: 'inline' | 'horizontal' | 'inline';

package/lib/modal/DialogBox.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 export interface ModalFuncProps {
     /** 对话框标题 */
-    title?: string;
+    title?: React.ReactNode;
     /** 对话框内容 */
     content?: React.ReactNode;
     /** 点击确定回调 */

package/lib/modal/Modal.d.ts

@@ -26,8 +26,6 @@ export interface ModalProps {
     afterClose?: () => void;
     /** 弹框宽度 */
     width?: number;
-    /** 弹框高度 */
-    height?: number;
     /** 底部内容 */
     footer?: React.ReactNode;
     /** 确认按钮文字 */

package/lib/modal/style/index.css

@@ -55,26 +55,46 @@
   -webkit-overflow-scrolling: touch;
   z-index: 1000;
 }
-.acud-modal-sm > .acud-modal-content {
+.acud-modal-sm {
   width: 520px;
   min-height: 240px;
   max-height: 560px;
 }
-.acud-modal-md > .acud-modal-content {
+.acud-modal-sm > .acud-modal-content {
+  width: 100%;
+  min-height: 240px;
+  max-height: 560px;
+}
+.acud-modal-md {
   width: 800px;
   min-height: 400px;
   max-height: 560px;
 }
-.acud-modal-lg > .acud-modal-content {
+.acud-modal-md > .acud-modal-content {
+  width: 100%;
+  min-height: 400px;
+  max-height: 560px;
+}
+.acud-modal-lg {
   width: 1120px;
   min-height: 480px;
   max-height: 560px;
 }
-.acud-modal-xl > .acud-modal-content {
+.acud-modal-lg > .acud-modal-content {
+  width: 100%;
+  min-height: 480px;
+  max-height: 560px;
+}
+.acud-modal-xl {
   width: 1200px;
   min-height: 480px;
   max-height: 560px;
 }
+.acud-modal-xl > .acud-modal-content {
+  width: 100%;
+  min-height: 480px;
+  max-height: 560px;
+}
 .acud-modal-content {
   position: relative;
   background-color: #FFFFFF;
@@ -130,13 +150,14 @@
   word-wrap: break-word;
 }
 .acud-modal-body {
-  padding: 16px 24px 24px;
+  margin: 16px 24px 24px;
   font-size: 12px;
   font-weight: 400;
   line-height: 20px;
   word-wrap: break-word;
   color: #151B26;
   flex: 1;
+  overflow-y: auto;
 }
 .acud-modal-footer {
   padding: 0 24px 24px;
@@ -171,14 +192,13 @@
   padding-right: 12px;
 }
 .acud-modal-dialogbox-content {
-  width: 400px;
+  width: 100%;
   padding-left: 32px;
 }
 .acud-modal-dialogbox .acud-modal-title .acudicon {
   font-size: 20px;
 }
 .acud-modal-dialogbox > .acud-modal-content {
-  width: 400px;
   min-height: 184px;
 }
 .acud-modal-dialogbox-warning .acud-modal-dialogbox-icon {

package/lib/modal/style/index.less

@@ -18,20 +18,36 @@
     width: auto;
     max-width: calc(100vw - 32px);
 
+    &-sm {
+        .modal-size-config(sm, false);
+    }
+
     &-sm > &-content {
-        .modal-size-config(sm);
+        .modal-size-config(sm, true);
+    }
+
+    &-md {
+        .modal-size-config(md, false);
     }
 
     &-md > &-content {
-        .modal-size-config(md);
+        .modal-size-config(md, true);
+    }
+
+    &-lg {
+        .modal-size-config(lg, false);
     }
 
     &-lg > &-content {
-        .modal-size-config(lg);
+        .modal-size-config(lg, true);
+    }
+
+    &-xl {
+        .modal-size-config(xl, false);
     }
 
     &-xl > &-content {
-        .modal-size-config(xl);
+        .modal-size-config(xl, true);
     }
 
     // 弹框内容
@@ -100,13 +116,14 @@
 
     // 内容body部分
     &-body {
-        padding: @modal-body-padding;
+        margin: @modal-body-margin;
         font-size: @modal-body-font-size;
         font-weight: @modal-body-font-weight;
         line-height: @modal-body-line-height;
         word-wrap: break-word;
         color: @modal-body-font-color;
         flex: 1;
+        overflow-y: auto;
     }
 
     // 内容footer部分
@@ -150,7 +167,7 @@
     }
 
     &-content {
-        width: @P * 100;
+        width: 100%;
         padding-left: @P * 3 + @T6;
     }
 
@@ -161,7 +178,6 @@
     }
 
     & > .@{modal-prefix-cls}-content {
-        width: @P * 100;
         min-height: @P * 46;
     }
 }

package/lib/modal/style/mixin.less

@@ -37,11 +37,11 @@
   }
 }
 
-.modal-size-config(@type) {
+.modal-size-config(@type, @content) {
     @width: ~'modal-width-@{type}';
     @min-height: ~'modal-height-@{type}';
     @max-height: ~'modal-max-height-@{type}';
-    width: @@width;
+    width: if(@content, 100%, @@width);
     min-height: @@min-height;
     max-height: @@max-height;
 }

package/lib/progress/CircleProgress.js

@@ -89,7 +89,7 @@ var CircleProgress = function CircleProgress(_ref) {
     style: labelStyles
   }, labelText);
 
-  var iconWidth = _common.sizeRatioMap[size] * 10; // 若信息类型为图标，在成功和异常时，显示图标
+  var iconWidth = _common.sizeRatioMap[size] * 12; // 若信息类型为图标，在成功和异常时，显示图标
 
   if (infoType === 'icon') {
     if (status === 'success') {
@@ -126,7 +126,7 @@ var CircleProgress = function CircleProgress(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("path", {
     d: circlePath,
     stroke: strokeColor || 'currentColor',
-    strokeWidth: strokeWidth,
+    strokeWidth: percent ? strokeWidth : 0,
     strokeLinecap: strokeLinecap,
     fill: "none",
     style: progressStyles

package/lib/progress/LineProgress.js

@@ -84,12 +84,14 @@ var LineProgress = function LineProgress(_ref) {
     if (status === 'success') {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.MultiToneSuccess, {
         className: labelClassNames,
-        color: strokeColor
+        color: strokeColor,
+        width: "16px"
       });
     } else if (status === 'error') {
       ProgressLabel = /*#__PURE__*/_react["default"].createElement(_acudIcon.MultiToneError, {
         className: labelClassNames,
-        color: strokeColor
+        color: strokeColor,
+        width: "16px"
       });
     }
   }

package/lib/radio/Radio.d.ts

@@ -7,6 +7,7 @@ export interface RadioProps {
     disabled?: boolean | undefined;
     children?: React.ReactNode;
     label?: string;
+    className?: string;
     onChange?: (e: Event) => {} | void;
     value?: any;
 }

package/lib/radio/Radio.js

@@ -46,9 +46,10 @@ var InternalRadio = function InternalRadio(props, ref) {
   var _props$prefixCls = props.prefixCls,
       prefixCls = _props$prefixCls === void 0 ? 'acud-radio' : _props$prefixCls,
       children = props.children,
+      className = props.className,
       onChange = props.onChange,
       label = props.label,
-      restProps = __rest(props, ["prefixCls", "children", "onChange", "label"]);
+      restProps = __rest(props, ["prefixCls", "children", "className", "onChange", "label"]);
 
   var radioRef = /*#__PURE__*/_react["default"].createRef();
 
@@ -64,7 +65,7 @@ var InternalRadio = function InternalRadio(props, ref) {
     radioProps.disabled = props.disabled || (context === null || context === void 0 ? void 0 : context.disabled);
   }
 
-  var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), radioProps.disabled), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), radioProps.checked), _classNames));
+  var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), radioProps.disabled), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), radioProps.checked), _classNames), className);
   var handleClick = (0, _react.useCallback)(function (e) {
     var _a;
 

package/lib/radio/RadioButton.js

@@ -44,9 +44,10 @@ var _default = function _default(props) {
   var _props$prefixCls = props.prefixCls,
       prefixCls = _props$prefixCls === void 0 ? 'acud-radio-button' : _props$prefixCls,
       children = props.children,
+      className = props.className,
       onChange = props.onChange,
       label = props.label,
-      restProps = __rest(props, ["prefixCls", "children", "onChange", "label"]);
+      restProps = __rest(props, ["prefixCls", "children", "className", "onChange", "label"]);
 
   var context = (0, _react.useContext)(_context["default"]);
   var radioProps = (0, _extends2["default"])({}, restProps);
@@ -56,7 +57,7 @@ var _default = function _default(props) {
     radioProps.disabled = props.disabled || (context === null || context === void 0 ? void 0 : context.disabled);
   }
 
-  var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), radioProps.disabled), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), radioProps.checked), _classNames));
+  var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), radioProps.disabled), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), radioProps.checked), _classNames), className);
   var handleClick = (0, _react.useCallback)(function (e) {
     var _a;
 

package/lib/radio/RadioGroup.d.ts

@@ -8,6 +8,7 @@ export interface BaseRadioGourpProps {
     optionType?: string;
     options?: RadioProps[];
     children?: React.ReactNode;
+    className?: string;
     onChange?: (e: Event) => {} | void;
 }
 declare const _default: (props: BaseRadioGourpProps) => JSX.Element;

package/lib/radio/RadioGroup.js

@@ -15,6 +15,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _useMergedState3 = _interopRequireDefault(require("../_util/hooks/useMergedState"));
 
 var _Radio = _interopRequireDefault(require("./Radio"));
@@ -34,6 +36,7 @@ var _default = function _default(props) {
       optionType = _props$optionType === void 0 ? 'default' : _props$optionType,
       options = props.options,
       children = props.children,
+      className = props.className,
       onChange = props.onChange;
 
   var _useMergedState = (0, _useMergedState3["default"])(props.defaultValue, {
@@ -57,8 +60,9 @@ var _default = function _default(props) {
     }
   }, [value, disabled, onChange]);
   var Compo = optionType === 'default' ? _Radio["default"] : _Radio["default"].Button;
+  var classNames = (0, _classnames["default"])(prefixCls, className);
   return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefixCls
+    className: classNames
   }, /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
       value: value,

package/lib/radio/context.d.ts

@@ -4,6 +4,7 @@ export interface ContextProps {
     value: any;
     disabled?: boolean;
     name?: string;
+    className?: string;
 }
 declare const RadioGroupContext: import("react").Context<ContextProps>;
 export default RadioGroupContext;

package/lib/style/components.less

@@ -9,6 +9,7 @@
 @import "../carousel/style/index.less";
 @import "../cascader/style/index.less";
 @import "../checkbox/style/index.less";
+@import "../clear/style/index.less";
 @import "../collapse/style/index.less";
 @import "../config-provider/style/index.less";
 @import "../date-picker/style/index.less";

package/lib/style/themes/dark/components/modal.less

@@ -41,7 +41,7 @@
 @modal-close-font-size: @T4;
 
 // Body
-@modal-body-padding: 6*@P 8*@P;
+@modal-body-margin: 4*@P 6*@P 6*@P;
 @modal-body-bg-color: @G11;
 @modal-body-font-size: @T2;
 @modal-body-line-height: 5*@P;