From 2b68f465d16aecbe4bc00cec434007ea07b7a7bd Mon Sep 17 00:00:00 2001
From: kooriookami <38392315+kooriookami@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:36:50 +0800
Subject: [PATCH] fix(components): [select-v2] show header and footer slots
 when empty (#15964)

---
 .../select-v2/src/select-dropdown.tsx         | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/packages/components/select-v2/src/select-dropdown.tsx b/packages/components/select-v2/src/select-dropdown.tsx
index 8bd5a5bab8..e4d324f052 100644
--- a/packages/components/select-v2/src/select-dropdown.tsx
+++ b/packages/components/select-v2/src/select-dropdown.tsx
@@ -226,40 +226,34 @@ export default defineComponent({
       const { data, width } = props
       const { height, multiple, scrollbarAlwaysOn } = select.props
 
-      if (slots.loading || slots.empty) {
-        return (
-          <div
-            class={ns.b('dropdown')}
-            style={{
-              width: `${width}px`,
-            }}
-          >
-            {slots.loading?.() || slots.empty?.()}
-          </div>
-        )
-      }
-
       const List = unref(isSized) ? FixedSizeList : DynamicSizeList
 
       return (
-        <div class={[ns.b('dropdown'), ns.is('multiple', multiple)]}>
+        <div
+          class={[ns.b('dropdown'), ns.is('multiple', multiple)]}
+          style={{
+            width: `${width}px`,
+          }}
+        >
           {slots.header?.()}
-          <List
-            ref={listRef}
-            {...unref(listProps)}
-            className={ns.be('dropdown', 'list')}
-            scrollbarAlwaysOn={scrollbarAlwaysOn}
-            data={data}
-            height={height}
-            width={width}
-            total={data.length}
-            // @ts-ignore - dts problem
-            onKeydown={onKeydown}
-          >
-            {{
-              default: (props: ItemProps<any>) => <Item {...props} />,
-            }}
-          </List>
+          {slots.loading?.() || slots.empty?.() || (
+            <List
+              ref={listRef}
+              {...unref(listProps)}
+              className={ns.be('dropdown', 'list')}
+              scrollbarAlwaysOn={scrollbarAlwaysOn}
+              data={data}
+              height={height}
+              width={width}
+              total={data.length}
+              // @ts-ignore - dts problem
+              onKeydown={onKeydown}
+            >
+              {{
+                default: (props: ItemProps<any>) => <Item {...props} />,
+              }}
+            </List>
+          )}
           {slots.footer?.()}
         </div>
       )