acud 0.0.65 → 0.0.68

package/lib/modal/Modal.js

@@ -87,15 +87,17 @@ var Modal = function Modal(props) {
   var renderFooter = function renderFooter() {
     var okText = props.okText,
         cancelText = props.cancelText,
-        confirmLoading = props.confirmLoading;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_button["default"], {
+        confirmLoading = props.confirmLoading,
+        okButtonProps = props.okButtonProps,
+        cancelButtonProps = props.cancelButtonProps;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_button["default"], (0, _extends2["default"])({
       onClick: handleCancel,
       type: "default"
-    }, cancelText || '取消'), /*#__PURE__*/React.createElement(_button["default"], {
+    }, cancelButtonProps), cancelText || '取消'), /*#__PURE__*/React.createElement(_button["default"], (0, _extends2["default"])({
       onClick: handleOk,
       loading: confirmLoading,
       type: "primary"
-    }, okText || '确定'));
+    }, okButtonProps), okText || '确定'));
   };
 
   var visible = props.visible,

package/lib/modal/style/index.css

@@ -57,23 +57,43 @@
 }
 .acud-modal-sm {
   width: 520px;
-  height: 240px;
-  max-height: 240px;
+  min-height: 240px;
+  max-height: 560px;
+}
+.acud-modal-sm > .acud-modal-content {
+  width: 100%;
+  min-height: 240px;
+  max-height: 560px;
 }
 .acud-modal-md {
   width: 800px;
-  height: 400px;
-  max-height: 400px;
+  min-height: 400px;
+  max-height: 560px;
+}
+.acud-modal-md > .acud-modal-content {
+  width: 100%;
+  min-height: 400px;
+  max-height: 560px;
 }
 .acud-modal-lg {
   width: 1120px;
-  height: 480px;
-  max-height: 480px;
+  min-height: 480px;
+  max-height: 560px;
+}
+.acud-modal-lg > .acud-modal-content {
+  width: 100%;
+  min-height: 480px;
+  max-height: 560px;
 }
 .acud-modal-xl {
   width: 1200px;
-  height: 480px;
-  max-height: 480px;
+  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;
@@ -126,16 +146,18 @@
 .acud-modal-title {
   font-size: 14px;
   line-height: 22px;
+  padding-right: 12px;
   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;
@@ -165,12 +187,20 @@
   align-items: center;
   padding-top: 2px;
 }
-.acud-modal-dialogbox .acud-modal-title .acudicon {
-  font-size: 20px;
+.acud-modal-dialogbox-title {
+  overflow: hidden;
+  padding-right: 12px;
 }
 .acud-modal-dialogbox-content {
+  width: 100%;
   padding-left: 32px;
 }
+.acud-modal-dialogbox .acud-modal-title .acudicon {
+  font-size: 20px;
+}
+.acud-modal-dialogbox > .acud-modal-content {
+  min-height: 184px;
+}
 .acud-modal-dialogbox-warning .acud-modal-dialogbox-icon {
   color: #FF9326;
 }

package/lib/modal/style/index.less

@@ -19,19 +19,35 @@
     max-width: calc(100vw - 32px);
 
     &-sm {
-        .modal-size-config(sm);
+        .modal-size-config(sm, false);
+    }
+
+    &-sm > &-content {
+        .modal-size-config(sm, true);
     }
 
     &-md {
-        .modal-size-config(md);
+        .modal-size-config(md, false);
+    }
+
+    &-md > &-content {
+        .modal-size-config(md, true);
     }
 
     &-lg {
-        .modal-size-config(lg);
+        .modal-size-config(lg, false);
+    }
+
+    &-lg > &-content {
+        .modal-size-config(lg, true);
     }
 
     &-xl {
-        .modal-size-config(xl);
+        .modal-size-config(xl, false);
+    }
+
+    &-xl > &-content {
+        .modal-size-config(xl, true);
     }
 
     // 弹框内容
@@ -94,18 +110,20 @@
     &-title {
         font-size: @modal-heading-font-size;
         line-height: @modal-heading-height;
+        padding-right: @P * 3;
         word-wrap: break-word;
     }
 
     // 内容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部分
@@ -143,14 +161,24 @@
         padding-top: 2px;
     }
 
+    &-title {
+        overflow: hidden;
+        padding-right: @P * 3;
+    }
+
+    &-content {
+        width: 100%;
+        padding-left: @P * 3 + @T6;
+    }
+
     .@{modal-prefix-cls}-title {
         .acudicon {
             font-size: @T6;
         }
     }
 
-    &-content {
-        padding-left: @P * 3 + @T6;
+    & > .@{modal-prefix-cls}-content {
+        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}';
-    @height: ~'modal-height-@{type}';
+    @min-height: ~'modal-height-@{type}';
     @max-height: ~'modal-max-height-@{type}';
-    width: @@width;
-    height: @@height;
+    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/progress/style/common.less

@@ -29,6 +29,8 @@
     }
 }
 
