@aloudata/aloudata-design 0.2.0-beta.15 → 0.2.0-beta.18

package/es/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/es/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/es/Select/BaseSelect.js

@@ -48,7 +48,6 @@ export 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,
@@ -314,7 +313,6 @@ export var Select = function Select(props, ref) {
     visible: visible,
     hasGroup: hasGroup,
     groupStyle: groupStyle,
-    optionStyle: optionStyle,
     searchType: "no-search",
     placeholder: placeholder,
     data: flattenOptions,

package/es/Select/OptionsList/index.js

@@ -1,4 +1,4 @@
-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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -25,17 +25,19 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import React, { useCallback, useImperativeHandle, useMemo, useRef, useEffect } from 'react';
 import classnames from 'classnames';
-import VirtualList from '../VirtualList';
-import { ForwardRenderGroup, ForwardRenderOption, ForwardRenderTooltip, RenderLabelIcon } from './OptionItem';
+import { ForwardRenderOption, ForwardRenderTooltip, RenderLabelIcon } from './OptionItem';
 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,
@@ -51,7 +53,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);
 
@@ -146,7 +147,9 @@ var OptionsList = function OptionsList(props, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-list"),
-    style: style,
+    style: {
+      maxHeight: "".concat(height - DEFAULT_LIST_PADDING, "px")
+    },
     ref: OptionListRef,
     role: "list",
     "aria-hidden": "true",
@@ -155,19 +158,8 @@ var OptionsList = function OptionsList(props, ref) {
     onMouseLeave: function onMouseLeave() {
       return setActiveIndex(DEFAULT_ACTIVE_INDEX);
     }
-  }, multiple && renderAllOptions(), data.length > ZERO_LENGTH ? /*#__PURE__*/React.createElement(VirtualList, _objectSpread({
-    itemKey: "value",
-    prefixCls: prefixCls,
-    ref: VirtualListRef,
-    data: data,
-    height: height,
-    itemHeight: itemHeight
-  }, restProps), function (option, index) {
-    return option.isSelectOptGroup ? /*#__PURE__*/React.createElement(ForwardRenderGroup, {
-      option: option,
-      prefixCls: prefixCls,
-      groupStyle: groupStyle
-    }) : /*#__PURE__*/React.createElement(ForwardRenderTooltip, {
+  }, multiple && renderAllOptions(), data.length > ZERO_LENGTH ? data.map(function (option, index) {
+    return /*#__PURE__*/React.createElement(ForwardRenderTooltip, {
       tooltip: option === null || option === void 0 ? void 0 : option.tooltip,
       render: /*#__PURE__*/React.createElement(ForwardRenderOption, _objectSpread({
         option: option,

package/es/Select/Selector/index.js

@@ -173,7 +173,7 @@ var Selector = function Selector(props, ref) {
       return [].concat(_toConsumableArray(prev), [curr]);
     }, []);
 
-    if (Array.isArray(value) && value.length === filteredOptions.length) {
+    if (Array.isArray(value) && value.length === filteredOptions.length && !isEmpty(value)) {
       return /*#__PURE__*/React.createElement("span", null, "\u5168\u90E8");
     }
 

package/es/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/es/Table/index.js

@@ -23,6 +23,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+/* eslint-disable no-unneeded-ternary */
 /// <reference types ='./react-table-config' />
 import _ from 'lodash';
 import classnames from 'classnames';
@@ -31,6 +32,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import usePrefixCls from '../_utils/hooks/usePrefixCls';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import Empty from '../Empty';
+import ResizeObserver from 'rc-resize-observer';
 import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
 var ARRAY_FIRST_INDEX = 0;
 var DEFAULT_ROW_WIDTH = 0;
@@ -73,11 +75,18 @@ function Table(_ref, ref) {
       setTableClientWidth = _useState2[1];
 
   var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
+
+  var _useState3 = useState(DEFAULT_ROW_WIDTH),
+      _useState4 = _slicedToArray(_useState3, 2),
+      width = _useState4[0],
+      setWidth = _useState4[1]; // 如果页面整体宽度变化则重新计算
+
+
   useEffect(function () {
     if (tableRef.current) {
       setTableClientWidth(tableRef.current.clientWidth);
     }
-  }, []);
+  }, [width]);
   var initialColumnsWidthMap = useMemo(function () {
     var map = new Map();
 
@@ -125,7 +134,12 @@ function Table(_ref, ref) {
         }
       });
     });
-  }, [columns, sortable, initialColumnsWidthMap]);
+  }, [columns, sortable, initialColumnsWidthMap]); // 默认排序的对象
+
+  var defaultSortObject = {
+    id: newColumns[ARRAY_FIRST_INDEX].accessor,
+    desc: newColumns[ARRAY_FIRST_INDEX].sortOrder && newColumns[ARRAY_FIRST_INDEX].sortOrder === 'descend' ? true : false
+  }; // 如果支持排序 但是没有默认排序 则默认按第一列倒叙排序
 
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
@@ -133,10 +147,7 @@ function Table(_ref, ref) {
     }
 
     if (sortable) {
-      return {
-        id: newColumns[ARRAY_FIRST_INDEX].accessor,
-        desc: false
-      };
+      return defaultSortObject;
     }
 
     return {
@@ -202,41 +213,65 @@ function Table(_ref, ref) {
     }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/React.createElement("div", {
       className: classnames("".concat(prefixCls, "-header-right"))
     }, renderHeaderRight ? renderHeaderRight() : null));
-  };
+  }; // 排序的方向 倒叙{ id: 'xx', desc: true }、正序{ id: 'xx', desc: false }、无序 { id: '', desc: undefined }
+  // 获取排序方向以及排序的id
+
 
-  var getNextSortDesc = function getNextSortDesc(currentDesc) {
+  var getSortBy = function getSortBy(id) {
     var sortDirections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['ascend', 'descend'];
-    var sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var // 如果传了sortDirections，则使用传入的，否则使用默认的
+    sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var res = {
+      id: id,
+      desc: undefined // 给个默认的排序
+
+    };
+    var isSameCol = sortDirection.id === id;
     var descMap = new Map([['ascend', false], ['descend', true]]);
-    var directions = allSortDirections || sortDirections;
+    var directions = allSortDirections || sortDirections; // 如果不是同一列 则返回默认排序 或者排序顺序的第一个
+
+    if (!isSameCol) {
+      if (sortOrder === 'ascend' || sortOrder === 'descend') {
+        res.desc = descMap.get(sortOrder);
+      } else {
+        res.desc = sortOrder ? sortOrder : descMap.get(directions[ARRAY_FIRST_INDEX]);
+      }
+
+      return res;
+    } // 如果是同一列
+    // 如果列给了默认的sortOrder则不在变化
+
 
     if (sortOrder === 'ascend' || sortOrder === 'descend') {
-      return descMap.get(sortOrder);
-    }
+      res.desc = descMap.get(sortOrder);
+      return res;
+    } // 在所有方向上 往后取一个
 
-    if (typeof currentDesc === 'undefined') {
-      return descMap.get(directions[ARRAY_FIRST_INDEX]);
-    }
 
-    var direction = currentDesc ? 'descend' : 'ascend';
+    var lastSortDirection = sortDirection.desc ? 'descend' : 'ascend';
 
     var index = _.findIndex(directions, function (item) {
-      return item === direction;
+      return item === lastSortDirection;
     });
 
     var nextIndex = index + 1;
-    return descMap.get(directions[nextIndex]);
+    res.desc = descMap.get(directions[nextIndex]); // 如果没有排序方向，则返回默认排序对象
+
+    if (res.desc === undefined) {
+      res.id = '';
+    }
+
+    return res;
   };
 
   var getHeaderProps = function getHeaderProps(column) {
     // @ts-ignore
     var id = column.id,
-        isSortedDesc = column.isSortedDesc,
         canSort = column.canSort,
         sorter = column.sorter,
         sortOrder = column.sortOrder,
         sortDirections = column.sortDirections;
-    var toggleProps = column.getSortByToggleProps();
+    var toggleProps = column.getSortByToggleProps(); // 仅在Table设置sortable时,所有列的canSort为true,此时为前端排序
 
     if (canSort) {
       // client sort
@@ -245,19 +280,16 @@ function Table(_ref, ref) {
           e.stopPropagation();
 
           if (typeof toggleProps.onClick === 'function') {
-            // toggleProps.onClick(e);
-            var desc = getNextSortDesc(isSortedDesc, sortDirections, sortOrder);
-            var sortBy = {
-              id: typeof desc === 'undefined' ? '' : id,
-              desc: desc
-            };
-            setSortBy(typeof desc === 'undefined' ? [] : [sortBy]);
+            var sortBy = getSortBy(id, sortDirections, sortOrder);
+            setSortBy(sortBy.desc === undefined ? [defaultSortObject] : [sortBy]); // 客户端排序时 需要重新设置排序
+
             setSortDirection(sortBy);
             onChange(sortBy);
           }
         }
       });
-    }
+    } // 当列设置sorter属性时，则为服务端排序
+
 
     if (sorter) {
       // server sort
@@ -267,14 +299,8 @@ function Table(_ref, ref) {
         }
       })), {}, {
         onClick: function onClick(e) {
-          e.stopPropagation(); // 需要触发onChange
-          // debugger;
-
-          var desc = getNextSortDesc(sortDirection.desc, sortDirections, sortOrder);
-          var sortBy = {
-            id: typeof desc === 'boolean' ? id : '',
-            desc: desc
-          };
+          e.stopPropagation();
+          var sortBy = getSortBy(id, sortDirections, sortOrder);
           setSortDirection(sortBy);
           onChange(sortBy);
         }
@@ -365,7 +391,7 @@ function Table(_ref, ref) {
       className: classnames("".concat(prefixCls, "-list"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
       id: RANDOM_ID,
       ref: tableBodyListRef
-    }, innerScroll && loadMore ? /*#__PURE__*/React.createElement(InfiniteScroll, {
+    }, innerScroll ? /*#__PURE__*/React.createElement(InfiniteScroll, {
       dataLength: rows.length,
       next: loadMore,
       hasMore: !!hasNextPage,
@@ -374,7 +400,12 @@ function Table(_ref, ref) {
     }, renderRowList()) : renderRowList());
   };
 
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(ResizeObserver, {
+    onResize: function onResize(_ref4) {
+      var domWidth = _ref4.width;
+      setWidth(domWidth);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     className: prefixCls,
     ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
@@ -415,7 +446,7 @@ function Table(_ref, ref) {
     style: {
       width: totalColumnsWidth
     }
-  }), renderTableBody())));
+  }), renderTableBody()))));
 }
 
 export default /*#__PURE__*/React.forwardRef(Table);

