fix(Select): add title for multiple option (#2446)

* fix(Select): add title for multiple option * fix(Select): disable internal filter when onsearch * chore: select demo
Tencent · Aug 16, 2023 · e5d3aa4 · e5d3aa4
1 parent f098db6
commit e5d3aa4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/select/_example/remote-search.jsx b/src/select/_example/remote-search.jsx
@@ -35,16 +35,16 @@ const RemoteSearchSelect = () => {
       if (search) {
         options = [
           {
-            value: `${search}_test1`,
-            label: `${search}_test1`,
+            value: `腾讯_test1`,
+            label: `腾讯_test1`,
           },
           {
-            value: `${search}_test2`,
-            label: `${search}_test2`,
+            value: `腾讯_test2`,
+            label: `腾讯_test2`,
           },
           {
-            value: `${search}_test3`,
-            label: `${search}_test3`,
+            value: `腾讯_test3`,
+            label: `腾讯_test3`,
           },
         ];
       } else {

diff --git a/src/select/_example/scroll-bottom.jsx b/src/select/_example/scroll-bottom.jsx
@@ -12,7 +12,7 @@ export default function ScrollBottom() {
   // 通过滚动事件自行判断
   // const handleScroll = ({ e }) => {
   //   const { scrollTop, clientHeight, scrollHeight } = e.target;
-  //   if (scrollHeight - scrollTop === clientHeight) {
+  //   if (clientHeight + Math.floor(scrollTop) === scrollHeight) {
   //     console.log('到底部了');
   //     changeDynamicOptions((dynamicOptions) =>
   //       dynamicOptions.concat({

diff --git a/src/select/base/Option.tsx b/src/select/base/Option.tsx
@@ -118,6 +118,7 @@ const Option = (props: SelectOptionProps) => {
             [`${classPrefix}-is-disabled`]: disabled,
             [`${classPrefix}-is-checked`]: selected,
           })}
+          title={propTitle || (label as string)}
         >
           <input
             type="checkbox"

diff --git a/src/select/base/Select.tsx b/src/select/base/Select.tsx
@@ -209,6 +209,8 @@ const Select = forwardRefWithStatics(
     // 处理filter逻辑
     const handleFilter = (value: string) => {
       let filteredOptions: OptionsType = [];
+      if (filterable && isFunction(onSearch)) return;
+
       if (!value) {
         setCurrentOptions(tmpPropOptions);
         return;