From 55f1a40b85a5b8c03182f08accb856f56defc82c Mon Sep 17 00:00:00 2001
From: Jinke Li <a1231236677287@163.com>
Date: Thu, 17 Oct 2024 10:04:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E9=92=BB=20i?=
 =?UTF-8?q?con=20=E4=B8=8D=E5=BA=94=E8=AF=A5=E9=BB=98=E8=AE=A4=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=B1=95=E7=A4=BA=E5=92=8C=E6=A0=87=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=20(#2925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复下钻 icon 不应该默认全部展示

* fix: 修复下钻面板标题不展示

* fix: 移除 extra dom 节点

* test: 更新快照

* test: 更新快照
---
 .../components/drill-down/__snapshots__/index-spec.tsx.snap | 6 +-----
 packages/s2-react/playground/drill-down.tsx                 | 2 +-
 packages/s2-react/src/components/drill-down/index.tsx       | 2 +-
 .../unit/utils/__snapshots__/drill-down-spec.ts.snap        | 2 +-
 packages/s2-shared/src/styles/drill-down.less               | 6 +-----
 packages/s2-shared/src/utils/drill-down.ts                  | 2 +-
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/s2-react/__tests__/unit/components/drill-down/__snapshots__/index-spec.tsx.snap b/packages/s2-react/__tests__/unit/components/drill-down/__snapshots__/index-spec.tsx.snap
index f59965b5f9..df113f3937 100644
--- a/packages/s2-react/__tests__/unit/components/drill-down/__snapshots__/index-spec.tsx.snap
+++ b/packages/s2-react/__tests__/unit/components/drill-down/__snapshots__/index-spec.tsx.snap
@@ -66,11 +66,6 @@ exports[`DrillDown Component Tests should render component 1`] = `
         </span>
       </span>
     </span>
-    <div
-      class="antv-s2-drill-down-extra"
-    >
-      extra
-    </div>
     <div
       class="css-dev-only-do-not-override-3rel02 ant-empty antv-s2-drill-down-empty"
     >
@@ -144,6 +139,7 @@ exports[`DrillDown Component Tests should render component 1`] = `
         No data
       </div>
     </div>
+    extra
     <ul
       class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light antv-s2-drill-down-menu css-dev-only-do-not-override-3rel02"
       data-menu-list="true"
diff --git a/packages/s2-react/playground/drill-down.tsx b/packages/s2-react/playground/drill-down.tsx
index 88b87355f3..44fa15e0ae 100644
--- a/packages/s2-react/playground/drill-down.tsx
+++ b/packages/s2-react/playground/drill-down.tsx
@@ -23,7 +23,7 @@ export const partDrillDown: PartDrillDown = {
         type: 'text',
       },
     ],
-    extra: <div>test</div>,
+    extra: <div style={{ margin: '4px 16px' }}>test</div>,
   },
   // drillItemsNum: 1,
   fetchData: (meta, drillFields) =>
diff --git a/packages/s2-react/src/components/drill-down/index.tsx b/packages/s2-react/src/components/drill-down/index.tsx
index a6f9f25bf5..f1460d015f 100644
--- a/packages/s2-react/src/components/drill-down/index.tsx
+++ b/packages/s2-react/src/components/drill-down/index.tsx
@@ -122,13 +122,13 @@ export const DrillDown: React.FC<DrillDownProps> = React.memo(
           prefix={<SearchIcon />}
           allowClear
         />
-        <div className={`${DRILL_DOWN_PRE_CLASS}-extra`}>{extra}</div>
         {isEmpty(options) && (
           <Empty
             imageStyle={{ height: '64px' }}
             className={`${DRILL_DOWN_PRE_CLASS}-empty`}
           />
         )}
+        {extra}
         <Menu
           className={`${DRILL_DOWN_PRE_CLASS}-menu`}
           selectedKeys={drillFields}
diff --git a/packages/s2-shared/__tests__/unit/utils/__snapshots__/drill-down-spec.ts.snap b/packages/s2-shared/__tests__/unit/utils/__snapshots__/drill-down-spec.ts.snap
index 92dae3708f..2348751b3c 100644
--- a/packages/s2-shared/__tests__/unit/utils/__snapshots__/drill-down-spec.ts.snap
+++ b/packages/s2-shared/__tests__/unit/utils/__snapshots__/drill-down-spec.ts.snap
@@ -11,7 +11,7 @@ Object {
   "headerActionIcons": Array [
     Object {
       "belongsCell": "rowCell",
-      "defaultHide": false,
+      "defaultHide": true,
       "displayCondition": [Function],
       "icons": Array [
         Object {
diff --git a/packages/s2-shared/src/styles/drill-down.less b/packages/s2-shared/src/styles/drill-down.less
index 46d6655c34..40beb64006 100644
--- a/packages/s2-shared/src/styles/drill-down.less
+++ b/packages/s2-shared/src/styles/drill-down.less
@@ -4,7 +4,7 @@
   width: 260px;
   min-height: 20px;
   position: relative;
-  color: var(--antv-s2-font-70, #fff);
+  color: var(--antv-s2-font-70, rgba(0, 0, 0, 0.9));
 
   &-header {
     display: flex;
@@ -42,10 +42,6 @@
     }
   }
 
-  &-extra {
-    margin: 4px 16px;
-  }
-
   &-menu {
     max-height: 314px;
     overflow: hidden auto;
diff --git a/packages/s2-shared/src/utils/drill-down.ts b/packages/s2-shared/src/utils/drill-down.ts
index f030bfc7b6..22b3e82b19 100644
--- a/packages/s2-shared/src/utils/drill-down.ts
+++ b/packages/s2-shared/src/utils/drill-down.ts
@@ -154,7 +154,7 @@ export const buildDrillDownOptions = <T extends Omit<S2Options, 'tooltip'>>(
         },
       ],
       belongsCell: 'rowCell',
-      defaultHide: false,
+      defaultHide: true,
       displayCondition:
         partDrillDown?.displayCondition || defaultPartDrillDownDisplayCondition,
     };