acud 0.0.66 → 0.0.69

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

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

@@ -73,9 +73,8 @@ function ToastDom(props) {
       onClose = _props$onClose === void 0 ? null : _props$onClose;
 
   var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      timerID = _useState2[0],
-      setTimerID = _useState2[1];
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+      setTimerID = _useState2[0];
 
   var _useState3 = (0, _react.useState)(countdown),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
@@ -101,9 +100,9 @@ function ToastDom(props) {
     }
 
     return function () {
-      if (timerID) {
-        setTimerID(null);
-      }
+      // destory时可能timerID并没有 但是计时器存在 设置值时react会警告
+      // if (timerID) {
+      setTimerID(null); // }
     };
   }, [counter]);
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -155,7 +154,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';
@@ -173,7 +172,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["default"].createElement(DescriptionDom, {
         description: args.description

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

@@ -167,6 +167,7 @@ function sourceList(props) {
         return expandGroup(e, data.key);
       }
     }, expandGroupKey.includes(data.key) ? /*#__PURE__*/React.createElement(_OutlinedDown["default"], null) : /*#__PURE__*/React.createElement(_OutlinedRight["default"], null)), /*#__PURE__*/React.createElement(_checkbox["default"], {
+      className: "".concat(prefixCls, "-datasource-item-checkbox"),
       checked: checked,
       disabled: data.disabled,
       indeterminate: indeterminate

package/lib/transfer/index.js

@@ -40,8 +40,7 @@ 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,
@@ -76,11 +75,12 @@ function transfer(props) {
     return expansionArr;
   }, [dataSource]);
 
-  var _React$useState = React.useState(targetKeys),
+  var _React$useState = React.useState(targetKeys || []),
       _React$useState2 = (0, _slicedToArray2["default"])(_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]);
@@ -91,14 +91,14 @@ function transfer(props) {
     displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
-    tKeys: tKeys,
+    tKeys: mergedKeys,
     setTKeys: setTKeys,
     expansionSource: expansionSource
   })), /*#__PURE__*/React.createElement(_Target["default"], (0, _extends2["default"])({}, props, {
     displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
-    tKeys: tKeys,
+    tKeys: mergedKeys,
     setTKeys: setTKeys,
     expansionSource: expansionSource
   })));

package/lib/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/lib/transfer/style/index.less

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

package/lib/upload/Upload.js

@@ -474,12 +474,15 @@ var InternalUpload = function InternalUpload(props, ref) {
 
     var dragCls = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-drag"), true), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-drag-uploading"), mergedFileList.some(function (file) {
       return file.status === 'uploading';
-    })), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-drag-hover"), dragState === 'dragover'), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), _classNames), className);
+    })), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-drag-hover"), dragState === 'dragover'), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-drag-click"), dragState === 'mousedown'), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2["default"])(_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(_BaseUpload["default"], (0, _extends2["default"])({}, rcUploadProps, {
       ref: upload,

package/lib/upload/UploadList/ListItem.js

@@ -29,7 +29,7 @@ var _OutlinedClose = _interopRequireDefault(require("acud-icon/lib/icons/Outline
 
 var _OutlinedCloudDownload = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedCloudDownload"));
 
-var _OutlinedRefresh = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedRefresh"));
+var _OutlinedButtonUpload = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedButtonUpload"));
 
 var _tooltip = _interopRequireDefault(require("../../tooltip"));
 
@@ -185,7 +185,7 @@ var ListItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     title: locale.previewFile
   }, /*#__PURE__*/React.createElement(_OutlinedEye["default"], null)) : null; // 上传icon
 
-  var uploadIcon = showUploadIcon ? actionIconRender((typeof customUploadIcon === 'function' ? customUploadIcon(file) : customUploadIcon) || /*#__PURE__*/React.createElement(_OutlinedRefresh["default"], null), function () {
+  var uploadIcon = showUploadIcon ? actionIconRender((typeof customUploadIcon === 'function' ? customUploadIcon(file) : customUploadIcon) || /*#__PURE__*/React.createElement(_OutlinedButtonUpload["default"], null), function () {
     return onUpload(file);
   }, prefixCls, locale.uploadFile) : null;
   var actions = listType === 'picture-card' && file.status !== 'uploading' && /*#__PURE__*/React.createElement("span", {

package/lib/upload/UploadList/index.js

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

package/lib/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,