@aloudata/aloudata-design 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/Button/style/variables.less

@@ -23,7 +23,7 @@
 
 @button-height-small: 28px;
 @button-text-size-small: 12px;
-@button-border-radius-small: 2px;
+@button-border-radius-small: var(--alias-radius-50, 4px);
 @button-padding-small: var(--alias-padding-75-minus-1, 6px)
   var(--alias-padding-150-minus-1, 12px);
 @button-line-height-small: 16px;

package/dist/Empty/style/index.less

@@ -7,6 +7,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  height: 100%;
 
   .ald-empty-image-wrap {
     display: flex;

package/dist/Input/style/reset.less

@@ -2,10 +2,12 @@
   // 纯input 输入框，比如普通的<Input /> <Input.textarea />
   &:not(.ant-input-affix-wrapper) {
     box-shadow: none;
+    width: auto;
   }
   // 带有其他内容的输入框，比如带 allowClear图标、prefix、suffix、密码图标等。
   &.ant-input-affix-wrapper {
     box-shadow: none;
+    width: auto;
     // 输入框
     .ant-input.ant-input {
       color: inherit;

package/dist/ScrollArea/index.d.ts

@@ -8,6 +8,7 @@ interface Props extends ScrollAreaProps {
     onViewportScroll?: (event: React.UIEvent<HTMLDivElement>) => void;
     innerClassName?: string;
     scrollBarHidden?: Array<'horizontal' | 'vertical'>;
+    contentDeterminesWidth?: boolean;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>>;
 export default _default;

package/dist/ScrollArea/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["children", "className", "innerClassName", "horizontalScrollBarClassName", "verticalScrollBarClassName", "onViewportScroll", "scrollBarHidden"];
+var _excluded = ["children", "className", "innerClassName", "horizontalScrollBarClassName", "verticalScrollBarClassName", "onViewportScroll", "contentDeterminesWidth", "scrollBarHidden"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -12,6 +12,7 @@ var ScrollArea = function ScrollArea(props, ref) {
     horizontalScrollBarClassName = props.horizontalScrollBarClassName,
     verticalScrollBarClassName = props.verticalScrollBarClassName,
     onViewportScroll = props.onViewportScroll,
+    contentDeterminesWidth = props.contentDeterminesWidth,
     scrollBarHidden = props.scrollBarHidden,
     rest = _objectWithoutProperties(props, _excluded);
   var isHorizontalScrollBarHidden = scrollBarHidden === null || scrollBarHidden === void 0 ? void 0 : scrollBarHidden.includes('horizontal');
@@ -20,7 +21,9 @@ var ScrollArea = function ScrollArea(props, ref) {
     scrollHideDelay: 50,
     className: classNames('ald-scroll-area', className)
   }), /*#__PURE__*/React.createElement(ScrollAreaComponent.Viewport, {
-    className: classNames('ald-scroll-area-inner', innerClassName),
+    className: classNames('ald-scroll-area-inner', {
+      'ald-scroll-area-width-auto': !contentDeterminesWidth
+    }, innerClassName),
     onScroll: function onScroll(event) {
       onViewportScroll === null || onViewportScroll === void 0 ? void 0 : onViewportScroll(event);
     },

package/dist/ScrollArea/style/index.less

@@ -46,4 +46,9 @@
   height: 100%;
   box-sizing: border-box;
   position: relative;
+
+  &.ald-scroll-area-width-auto > div {
+    // 覆盖内联的display:table;
+    display: block !important;
+  }
 }

package/dist/Select/index.js

@@ -23,6 +23,7 @@ import { FormItemInputContext } from 'antd/lib/form/context';
 import useStyle from 'antd/lib/select/style';
 import { useCompactItemContext } from 'antd/lib/space/Compact';
 import classNames from 'classnames';
+import _ from 'lodash';
 import List from 'rc-virtual-list';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { ConfigContext } from "../ConfigProvider";
@@ -363,6 +364,7 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
       updatedRef.current = true;
     }
   }, [value, innerOptions, isMultiple, defaultValue]);
+  console.log(value, !_.isEmpty(value !== null && value !== void 0 ? value : currentValue), 'value');
   return /*#__PURE__*/React.createElement("div", {
     onMouseDown: function onMouseDown() {
       if (disabled) return;
@@ -370,7 +372,7 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
         setIsOpen(!isOpen);
       }
     },
-    className: classNames('ald-select', className, (_classNames = {}, _defineProperty(_classNames, "ald-select-".concat(type), type === 'primary' || type === 'secondary'), _defineProperty(_classNames, 'ald-select-multiple', isMultiple), _defineProperty(_classNames, 'ald-select-single', !isMultiple), _defineProperty(_classNames, 'ald-select-large', size === 'large'), _defineProperty(_classNames, 'ald-select-small', size === 'small'), _defineProperty(_classNames, 'ald-select-disabled', mergedDisabled), _defineProperty(_classNames, 'ald-select-middle', size !== 'large' && size !== 'small'), _defineProperty(_classNames, 'ald-select-open', typeof _open === 'boolean' ? _open : isOpen), _defineProperty(_classNames, 'ald-select-focus', isFocus), _defineProperty(_classNames, "ald-select-status-".concat(mergedStatus), mergedStatus), _classNames), compactItemClassnames, hashId),
+    className: classNames('ald-select', className, (_classNames = {}, _defineProperty(_classNames, "ald-select-".concat(type), type === 'primary' || type === 'secondary'), _defineProperty(_classNames, 'ald-select-multiple', isMultiple), _defineProperty(_classNames, 'ald-select-single', !isMultiple), _defineProperty(_classNames, 'ald-select-large', size === 'large'), _defineProperty(_classNames, 'ald-select-small', size === 'small'), _defineProperty(_classNames, 'ald-select-disabled', mergedDisabled), _defineProperty(_classNames, 'ald-select-middle', size !== 'large' && size !== 'small'), _defineProperty(_classNames, 'ald-select-open', typeof _open === 'boolean' ? _open : isOpen), _defineProperty(_classNames, 'ald-select-focus', isFocus), _defineProperty(_classNames, "ald-select-status-".concat(mergedStatus), mergedStatus), _defineProperty(_classNames, 'ald-select-has-value', !_.isEmpty(value) || !_.isEmpty(currentValue)), _classNames), compactItemClassnames, hashId),
     spellCheck: false,
     style: Object.assign(styleVar, style)
   }, !!prefix && /*#__PURE__*/React.createElement("span", {
@@ -404,6 +406,7 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
       className: "ald-select-suffix-icon"
     }),
     onDropdownVisibleChange: function onDropdownVisibleChange(open) {
+      console.log(open, 'open');
       setIsOpen(open);
       if (!open) {
         dropDownTimeRef.current = Date.now();

package/dist/Select/style/index.less

@@ -47,6 +47,9 @@
       align-items: center;
       transition: none;
       padding-right: 0;
+      padding-top: 0;
+      padding-bottom: 0;
+      position: relative;
 
       .ant-select-selection-search {
         display: flex;
@@ -59,14 +62,20 @@
       // 多选中存在这个样式
       .ant-select-selection-overflow {
         align-self: normal;
+        flex-wrap: nowrap;
+        margin-left: 6px;
+        min-width: 52px;
 
         .ant-select-selection-overflow-item {
           align-items: center;
           line-height: inherit;
-          height: 100%;
+          flex: 1;
+          min-width: 0;
+          // height: 100%;
 
           & > span {
             display: inline-flex;
+            min-width: 0;
           }
 
           .ant-select-selection-item {
@@ -89,6 +98,8 @@
           }
 
           &.ant-select-selection-overflow-item-rest {
+            flex: none;
+
             .ant-select-selection-item {
               border: none;
               background: none;
@@ -111,10 +122,16 @@
             }
           }
 
+          &.ant-select-selection-overflow-item-suffix {
+            flex: none;
+          }
+
           .ald-select-multiple-tag-default {
             color: inherit;
-            display: inline-flex;
-            align-items: center;
+            min-width: 0;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
           }
 
           .ant-select-selection-search-input {
@@ -123,12 +140,6 @@
             caret-color: var(--alias-colors-text-selected, #126fdd);
           }
         }
-
-        .ant-select-selection-overflow-item:first-of-type {
-          .ald-select-multiple-tag-default::before {
-            content: '';
-          }
-        }
       }
 
       .ant-select-selection-placeholder {

package/dist/Select/style/layout.less

@@ -12,17 +12,20 @@
     }
 
     .ant-select-arrow {
-      position: initial;
-      margin: 0;
+      top: 0;
+      bottom: 0;
+      margin: auto;
     }
 
     .ant-select-clear {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      margin: auto;
       transform: none;
       opacity: 1;
       align-items: center;
       flex: none;
-      position: relative;
-      margin-left: 8px;
       right: 0;
 
       &::before {
@@ -30,7 +33,6 @@
         top: 0;
         bottom: 0;
         margin: auto 0;
-        left: -8px;
         content: '';
         height: 14px;
         width: 1px;

package/dist/Select/style/size.less

@@ -26,14 +26,13 @@
     }
 
     .ant-select {
-      padding-right: @select-padding-horizontal-small;
-
       .ant-select-selector {
         height: @selector-height-small;
         line-height: @selector-height-small;
         padding-left: calc(
           @select-padding-horizontal-small + var(--ald-select-prefix-width)
         );
+        padding-right: @select-padding-horizontal-small;
 
         .ant-select-selection-item {
           line-height: inherit;
@@ -59,15 +58,89 @@
           );
         }
       }
+
+      &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+        .ant-select-selector {
+          padding-right: calc(
+            @select-padding-horizontal-small + @select-icon-use-width-small
+          );
+        }
+      }
+
+      .ant-select-arrow {
+        right: @select-padding-horizontal-small;
+      }
+
+      .ant-select-clear {
+        right: @select-padding-horizontal-small;
+
+        &::before {
+          left: -@selector-gap-small;
+        }
+      }
     }
 
     .ald-select-prefix-select {
+      // 单选值容器
       .ant-select-selection-item {
-        margin-left: @selector-item-margin-left-small;
+        margin-left: @selector-gap-small;
+      }
+      // 多选值容器
+      .ant-select-selection-overflow {
+        margin-left: @selector-gap-small;
       }
 
       .ant-select-selection-placeholder {
-        margin-left: @selector-item-margin-left-small;
+        margin-left: @selector-gap-small;
+      }
+    }
+
+    &.ald-select-has-value {
+      .ant-select {
+        &.ant-select-allow-clear:not(.ant-select-show-arrow),
+        &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-small + @select-icon-use-width-small
+            );
+          }
+
+          .ant-select-arrow {
+            right: @select-padding-horizontal-small;
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-small;
+
+            &::before {
+              left: -@selector-gap-small;
+            }
+          }
+        }
+
+        &.ant-select-show-arrow.ant-select-allow-clear {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-small + @selector-gap-small +
+                @select-icon-use-width-small + @select-icon-use-width-small
+            );
+          }
+
+          .ant-select-arrow {
+            right: calc(
+              @select-padding-horizontal-small + @select-icon-use-width-small +
+                @selector-gap-small
+            );
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-small;
+
+            &::before {
+              left: -@selector-gap-small;
+            }
+          }
+        }
       }
     }
   }
