acud 0.0.67 → 0.0.70

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

@@ -54,7 +54,6 @@ function ToastDom(props) {
 
   var _useState = useState(null),
       _useState2 = _slicedToArray(_useState, 2),
-      timerID = _useState2[0],
       setTimerID = _useState2[1];
 
   var _useState3 = useState(countdown),
@@ -80,9 +79,9 @@ function ToastDom(props) {
     }
 
     return function () {
-      if (timerID) {
-        setTimerID(null);
-      }
+      // destory时可能timerID并没有 但是计时器存在 设置值时react会警告
+      // if (timerID) {
+      setTimerID(null); // }
     };
   }, [counter]);
   return /*#__PURE__*/React.createElement("div", {
@@ -135,7 +134,7 @@ var handler = {
       var tempDuration = args.duration;
       args.duration = 0; // 设置样式 有描述和没描述间距不一样
 
-      var tempClassName = props.className + ' ' + PREFIX;
+      var tempClassName = (props === null || props === void 0 ? void 0 : props.className) + ' ' + PREFIX;
 
       if (args.description) {
         tempClassName += ' ' + getPrefixCls('notification') + '-has-description';
@@ -153,7 +152,7 @@ var handler = {
         description: args.description,
         countdown: tempDuration,
         notificationKey: key,
-        onClose: props.onClose
+        onClose: props === null || props === void 0 ? void 0 : props.onClose
       });
       args.description = /*#__PURE__*/React.createElement(DescriptionDom, {
         description: args.description

package/es/toast/style/index.css

@@ -106,7 +106,7 @@
 }
 .acud-notification-notice-with-icon .acud-notification-notice-message {
   margin: 0 calc(8px + 4px * 4) 0 calc(8px + 18px);
-  font-size: 16px;
+  font-size: 14px;
 }
 .acud-notification-notice-with-icon .acud-notification-notice-description {
   margin: 0 calc(8px + 4px * 4) 0 calc(8px + 18px);

package/es/toast/style/index.less

@@ -3,7 +3,7 @@
 
 @toast-padding-vertical: @P;
 @toast-padding-horizontal: 4 * @P;
-@font-size-base: @T3;
+@toast-font-size-base: @T3;
 @line-height-base: 1.5715;
 @notification-bg: #fff;
 @heading-color: #000;
@@ -103,7 +103,7 @@
     }
 
     &-description {
-      font-size: @font-size-base;
+      font-size: @toast-font-size-base;
       .description-wrap {
           margin: @P 0 0 0;
           color: @G2;
@@ -123,7 +123,7 @@
 
     &-with-icon &-description {
       margin: 0 ~'calc(@{toast-title-margin} + @{P} * 4)' 0 ~'calc(@{toast-title-margin} + @{T5})';
-      font-size: @font-size-base;
+      font-size: @toast-font-size-base;
     }
 
     &-icon {

package/es/tooltip/index.js

@@ -40,7 +40,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/es/transfer/SourceList.js

@@ -143,6 +143,7 @@ export default function sourceList(props) {
         return expandGroup(e, data.key);
       }
     }, expandGroupKey.includes(data.key) ? /*#__PURE__*/React.createElement(OutlinedDown, null) : /*#__PURE__*/React.createElement(OutlinedRight, null)), /*#__PURE__*/React.createElement(Checkbox, {
+      className: "".concat(prefixCls, "-datasource-item-checkbox"),
       checked: checked,
       disabled: data.disabled,
       indeterminate: indeterminate

package/es/transfer/index.js

@@ -18,8 +18,7 @@ export default function transfer(props) {
       prefixCls = _props$prefixCls === void 0 ? 'acud-transfer' : _props$prefixCls,
       _props$displayType = props.displayType,
       displayType = _props$displayType === void 0 ? 'single' : _props$displayType,
-      _props$targetKeys = props.targetKeys,
-      targetKeys = _props$targetKeys === void 0 ? [] : _props$targetKeys,
+      targetKeys = props.targetKeys,
       onChange = props.onChange,
       _props$locale = props.locale,
       locale = _props$locale === void 0 ? {} : _props$locale,
@@ -56,11 +55,12 @@ export default function transfer(props) {
     return expansionArr;
   }, [dataSource]);
 
-  var _React$useState = React.useState(targetKeys),
+  var _React$useState = React.useState(targetKeys || []),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       tKeys = _React$useState2[0],
       setTKeys = _React$useState2[1];
 
+  var mergedKeys = 'targetKeys' in props ? targetKeys : tKeys;
   React.useEffect(function () {
     onChange && onChange(tKeys);
   }, [tKeys]);
@@ -71,14 +71,14 @@ export default function transfer(props) {
     displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
-    tKeys: tKeys,
+    tKeys: mergedKeys,
     setTKeys: setTKeys,
     expansionSource: expansionSource
   })), /*#__PURE__*/React.createElement(Target, _extends({}, props, {
     displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
-    tKeys: tKeys,
+    tKeys: mergedKeys,
     setTKeys: setTKeys,
     expansionSource: expansionSource
   })));

package/es/transfer/style/index.css

@@ -150,6 +150,9 @@
 .acud-transfer-datasource-item-group-option {
   padding-left: 60px;
 }
+.acud-transfer-datasource-item-checkbox {
+  height: 16px;
+}
 .acud-transfer-datasource-search {
   height: 40px;
   padding: 8px 12px;

package/es/transfer/style/index.less

@@ -88,6 +88,9 @@
             &-group-option {
                 padding-left: 15 * @P;
             }
+            &-checkbox {
+                height: @P * 4;
+            }
         }
         &-search {
             height: @P * 10;

package/es/upload/Upload.js

@@ -448,12 +448,15 @@ var InternalUpload = function InternalUpload(props, ref) {
 
     var dragCls = classNames(prefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-drag"), true), _defineProperty(_classNames, "".concat(prefixCls, "-drag-uploading"), mergedFileList.some(function (file) {
       return file.status === 'uploading';
-    })), _defineProperty(_classNames, "".concat(prefixCls, "-drag-hover"), dragState === 'dragover'), _defineProperty(_classNames, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), _classNames), className);
+    })), _defineProperty(_classNames, "".concat(prefixCls, "-drag-hover"), dragState === 'dragover'), _defineProperty(_classNames, "".concat(prefixCls, "-drag-click"), dragState === 'mousedown'), _defineProperty(_classNames, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), _classNames), className);
     return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
       className: dragCls,
       onDrop: onFileDrop,
       onDragOver: onFileDrop,
       onDragLeave: onFileDrop,