package/es/Table/interface.d.ts

@@ -8,7 +8,7 @@ export interface ISort<T> {
 export interface IColumn<T extends object> {
     title: string | null;
     dataIndex: string;
-    render?: (value: any, row: Record<string, T>, index: number) => React.ReactNode;
+    render?: (value: any, row: any, index: number) => React.ReactNode;
     width?: number;
     minWidth?: number;
     sorter?: boolean | 'string' | 'number' | 'basic' | 'datetime' | 'alphanumeric' | ((rowA: Row<T>, rowB: Row<T>, columnId: IdType<T>, desc?: boolean) => number);

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/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/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/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,19 +175,8 @@ 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,
       render: /*#__PURE__*/_react.default.createElement(_OptionItem.ForwardRenderOption, _objectSpread({
         option: option,

package/lib/Select/Selector/index.js

@@ -195,7 +195,7 @@ var Selector = function Selector(props, ref) {
       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");
     }
 

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.js

@@ -21,6 +21,8 @@ var _reactInfiniteScrollComponent = _interopRequireDefault(require("react-infini
 
 var _Empty = _interopRequireDefault(require("../Empty"));
 
+var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
+
 var _reactTable = require("react-table");
 
 var _excluded = ["style"],
@@ -95,11 +97,18 @@ function Table(_ref, ref) {
       setTableClientWidth = _useState2[1];
 
   var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
+
+  var _useState3 = (0, _react.useState)(DEFAULT_ROW_WIDTH),
+      _useState4 = _slicedToArray(_useState3, 2),
+      width = _useState4[0],
+      setWidth = _useState4[1]; // 如果页面整体宽度变化则重新计算
+
+
   (0, _react.useEffect)(function () {
     if (tableRef.current) {
       setTableClientWidth(tableRef.current.clientWidth);
     }
-  }, []);
+  }, [width]);
   var initialColumnsWidthMap = (0, _react.useMemo)(function () {
     var map = new Map();
 
@@ -147,7 +156,12 @@ function Table(_ref, ref) {
         }
       });
     });
-  }, [columns, sortable, initialColumnsWidthMap]);
+  }, [columns, sortable, initialColumnsWidthMap]); // 默认排序的对象
+
+  var defaultSortObject = {
+    id: newColumns[ARRAY_FIRST_INDEX].accessor,
+    desc: newColumns[ARRAY_FIRST_INDEX].sortOrder && newColumns[ARRAY_FIRST_INDEX].sortOrder === 'descend' ? true : false
+  }; // 如果支持排序 但是没有默认排序 则默认按第一列倒叙排序
 
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
@@ -155,10 +169,7 @@ function Table(_ref, ref) {
     }
 
     if (sortable) {
-      return {
-        id: newColumns[ARRAY_FIRST_INDEX].accessor,
-        desc: false
-      };
+      return defaultSortObject;
     }
 
     return {
@@ -225,41 +236,65 @@ function Table(_ref, ref) {
     }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames7.default)("".concat(prefixCls, "-header-right"))
     }, renderHeaderRight ? renderHeaderRight() : null));