-.@{progress-prefix-cls}-label-hidden .@{progress-prefix-cls}-label {
-    display: none;
-}
+.@{progress-prefix-cls}-label-hidden .@{progress-prefix-cls}-label{
+    &.@{progress-prefix-cls}-label-outer, &.@{progress-prefix-cls}-label-inner{
+        display: none;
+    }
+}

package/lib/progress/style/index.css

@@ -23,7 +23,8 @@
 .acud-progress-success .acud-progress-label-icon {
   font-size: 0;
 }
-.acud-progress-label-hidden .acud-progress-label {
+.acud-progress-label-hidden .acud-progress-label.acud-progress-label-outer,
+.acud-progress-label-hidden .acud-progress-label.acud-progress-label-inner {
   display: none;
 }
 .acud-progress-line {

package/lib/radio/index.d.ts

@@ -1,2 +1,5 @@
 import Radio from './Radio';
+export { RadioProps } from './Radio';
+export { ContextProps } from './context';
+export { BaseRadioGourpProps } from './RadioGroup';
 export default Radio;

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

@@ -10,15 +10,20 @@
 @modal-mask-color: fade(@G5, 50%);
 
 // 默认宽高设置
-@modal-width-sm: 100*@P;
-@modal-width-md: 150*@P;
-@modal-width-lg: 200*@P;
-@modal-width-xl: 300*@P;
+@modal-width-sm: 100 * @P;
+@modal-width-md: 150 * @P;
+@modal-width-lg: 200 * @P;
+@modal-width-xl: 300 * @P;
 
-@modal-max-height-sm: 160*@P;
-@modal-max-height-md: 160*@P;
-@modal-max-height-lg: 160*@P;
-@modal-max-height-xl: 160*@P;
+@modal-max-height-sm: 140 * @P;
+@modal-max-height-md: 140 * @P;
+@modal-max-height-lg: 140 * @P;
+@modal-max-height-xl: 140 * @P;
+
+@modal-height-sm: 60 * @P;
+@modal-height-md: 100 * @P;
+@modal-height-lg: 120 * @P;
+@modal-height-xl: 120 * @P;
 
 // Content
 @modal-content-bg-color: @G11;
@@ -36,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;

package/lib/style/themes/default/components/cascader.less

@@ -34,10 +34,6 @@
 @cascader-picker-font-size-md: @T2;
 @cascader-picker-font-size-lg: @T3;
 
-// clear
-@cascader-picker-clear-tp: tp9;
-@cascader-picker-clear-p: p9;
-
 // 级联menus cascader-menus
 @cascader-menus-z-index: 1050;
 @cascader-menus-font-size: @T2;

package/lib/style/themes/default/components/clear.less

@@ -0,0 +1,2 @@
+@clear-tp: tp9;
+@clear-p: p9;

package/lib/style/themes/default/components/datePicker.less

@@ -22,6 +22,7 @@
 @date-picker-date-tp: tp31;
 @date-picker-date-p: p40;
 @date-picker-header-icon-tp: tp24;
+@date-picker-header-tp: tp3;
 
 @picker-panel-cell-height: 6*@P;
 @primary-color: @B2;

package/lib/style/themes/default/components/index.less

@@ -43,3 +43,4 @@
 @import './rate.less';
 @import './timeline.less';
 @import './popconfirm.less';
+@import './clear.less';

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

@@ -10,20 +10,20 @@
 @modal-mask-color: fade(@G5, 50%);
 
 // 默认宽高设置
-@modal-width-sm: 130*@P;
-@modal-width-md: 200*@P;
-@modal-width-lg: 280*@P;
-@modal-width-xl: 300*@P;
+@modal-width-sm: 130 * @P;
+@modal-width-md: 200 * @P;
+@modal-width-lg: 280 * @P;
+@modal-width-xl: 300 * @P;
 
-@modal-max-height-sm: 60*@P;
-@modal-max-height-md: 100*@P;
-@modal-max-height-lg: 120*@P;
-@modal-max-height-xl: 120*@P;
+@modal-max-height-sm: 140 * @P;
+@modal-max-height-md: 140 * @P;
+@modal-max-height-lg: 140 * @P;
+@modal-max-height-xl: 140 * @P;
 
-@modal-height-sm: 60*@P;
-@modal-height-md: 100*@P;
-@modal-height-lg: 120*@P;
-@modal-height-xl: 120*@P;
+@modal-height-sm: 60 * @P;
+@modal-height-md: 100 * @P;
+@modal-height-lg: 120 * @P;
+@modal-height-xl: 120 * @P;
 
 // Content
 @modal-content-bg-color: @G11;
@@ -42,7 +42,7 @@
 @modal-close-font-size: @T4;
 
 // Body
-@modal-body-padding: 4*@P 6*@P 6*@P;
+@modal-body-margin: 4*@P 6*@P 6*@P;
 @modal-body-bg-color: @G11;
 @modal-body-font-color: @G2;
 @modal-body-font-size: @T2;

package/lib/switch/index.d.ts

@@ -1,4 +1,3 @@
-import { FC } from 'react';
-import { SwitchProps } from './interface';
-declare const Switch: FC<SwitchProps>;
+import { CompoundedComponent } from './interface';
+declare const Switch: CompoundedComponent;
 export default Switch;

package/lib/switch/index.js

@@ -15,6 +15,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireDefault(require("react"));
 
+var _acudIcon = require("acud-icon");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _useMergedState3 = _interopRequireDefault(require("../_util/hooks/useMergedState"));
@@ -41,12 +43,13 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
       checked = _a.checked,
       defaultChecked = _a.defaultChecked,
       disabled = _a.disabled,
-      loadingIcon = _a.loadingIcon,
+      loading = _a.loading,
+      customLoadingIcon = _a.loadingIcon,
       checkedChildren = _a.checkedChildren,
       unCheckedChildren = _a.unCheckedChildren,
       onClick = _a.onClick,
       onChange = _a.onChange,
-      restProps = __rest(_a, ["prefixCls", "className", "checked", "defaultChecked", "disabled", "loadingIcon", "checkedChildren", "unCheckedChildren", "onClick", "onChange"]);
+      restProps = __rest(_a, ["prefixCls", "className", "checked", "defaultChecked", "disabled", "loading", "loadingIcon", "checkedChildren", "unCheckedChildren", "onClick", "onChange"]);
 
   var _useMergedState = (0, _useMergedState3["default"])(false, {
     value: checked,
@@ -56,6 +59,11 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
       innerChecked = _useMergedState2[0],
       setInnerChecked = _useMergedState2[1];
 
+  var loadingIcon = loading && (customLoadingIcon || /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedLoading, {
+    className: "".concat(prefixCls, "-loading-icon"),
+    animation: "spin"
+  }));
+
   function triggerChange(newChecked, event) {
     var mergedChecked = innerChecked;
 
@@ -73,7 +81,7 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
     onClick === null || onClick === void 0 ? void 0 : onClick(ret, e);
   }
 
-  var switchClassName = (0, _classnames["default"])(prefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), innerChecked), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), _classNames));
+  var switchClassName = (0, _classnames["default"])(prefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), innerChecked), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), _classNames));
   return /*#__PURE__*/_react["default"].createElement("button", (0, _extends2["default"])({}, restProps, {
     type: "button",
     role: "switch",
@@ -88,5 +96,6 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
 });
 
 Switch.displayName = 'Switch';
+Switch.__ACUD_SWITCH = true;
 var _default = Switch;
 exports["default"] = _default;

package/lib/switch/interface.d.ts

@@ -5,6 +5,7 @@ export interface SwitchProps extends Omit<React.HTMLAttributes<HTMLButtonElement
     className?: string;
     prefixCls?: string;
     disabled?: boolean;
+    loading?: boolean;
     checkedChildren?: React.ReactNode;
     unCheckedChildren?: React.ReactNode;
     onChange?: SwitchChangeEventHandler;
@@ -16,3 +17,6 @@ export interface SwitchProps extends Omit<React.HTMLAttributes<HTMLButtonElement
     style?: React.CSSProperties;
     title?: string;
 }
