@aloudata/aloudata-design 2.18.2 → 2.18.4

package/dist/AldSelect/index.js

@@ -181,17 +181,20 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
   };
   // Used for OptionList selection
   var onOptionSelect = function onOptionSelect(val) {
+    // Get the original value from keyMenuItems to preserve the type (number/string)
+    var menuItem = keyMenuItems.get(toString(val));
+    var originalValue = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.value) !== undefined ? menuItem.value : val;
     var selected = displayValues.find(function (item) {
       return toString(item.value) === toString(val);
     });
     if (isMultiple(mode)) {
       if (!selected) {
-        triggerSelect(val, true, 'add');
+        triggerSelect(originalValue, true, 'add');
       } else {
-        triggerSelect(val, false, 'remove');
+        triggerSelect(originalValue, false, 'remove');
       }
     } else {
-      triggerSelect(val, true, 'add');
+      triggerSelect(originalValue, true, 'add');
     }
   };
   // ======================= Display Change =======================
@@ -217,6 +220,9 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
       items: (mergedMenu === null || mergedMenu === void 0 ? void 0 : mergedMenu.items) || [],
       onClick: function onClick(menuInfo) {
         var _mergedMenu$onClick;
+        // Get the original value from keyMenuItems to preserve the type (number/string)
+        var menuItem = keyMenuItems.get(menuInfo.key);
+        var originalValue = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.value) !== undefined ? menuItem.value : menuInfo.key;
         if (mode && isMultiple(mode)) {
           if (displayValues.find(function (item) {
             return toString(item.value) === menuInfo.key;
@@ -227,15 +233,15 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
               return item.value;
             }));
           } else {
-            triggerChange([].concat(_toConsumableArray(displayValues), [menuInfo.key]));
+            triggerChange([].concat(_toConsumableArray(displayValues), [originalValue]));
           }
         } else {
-          triggerChange(menuInfo.key);
+          triggerChange(originalValue);
         }
         mergedMenu === null || mergedMenu === void 0 ? void 0 : (_mergedMenu$onClick = mergedMenu.onClick) === null || _mergedMenu$onClick === void 0 ? void 0 : _mergedMenu$onClick.call(mergedMenu, menuInfo);
       }
     });
-  }, [mergedMenu, mode, displayValues, triggerChange]);
+  }, [mergedMenu, mode, displayValues, triggerChange, keyMenuItems]);
   var displayMenu = useDisplayMenu(selectMenu,
   // 如果用户接管了搜索，则默认不做搜索过滤
   onSearch ? filterOption || noOpFilter : filterOption, innerSearchValue);

package/dist/ColorPicker/index.d.ts

@@ -7,8 +7,9 @@ export interface IColorPickerProps {
     localStorageKey?: string;
     onChange?: (color: string) => void;
     icon?: React.ReactNode;
+    bordered?: boolean;
     disabled?: boolean;
     mode?: 'simple' | 'complex';
     complexModeProps?: ColorPickerProps;
 }
-export default function ColorPicker({ className, value, icon, onChange, defaultColor, localStorageKey, disabled, mode, complexModeProps, }: IColorPickerProps): React.JSX.Element | null;
+export default function ColorPicker({ className, value, icon, onChange, defaultColor, localStorageKey, disabled, mode, complexModeProps, bordered, }: IColorPickerProps): React.JSX.Element | null;

package/dist/ColorPicker/index.js

