From 38060856f0f8bdc8ee5d135fc6944031603d729a Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Fri, 7 Jul 2023 09:45:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BE=A7=E8=BE=B9=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8E=E5=BA=95=E9=83=A8=E9=9D=A2=E6=9D=BF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/widgets/AnalysisLayout/Component/index.tsx     | 10 +++++++---
 .../src/widgets/AnalysisLayout/Component/style.ts      |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
index a55976f4..88569e4f 100644
--- a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
+++ b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
@@ -1,7 +1,8 @@
 import type { ImplementWidgetProps } from '@antv/li-sdk';
 import { MapContainer } from '@antv/li-sdk';
+import { useSize } from 'ahooks';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import FloatPanel from '../FloatPanel';
 import type { Properties } from '../registerForm';
 import { CLS_PREFIX } from './constant';
@@ -18,6 +19,9 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   const styles = useStyle();
 
+  const mapContainerRef = useRef<HTMLDivElement>(null);
+  const size = useSize(mapContainerRef);
+
   const [collapsed, setCollapsed] = useState(collapsedFloatPanel);
   const mapContainerSlots = useMemo(() => ({ content: slotsElements.content, controls: slotsElements.controls }), [
     slotsElements.content,
@@ -34,7 +38,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   return (
     <div className={classNames(styles.analysisLayout, CLS_PREFIX)}>
-      <div className={styles.layoutContainer}>
+      <div className={styles.layoutContainer} ref={mapContainerRef}>
         <MapContainer
           className={classNames(styles.mapContainer, `${CLS_PREFIX}__map-conatiner`, {
             [styles.showFloatPanel]: showFloatPanel && !collapsed,
@@ -53,7 +57,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
           {children}
         </MapContainer>
         {showSidePanel && (
-          <div className={classNames(styles.sidePanel, `${CLS_PREFIX}__side-panel`)}>
+          <div className={classNames(styles.sidePanel, `${CLS_PREFIX}__side-panel`)} style={{ height: size?.height }}>
             {slotsElements.sidePanel ? slotsElements.sidePanel({}) : null}
           </div>
         )}
diff --git a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/style.ts b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/style.ts
index 0ddaccd4..c803bdf4 100644
--- a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/style.ts
+++ b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/style.ts
@@ -25,7 +25,6 @@ const useStyle = () => {
       display: flex;
       flex: auto;
       width: 100%;
-      height: 100%;
     `,
 
     bottomPanel: css`

From a3649854bad0f6bebde126805ca674a2993a6191 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Fri, 7 Jul 2023 10:35:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/widgets/AnalysisLayout/Component/index.tsx     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
index 88569e4f..25c603b8 100644
--- a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
+++ b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
@@ -1,8 +1,7 @@
 import type { ImplementWidgetProps } from '@antv/li-sdk';
 import { MapContainer } from '@antv/li-sdk';
-import { useSize } from 'ahooks';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import FloatPanel from '../FloatPanel';
 import type { Properties } from '../registerForm';
 import { CLS_PREFIX } from './constant';
@@ -19,9 +18,6 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   const styles = useStyle();
 
-  const mapContainerRef = useRef<HTMLDivElement>(null);
-  const size = useSize(mapContainerRef);
-
   const [collapsed, setCollapsed] = useState(collapsedFloatPanel);
   const mapContainerSlots = useMemo(() => ({ content: slotsElements.content, controls: slotsElements.controls }), [
     slotsElements.content,
@@ -38,7 +34,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   return (
     <div className={classNames(styles.analysisLayout, CLS_PREFIX)}>
-      <div className={styles.layoutContainer} ref={mapContainerRef}>
+      <div className={styles.layoutContainer} style={showBottomPanel ? { height: 'calc(100% - 300px)' } : {}}>
         <MapContainer
           className={classNames(styles.mapContainer, `${CLS_PREFIX}__map-conatiner`, {
             [styles.showFloatPanel]: showFloatPanel && !collapsed,
@@ -57,7 +53,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
           {children}
         </MapContainer>
         {showSidePanel && (
-          <div className={classNames(styles.sidePanel, `${CLS_PREFIX}__side-panel`)} style={{ height: size?.height }}>
+          <div className={classNames(styles.sidePanel, `${CLS_PREFIX}__side-panel`)}>
             {slotsElements.sidePanel ? slotsElements.sidePanel({}) : null}
           </div>
         )}

From de7ba510072930e261d5e5fd25fa2dbbf4ae5a96 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Fri, 7 Jul 2023 10:42:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/widgets/AnalysisLayout/Component/index.tsx  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
index 25c603b8..bf79ccdb 100644
--- a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
+++ b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
@@ -1,7 +1,8 @@
 import type { ImplementWidgetProps } from '@antv/li-sdk';
 import { MapContainer } from '@antv/li-sdk';
+import { useSize } from 'ahooks';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import FloatPanel from '../FloatPanel';
 import type { Properties } from '../registerForm';
 import { CLS_PREFIX } from './constant';
@@ -18,6 +19,9 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   const styles = useStyle();
 
+  const bottomPanelContainerRef = useRef<HTMLDivElement>(null);
+  const size = useSize(bottomPanelContainerRef);
+
   const [collapsed, setCollapsed] = useState(collapsedFloatPanel);
   const mapContainerSlots = useMemo(() => ({ content: slotsElements.content, controls: slotsElements.controls }), [
     slotsElements.content,
@@ -34,7 +38,10 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
 
   return (
     <div className={classNames(styles.analysisLayout, CLS_PREFIX)}>
-      <div className={styles.layoutContainer} style={showBottomPanel ? { height: 'calc(100% - 300px)' } : {}}>
+      <div
+        className={styles.layoutContainer}
+        style={showBottomPanel ? { height: `calc(100% - ${size?.height}px)` } : {}}
+      >
         <MapContainer
           className={classNames(styles.mapContainer, `${CLS_PREFIX}__map-conatiner`, {
             [styles.showFloatPanel]: showFloatPanel && !collapsed,
@@ -59,7 +66,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
         )}
       </div>
       {showBottomPanel && (
-        <div className={classNames(styles.bottomPanel, `${CLS_PREFIX}__bottom-panel`)}>
+        <div className={classNames(styles.bottomPanel, `${CLS_PREFIX}__bottom-panel`)} ref={bottomPanelContainerRef}>
           {slotsElements.bottomPanel ? slotsElements.bottomPanel({}) : null}
         </div>
       )}

From 28df1d5a4d3099f482b7da6b650334c17f965549 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Fri, 7 Jul 2023 10:43:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/widgets/AnalysisLayout/Component/index.tsx              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
index bf79ccdb..018715da 100644
--- a/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
+++ b/packages/li-analysis-assets/src/widgets/AnalysisLayout/Component/index.tsx
@@ -40,7 +40,7 @@ const AnalysisLayout: React.FC<AnalysisLayoutProps> = (props) => {
     <div className={classNames(styles.analysisLayout, CLS_PREFIX)}>
       <div
         className={styles.layoutContainer}
-        style={showBottomPanel ? { height: `calc(100% - ${size?.height}px)` } : {}}
+        style={showBottomPanel && size?.height ? { height: `calc(100% - ${size.height}px)` } : {}}
       >
         <MapContainer
           className={classNames(styles.mapContainer, `${CLS_PREFIX}__map-conatiner`, {