+export interface CompoundedComponent extends React.ForwardRefExoticComponent<SwitchProps & React.RefAttributes<HTMLElement>> {
+    __ACUD_SWITCH: boolean;
+}

package/lib/switch/style/index.css

@@ -148,6 +148,34 @@
 .acud-switch-checked[disabled]:after {
   background-color: #FFFFFF;
 }
+.acud-switch-checked[disabled].acud-switch-loading .acud-switch-loading-icon {
+  color: #D4E5FF;
+}
+.acud-switch-checked.acud-switch-loading .acud-switch-loading-icon {
+  color: #2468F2;
+  left: initial;
+  right: 2px;
+}
+.acud-switch-loading {
+  cursor: no-drop;
+}
+.acud-switch-loading:after {
+  cursor: no-drop;
+  -webkit-animation-name: none;
+          animation-name: none;
+}
+.acud-switch-loading:hover:after {
+  width: 16px;
+  -webkit-animation-name: none;
+          animation-name: none;
+}
+.acud-switch-loading .acud-switch-loading-icon {
+  position: absolute;
+  top: 1px;
+  z-index: 99;
+  color: #D4D6D9;
+  left: 2px;
+}
 .acud-switch-disabled {
   cursor: no-drop;
 }
@@ -162,6 +190,9 @@
   -webkit-animation-name: none;
           animation-name: none;
 }