-  };
+  }; // 排序的方向 倒叙{ id: 'xx', desc: true }、正序{ id: 'xx', desc: false }、无序 { id: '', desc: undefined }
+  // 获取排序方向以及排序的id
+
 
-  var getNextSortDesc = function getNextSortDesc(currentDesc) {
+  var getSortBy = function getSortBy(id) {
     var sortDirections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['ascend', 'descend'];
-    var sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var // 如果传了sortDirections，则使用传入的，否则使用默认的
+    sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var res = {
+      id: id,
+      desc: undefined // 给个默认的排序
+
+    };
+    var isSameCol = sortDirection.id === id;
     var descMap = new Map([['ascend', false], ['descend', true]]);
-    var directions = allSortDirections || sortDirections;
+    var directions = allSortDirections || sortDirections; // 如果不是同一列 则返回默认排序 或者排序顺序的第一个
+
+    if (!isSameCol) {
+      if (sortOrder === 'ascend' || sortOrder === 'descend') {
+        res.desc = descMap.get(sortOrder);
+      } else {
+        res.desc = sortOrder ? sortOrder : descMap.get(directions[ARRAY_FIRST_INDEX]);
+      }
+
+      return res;
+    } // 如果是同一列
+    // 如果列给了默认的sortOrder则不在变化
+
 
     if (sortOrder === 'ascend' || sortOrder === 'descend') {
-      return descMap.get(sortOrder);
-    }
+      res.desc = descMap.get(sortOrder);
+      return res;
+    } // 在所有方向上 往后取一个
 
-    if (typeof currentDesc === 'undefined') {
-      return descMap.get(directions[ARRAY_FIRST_INDEX]);
-    }
 
-    var direction = currentDesc ? 'descend' : 'ascend';
+    var lastSortDirection = sortDirection.desc ? 'descend' : 'ascend';
 
     var index = _lodash.default.findIndex(directions, function (item) {
-      return item === direction;
+      return item === lastSortDirection;
     });
 
     var nextIndex = index + 1;
-    return descMap.get(directions[nextIndex]);
+    res.desc = descMap.get(directions[nextIndex]); // 如果没有排序方向，则返回默认排序对象
+
+    if (res.desc === undefined) {
+      res.id = '';
+    }
+
+    return res;
   };
 
   var getHeaderProps = function getHeaderProps(column) {
     // @ts-ignore
     var id = column.id,
-        isSortedDesc = column.isSortedDesc,
         canSort = column.canSort,
         sorter = column.sorter,
         sortOrder = column.sortOrder,
         sortDirections = column.sortDirections;
-    var toggleProps = column.getSortByToggleProps();
+    var toggleProps = column.getSortByToggleProps(); // 仅在Table设置sortable时,所有列的canSort为true,此时为前端排序
 
     if (canSort) {
       // client sort
@@ -268,19 +303,16 @@ function Table(_ref, ref) {
           e.stopPropagation();
 
           if (typeof toggleProps.onClick === 'function') {
-            // toggleProps.onClick(e);
-            var desc = getNextSortDesc(isSortedDesc, sortDirections, sortOrder);
-            var sortBy = {
-              id: typeof desc === 'undefined' ? '' : id,
-              desc: desc
-            };
-            setSortBy(typeof desc === 'undefined' ? [] : [sortBy]);
+            var sortBy = getSortBy(id, sortDirections, sortOrder);
+            setSortBy(sortBy.desc === undefined ? [defaultSortObject] : [sortBy]); // 客户端排序时 需要重新设置排序
+
             setSortDirection(sortBy);
             onChange(sortBy);
           }
         }
       });
