From 20a5ef53db95af7fd8d4df202448935e40f8af8e Mon Sep 17 00:00:00 2001
From: zhouxinyu <zhouxinyu12138@gmail.com>
Date: Fri, 20 Jun 2025 18:10:57 +0800
Subject: [PATCH] fix: fix issue with 3d chart grid

---
 .../fix-3d-chart-grid_2025-06-20-10-11.json   | 10 ++++
 .../src/charts/axis-3d/axis-3d-mixin.ts       | 59 ++++++++++++++++++-
 .../src/charts/axis-3d/util.ts                | 25 ++++----
 3 files changed, 82 insertions(+), 12 deletions(-)
 create mode 100644 common/changes/@visactor/vchart/fix-3d-chart-grid_2025-06-20-10-11.json

diff --git a/common/changes/@visactor/vchart/fix-3d-chart-grid_2025-06-20-10-11.json b/common/changes/@visactor/vchart/fix-3d-chart-grid_2025-06-20-10-11.json
new file mode 100644
index 0000000000..f597d436ec
--- /dev/null
+++ b/common/changes/@visactor/vchart/fix-3d-chart-grid_2025-06-20-10-11.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vchart",
+      "comment": "fix: fix issue with 3d chart grid",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vchart"
+}
\ No newline at end of file
diff --git a/packages/vchart-extension/src/charts/axis-3d/axis-3d-mixin.ts b/packages/vchart-extension/src/charts/axis-3d/axis-3d-mixin.ts
index df9eb76fd1..e002bba4b3 100644
--- a/packages/vchart-extension/src/charts/axis-3d/axis-3d-mixin.ts
+++ b/packages/vchart-extension/src/charts/axis-3d/axis-3d-mixin.ts
@@ -1,5 +1,5 @@
 import type { IAxis } from '@visactor/vchart';
-import { isZAxis } from '@visactor/vchart';
+import { isXAxis, isYAxis, isZAxis } from '@visactor/vchart';
 import { getUpdateAttributeOfZAxis } from './util';
 
 export class Axis3dMixin {
@@ -11,8 +11,65 @@ export class Axis3dMixin {
 
   protected _afterUpdateAttribute(attrs: any, ignoreGrid: boolean) {
     const isZ = isZAxis((this as any)._orient);
+    const isX = isXAxis((this as any)._orient);
+    const isY = isYAxis((this as any)._orient);
+
+    // 获取更新的坐标轴属性
+    let regionHeight = 0;
+    let regionWidth = 0;
+
+    if (!ignoreGrid) {
+      const regions = (this as any).getRegions();
+      let { x: minX, y: minY } = regions[0].getLayoutStartPoint();
+      let maxX = minX + regions[0].getLayoutRect().width;
+      let maxY = minY + regions[0].getLayoutRect().height;
+      for (let index = 1; index < regions.length; index++) {
+        const region = regions[index];
+        const { x, y } = region.getLayoutStartPoint();
+        const { width, height } = region.getLayoutRect();
+        minX = Math.min(minX, x);
+        maxX = Math.max(maxX, width + x);
+        minY = Math.min(minY, y);
+        maxY = Math.max(maxY, height + y);
+      }
+      regionHeight = Math.abs(maxY - minY);
+      regionWidth = Math.abs(maxX - minX);
+    }
+
+    let gridLength = 0;
+    let axisLength = 0;
+    const { width, height } = (this as any).getLayoutRect();
+    let end = { x: 0, y: 0 };
+
+    if (isX) {
+      end = { x: width, y: 0 };
+      gridLength = regionHeight;
+      axisLength = width;
+    } else if (isY) {
+      end = { x: 0, y: height };
+      gridLength = regionWidth;
+      axisLength = height;
+    }
+
+    const depth = (this as any).layout3dBox ? (this as any).layout3dBox.length : 0;
 
     if (!isZ) {
+      const items = (this as any).getLabelItems(axisLength);
+      attrs.grid = {
+        length: gridLength
+      };
+      attrs.start = { x: 0, y: 0 };
+      attrs.text = (this as any)._spec.title.text || (this as any)._dataFieldText;
+      attrs.maxWidth = (this as any)._getTitleLimit(isX);
+      attrs.items = items;
+      attrs.grid = {
+        type: 'line',
+        start: { x: 0, y: 0 },
+        end,
+        items: items[0],
+        depth,
+        length: gridLength
+      };
       return attrs;
     }
 
diff --git a/packages/vchart-extension/src/charts/axis-3d/util.ts b/packages/vchart-extension/src/charts/axis-3d/util.ts
index 8652201123..7c24afa3df 100644
--- a/packages/vchart-extension/src/charts/axis-3d/util.ts
+++ b/packages/vchart-extension/src/charts/axis-3d/util.ts
@@ -19,17 +19,6 @@ export const getUpdateAttributeOfZAxis = (axis: IAxis, ignoreGrid: boolean) => {
     items,
     scale: (axis as any)._scale.clone()
   };
-  if (!ignoreGrid) {
-    attrs.grid = {
-      type: 'line',
-      start: { x: 0, y: 0 },
-      end,
-      items: items[0],
-      verticalFactor: (axis as any)._axisStyle.verticalFactor,
-      depth: depthZ,
-      length: !ignoreGrid ? regionSize.height : 0
-    };
-  }
 
   const directionStr = (axis as any).directionStr ?? 'r2l';
   let anchor3d = [0, 0];
@@ -44,5 +33,19 @@ export const getUpdateAttributeOfZAxis = (axis: IAxis, ignoreGrid: boolean) => {
   attrs.alpha = alpha;
   attrs.anchor3d = anchor3d;
 
+  if (!ignoreGrid) {
+    attrs.grid = {
+      type: 'line',
+      start: { x: 0, y: 0 },
+      end,
+      items: items[0],
+      verticalFactor: (axis as any)._axisStyle.verticalFactor,
+      depth: depthZ,
+      length: !ignoreGrid ? regionSize.height : 0,
+      alpha,
+      z,
+      anchor3d
+    };
+  }
   return attrs;
 };