From 10c64a2ef2482abf9aaad06db95ea67d417a3cad Mon Sep 17 00:00:00 2001
From: freedakgmail <freedak.gemini@gmail.com>
Date: Thu, 30 Jul 2026 14:34:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=80=91=E5=B8=83=E5=9B=BE=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89shape=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=94=A8=E5=A0=86=E5=8F=A0=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=9F=B1=E5=AD=90=E9=AB=98=E5=BA=A6=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/pages/BossPage.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/BossPage.tsx b/client/src/pages/BossPage.tsx
index d72f09f..9c3bbed 100644
--- a/client/src/pages/BossPage.tsx
+++ b/client/src/pages/BossPage.tsx
@@ -160,16 +160,21 @@ export function BossPage() {
       {wf && (
         <CollapsibleSection title="利润结构" subtitle="实收 → 减各项成本费用 → 净利润">
           <ResponsiveContainer width="100%" height={280}>
-            <ComposedChart data={waterfallChart} margin={{ top: 10, right: 10, left: 0, bottom: 0 }}>
+            <BarChart data={waterfallChart} margin={{ top: 10, right: 10, left: 0, bottom: 0 }}>
               <CartesianGrid strokeDasharray="3 3" />
               <XAxis dataKey="name" tick={{ fontSize: 10 }} angle={-20} textAnchor="middle" height={60} />
               <YAxis tickFormatter={(v) => v >= 10000 ? `${(v / 10000).toFixed(0)}万` : v} tick={{ fontSize: 10 }} />
               <Tooltip formatter={(v: any) => formatCurrency(v)} />
-              <Bar dataKey="base" stackId="a" fill="transparent" />
-              <Bar dataKey="value" stackId="a" radius={[4, 4, 0, 0]}>
+              <Bar dataKey="value" radius={[4, 4, 0, 0]} shape={(props: any) => {
+                const { x, y, width, height, payload, fill } = props
+                if (!payload.value || payload.value === 0) return <rect />
+                const scale = height / payload.value
+                const newY = y - payload.base * scale
+                return <rect x={x} y={newY} width={width} height={height} fill={fill} rx={4} ry={4} />
+              }}>
                 {waterfallChart.map((entry, i) => <Cell key={i} fill={entry.fill} />)}
               </Bar>
-            </ComposedChart>
+            </BarChart>
           </ResponsiveContainer>
           <div className="mt-2 grid grid-cols-3 gap-2 md:grid-cols-5">
             {waterfallSteps.filter(s => s.type === 'cost').map(s => (