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

package/es/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/es/Navigator/components/Menu/index.js

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

package/es/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/es/Select/OptionsList/OptionItem/RenderLabelIcon.js

@@ -2,6 +2,7 @@ import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import React from 'react';
 import { noop } from 'lodash';
+import 'antd/lib/checkbox/style';
 import Icon from '../../../Icon';
 
 var RenderLabelIcon = function RenderLabelIcon(_ref) {

package/es/Select/OptionsList/index.js

@@ -161,6 +161,7 @@ var OptionsList = function OptionsList(props, ref) {
   }, 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,
+      key: option === null || option === void 0 ? void 0 : option.value,
       render: /*#__PURE__*/React.createElement(ForwardRenderOption, _objectSpread({
         option: option,
         prefixCls: prefixCls,

package/es/Select/Selector/index.js

@@ -40,6 +40,8 @@ import color from '../../style/themes/default/themeColor.module.less';
 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.createElement(Icon, {
@@ -163,14 +165,14 @@ 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 && !isEmpty(value)) {
@@ -188,7 +190,7 @@ var Selector = function Selector(props, ref) {
     return !input && !isNil(value) ? /*#__PURE__*/React.createElement(Tooltip // @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/es/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/es/Select/style/index.less

@@ -465,7 +465,7 @@
     transform: translateY(-50%);
     left: 12px;
     color: @B40;
-    margin-top: 2px;
+    margin-top: -2px;
 
     &-checkbox {
       .@{component-prefix}-checkbox-inner {

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

package/es/Table/index.js

@@ -59,7 +59,10 @@ function Table(_ref, ref) {
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
       _ref$innerScroll = _ref.innerScroll,
-      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll;
+      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll,
+      _ref$scrollThreshold = _ref.scrollThreshold,
+      scrollThreshold = _ref$scrollThreshold === void 0 ? '150px' : _ref$scrollThreshold,
+      rowKey = _ref.rowKey;
 
   var _React$useState = React.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -182,6 +185,9 @@ function Table(_ref, ref) {
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
+    getRowId: typeof rowKey === 'string' ? function () {
+      return rowKey;
+    } : rowKey,
     initialState: {
       sortBy: getInitSortBy()
     }
@@ -396,7 +402,8 @@ function Table(_ref, ref) {
       next: loadMore,
       hasMore: !!hasNextPage,
       loader: LoadingNode,
-      scrollableTarget: RANDOM_ID
+      scrollableTarget: RANDOM_ID,
+      scrollThreshold: scrollThreshold
     }, renderRowList()) : renderRowList());
   };
 

package/es/Table/interface.d.ts

@@ -34,4 +34,6 @@ export interface ITableProps<T extends object> {
     showHeader?: boolean;
     innerScroll?: boolean;
     ref?: React.RefObject<unknown>;
+    scrollThreshold?: string | number;
+    rowKey?: string | ((row: T) => string);
 }

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/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/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

@@ -178,6 +178,7 @@ var OptionsList = function OptionsList(props, ref) {
   }, 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,14 +187,14 @@ 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 && !(0, _lodash.isEmpty)(value)) {
@@ -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

@@ -465,7 +465,7 @@
     transform: translateY(-50%);
     left: 12px;
     color: @B40;
-    margin-top: 2px;
+    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;

package/lib/Table/index.js

@@ -81,7 +81,10 @@ function Table(_ref, ref) {
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
       _ref$innerScroll = _ref.innerScroll,
-      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll;
+      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll,
+      _ref$scrollThreshold = _ref.scrollThreshold,
+      scrollThreshold = _ref$scrollThreshold === void 0 ? '150px' : _ref$scrollThreshold,
+      rowKey = _ref.rowKey;
 
   var _React$useState = _react.default.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -204,6 +207,9 @@ function Table(_ref, ref) {
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
+    getRowId: typeof rowKey === 'string' ? function () {
+      return rowKey;
+    } : rowKey,
     initialState: {
       sortBy: getInitSortBy()
     }
@@ -420,7 +426,8 @@ function Table(_ref, ref) {
       next: loadMore,
       hasMore: !!hasNextPage,
       loader: LoadingNode,
-      scrollableTarget: RANDOM_ID
+      scrollableTarget: RANDOM_ID,
+      scrollThreshold: scrollThreshold
     }, renderRowList()) : renderRowList());
   };
 

package/lib/Table/interface.d.ts

@@ -34,4 +34,6 @@ export interface ITableProps<T extends object> {
     showHeader?: boolean;
     innerScroll?: boolean;
     ref?: React.RefObject<unknown>;
+    scrollThreshold?: string | number;
+    rowKey?: string | ((row: T) => string);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.2.0-beta.18",
+  "version": "0.2.0-beta.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",