acud 0.0.64 → 0.0.67

package/es/modal/style/index.css

@@ -19,7 +19,6 @@
   transform: translate(-50%, -50%);
   width: auto;
   max-width: calc(100vw - 32px);
-  padding-bottom: 24px;
 }
 .acud-modal.zoom-enter,
 .acud-modal.zoom-appear {
@@ -58,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;
@@ -111,7 +130,7 @@
 }
 .acud-modal-close-x {
   display: block;
-  margin-top: 28px;
+  margin-top: 27px;
   font-size: 16px;
   text-align: center;
   text-transform: none;
@@ -125,24 +144,29 @@
   font-weight: 900;
 }
 .acud-modal-title {
-  font-size: 16px;
-  line-height: 24px;
+  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;
   background: #FFFFFF;
   text-align: right;
   flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
 }
 .acud-modal-footer .acud-btn {
   margin: 0;
@@ -150,3 +174,45 @@
 .acud-modal-footer .acud-btn + .acud-btn {
   margin-left: 16px;
 }
+.acud-modal-dialogbox {
+  width: 400px;
+  height: auto;
+  min-height: 184px;
+}
+.acud-modal-dialogbox-icon {
+  height: 100%;
+  margin-right: 12px;
+  float: left;
+  display: flex;
+  align-items: center;
+  padding-top: 2px;
+}
+.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;
+}
+.acud-modal-dialogbox-info .acud-modal-dialogbox-icon {
+  color: #2468F2;
+}
+.acud-modal-dialogbox-success .acud-modal-dialogbox-icon {
+  color: #30BF13;
+}
+.acud-modal-dialogbox-error .acud-modal-dialogbox-icon {
+  color: #F33E3E;
+}
+.acud-modal-dialogbox-confirm .acud-modal-dialogbox-icon {
+  color: #FF9326;
+}

package/es/modal/style/index.less

@@ -3,6 +3,7 @@
 @import './mixin';
 
 @modal-prefix-cls: ~'@{acud-prefix}-modal';
+@dialogbox-prefix: ~'@{modal-prefix-cls}-dialogbox';
 
 .@{modal-prefix-cls} {
     .reset-component();
@@ -16,22 +17,37 @@
     transform: translate(-50%, -50%);
     width: auto;
     max-width: calc(100vw - 32px);
-    padding-bottom: 24px;
 
     &-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部分
@@ -114,6 +132,10 @@
         background: @modal-footer-bg-color;
         text-align: right;
         flex: none;
+        // TODO: 暂时解决 confirmLoading 时按钮对齐问题
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
     
         .@{acud-prefix}-btn {
             margin: 0;
@@ -123,3 +145,68 @@
         }
       }
 }
+
+.@{dialogbox-prefix} {
+    width: @P * 100;
+    height: auto;
+    min-height: @P * 46;
+
+    &-icon {
+        height: 100%;
+        margin-right: @P * 3;
+        float: left;
+        // TODO: 没找到更好的居中办法
+        display: flex;
+        align-items: center;
+        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;
+        }
+    }
+
+    & > .@{modal-prefix-cls}-content {
+        min-height: @P * 46;
+    }
+}
+
+.@{dialogbox-prefix}-warning {
+    .@{dialogbox-prefix}-icon {
+        color: @W6;
+    }
+}
+
+.@{dialogbox-prefix}-info {
+    .@{dialogbox-prefix}-icon {
+        color: @B6;
+    }
+}
+
+.@{dialogbox-prefix}-success {
+    .@{dialogbox-prefix}-icon {
+        color: @S6;
+    }
+}
+.@{dialogbox-prefix}-error {
+    .@{dialogbox-prefix}-icon {
+        color: @E6;
+    }
+}
+
+.@{dialogbox-prefix}-confirm {
+    .@{dialogbox-prefix}-icon {
+        color: @W6;
+    }
+}

package/es/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/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-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/es/style/themes/default/components/modal.less

@@ -10,29 +10,29 @@
 @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;
 
 // Header
-@modal-heading-height: 6*@P;
+@modal-heading-height: 22px;
 @modal-heading-bg-color: @G10;
 @modal-heading-padding: 6*@P 6*@P 0;
-@modal-heading-font-size: @T4;
+@modal-heading-font-size: @T3;
 @modal-heading-font-weight: 500;
 @modal-heading-color: @G2;
 
@@ -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/es/tabs/src/TabNavList/index.js

@@ -362,9 +362,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/es/tabs/style/index.css

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

package/es/tabs/style/index.less

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

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;