@@ -83,14 +156,13 @@
     }
 
     .ant-select {
-      padding-right: @select-padding-horizontal-middle;
-
       .ant-select-selector {
         height: @selector-height-middle;
         line-height: @selector-height-middle;
         padding-left: calc(
           @select-padding-horizontal-middle + var(--ald-select-prefix-width)
         );
+        padding-right: @select-padding-horizontal-middle;
 
         .ant-select-selection-item {
           font-size: @select-font-size-middle;
@@ -116,15 +188,89 @@
           );
         }
       }
+
+      &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+        .ant-select-selector {
+          padding-right: calc(
+            @select-padding-horizontal-middle + @select-icon-use-width-middle
+          );
+        }
+      }
+
+      .ant-select-arrow {
+        right: @select-padding-horizontal-middle;
+      }
+
+      .ant-select-clear {
+        right: @select-padding-horizontal-middle;
+
+        &::before {
+          left: -@selector-gap-middle;
+        }
+      }
     }
 
     .ald-select-prefix-select {
+      // 单选值容器
       .ant-select-selection-item {
-        margin-left: @selector-item-margin-left-middle;
+        margin-left: @selector-gap-middle;
+      }
+      // 多选值容器
+      .ant-select-selection-overflow {
+        margin-left: @selector-gap-middle;
       }
 
       .ant-select-selection-placeholder {
-        margin-left: @selector-item-margin-left-middle;
+        margin-left: @selector-gap-middle;
+      }
+    }
+
+    &.ald-select-has-value {
+      .ant-select {
+        &.ant-select-allow-clear:not(.ant-select-show-arrow),
+        &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-middle + @select-icon-use-width-middle
+            );
+          }
+
+          .ant-select-arrow {
+            right: @select-padding-horizontal-middle;
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-middle;
+
+            &::before {
+              left: -@selector-gap-middle;
+            }
+          }
+        }
+
+        &.ant-select-show-arrow.ant-select-allow-clear {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-middle + @selector-gap-middle +
+                @select-icon-use-width-middle + @select-icon-use-width-middle
+            );
+          }
+
+          .ant-select-arrow {
+            right: calc(
+              @select-padding-horizontal-middle + @select-icon-use-width-middle +
+                @selector-gap-middle
+            );
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-middle;
+
+            &::before {
+              left: -@selector-gap-middle;
+            }
+          }
+        }
       }
     }
   }
