acud 1.2.1 → 1.2.2

package/es/menu/rc-menu/SubMenu/index.d.ts

@@ -20,6 +20,7 @@ export interface SubMenuProps {
     popupClassName?: string;
     popupOffset?: number[];
     inlineCollapsed?: boolean;
+    mode?: 'inline' | 'horizontal' | 'vertical';
     onClick?: MenuClickEventHandler;
     onTitleClick?: (info: MenuTitleInfo) => void;
     onTitleMouseEnter?: MenuHoverEventHandler;

package/es/rate/rate.js

@@ -73,7 +73,7 @@ var Rate = function Rate(_ref) {
     });
   }, [count]);
   useEffect(function () {
-    return value && updateCurrValue(allowHalf ? value : value - 1);
+    value && updateCurrValue(allowHalf ? value : value - 1);
   }, [value]);
   // 获取焦点
   var handleFocus = useCallback(function () {

package/es/select/src/OptionList.js

@@ -26,13 +26,13 @@ var formatContent = function formatContent(content, searchValue, prefixCls) {
   var lowerSearch = searchValue.toLowerCase();
   var searchStartIndex = lowerContent.indexOf(lowerSearch);
   var len = lowerSearch.length;
-  // 存在搜索值不在content的情况，比如key与children不一致时
+  // 存在搜索值不在content的情况，比如value与children不一致时
   if (searchStartIndex === -1) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, content);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, content.slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, content.toString().slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-search-highlight")
-  }, content.slice(searchStartIndex, searchStartIndex + len)), content.slice(searchStartIndex + len));
+  }, content.toString().slice(searchStartIndex, searchStartIndex + len)), content.toString().slice(searchStartIndex + len));
 };
 /**
  * {afterSearch}
@@ -277,16 +277,16 @@ var OptionList = function OptionList(_ref, ref) {
       return option.data.disabled;
     });
     enableAllValues = enableOptions.map(function (option) {
-      return option.key;
+      return option.value;
     });
     enableValues = _toConsumableArray(values).filter(function (value) {
       return enableOptions.find(function (option) {
-        return option.key === value;
+        return option.value === value;
       });
     });
     disabledValues = _toConsumableArray(values).filter(function (value) {
       return disabledOptions.find(function (option) {
-        return option.key === value;
+        return option.value === value;
       });
     });
     selectAllChecked = enableValues.length === enableOptions.length;
@@ -331,13 +331,13 @@ var OptionList = function OptionList(_ref, ref) {
     });
     if (type === 'all') {
       return groupEnableOptions.every(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       });
     } else if (type === 'indeterminate') {
       return !groupEnableOptions.every(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       }) && groupEnableOptions.some(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       });
     }
     return false;
@@ -354,7 +354,7 @@ var OptionList = function OptionList(_ref, ref) {
       return !option.data.disabled;
     });
     var allValues = groupEnableOptions.map(function (option) {
-      return option.key;
+      return option.value;
     });
     var checkAll = getCheckStatus(groupKey, 'all');
     if (checkAll) {

package/es/select/src/Selector/MultipleSelector.js

@@ -5,6 +5,7 @@ import { useState } from 'react';
 import classNames from 'classnames';
 import pickAttrs from "rc-util/es/pickAttrs";
 import Overflow from 'rc-overflow';
+// import Overflow from '../../../overflow';
 import TransBtn from '../TransBtn';
 import Input from './Input';
 import useLayoutEffect from '../hooks/useLayoutEffect';
@@ -13,6 +14,10 @@ var onPreventMouseDown = function onPreventMouseDown(event) {
   event.preventDefault();
   event.stopPropagation();
 };
+function itemKey(value) {
+  var _a;
+  return (_a = value.key) !== null && _a !== void 0 ? _a : value.value;
+}
 var SelectSelector = function SelectSelector(props) {
   var id = props.id,
     prefixCls = props.prefixCls,
@@ -171,7 +176,7 @@ var SelectSelector = function SelectSelector(props) {
     renderItem: renderItem,
     renderRest: renderRest,
     suffix: inputNode,
-    itemKey: "key",
+    itemKey: itemKey,
     maxCount: maxTagCount
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, selectionNode, !values.length && !inputValue && /*#__PURE__*/React.createElement("span", {

package/es/select/src/interface/generator.d.ts

@@ -41,8 +41,8 @@ config: {
 export type FilterFunc<OptionType> = (inputValue: string, option?: OptionType) => boolean;
 export declare function RefSelectFunc<OptionsType extends object[], ValueType>(Component: React.ForwardRefRenderFunction<RefSelectProps, SelectProps<OptionsType, ValueType>>): React.ForwardRefExoticComponent<React.PropsWithoutRef<SelectProps<OptionsType, ValueType>> & React.RefAttributes<RefSelectProps>>;
 export type FlattenOptionsType<OptionsType extends object[] = object[]> = {
-    key: Key;
-    data: OptionsType[number];
+    key?: Key;
+    data?: OptionsType[number];
     /** Used for customize data */
     [name: string]: any;
 }[];

package/es/select/src/interface/index.d.ts

@@ -35,8 +35,9 @@ export type OptionsType = (OptionData | OptionGroupData)[];
 export interface FlattenOptionData {
     group?: boolean;
     groupOption?: boolean;
-    key: string | number;
-    data: OptionData | OptionGroupData;
+    key?: string | number;
+    value?: string | number;
+    data?: OptionData | OptionGroupData;
     groupKey?: string | number;
     groupLabel?: React.ReactNode;
 }

package/es/select/src/utils/valueUtil.js

@@ -32,6 +32,7 @@ export function flattenOptions(options) {
         // Option
         flattenList.push({
           key: getKey(data, flattenList.length),
+          value: data.value,
           groupOption: isGroupOption,
           data: data,
           groupKey: groupKey,

package/es/table/style/index.css

@@ -217,6 +217,7 @@
 .acud-table-tbody > tr > td {
   border-bottom: 1px solid #f0f0f0;
   transition: background 0.3s;
+  border-right: 1px solid transparent;
 }
 .acud-table-tbody > tr > td > .acud-table-wrapper:only-child .acud-table,
 .acud-table-tbody > tr > td > .acud-table-expanded-row-fixed > .acud-table-wrapper:only-child .acud-table {

package/es/table/style/index.less

@@ -203,6 +203,7 @@
       > td {
         border-bottom: @border-width-base @border-style-base @table-border-color;
         transition: background 0.3s;
+        border-right: 1px solid transparent;
 
         // ========================= Nest Table ===========================
         > .@{table-prefix-cls}-wrapper:only-child,

package/lib/menu/rc-menu/SubMenu/index.d.ts

@@ -20,6 +20,7 @@ export interface SubMenuProps {
     popupClassName?: string;
     popupOffset?: number[];
     inlineCollapsed?: boolean;
+    mode?: 'inline' | 'horizontal' | 'vertical';
     onClick?: MenuClickEventHandler;
     onTitleClick?: (info: MenuTitleInfo) => void;
     onTitleMouseEnter?: MenuHoverEventHandler;

package/lib/rate/rate.js

@@ -84,7 +84,7 @@ var Rate = function Rate(_ref) {
     });
   }, [count]);
   (0, _react.useEffect)(function () {
-    return value && updateCurrValue(allowHalf ? value : value - 1);
+    value && updateCurrValue(allowHalf ? value : value - 1);
   }, [value]);
   // 获取焦点
   var handleFocus = (0, _react.useCallback)(function () {

package/lib/select/src/OptionList.js

@@ -36,13 +36,13 @@ var formatContent = function formatContent(content, searchValue, prefixCls) {
   var lowerSearch = searchValue.toLowerCase();
   var searchStartIndex = lowerContent.indexOf(lowerSearch);
   var len = lowerSearch.length;
-  // 存在搜索值不在content的情况，比如key与children不一致时
+  // 存在搜索值不在content的情况，比如value与children不一致时
   if (searchStartIndex === -1) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, content);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, content.slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, content.toString().slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-search-highlight")
-  }, content.slice(searchStartIndex, searchStartIndex + len)), content.slice(searchStartIndex + len));
+  }, content.toString().slice(searchStartIndex, searchStartIndex + len)), content.toString().slice(searchStartIndex + len));
 };
 /**
  * {afterSearch}
@@ -287,16 +287,16 @@ var OptionList = function OptionList(_ref, ref) {
       return option.data.disabled;
     });
     enableAllValues = enableOptions.map(function (option) {
-      return option.key;
+      return option.value;
     });
     enableValues = (0, _toConsumableArray2["default"])(values).filter(function (value) {
       return enableOptions.find(function (option) {
-        return option.key === value;
+        return option.value === value;
       });
     });
     disabledValues = (0, _toConsumableArray2["default"])(values).filter(function (value) {
       return disabledOptions.find(function (option) {
-        return option.key === value;
+        return option.value === value;
       });
     });
     selectAllChecked = enableValues.length === enableOptions.length;
@@ -341,13 +341,13 @@ var OptionList = function OptionList(_ref, ref) {
     });
     if (type === 'all') {
       return groupEnableOptions.every(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       });
     } else if (type === 'indeterminate') {
       return !groupEnableOptions.every(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       }) && groupEnableOptions.some(function (option) {
-        return values.has(option.key);
+        return values.has(option.value);
       });
     }
     return false;
@@ -364,7 +364,7 @@ var OptionList = function OptionList(_ref, ref) {
       return !option.data.disabled;
     });
     var allValues = groupEnableOptions.map(function (option) {
-      return option.key;
+      return option.value;
     });
     var checkAll = getCheckStatus(groupKey, 'all');
     if (checkAll) {

package/lib/select/src/Selector/MultipleSelector.js

@@ -18,10 +18,16 @@ var _useLayoutEffect = _interopRequireDefault(require("../hooks/useLayoutEffect"
 var _LocaleReceiver = require("../../../locale-provider/LocaleReceiver");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+// import Overflow from '../../../overflow';
+
 var onPreventMouseDown = function onPreventMouseDown(event) {
   event.preventDefault();
   event.stopPropagation();
 };
+function itemKey(value) {
+  var _a;
+  return (_a = value.key) !== null && _a !== void 0 ? _a : value.value;
+}
 var SelectSelector = function SelectSelector(props) {
   var id = props.id,
     prefixCls = props.prefixCls,
@@ -180,7 +186,7 @@ var SelectSelector = function SelectSelector(props) {
     renderItem: renderItem,
     renderRest: renderRest,
     suffix: inputNode,
-    itemKey: "key",
+    itemKey: itemKey,
     maxCount: maxTagCount
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, selectionNode, !values.length && !inputValue && /*#__PURE__*/React.createElement("span", {

package/lib/select/src/interface/generator.d.ts

@@ -41,8 +41,8 @@ config: {
 export type FilterFunc<OptionType> = (inputValue: string, option?: OptionType) => boolean;
 export declare function RefSelectFunc<OptionsType extends object[], ValueType>(Component: React.ForwardRefRenderFunction<RefSelectProps, SelectProps<OptionsType, ValueType>>): React.ForwardRefExoticComponent<React.PropsWithoutRef<SelectProps<OptionsType, ValueType>> & React.RefAttributes<RefSelectProps>>;
 export type FlattenOptionsType<OptionsType extends object[] = object[]> = {
-    key: Key;
-    data: OptionsType[number];
+    key?: Key;
+    data?: OptionsType[number];
     /** Used for customize data */
     [name: string]: any;
 }[];

package/lib/select/src/interface/index.d.ts

@@ -35,8 +35,9 @@ export type OptionsType = (OptionData | OptionGroupData)[];
 export interface FlattenOptionData {
     group?: boolean;
     groupOption?: boolean;
-    key: string | number;
-    data: OptionData | OptionGroupData;
+    key?: string | number;
+    value?: string | number;
+    data?: OptionData | OptionGroupData;
     groupKey?: string | number;
     groupLabel?: React.ReactNode;
 }

package/lib/select/src/utils/valueUtil.js

@@ -46,6 +46,7 @@ function flattenOptions(options) {
         // Option
         flattenList.push({
           key: getKey(data, flattenList.length),
+          value: data.value,
           groupOption: isGroupOption,
           data: data,
           groupKey: groupKey,

package/lib/table/style/index.css

@@ -217,6 +217,7 @@
 .acud-table-tbody > tr > td {
   border-bottom: 1px solid #f0f0f0;
   transition: background 0.3s;
+  border-right: 1px solid transparent;
 }
 .acud-table-tbody > tr > td > .acud-table-wrapper:only-child .acud-table,
 .acud-table-tbody > tr > td > .acud-table-expanded-row-fixed > .acud-table-wrapper:only-child .acud-table {

package/lib/table/style/index.less

@@ -203,6 +203,7 @@
       > td {
         border-bottom: @border-width-base @border-style-base @table-border-color;
         transition: background 0.3s;
+        border-right: 1px solid transparent;
 
         // ========================= Nest Table ===========================
         > .@{table-prefix-cls}-wrapper:only-child,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "acg react 组件库",
     "license": "ISC",
     "author": "acg",
@@ -59,7 +59,7 @@
         "rc-input-number": "^7.1.3",
         "rc-motion": "2.4.3",
         "rc-notification": "4.5.7",
-        "rc-overflow": "^1.0.2",
+        "rc-overflow": "1.2.8",
         "rc-resize-observer": "^1.2.0",
         "rc-select": "^14.1.13",
         "rc-slider": "^9.7.5",