acud 0.0.65 → 0.0.66

package/es/breadcrumb/BreadcrumbItem.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { BaseDropdownProps } from '../dropdown/dropdown';
 export interface BreadcrumbItemProps {
     prefixCls?: string;

package/es/breadcrumb/BreadcrumbItem.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
@@ -13,8 +14,8 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-import * as React from 'react';
-import { OutlinedDown } from 'acud-icon';
+import React, { useCallback, useState } from 'react';
+import { OutlinedDown, OutlinedUp } from 'acud-icon';
 import DropDown from '../dropdown/dropdown';
 import { ConfigContext } from '../config-provider';
 
@@ -27,21 +28,32 @@ var BreadcrumbItem = function BreadcrumbItem(_a) {
       dropdownProps = _a.dropdownProps,
       restProps = __rest(_a, ["prefixCls", "separator", "children", "overlay", "dropdownProps"]);
 
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
   var _React$useContext = React.useContext(ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls;
 
   var prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);
+  var handleVisibleChange = useCallback(function (visible) {
+    setVisible(visible);
+  }, []);
   /** If overlay is have Wrap a DropDown */
 
   var renderBreadcrumbNode = function renderBreadcrumbNode(breadcrumbItem) {
     if (overlay) {
       return /*#__PURE__*/React.createElement(DropDown, _extends({
         overlay: overlay,
+        visible: visible,
         placement: "bottomCenter",
         overlayClassName: "".concat(prefixCls, "-dropdown")
-      }, dropdownProps), /*#__PURE__*/React.createElement("span", {
+      }, dropdownProps, {
+        onVisibleChange: handleVisibleChange
+      }), /*#__PURE__*/React.createElement("span", {
         className: "".concat(prefixCls, "-overlay-link")
-      }, breadcrumbItem, /*#__PURE__*/React.createElement(OutlinedDown, null)));
+      }, breadcrumbItem, visible ? /*#__PURE__*/React.createElement(OutlinedUp, null) : /*#__PURE__*/React.createElement(OutlinedDown, null)));
     }
 
     return breadcrumbItem;

package/es/dialog-box/style/index.css