+      onMouseDown: onFileDrop,
+      onMouseUp: onFileDrop,
+      onMouseLeave: onFileDrop,
       style: style
     }, /*#__PURE__*/React.createElement(RcUpload, _extends({}, rcUploadProps, {
       ref: upload,

package/es/upload/UploadList/ListItem.js

@@ -13,7 +13,7 @@ import EyeOutlined from "acud-icon/es/icons/OutlinedEye";
 import DeleteOutlined from "acud-icon/es/icons/OutlinedDelete";
 import OutlinedClose from "acud-icon/es/icons/OutlinedClose";
 import DownloadOutlined from "acud-icon/es/icons/OutlinedCloudDownload";
-import OutlinedRefresh from "acud-icon/es/icons/OutlinedRefresh";
+import OutlinedButtonUpload from "acud-icon/es/icons/OutlinedButtonUpload";
 import Tooltip from '../../tooltip';
 import Progress from '../../progress';
 import { ConfigContext } from '../../config-provider';
@@ -157,7 +157,7 @@ var ListItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     title: locale.previewFile
   }, /*#__PURE__*/React.createElement(EyeOutlined, null)) : null; // 上传icon
 
-  var uploadIcon = showUploadIcon ? actionIconRender((typeof customUploadIcon === 'function' ? customUploadIcon(file) : customUploadIcon) || /*#__PURE__*/React.createElement(OutlinedRefresh, null), function () {
+  var uploadIcon = showUploadIcon ? actionIconRender((typeof customUploadIcon === 'function' ? customUploadIcon(file) : customUploadIcon) || /*#__PURE__*/React.createElement(OutlinedButtonUpload, null), function () {
     return onUpload(file);
   }, prefixCls, locale.uploadFile) : null;
   var actions = listType === 'picture-card' && file.status !== 'uploading' && /*#__PURE__*/React.createElement("span", {

package/es/upload/UploadList/index.js

@@ -58,7 +58,7 @@ var renderIcon = function renderIcon(fileName) {
   }
 
   return /*#__PURE__*/React.createElement(Icon, {
-    width: 14
+    width: 16
   });
 };
 

package/es/upload/style/index.css

@@ -123,6 +123,12 @@
 .acud-upload.acud-upload-drag.acud-upload-drag-hover:not(.acud-upload-disabled) {
   border-color: #144BCC;
 }
+.acud-upload.acud-upload-drag.acud-upload-drag-click:not(.acud-upload-disabled) {
+  border-color: #144BCC;
+}
+.acud-upload.acud-upload-drag.acud-upload-drag-click:not(.acud-upload-disabled):hover {
+  border-color: #144BCC;
+}
 .acud-upload.acud-upload-drag.acud-upload-disabled {
   background: #fafafa;
   cursor: not-allowed;
@@ -192,9 +198,9 @@
 }
 .acud-upload-list-item {
   position: relative;
-  height: 24px;
-  margin-top: 8px;
   font-size: 12px;
+  transition: background-color 0.3s;
+  overflow-y: hidden;
 }
 .acud-upload-list-item-name {
   display: inline-block;
@@ -221,7 +227,7 @@
 }
 .acud-upload-list-item-card-actions {
   position: absolute;
-  right: 0;
+  right: 4px;
 }
 .acud-upload-list-item-card-actions-btn {
   opacity: 0;
@@ -257,9 +263,8 @@
   color: #B8BABF;
 }
 .acud-upload-list-item-info {
-  height: 100%;
+  height: 24px;
   padding: 0 2px;
-  transition: background-color 0.3s;
   border-radius: 2px;
 }
 .acud-upload-list-item-info > span {
@@ -307,7 +312,7 @@
 .acud-upload-list-item .acuicon-outlined-close:hover {
   color: #151B26;
 }
-.acud-upload-list-item:hover .acud-upload-list-item-info {
+.acud-upload-list-item:hover {
   background-color: #F7F7F9;
 }
 .acud-upload-list-item:hover .acuicon-outlined-close {
@@ -339,10 +344,9 @@
   color: #F33E3E;
 }
 .acud-upload-list-item-progress {
-  position: absolute;
-  bottom: -12px;
   width: 100%;
   padding-left: 4px;
+  padding-right: 4px;
   font-size: 12px;
   line-height: 0;
 }
@@ -432,13 +436,6 @@
 .acud-upload-list-picture-card .acud-upload-list-item-uploading .acud-upload-list-item-name {
   margin-bottom: 12px;
 }
-.acud-upload-list-picture .acud-upload-list-item-progress,
-.acud-upload-list-picture-card .acud-upload-list-item-progress {
-  bottom: 14px;
-  width: calc(100% - 24px);
-  margin-top: 0;
-  padding-left: 56px;
-}
 .acud-upload-list-picture .acuicon-outlined-close,
 .acud-upload-list-picture-card .acuicon-outlined-close {
   position: absolute;
@@ -491,7 +488,7 @@
   opacity: 0;
   transition: all 0.3s;
 }
-.acud-upload-list-picture-card .acud-upload-list-item-actions .acuicon-outlined-refresh,
+.acud-upload-list-picture-card .acud-upload-list-item-actions .acuicon-outlined-button-upload,
 .acud-upload-list-picture-card .acud-upload-list-item-actions .acuicon-outlined-eye,
 .acud-upload-list-picture-card .acud-upload-list-item-actions .acuicon-outlined-download,
 .acud-upload-list-picture-card .acud-upload-list-item-actions .acuicon-outlined-delete {
@@ -519,8 +516,8 @@
   display: block;
   width: 100%;
   height: 100%;
-  -o-object-fit: contain;
-     object-fit: contain;
+  -o-object-fit: cover;
+     object-fit: cover;
 }
 .acud-upload-list-picture-card .acud-upload-list-item-name {
   display: none;
@@ -547,6 +544,7 @@
   line-height: 140px;
 }
 .acud-upload-list-picture-card .acud-upload-list-item-progress {
+  position: absolute;
   top: 44px;
   padding-left: 8px;
   padding-right: 8px;
@@ -583,9 +581,15 @@
   margin: 0;
   padding: 0 8px 0 4px;
 }
-.acud-upload-list-text .acud-upload-list-item-card-actions,
-.acud-upload-list-picture .acud-upload-list-item-card-actions {
-  position: static;
+.acud-upload-list-text-container {
+  margin-bottom: 4px;
+}
+.acud-upload-list-text-container:first-child {
+  margin-top: 8px;
+}
+.acud-upload-list-text .acud-upload-list-item-progress {
+  margin-top: 4px;
+  margin-bottom: 2px;
 }
 .acud-upload-list .acud-upload-animate-inline-appear,
 .acud-upload-list .acud-upload-animate-inline-enter,

package/es/upload/style/index.less

@@ -97,7 +97,12 @@
         &.@{upload-prefix-cls}-drag-hover:not(.@{upload-prefix-cls}-disabled) {
             border-color: @primary-7;
         }
-
+        &.@{upload-prefix-cls}-drag-click:not(.@{upload-prefix-cls}-disabled) {
+            border-color: @B7;
+            &:hover{
+                border-color: @B7;
+            }
+        }
         &.@{upload-prefix-cls}-disabled {
             background: @background-color-light;
             cursor: not-allowed;
@@ -181,10 +186,9 @@
     // ============================ Item ============================
     &-item {
         position: relative;
-        height: @P * 6;
-        margin-top: @margin-xs;
         font-size: @font-size-base;
-
+        transition: background-color .3s;
+        overflow-y: hidden;
         &-name {
             display: inline-block;
             width: 100%;
@@ -198,7 +202,7 @@
 
         &-card-actions {
             position: absolute;
-            right: 0;
+            right: @P;
 
             &-btn {
                 opacity: 0;
@@ -226,9 +230,8 @@
         }
 
         &-info {
-            height: 100%;
+            height: @P * 6;
             padding: 0 .5 * @P;
-            transition: background-color .3s;
             border-radius: @R2;
 
             > span {
@@ -264,7 +267,7 @@
             }
         }
 
-        &:hover &-info {
+        &:hover {
             // background-color: @item-hover-bg;
             background-color: ~'@{@{upload-list-p}-hover-background-color}';
         }
@@ -303,10 +306,9 @@
         }
 
         &-progress {
-            position: absolute;
-            bottom: -12px;
             width: 100%;
             padding-left: @P;
+            padding-right: @P;
             font-size: @T2;
             line-height: 0;
         }
@@ -410,13 +412,6 @@
             margin-bottom: 12px;
         }
 
-        .@{upload-item}-progress {
-            bottom: 14px;
-            width: ~'calc(100% - 24px)';
-            margin-top: 0;
-            padding-left: 56px;
-        }
-
         .@{iconfont-css-prefix}-outlined-close {
             position: absolute;
             top: 8px;
@@ -478,7 +473,7 @@
             transform: translate(-50%, -50%);
             opacity: 0;
             transition: all .3s;
-            .@{iconfont-css-prefix}-outlined-refresh,
+            .@{iconfont-css-prefix}-outlined-button-upload,
             .@{iconfont-css-prefix}-outlined-eye,
             .@{iconfont-css-prefix}-outlined-download,
             .@{iconfont-css-prefix}-outlined-delete {
@@ -510,7 +505,7 @@
             display: block;
             width: 100%;
             height: 100%;
-            object-fit: contain;
+            object-fit: cover;
         }
 
         .@{upload-item}-name {
@@ -544,6 +539,7 @@
         }
 
         .@{upload-item}-progress {
+            position: absolute;
             top: 44px;
             padding-left: 8px;
             padding-right: 8px;
@@ -589,12 +585,23 @@
         }
 
         .@{upload-item}-card-actions {
-            position: static;
+            // position: static;
         }
     }
 
     // ============================ Text ============================
-
+    &-text {
+        &-container {
+            margin-bottom: @P;
+            &:first-child {
+                margin-top: @P * 2;
+            }
+        }
+        .@{upload-item}-progress {
+            margin-top: @P;
+            margin-bottom: @P * 0.5;
+        }
+    }
     // =========================== Motion ===========================
     .@{upload-prefix-cls}-animate-inline-appear,
     .@{upload-prefix-cls}-animate-inline-enter,

package/lib/button/button.d.ts

@@ -31,6 +31,7 @@ export declare type NativeButtonProps = {
 export declare type ButtonProps = Partial<NativeButtonProps>;
 interface CompoundedComponent extends React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLElement>> {
     Group: typeof ButtonGroup;
+    __ACUD_BUTTON: boolean;
 }
 declare const Button: CompoundedComponent;
 export default Button;

package/lib/button/button.js

@@ -133,5 +133,6 @@ var Button = /*#__PURE__*/_react["default"].forwardRef(InternalButton);
 
 Button.displayName = 'Button';
 Button.Group = _buttonGroup["default"];
+Button.__ACUD_BUTTON = true;
 var _default = Button;
 exports["default"] = _default;

package/lib/cascader/Cascader.js

@@ -195,11 +195,12 @@ var Cascader = /*#__PURE__*/function (_React$Component) {
           }, e);
         }
 
+        loadData(activeOptions);
+
         _this.setState({
           activeValue: activeValue
         });
 
-        loadData(activeOptions);
         return;
       }
 

package/lib/cascader/MenuItem.js

@@ -57,16 +57,12 @@ var MenuItem = function MenuItem(props) {
   var handleMouseEnter = (0, _react.useCallback)(function (e) {
     onMouseEnter === null || onMouseEnter === void 0 ? void 0 : onMouseEnter(e);
     var ele = targetRef.current;
-
-    if (isMulti) {
-      ele = ele === null || ele === void 0 ? void 0 : ele.parentNode;
-    }
-
     var overflow = (ele === null || ele === void 0 ? void 0 : ele.scrollWidth) > (ele === null || ele === void 0 ? void 0 : ele.clientWidth);
     setOverflow(overflow);
-  }, [isMulti, onMouseEnter]);
+  }, [onMouseEnter]);
   return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    title: title
+    title: title,
+    overlayClassName: "".concat(prefixCls, "-menu-item-tooltip")
   }, /*#__PURE__*/_react["default"].createElement("li", (0, _extends2["default"])({
     className: menuItemCls
   }, expandProps, {
@@ -76,21 +72,19 @@ var MenuItem = function MenuItem(props) {
       return e.preventDefault();
     },
     onMouseEnter: handleMouseEnter
-  }), /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({}, isMulti ? {} : {
-    ref: targetRef
-  }, {
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "-menu-item-content"),
     disabled: option.disabled
-  }), isMulti ? /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+  }, isMulti && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
     className: "".concat(prefixCls, "-menu-item-checkbox"),
     disabled: option.disabled,
     checked: checked,
     indeterminate: indeterminate,
     onChange: onMultiSelect,
     onClick: handleMultiClick
-  }, /*#__PURE__*/_react["default"].cloneElement(labelContent, {
+  }), /*#__PURE__*/_react["default"].cloneElement(labelContent, {
     ref: targetRef
-  })) : labelContent), expandIconNode, loadingIconNode));
+  })), expandIconNode, loadingIconNode));
 };
 
 var _default = MenuItem;

package/lib/cascader/Menus.d.ts

@@ -52,11 +52,12 @@ declare class Menus extends React.Component<MenusProps, MenusState> {
     saveMenuWrap: (menuWrap: any) => void;
     saveMenus: (menuIndex: any) => (menus: any) => void;
     saveMenuItems: (index: any) => (node: any) => void;
-    openMenuScroll(): void;
     scrollActiveItemToView(): void;
     setMenuPosition(callback?: () => void): void;
+    handleMenuScrollChange(menuScrollOpen: any): void;
     handleMenuScroll: (menuIndex: any) => () => void;
-    onShowPrepare: () => Promise<unknown>;
+    onShowActive: () => void;
+    onShowEnd: () => void;
     render(): JSX.Element;
 }
 export default Menus;