-    }
+    } // 当列设置sorter属性时，则为服务端排序
+
 
     if (sorter) {
       // server sort
@@ -290,14 +322,8 @@ function Table(_ref, ref) {
         }
       })), {}, {
         onClick: function onClick(e) {
-          e.stopPropagation(); // 需要触发onChange
-          // debugger;
-
-          var desc = getNextSortDesc(sortDirection.desc, sortDirections, sortOrder);
-          var sortBy = {
-            id: typeof desc === 'boolean' ? id : '',
-            desc: desc
-          };
+          e.stopPropagation();
+          var sortBy = getSortBy(id, sortDirections, sortOrder);
           setSortDirection(sortBy);
           onChange(sortBy);
         }
@@ -389,7 +415,7 @@ function Table(_ref, ref) {
       className: (0, _classnames7.default)("".concat(prefixCls, "-list"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
       id: RANDOM_ID,
       ref: tableBodyListRef
-    }, innerScroll && loadMore ? /*#__PURE__*/_react.default.createElement(_reactInfiniteScrollComponent.default, {
+    }, innerScroll ? /*#__PURE__*/_react.default.createElement(_reactInfiniteScrollComponent.default, {
       dataLength: rows.length,
       next: loadMore,
       hasMore: !!hasNextPage,
@@ -398,7 +424,12 @@ function Table(_ref, ref) {
     }, renderRowList()) : renderRowList());
   };
 
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_rcResizeObserver.default, {
+    onResize: function onResize(_ref4) {
+      var domWidth = _ref4.width;
+      setWidth(domWidth);
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: prefixCls,
     ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
@@ -439,7 +470,7 @@ function Table(_ref, ref) {
     style: {
       width: totalColumnsWidth
     }
-  }), renderTableBody())));
+  }), renderTableBody()))));
 }
 
 var _default = /*#__PURE__*/_react.default.forwardRef(Table);

package/lib/Table/interface.d.ts

@@ -8,7 +8,7 @@ export interface ISort<T> {
 export interface IColumn<T extends object> {
     title: string | null;
     dataIndex: string;
-    render?: (value: any, row: Record<string, T>, index: number) => React.ReactNode;
+    render?: (value: any, row: any, index: number) => React.ReactNode;
     width?: number;
     minWidth?: number;
     sorter?: boolean | 'string' | 'number' | 'basic' | 'datetime' | 'alphanumeric' | ((rowA: Row<T>, rowB: Row<T>, columnId: IdType<T>, desc?: boolean) => number);

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.2.0-beta.15",
+  "version": "0.2.0-beta.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -55,6 +55,7 @@
     "lodash": "^4.17.21",
     "rc-menu": "^9.3.2",
     "rc-overflow": "^1.2.3",
+    "rc-resize-observer": "^1.2.0",
     "rc-trigger": "^5.2.10",
     "rc-virtual-list": "^3.4.2",
     "react-infinite-scroll-component": "^6.1.0",