@aloudata/aloudata-design 0.2.0-beta.16 → 0.2.0-beta.19

package/es/Table/style/index.less

@@ -26,14 +26,13 @@
   &-cell {
     flex-grow: 1;
     height: unset;
-    min-height: @table-row-height;
     color: @NL0;
-    line-height: @table-row-height;
+    line-height: 16px;
     text-align: left;
     border-bottom: 1px solid @NL95;
     word-break: break-all;
-    display: flex;
-    padding: 0 12px;
+    display: flex !important; // 目前都让表格先居左、居中处理，所以这里需要强制设置为flex
+    padding: 11.5px 12px;
     align-items: center;
 
     &-content {
@@ -126,7 +125,6 @@
     align-items: center;
     justify-content: space-between;
     margin-bottom: 24px;
-    padding: 0 10px;
 
     &-left {
       color: @NL0;

package/es/Tabs/index.js

@@ -36,7 +36,8 @@ export default function Tabs(props) {
     }),
     tabBarGutter: 24,
     className: classNames('ald-tabs', className, {
-      'ald-adapt-height': adaptHeight
+      'ald-adapt-height': adaptHeight,
+      'ald-tabs-default': size !== 'large'
     })
   }, tabsProps));
 }

package/es/Tabs/style/index.less

@@ -1,6 +1,6 @@
 @import '../../style/index.less';
 
-.ald-tabs {
+.ant-tabs.ald-tabs {
   &.ant-tabs {
     color: @NL30;
   }
@@ -30,6 +30,13 @@
     }
   }
 
+  &.ald-tabs-default {
+    .ant-tabs-tab {
+      font-size: 14px;
+      line-height: 20px;
+    }
+  }
+
   .ant-tabs-nav-more {
     margin: 0 !important;
   }

package/lib/Button/style/index.less