+.acud-switch-disabled .acud-switch-loading-icon {
+  color: #F2F2F4;
+}
 .acud-switch-label {
   display: inline-block;
   padding-left: 10px;

package/lib/switch/style/index.less

@@ -96,9 +96,38 @@
             &:after {
                 background-color: @switch-handle-color;
             }
+            &.@{switch-prefix-cls}-loading {
+                .@{switch-prefix-cls}-loading-icon {
+                    color: @B2;
+                }
+            }
+        }
+        &.@{switch-prefix-cls}-loading {
+            .@{switch-prefix-cls}-loading-icon {
+                color: @B6;
+                left: initial;
+                right: 0.5 * @P;
+            }
+        }
+    }
+    &-loading {
+        cursor: no-drop;
+        &:after {
+            cursor: no-drop;
+            animation-name: none;
+        }
+        &:hover:after {
+            width: @switch-inner-width;
+            animation-name: none;
+        }
+        .@{switch-prefix-cls}-loading-icon {
+            position: absolute;
+            top: 1px;
+            z-index: 99;
+            color: @G7;
+            left: 0.5 * @P;
         }
     }
-
     &-disabled {
         cursor: no-drop;
         &:after {
@@ -110,6 +139,9 @@
             width: @switch-inner-width;
             animation-name: none;
         }
+        .@{switch-prefix-cls}-loading-icon {
+            color: @G9;
+        }
     }
 
     &-label {

package/lib/tabs/src/TabNavList/index.js

@@ -396,9 +396,9 @@ function TabNavList(props, ref) {
 
         if (btnNode) {
           newSizes.set(key, {
-            width: btnNode.offsetWidth,
+            width: btnNode.offsetWidth - 32,
             height: btnNode.offsetHeight,
-            left: btnNode.offsetLeft,
+            left: btnNode.offsetLeft + 16,
             top: btnNode.offsetTop
           });
         }

package/lib/tabs/style/index.css

@@ -556,7 +556,6 @@
 }
 .acud-tabs-tab-active {
   color: #2468F2;
-  background: #FFFFFF;
 }
 .acud-tabs-tab-btn {
   outline: none;

package/lib/tabs/style/index.less

@@ -155,7 +155,6 @@
 
         &-active {
             color: @tabs-active-color;
-            background: @tabs-card-head-background;
         }
 
         &-btn {

package/lib/time-picker/style/index.css

@@ -231,6 +231,7 @@
   text-align: left;
   color: #2468F2;
   cursor: pointer;
+  margin-top: 0;
 }
 .acud-time-panel-wrap .acud-picker-decade-panel .acud-picker-cell-inner {
   padding: 0 6px;

package/lib/time-picker/style/index.less

@@ -183,6 +183,7 @@
             text-align: left;
             color: @picker-time-active-color;
             cursor: pointer;
+            margin-top: 0;
         }
         // ===================== Decade Panel =====================
         &-decade-panel {

package/lib/tooltip/index.js

@@ -63,7 +63,7 @@ var PresetColorRegex = new RegExp("^(".concat(PresetColorTypes.join('|'), ")(-in
 function getDisabledCompatibleChildren(element, prefixCls) {
   var elementType = element.type;
 
-  if ((elementType.__ANT_BUTTON === true || elementType.__ANT_SWITCH === true || elementType.__ANT_CHECKBOX === true || element.type === 'button') && element.props.disabled) {
+  if ((elementType.__ACUD_BUTTON === true || elementType.__ACUD_SWITCH === true || elementType.__ACUD_CHECKBOX === true || element.type === 'button') && element.props.disabled) {
     // Pick some layout related style properties up to span
     var _splitObject = splitObject(element.props.style, ['position', 'left', 'right', 'top', 'bottom', 'float', 'display', 'zIndex']),
         picked = _splitObject.picked,

package/lib/transfer/{dataSource.d.ts → DataSource.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { TransferItem, TransferProps } from './';
+import { TransferItem, TransferProps } from '.';
 export interface DataSourceProps<RecordType> extends TransferProps<RecordType> {
     tKeys: string[];
     setTKeys: (t: string[]) => void;