@@ -58,19 +58,19 @@
 }
 .acud-dialogbox-sm {
   width: 520px;
-  max-height: 240px;
+  max-height: 560px;
 }
 .acud-dialogbox-md {
   width: 800px;
-  max-height: 400px;
+  max-height: 560px;
 }
 .acud-dialogbox-lg {
   width: 1120px;
-  max-height: 480px;
+  max-height: 560px;
 }
 .acud-dialogbox-xl {
   width: 1200px;
-  max-height: 480px;
+  max-height: 560px;
 }
 .acud-dialogbox-content {
   position: relative;

package/es/dropdown/dropdown-button.js

@@ -35,7 +35,10 @@ var DropdownButton = function DropdownButton(props) {
       trigger = props.trigger,
       visible = props.visible,
       onVisibleChange = props.onVisibleChange,
-      restProps = __rest(props, ["children", "overlay", "disabled", "trigger", "visible", "onVisibleChange"]); // 菜单可见，需要将ICON旋转
+      overlayClassName = props.overlayClassName,
+      overlayStyle = props.overlayStyle,
+      getPopupContainer = props.getPopupContainer,
+      restProps = __rest(props, ["children", "overlay", "disabled", "trigger", "visible", "onVisibleChange", "overlayClassName", "overlayStyle", "getPopupContainer"]); // 菜单可见，需要将ICON旋转
 
 
   var _useState = useState(!!visible),
@@ -58,6 +61,9 @@ var DropdownButton = function DropdownButton(props) {
     placement: "bottomRight",
     trigger: trigger,
     overlay: overlay,
+    overlayClassName: overlayClassName,
+    overlayStyle: overlayStyle,
+    getPopupContainer: getPopupContainer,
     visible: popupVisible,
     onVisibleChange: handleVisibleChange
   }, /*#__PURE__*/React.createElement(Button, _extends({

package/es/dropdown/style/index.css

@@ -93,9 +93,10 @@
   margin-top: -8px;
   font-size: 12px;
   line-height: 16px;
+  transition: transform 0.48s;
 }
 .acud-dropdown-trigger-arrow-expand {
-  transform: rotate(-180deg);
+  transform: rotate(180deg);
 }
 .acud-dropdown-trigger-arrow > svg {
   width: 16px;

package/es/dropdown/style/index.less

@@ -72,9 +72,10 @@
             margin-top: -2 * @P;
             font-size: @T2;
             line-height: 4 * @P;
+            transition: transform .48s;
 
             &-expand {
-                transform: rotate(-180deg);
+                transform: rotate(180deg);
             }
 
             & > svg {

package/es/modal/Modal.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { ButtonProps } from '../button';
 declare enum SizeType {
     'small' = "sm",
     'normal' = "md",
@@ -14,8 +15,12 @@ export interface ModalProps {
     confirmLoading?: boolean;
     /** 弹框标题 */
     title?: React.ReactNode;
+    /** 确认按钮 props */
+    okButtonProps?: ButtonProps;
     /** 点击确定回调 */
     onOk?: (e: React.MouseEvent<HTMLElement>) => void;
+    /** 取消按钮 props */
+    cancelButtonProps?: ButtonProps;
     /** 点击模态框右上角叉、取消按钮、Props.maskClosable 值为 true 时的遮罩层或键盘按下 Esc 时的回调 */
     onCancel?: (e: React.MouseEvent<HTMLElement>) => void;
     afterClose?: () => void;

package/es/modal/Modal.js

@@ -63,15 +63,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, {
+        confirmLoading = props.confirmLoading,
+        okButtonProps = props.okButtonProps,
+        cancelButtonProps = props.cancelButtonProps;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, _extends({
       onClick: handleCancel,
       type: "default"
-    }, cancelText || '取消'), /*#__PURE__*/React.createElement(Button, {
+    }, cancelButtonProps), cancelText || '取消'), /*#__PURE__*/React.createElement(Button, _extends({
       onClick: handleOk,
       loading: confirmLoading,
       type: "primary"
-    }, okText || '确定'));
+    }, okButtonProps), okText || '确定'));
   };
 
   var visible = props.visible,

package/es/modal/style/index.css

@@ -55,25 +55,25 @@
   -webkit-overflow-scrolling: touch;
   z-index: 1000;
 }
-.acud-modal-sm {
+.acud-modal-sm > .acud-modal-content {
   width: 520px;
-  height: 240px;
-  max-height: 240px;
+  min-height: 240px;
+  max-height: 560px;
 }
-.acud-modal-md {
+.acud-modal-md > .acud-modal-content {
   width: 800px;
-  height: 400px;
-  max-height: 400px;
+  min-height: 400px;
+  max-height: 560px;
 }
-.acud-modal-lg {
+.acud-modal-lg > .acud-modal-content {
   width: 1120px;
-  height: 480px;
-  max-height: 480px;
+  min-height: 480px;
+  max-height: 560px;
 }
-.acud-modal-xl {
+.acud-modal-xl > .acud-modal-content {
   width: 1200px;
-  height: 480px;
-  max-height: 480px;
+  min-height: 480px;
+  max-height: 560px;
 }
 .acud-modal-content {
   position: relative;
@@ -126,6 +126,7 @@
 .acud-modal-title {
   font-size: 14px;
   line-height: 22px;
+  padding-right: 12px;
   word-wrap: break-word;
 }
 .acud-modal-body {
@@ -165,12 +166,21 @@
   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: 400px;
   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 {
   color: #FF9326;
 }

package/es/modal/style/index.less

@@ -18,19 +18,19 @@
     width: auto;
     max-width: calc(100vw - 32px);
 
-    &-sm {
+    &-sm > &-content {
         .modal-size-config(sm);
     }
 
-    &-md {
+    &-md > &-content {
         .modal-size-config(md);
     }
 
-    &-lg {
+    &-lg > &-content {
         .modal-size-config(lg);
     }
 
-    &-xl {
+    &-xl > &-content {
         .modal-size-config(xl);
     }
 
@@ -94,6 +94,7 @@
     &-title {
         font-size: @modal-heading-font-size;
         line-height: @modal-heading-height;
+        padding-right: @P * 3;
         word-wrap: break-word;
     }
 
@@ -143,14 +144,25 @@
         padding-top: 2px;
     }
 
+    &-title {
+        overflow: hidden;
+        padding-right: @P * 3;
+    }
+
+    &-content {
+        width: @P * 100;
+        padding-left: @P * 3 + @T6;
+    }
+
     .@{modal-prefix-cls}-title {
         .acudicon {
             font-size: @T6;
         }
     }
 
-    &-content {
-        padding-left: @P * 3 + @T6;
+    & > .@{modal-prefix-cls}-content {
+        width: @P * 100;
+        min-height: @P * 46;
     }
 }
 

package/es/modal/style/mixin.less

@@ -39,9 +39,9 @@
 
 .modal-size-config(@type) {
     @width: ~'modal-width-@{type}';
-    @height: ~'modal-height-@{type}';
+    @min-height: ~'modal-height-@{type}';
     @max-height: ~'modal-max-height-@{type}';
     width: @@width;
-    height: @@height;
+    min-height: @@min-height;
     max-height: @@max-height;
 }

package/es/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/es/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/es/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/es/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-max-height-sm: 160*@P;
-@modal-max-height-md: 160*@P;
-@modal-max-height-lg: 160*@P;
-@modal-max-height-xl: 160*@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: 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;

package/es/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-max-height-sm: 60*@P;
-@modal-max-height-md: 100*@P;
-@modal-max-height-lg: 120*@P;
-@modal-max-height-xl: 120*@P;
-
-@modal-height-sm: 60*@P;
-@modal-height-md: 100*@P;
-@modal-height-lg: 120*@P;
-@modal-height-xl: 120*@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: 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;

package/es/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/es/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/es/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;

package/es/transfer/{dataSource.js → DataSource.js}

@@ -9,20 +9,26 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import * as React from 'react';
 import cloneDeep from 'lodash/cloneDeep';
 import Checkbox from '../checkbox';
+import Table from '../table';
 import Search from '../search';
-import SourceList from './sourceList';
+import SourceList from './SourceList';
 
 var defaultFilterOption = function defaultFilterOption(inputValue, option) {
   return option.title.indexOf(inputValue) > -1;
 };
 
+var defaultTableFilterOption = function defaultTableFilterOption(inputValue, option) {
+  return option.key.indexOf(inputValue) > -1;
+};
+
 export default function dataSource(props) {
   var prefixCls = props.prefixCls,
+      displayType = props.displayType,
+      columns = props.columns,
       expansionSource = props.expansionSource,
       _props$showSelectAll = props.showSelectAll,
       showSelectAll = _props$showSelectAll === void 0 ? true : _props$showSelectAll,
-      _props$filterOption = props.filterOption,
-      filterOption = _props$filterOption === void 0 ? defaultFilterOption : _props$filterOption,
+      filterOptionProp = props.filterOption,
       showSearch = props.showSearch,
       _props$showSearchClea = props.showSearchClear,
       showSearchClear = _props$showSearchClea === void 0 ? true : _props$showSearchClea,
@@ -30,6 +36,7 @@ export default function dataSource(props) {
       setTKeys = props.setTKeys,
       leftStyle = props.leftStyle,
       locale = props.locale;
+  var filterOption = filterOptionProp || (displayType === 'table' ? defaultTableFilterOption : defaultFilterOption);
   var dataSourceCls = "".concat(prefixCls, "-datasource");
   var sourceTitle = locale.sourceTitle,
       searchPlaceholder = locale.searchPlaceholder,
@@ -79,7 +86,7 @@ export default function dataSource(props) {
       }
     });
     return fileterCloneSource;
-  }, [searchValue, expansionSource]);
+  }, [searchValue, expansionSource, displayType]);
   var totalUndisabledKeys = React.useMemo(function () {
     var unDisabledDataSource = filterSource.filter(function (data) {
       return !data.group && !data.disabled;
@@ -112,14 +119,31 @@ export default function dataSource(props) {
     var searchValue = e.target.value;
     setSearchValue(searchValue);
   }, []);
+
+  var onSelectChange = function onSelectChange(v) {
+    // 排除filter中包含的tKeys，记为noneFilterKeys
+    // 联合noneFilterKeys与filter中的选择项，记为最终keys
+    var noneFilterKeys = tKeys.filter(function (key) {
+      return !filterSource.some(function (item) {
+        return item.key === key;
+      });
+    });
+    setTKeys([].concat(_toConsumableArray(noneFilterKeys), _toConsumableArray(v)));
+  };
+
+  var rowSelection = {
+    onChange: onSelectChange,
+    selectedRowKeys: tKeys
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: dataSourceCls,
     style: leftStyle
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(dataSourceCls, "-header")
-  }, showSelectAll && /*#__PURE__*/React.createElement(Checkbox, {
+  }, showSelectAll && displayType === 'single' && /*#__PURE__*/React.createElement(Checkbox, {
     checked: allChecked,
     indeterminate: indeterminate,
+    className: "".concat(dataSourceCls, "-header-checkall"),
     onClick: selectAll
   }), /*#__PURE__*/React.createElement("span", {
     className: "".concat(dataSourceCls, "-label")
@@ -131,7 +155,14 @@ export default function dataSource(props) {
     allowClear: showSearchClear,
     size: "small",
     onChange: searchChange
-  }), !!filterSource.length && /*#__PURE__*/React.createElement(SourceList, _extends({}, props, {
+  }), !!filterSource.length && displayType === 'table' && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-table-box")
+  }, /*#__PURE__*/React.createElement(Table, {
+    pagination: false,
+    dataSource: filterSource,
+    columns: columns,
+    rowSelection: rowSelection
+  })), !!filterSource.length && displayType === 'single' && /*#__PURE__*/React.createElement(SourceList, _extends({}, props, {
     filterSource: filterSource
   })), filterSource.length === 0 && /*#__PURE__*/React.createElement("p", {
     className: "".concat(dataSourceCls, "-nodata")

package/{lib/transfer/sourceList.d.ts → es/transfer/SourceList.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { DataSourceProps } from './dataSource';
-import { TransferItem } from './';
+import { DataSourceProps } from './DataSource';
+import { TransferItem } from '.';
 export interface DataSourceListProps<RecordType> extends DataSourceProps<RecordType> {
     filterSource: RecordType[];
 }

package/es/transfer/{target.d.ts → Target.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;

package/es/transfer/{target.js → Target.js}

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
@@ -7,8 +8,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * author zhousheng
  */
 import * as React from 'react';
-import classnames from 'classnames';
-import TargetList from './targetList';
+import classnames from 'classnames/dedupe';
+import { OutlinedClose } from 'acud-icon';
+import Table from '../table';
+import TargetList from './TargetList';
 import Search from '../search';
 
 var defaultFilterOption = function defaultFilterOption(inputValue, option) {
@@ -19,6 +22,7 @@ export default function target(props) {
   var _classnames;
 
   var prefixCls = props.prefixCls,
+      displayType = props.displayType,
       _props$showClearAll = props.showClearAll,
       showClearAll = _props$showClearAll === void 0 ? true : _props$showClearAll,
       _props$filterOption = props.filterOption,
@@ -30,7 +34,8 @@ export default function target(props) {
       setTKeys = props.setTKeys,
       rightStyle = props.rightStyle,
       locale = props.locale,
-      expansionSource = props.expansionSource;
+      expansionSource = props.expansionSource,
+      columns = props.columns;
   var targetCls = "".concat(prefixCls, "-target");
   var targetTitle = locale.targetTitle,
       searchPlaceholder = locale.searchPlaceholder,
@@ -105,6 +110,51 @@ export default function target(props) {
     var searchValue = e.target.value;
     setSearchValue(searchValue);
   }, []);
+  var targetColumns = React.useMemo(function () {
+    if (!columns) {
+      return;
+    }
+
+    var cancelItem = function cancelItem(data) {
+      if (data.disabled) {
+        return;
+      }
+
+      var curTKeys = _toConsumableArray(tKeys);
+
+      if (data.group) {
+        var deleteKeys = data.childrenKeys;
+        curTKeys = curTKeys.filter(function (tKey) {
+          return !deleteKeys.includes(tKey);
+        });
+      } else if (curTKeys.includes(data.key)) {
+        curTKeys.splice(curTKeys.indexOf(data.key), 1);
+      }
+
+      setTKeys(curTKeys);
+    };
+
+    var tColumns = _toConsumableArray(columns);
+
+    tColumns.push({
+      title: '',
+      key: 'action',
+      width: 40,
+      render: function render(_text, data) {
+        if (!data.disabled) {
+          return /*#__PURE__*/React.createElement(OutlinedClose, {
+            className: "".concat(prefixCls, "-target-item-cancel"),
+            onClick: function onClick() {
+              return cancelItem(data);
+            }
+          });
+        }
+
+        return null;
+      }
+    });
+    return tColumns;
+  }, [columns, tKeys]);
   var clearCls = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(targetCls, "-clear-all"), true), _defineProperty(_classnames, "".concat(targetCls, "-clear-all-disabled"), filterSource.length === totalDisabledKeys.length), _classnames));
   return /*#__PURE__*/React.createElement("div", {
     className: targetCls,
@@ -125,7 +175,13 @@ export default function target(props) {
     allowClear: showSearchClear,
     size: "small",
     onChange: searchChange
-  }), !!filterSource.length && /*#__PURE__*/React.createElement(TargetList, _extends({}, props, {
+  }), !!filterSource.length && displayType === 'table' && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-table-box")
+  }, /*#__PURE__*/React.createElement(Table, {
+    pagination: false,
+    dataSource: filterSource,
+    columns: targetColumns
+  })), !!filterSource.length && displayType === 'single' && /*#__PURE__*/React.createElement(TargetList, _extends({}, props, {
     filterSource: filterSource
   })), filterSource.length === 0 && /*#__PURE__*/React.createElement("p", {
     className: "".concat(prefixCls, "-target-nodata")