@@ -140,14 +286,13 @@
     }
 
     .ant-select {
-      padding-right: @select-padding-horizontal-large;
-
       .ant-select-selector {
         height: @selector-height-large;
         line-height: @selector-height-large;
         padding-left: calc(
           @select-padding-horizontal-large + var(--ald-select-prefix-width)
         );
+        padding-right: @select-padding-horizontal-large;
 
         .ant-select-selection-item {
           font-size: @select-font-size-large;
@@ -172,6 +317,90 @@
             @select-padding-horizontal-large + var(--ald-select-prefix-width)
           );
         }
+
+        &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-large + @select-icon-use-width-large
+            );
+          }
+        }
+
+        .ant-select-arrow {
+          right: @select-padding-horizontal-large;
+        }
+
+        .ant-select-clear {
+          right: @select-padding-horizontal-large;
+
+          &::before {
+            left: -@selector-gap-large;
+          }
+        }
+      }
+    }
+
+    .ald-select-prefix-select {
+      // 单选值容器
+      .ant-select-selection-item {
+        margin-left: @selector-gap-large;
+      }
+      // 多选值容器
+      .ant-select-selection-overflow {
+        margin-left: @selector-gap-large;
+      }
+
+      .ant-select-selection-placeholder {
+        margin-left: @selector-gap-large;
+      }
+    }
+
+    &.ald-select-has-value {
+      .ant-select {
+        &.ant-select-allow-clear:not(.ant-select-show-arrow),
+        &.ant-select-show-arrow:not(.ant-select-allow-clear) {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-large + @select-icon-use-width-large
+            );
+          }
+
+          .ant-select-arrow {
+            right: @select-padding-horizontal-large;
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-large;
+
+            &::before {
+              left: -@selector-gap-large;
+            }
+          }
+        }
+
+        &.ant-select-show-arrow.ant-select-allow-clear {
+          .ant-select-selector {
+            padding-right: calc(
+              @select-padding-horizontal-large + @selector-gap-large +
+                @select-icon-use-width-large + @select-icon-use-width-large
+            );
+          }
+
+          .ant-select-arrow {
+            right: calc(
+              @select-padding-horizontal-large + @select-icon-use-width-large +
+                @selector-gap-large
+            );
+          }
+
+          .ant-select-clear {
+            right: @select-padding-horizontal-large;
+
+            &::before {
+              left: -@selector-gap-large;
+            }
+          }
+        }
       }
     }
   }