@@ -45,7 +45,9 @@ export default function ColorPicker(_ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$mode = _ref.mode,
     mode = _ref$mode === void 0 ? 'simple' : _ref$mode,
-    complexModeProps = _ref.complexModeProps;
+    complexModeProps = _ref.complexModeProps,
+    _ref$bordered = _ref.bordered,
+    bordered = _ref$bordered === void 0 ? true : _ref$bordered;
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
@@ -171,14 +173,24 @@ export default function ColorPicker(_ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: cls('ald-color-picker-wrapper', {
         'ald-color-picker-wrapper-focused': open,
-        'ald-color-picker-wrapper-disabled': disabled
+        'ald-color-picker-wrapper-disabled': disabled,
+        'ald-color-picker-wrapper-borderless': bordered === false
       }),
       onClick: function onClick(e) {
         if (disabled) {
           e.stopPropagation();
         }
       }
-    }, icon || /*#__PURE__*/React.createElement("div", {
+    }, icon ? /*#__PURE__*/React.createElement("div", {
+      className: 'svg'
+    }, /*#__PURE__*/React.createElement("div", {
+      className: 'icon'
+    }, icon), /*#__PURE__*/React.createElement("div", {
+      className: 'line',
+      style: {
+        backgroundColor: value !== null && value !== void 0 ? value : '#4B5563'
+      }
+    })) : /*#__PURE__*/React.createElement("div", {
       className: 'word'
     }, "A", /*#__PURE__*/React.createElement("div", {
       className: 'line',

package/dist/ColorPicker/style/index.less

@@ -29,11 +29,25 @@
     }
   }
 
+  .ald-color-picker-wrapper-borderless {
+    border: 1px solid transparent;
+  }
+
+  .ald-color-picker-wrapper-borderless:hover {
+    border: 1px solid transparent !important;
+    box-shadow: none;
+  }
+
   .ald-color-picker-wrapper-focused {
     border: 1px solid #3271c9;
     box-sizing: border-box;
   }
 
+  .ald-color-picker-wrapper-borderless.ald-color-picker-wrapper-focused {
+    border: 1px solid transparent !important;
+    box-shadow: none;
+  }
+
   .word {
     position: relative;
     top: -1px;
@@ -47,6 +61,30 @@
       bottom: 3px;
     }
   }
+
+  .svg {
+    position: relative;
+    top: -1px;
+
+    .icon {
+      margin-bottom: 1px;
+    }
+
+    .icon.bordered {
+      border: 1px solid #d1d5db;
+      border-radius: 3px;
+      padding: 1px;
+    }
+
+    .line {
+      width: 10px;
+      height: 2px;
+      position: absolute;
+      bottom: 3px;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
 }
 
 .ald-dropdown-overlay.ald-color-picker-overlay-wrapper {

package/dist/InputSearch/index.js

@@ -62,14 +62,14 @@ export default function InputSearch(props) {
   }, [locale, size]);
 
   // 判断是否为受控模式
-  var isControlled = value !== undefined;
+  var isControlled = ('value' in props);
   var _useState = useState(defaultValue || ''),
     _useState2 = _slicedToArray(_useState, 2),
     searchValue = _useState2[0],
     setSearchValue = _useState2[1];
 
   // 获取当前值：受控模式使用 value，非受控模式使用内部状态
-  var currentValue = isControlled ? value : searchValue;
+  var currentValue = isControlled ? value !== null && value !== void 0 ? value : '' : searchValue;
   var isComposing = useRef(false);
   var onPressEnter = useCallback(function (e) {
     if (!isComposing.current) {
@@ -93,7 +93,8 @@ export default function InputSearch(props) {
       setSearchValue(newValue);
     }
     if (!isComposing.current) {
-      if (debounce) {
+      // 受控的时候debounce不生效
+      if (debounce && !isControlled) {
         debounceSearch(newValue);
       } else {
         onSearch(newValue);
@@ -125,7 +126,7 @@ export default function InputSearch(props) {
       '--init-width': (props.initWidth || defaultWidth) + 'px'
     })
   }, /*#__PURE__*/React.createElement(Input, _extends({
-    className: classnames((_classnames2 = {}, _defineProperty(_classnames2, 'input-search-has-value', currentValue.length !== 0 || inputMode), _defineProperty(_classnames2, 'inputMode', inputMode), _classnames2)),
+    className: classnames((_classnames2 = {}, _defineProperty(_classnames2, 'input-search-has-value', currentValue.length !== 0 || inputMode), _defineProperty(_classnames2, 'input-search-has-content', currentValue.length !== 0), _defineProperty(_classnames2, 'inputMode', inputMode), _classnames2)),
     size: size
     // @ts-ignore
     ,

package/dist/InputSearch/style/index.less

@@ -37,17 +37,32 @@
       background-color: var(--alias-colors-bg-skeleton-subtle, #f9fafb);
     }
 
-    &.ant-input-affix-wrapper-focused,
-    &:hover,
-    &.input-search-has-value {
+    &.ant-input-affix-wrapper-focused:not(.inputMode),
+    &:hover:not(.inputMode),
+    &.input-search-has-value:not(.inputMode) {
       width: 200px !important;
       transition: all 0.2s ease 0.1s !important;
       background-color: var(--alias-colors-bg-skeleton-subtler, #fff);
 
-      &.inputMode {
-        width: 100% !important;
+      input {
+        background-color: #fff;
       }
 
+      ::placeholder {
+        color: var(--alias-colors-text-subtlest, #9ca3af);
+        background-color: var(--alias-colors-bg-skeleton-subtler, #fff);
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 400;
+        line-height: 16px; /* 133.333% */
+        transition: all 0.2s ease 0.1s !important;
+      }
+    }
+
+    &.inputMode {
+      width: 100% !important;
+      background-color: var(--alias-colors-bg-skeleton-subtler, #fff);
+
       input {
         background-color: #fff;
       }
@@ -63,8 +78,7 @@
       }
     }
 
-    &.ant-input-affix-wrapper-focused,
-    &.inputSearchHasValue {
+    &.input-search-has-content {
       .ant-input-suffix {
         display: flex;
 

package/dist/Pagination/PageSizeChanger.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+interface IPageSizeChangerProps {
+    pageSize: number;
+    pageSizeOptions: (string | number)[];
+    onChange: (size: number) => void;
+    className?: string;
+    disabled?: boolean;
+}
+declare const PageSizeChanger: React.FC<IPageSizeChangerProps>;
+export default PageSizeChanger;

package/dist/Pagination/PageSizeChanger.js

@@ -0,0 +1,50 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React, { useContext } from 'react';
+import AldSelect from "../AldSelect";
+import { LocaleContext, getTranslator } from "../locale/default";
+var PageSizeChanger = function PageSizeChanger(_ref) {
+  var pageSize = _ref.pageSize,
+    pageSizeOptions = _ref.pageSizeOptions,
+    onChange = _ref.onChange,
+    className = _ref.className,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+  var _useContext = useContext(LocaleContext),
+    locale = _useContext.locale;
+  var t = getTranslator(locale);
+
+  // 将 pageSizeOptions 转换为 Select 可用的选项格式
+  // 确保当前 pageSize 值在选项中存在
+  var optionSet = new Set([].concat(_toConsumableArray(pageSizeOptions), [pageSize]));
+  var allOptions = Array.from(optionSet).sort(function (a, b) {
+    return Number(a) - Number(b);
+  });
+  var selectOptions = allOptions.map(function (option) {
+    return {
+      label: "".concat(option, " ").concat(t.Pagination.itemsPerPage),
+      value: String(option)
+    };
+  });
+  var handleChange = function handleChange(value) {
+    var newSize = parseInt(value, 10);
+    if (!isNaN(newSize) && newSize !== pageSize) {
+      onChange(newSize);
+    }
+  };
+  var selectProps = {
+    value: String(pageSize),
+    onChange: handleChange,
+    options: selectOptions,
+    width: 112,
+    disabled: disabled,
+    className: "ald-pagination-page-size-changer ".concat(className || '').trim(),
+    placeholder: t.Pagination.selectPageSize
+  };
+  return /*#__PURE__*/React.createElement(AldSelect, selectProps);
+};
+export default PageSizeChanger;

package/dist/Pagination/index.js

@@ -10,16 +10,28 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classnames from 'classnames';
 import _ from 'lodash';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import Button from "../Button";
 import { ChevronLeftLine, ChevronRightLine, Ellipsis } from "../Icon";
+import { LocaleContext, getTranslator } from "../locale/default";
+import PageSizeChanger from "./PageSizeChanger";
 function Pagination(props) {
   var _props$current = props.current,
     currPage = _props$current === void 0 ? 1 : _props$current,
     pageSize = props.pageSize,
     total = props.total,
     onChange = props.onChange,
-    hideOnSinglePage = props.hideOnSinglePage;
+    hideOnSinglePage = props.hideOnSinglePage,
+    _props$showSizeChange = props.showSizeChanger,
+    showSizeChanger = _props$showSizeChange === void 0 ? false : _props$showSizeChange,
+    _props$pageSizeOption = props.pageSizeOptions,
+    pageSizeOptions = _props$pageSizeOption === void 0 ? [10, 20, 30, 50] : _props$pageSizeOption,
+    onShowSizeChange = props.onShowSizeChange,
+    _props$showTotal = props.showTotal,
+    showTotal = _props$showTotal === void 0 ? false : _props$showTotal;
+  var _useContext = useContext(LocaleContext),
+    locale = _useContext.locale;
+  var t = getTranslator(locale);
   var totalPage = getTotalPage(total, pageSize);
   var _useState = useState(getSafeCurrent(totalPage, currPage)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -38,17 +50,52 @@ function Pagination(props) {
         return;
       }
       setCurrent(page);
-      onChange(page);
+      onChange(page, pageSize);
     };
-  }, [onChange, current]);
+  }, [onChange, current, pageSize]);
+  var handlePageSizeChange = useCallback(function (newPageSize) {
+    var newTotalPage = getTotalPage(total, newPageSize);
+    // 确保当前页在有效范围内
+    var safeCurrent = getSafeCurrent(newTotalPage, current);
+    setCurrent(safeCurrent);
+
+    // 调用回调函数
+    if (onShowSizeChange) {
+      onShowSizeChange(safeCurrent, newPageSize);
+    }
+
+    // 也调用 onChange 以保持一致性
+    onChange(safeCurrent, newPageSize);
+  }, [total, current, onShowSizeChange, onChange]);
   var pageRange = getPaginationRange(totalPage, current);
   if (hideOnSinglePage) {
-    if (totalPage <= 1) {
+    if (totalPage <= 1 && !showSizeChanger && !showTotal) {
       return null;
     }
   }
+
+  // 计算当前显示的数据范围
+  var startIndex = (current - 1) * pageSize + 1;
+  var endIndex = Math.min(current * pageSize, total);
+  var range = [startIndex, endIndex];
+  var containerClassName = prefixCls('container');
+
+  // 获取显示总数的函数
+  var getShowTotalContent = function getShowTotalContent() {
+    if (typeof showTotal === 'function') {
+      return showTotal(total, range);
+    }
+    if (showTotal === true) {
+      return t.Pagination.totalItems(total, range);
+    }
+    return null;
+  };
   return /*#__PURE__*/React.createElement("div", {
-    className: prefixCls('container')
+    className: containerClassName
+  }, showTotal && /*#__PURE__*/React.createElement("div", {
+    className: prefixCls('total')
+  }, getShowTotalContent()), /*#__PURE__*/React.createElement("div", {
+    className: prefixCls('main')
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(ChevronLeftLine, {
       size: 16
@@ -76,6 +123,10 @@ function Pagination(props) {
     }),
     onClick: onChangePage(current + 1),
     disabled: current >= totalPage
+  })), showSizeChanger && /*#__PURE__*/React.createElement(PageSizeChanger, {
+    pageSize: pageSize,
+    pageSizeOptions: pageSizeOptions,
+    onChange: handlePageSizeChange
   }));
 }
 export default Pagination;

package/dist/Pagination/style/index.less

@@ -1,5 +1,6 @@
 @import '../../style/index.less';
 @import '../../Button/style/index.less';
+@import '../../AldSelect/style/index.less';
 
 .ald-pagination-container {
   display: flex;
@@ -7,6 +8,12 @@
   gap: 8px;
 }
 
+.ald-pagination-main {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 .ald-pagination-active.ald-btn.ald-btn.ald-btn-secondary {
   &,
   &:focus,
@@ -31,3 +38,9 @@
   font-size: 12px;
   font-weight: 500;
 }
+
+.ald-pagination-total {
+  margin-right: 8px;
+  color: var(--alias-colors-text-secondary, #666);
+  font-size: 14px;
+}

package/dist/Pagination/types.d.ts

@@ -1,7 +1,12 @@
+/// <reference types="react" />
 export interface IPaginationProps {
     current?: number;
     pageSize: number;
     total: number;
-    onChange: (current: number) => void;
+    onChange: (current: number, pageSize?: number) => void;
     hideOnSinglePage?: boolean;
+    showSizeChanger?: boolean;
+    pageSizeOptions?: (string | number)[];
+    onShowSizeChange?: (current: number, size: number) => void;
+    showTotal?: boolean | ((total: number, range: [number, number]) => React.ReactNode);
 }