@@ -16,7 +16,7 @@
     &-link {
       font-size: 12px;
       height: @height-base;
-      padding: 0 12px;
+      padding: 0 11px;
       display: inline-flex;
       line-height: @height-base;
       align-items: center;

package/lib/Input/components/Input/index.d.ts

@@ -1,8 +1,13 @@
 import React, { ReactNode } from 'react';
-import type { ShowCountProps, InputProps } from 'antd/lib/input/Input';
-import AntdInput from 'antd/lib/input/Input';
+import type { InputProps, InputRef } from 'antd/lib/input/Input';
+interface IShowCountProps {
+    formatter: (args: {
+        count: number;
+        maxLength?: number;
+    }) => string;
+}
 export declare type TSize = 'small' | 'default' | 'large';
-export declare type InputRef = React.Ref<AntdInput>;
+export type { InputRef };
 declare type ChangeEventHandler = (e: React.ChangeEvent<HTMLInputElement>) => void;
 export interface IInputProps extends Omit<InputProps, 'size' | 'id' | 'prefix' | 'allowClear' | 'disabled' | 'showCount' | 'maxLength' | 'value' | 'defaultValue' | 'onPressEnter' | 'onChange'> {
     /**
@@ -33,7 +38,7 @@ export interface IInputProps extends Omit<InputProps, 'size' | 'id' | 'prefix' |
      * @default false
      * @type boolean | { formatter: (args: { count: number; maxLength?: number; }) => string; };
      */
-    showCount?: boolean | ShowCountProps;
+    showCount?: boolean | IShowCountProps;
     /**
      * @description 最大长度
      */
@@ -57,5 +62,5 @@ export interface IInputProps extends Omit<InputProps, 'size' | 'id' | 'prefix' |
      */
     onChange?: ChangeEventHandler;
 }
-declare const Input: React.ForwardRefExoticComponent<IInputProps & React.RefAttributes<AntdInput>>;
+declare const Input: React.ForwardRefExoticComponent<IInputProps & React.RefAttributes<InputRef>>;
 export default Input;

package/lib/Input/style/index.less

@@ -8,6 +8,8 @@
 .ant-input {
   color: @NL0;
   border-radius: @border-radius-base;
+  font-size: 12px;
+  height: 28px;
 
   &::placeholder {
     color: @NL50;
@@ -15,6 +17,9 @@
 
   &-prefix {
     color: @NL30;
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 16px;
   }
 
   &-suffix {
@@ -39,10 +44,19 @@
 
   &-sm {
     border-radius: @border-radius-sm;
+    font-size: 12px;
+    height: 24px;
+  }
+
+  &-lg {
+    height: 32px;
+    font-size: 14px;
   }
 
   &-affix-wrapper {
     border-radius: @border-radius-base;
+    padding: 0 12px;
+    height: 28px;
 
     &-hover,
     &-focused,
@@ -53,10 +67,25 @@
     .ant-input {
       border-radius: 0;
       caret-color: @B40;
+      height: 100%;
     }
+  }
+}
+
+.ant-input-affix-wrapper.ant-input-affix-wrapper {
+  &-lg {
+    padding: 4px 11px;
+    height: 32px;
+    font-size: 14px;
+  }
+
+  &-sm {
+    border-radius: @border-radius-sm;
+    padding: 0 12px;
+    height: 24px;
 
-    &-sm {
-      border-radius: @border-radius-sm;
+    .ant-input-sm {
+      height: 22px;
     }
   }
 }

package/lib/Navigator/components/Menu/index.js

@@ -64,14 +64,14 @@ function Menu(props) {
 
     if (isOpen) {
       return /*#__PURE__*/_react.default.createElement(_Icon.default, {
-        type: "arrow_drop_down",
+        type: "arrow_drop_up",
         size: 20,
         className: "ald-nav-menu-icon-right"
       });
     }
 
     return /*#__PURE__*/_react.default.createElement(_Icon.default, {
-      type: "arrow_drop_up",
+      type: "arrow_drop_down",
       size: 20,
       className: "ald-nav-menu-icon-right"
     });

package/lib/Select/BaseSelect.js

@@ -74,7 +74,6 @@ var Select = function Select(props, ref) {
       label = props.label,
       className = props.className,
       style = props.style,
-      optionStyle = props.optionStyle,
       groupStyle = props.groupStyle,
       _props$allowClear = props.allowClear,
       allowClear = _props$allowClear === void 0 ? false : _props$allowClear,
@@ -341,7 +340,6 @@ var Select = function Select(props, ref) {
     visible: visible,
     hasGroup: hasGroup,
     groupStyle: groupStyle,
-    optionStyle: optionStyle,
     searchType: "no-search",
     placeholder: placeholder,
     data: flattenOptions,

package/lib/Select/OptionsList/OptionItem/RenderLabelIcon.d.ts

@@ -1,3 +1,4 @@
+import 'antd/lib/checkbox/style';
 declare const RenderLabelIcon: ({ isSelected, multiple, disabled, prefixCls, isIndeterminate }: {
     isSelected: boolean;
     multiple: boolean;

package/lib/Select/OptionsList/OptionItem/RenderLabelIcon.js

@@ -13,6 +13,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _lodash = require("lodash");
 
+require("antd/lib/checkbox/style");
+
 var _Icon = _interopRequireDefault(require("../../../Icon"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/Select/OptionsList/index.js

@@ -11,11 +11,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames2 = _interopRequireDefault(require("classnames"));
 
-var _VirtualList = _interopRequireDefault(require("../VirtualList"));
-
 var _OptionItem = require("./OptionItem");
 
-var _excluded = ["input", "prefixCls", "data", "groupStyle", "height", "itemHeight", "selected", "optionChecked", "tempValue", "value", "placeholder", "notFoundContent", "onValueChange", "onTempValueChange", "setTempValue", "onInputChange", "onOptionClick", "activeIndex", "multiple", "visible", "style", "setActiveIndex"];
+var _excluded = ["input", "prefixCls", "data", "groupStyle", "height", "itemHeight", "selected", "optionChecked", "tempValue", "value", "placeholder", "notFoundContent", "onValueChange", "onTempValueChange", "setTempValue", "onInputChange", "onOptionClick", "activeIndex", "multiple", "visible", "setActiveIndex"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -47,13 +45,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var ZERO_LENGTH = 0;
 var DEFAULT_ACTIVE_INDEX = -1;
+var DEFAULT_LIST_HEIGHT = 256;
+var DEFAULT_LIST_PADDING = 8;
 
 var OptionsList = function OptionsList(props, ref) {
   var input = props.input,
       prefixCls = props.prefixCls,
       data = props.data,
       groupStyle = props.groupStyle,
-      height = props.height,
+      _props$height = props.height,
+      height = _props$height === void 0 ? DEFAULT_LIST_HEIGHT : _props$height,
       itemHeight = props.itemHeight,
       selected = props.selected,
       optionChecked = props.optionChecked,
@@ -69,7 +70,6 @@ var OptionsList = function OptionsList(props, ref) {
       activeIndex = props.activeIndex,
       multiple = props.multiple,
       visible = props.visible,
-      style = props.style,
       setActiveIndex = props.setActiveIndex,
       restProps = _objectWithoutProperties(props, _excluded);
 
@@ -164,7 +164,9 @@ var OptionsList = function OptionsList(props, ref) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-list"),
-    style: style,
+    style: {
+      maxHeight: "".concat(height - DEFAULT_LIST_PADDING, "px")
+    },
     ref: OptionListRef,
     role: "list",
     "aria-hidden": "true",
@@ -173,20 +175,10 @@ var OptionsList = function OptionsList(props, ref) {
     onMouseLeave: function onMouseLeave() {
       return setActiveIndex(DEFAULT_ACTIVE_INDEX);
     }
-  }, multiple && renderAllOptions(), data.length > ZERO_LENGTH ? /*#__PURE__*/_react.default.createElement(_VirtualList.default, _objectSpread({
-    itemKey: "value",
-    prefixCls: prefixCls,
-    ref: VirtualListRef,
-    data: data,
-    height: height,
-    itemHeight: itemHeight
-  }, restProps), function (option, index) {
-    return option.isSelectOptGroup ? /*#__PURE__*/_react.default.createElement(_OptionItem.ForwardRenderGroup, {
-      option: option,
-      prefixCls: prefixCls,
-      groupStyle: groupStyle
-    }) : /*#__PURE__*/_react.default.createElement(_OptionItem.ForwardRenderTooltip, {
+  }, multiple && renderAllOptions(), data.length > ZERO_LENGTH ? data.map(function (option, index) {
+    return /*#__PURE__*/_react.default.createElement(_OptionItem.ForwardRenderTooltip, {
       tooltip: option === null || option === void 0 ? void 0 : option.tooltip,
+      key: option === null || option === void 0 ? void 0 : option.value,
       render: /*#__PURE__*/_react.default.createElement(_OptionItem.ForwardRenderOption, _objectSpread({
         option: option,
         prefixCls: prefixCls,

package/lib/Select/Selector/index.js

@@ -62,6 +62,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var ZERO = 0;
 var ICON_LARGE_SIZE = 20;
 var ICON_SMALL_SIZE = 16;
+var FIRST_INDEX = 0;
+var REVERSE_INDEX = -1;
 
 var defaultArrowComponent = function defaultArrowComponent(prefix, size) {
   return /*#__PURE__*/_react.default.createElement(_Icon.default, {
@@ -185,17 +187,17 @@ var Selector = function Selector(props, ref) {
 
   var renderMultipleValue = function renderMultipleValue() {
     // @ts-ignore
-    var allValueLabel = value === null || value === void 0 ? void 0 : value.reduce(function (prev, curr) {
+    var allTooltipTitleNode = value === null || value === void 0 ? void 0 : value.reduce(function (prev, curr) {
       var item = getOptionByValue(curr);
 
       if (item) {
-        return [].concat(_toConsumableArray(prev), [(item === null || item === void 0 ? void 0 : item.title) || (item === null || item === void 0 ? void 0 : item.label)]);
+        return [].concat(_toConsumableArray(prev), [(item === null || item === void 0 ? void 0 : item.title) || optionLabelRenderer(curr, getOptionByValue(curr)) || (item === null || item === void 0 ? void 0 : item.label), ',']);
       }
 
-      return [].concat(_toConsumableArray(prev), [curr]);
+      return [].concat(_toConsumableArray(prev), [curr, ',']);
     }, []);
 
-    if (Array.isArray(value) && value.length === filteredOptions.length) {
+    if (Array.isArray(value) && value.length === filteredOptions.length && !(0, _lodash.isEmpty)(value)) {
       return /*#__PURE__*/_react.default.createElement("span", null, "\u5168\u90E8");
     }
 
@@ -210,7 +212,7 @@ var Selector = function Selector(props, ref) {
     return !input && !(0, _lodash.isNil)(value) ? /*#__PURE__*/_react.default.createElement(_Tooltip.default // @ts-ignore
     , {
       // @ts-ignore
-      title: allValueLabel === null || allValueLabel === void 0 ? void 0 : allValueLabel.join(','),
+      title: allTooltipTitleNode.slice(FIRST_INDEX, REVERSE_INDEX),
       placement: "top",
       getTooltipContainer: function getTooltipContainer() {
         var _selectorRef$current4;

package/lib/Select/interface.d.ts

@@ -117,6 +117,9 @@ export interface ISelectProps {
     labelRenderer?: (input: string) => (option: IOption, isGroup: boolean) => React.ReactNode;
     searchPredicate?: (input: string) => _.ListIterateeCustom<IOption, boolean>;
     matchPredicate?: (input: string) => _.ListIterateeCustom<IOption, boolean>;
+    /**
+     * @description 渲染选中条目对应的内容
+     */
     optionLabelRenderer?: (value: string | number, option?: IOption) => React.ReactNode;
     /**
      * @description 选中值改变时的回调

package/lib/Select/style/index.less

@@ -35,7 +35,7 @@
 // Base Text
 // @text-color-base: #313e75;
 // @text-color-disabled: #313e75;
-@text-font-size-base: 14px;
+@text-font-base-size: 14px;
 // @text-lint-height-base: 22px;
 
 //Background Color
@@ -44,8 +44,8 @@
 
 @ald-prefix: ~'@{component-prefix}';
 @select-prefix-cls-legacy: ~'@{component-prefix}-select-legacy';
-@select-input-fontSize: @text-font-size-base;
-@select-input-fontSize-sm: @text-font-size-base - 2px;
+@select-input-fontSize: @text-font-base-size;
+@select-input-fontSize-sm: @text-font-base-size - 2px;
 // @color-font-list-primary-normal: @palette-black-6; // $color-black-6
 // @color-box-shadow-focused: #c0c4d3;
 // @color-background-matchHeight: #ffcf3c;
@@ -56,7 +56,7 @@
   overflow: hidden;
   border: 1px solid transparent;
   border-radius: @border-radius-base;
-  padding: 0 36px 0 12px;
+  padding: 0 36px 0 11px;
   outline: none;
   transition: all 0.2s;
   cursor: pointer;
@@ -141,7 +141,7 @@
   &-close {
     position: absolute;
     top: 0;
-    right: 12px;
+    right: 8px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -162,7 +162,7 @@
 
     &-text {
       overflow: hidden;
-      font-size: 14px;
+      font-size: @select-input-fontSize-sm;
       line-height: 22px;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -197,7 +197,7 @@
 
     &-text {
       overflow: hidden;
-      font-size: 14px;
+      font-size: @select-input-fontSize-sm;
       line-height: 22px;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -209,6 +209,7 @@
     top: 0;
     left: 0;
     color: @select-placeholder-color;
+    font-size: @select-input-fontSize-sm;
   }
 
   &-input {
@@ -282,7 +283,27 @@
     }
   }
 
+  &-default {
+    height: 28px;
+    .@{select-prefix-cls-legacy} {
+      &-selector {
+        height: 26px;
+        min-height: 26px;
+      }
+
+      &-values-wrapper {
+        line-height: 26px;
+      }
+
+      &-selector-label {
+        height: 26px;
+        font-size: 12px;
+      }
+    }
+  }
+
   &-large {
+    height: @height-lg;
     .@{select-prefix-cls-legacy} {
       &-selector {
         min-height: @height-lg;
@@ -310,6 +331,14 @@
       &-input-tags {
         top: 0;
       }
+
+      &-placeholder {
+        font-size: @select-input-fontSize;
+      }
+
+      &-item-text {
+        font-size: @select-input-fontSize;
+      }
     }
   }
 
@@ -406,6 +435,8 @@
   // min-width: 160px;
   // padding: 16px 0 16px 8px;
   outline: none;
+  overflow-y: scroll;
+  overflow-y: overlay;
 }
 
 .@{select-prefix-cls-legacy}-list-option {
@@ -434,6 +465,7 @@
     transform: translateY(-50%);
     left: 12px;
     color: @B40;
+    margin-top: -2px;
 
     &-checkbox {
       .@{component-prefix}-checkbox-inner {

package/lib/Table/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ITableProps } from './interface';
-declare const _default: React.ForwardRefExoticComponent<Pick<ITableProps<Record<string, unknown>>, "onChange" | "loading" | "data" | "columns" | "total" | "renderHeaderLeft" | "renderHeaderRight" | "onRowSelected" | "loadMore" | "hasNextPage" | "sortable" | "defaultSort" | "resizeColumn" | "sortDirections" | "showHeader" | "innerScroll"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<ITableProps<Record<string, unknown>>, "onChange" | "loading" | "data" | "columns" | "total" | "renderHeaderLeft" | "renderHeaderRight" | "onRowSelected" | "loadMore" | "hasNextPage" | "sortable" | "defaultSort" | "resizeColumn" | "sortDirections" | "showHeader" | "innerScroll" | "scrollThreshold" | "rowKey"> & React.RefAttributes<unknown>>;
 export default _default;