@@ -187,16 +416,6 @@
     margin-top: 0;
   }
 
-  .ald-select-prefix-select {
-    .ant-select-selection-item {
-      margin-left: @selector-item-margin-left-large;
-    }
-
-    .ant-select-selection-placeholder {
-      margin-left: @selector-item-margin-left-large;
-    }
-  }
-
   &.ald-select-primary {
     font-weight: 500;
   }

package/dist/Select/style/variables.less

@@ -7,7 +7,8 @@
 @select-line-height-large: 24px;
 @select-padding-horizontal-large: var(--alias-padding-150-minus-1, 12px);
 @selector-height-large: 34px;
-@selector-item-margin-left-large: 8px;
+@selector-gap-large: 8px;
+@select-icon-use-width-large: 24px; //16+8
 
 // medium size
 @select-height-middle: 32px;
@@ -16,7 +17,8 @@
 @select-line-height-middle: 20px;
 @select-padding-horizontal-middle: var(--alias-padding-150-minus-1, 12px);
 @selector-height-middle: 30px;
-@selector-item-margin-left-middle: 6px;
+@selector-gap-middle: 6px;
+@select-icon-use-width-middle: 22px; //16+6
 
 // small size
 @select-height-small: 28px;
@@ -25,4 +27,5 @@
 @select-line-height-small: 16px;
 @select-padding-horizontal-small: var(--alias-padding-150-minus-1, 12px);
 @selector-height-small: 26px;
-@selector-item-margin-left-small: 4px;
+@selector-gap-small: 4px;
+@select-icon-use-width-small: 20px; //16+4