From 3492957613abd002b2fffd6c879e4625cebcdc85 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Fri, 29 Mar 2024 05:23:13 +0000
Subject: [PATCH] * Fix preview layout in chart and pivot.

---
 module/chart/ui/charts.html.php  |  4 +-
 module/chart/ui/preview.html.php | 66 +++++++++++++++-----------------
 module/pivot/ui/preview.html.php | 46 +++++++++++-----------
 3 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/module/chart/ui/charts.html.php b/module/chart/ui/charts.html.php
index f39e2f1f64..f65fd24c4f 100644
--- a/module/chart/ui/charts.html.php
+++ b/module/chart/ui/charts.html.php
@@ -65,8 +65,10 @@ $generateCharts = function() use($charts, $lang)
                 echarts
                 (
                     set($chartOptions),
+                    set::width('100%'),
+                    set::height(400),
                     $chart->type == 'waterpolo' ? set::exts('liquidfill') : null,
-                )->size('100%', 400)
+                )
             )
         );
     }
diff --git a/module/chart/ui/preview.html.php b/module/chart/ui/preview.html.php
index 79f1b6f834..56f63d4ea3 100644
--- a/module/chart/ui/preview.html.php
+++ b/module/chart/ui/preview.html.php
@@ -45,42 +45,36 @@ if($config->edition != 'open')
 
 $chart = zget($charts, 0, null);
 
+sidebar
+(
+    set::width(240),
+    moduleMenu
+    (
+        set::title($groups[$groupID]),
+        set::modules($treeMenu),
+        $charts ? set::activeKey($charts[0]->currentGroup . '_' . $charts[0]->id) : null,
+        set::closeLink(''),
+        set::showDisplay(false),
+        set::titleShow(false),
+        set::checkbox(true),
+        set::checkOnClick('any'),
+        to::footer
+        ([
+            $treeMenu ? div
+            (
+                setClass('bg-canvas px-4 py-2 module-menu'),
+                btn($lang->chart->preview, setClass('primary'), on::click('previewCharts'))
+            ) : null,
+            $config->edition == 'open' ? div
+            (
+                setClass('bg-canvas px-4 py-2 module-menu'),
+                html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
+            ) : null
+        ])
+    ),
+);
 div
 (
-    setClass('flex gap-4'),
-    sidebar
-    (
-        set::width(240),
-        moduleMenu
-        (
-            set::title($groups[$groupID]),
-            set::modules($treeMenu),
-            $charts ? set::activeKey($charts[0]->currentGroup . '_' . $charts[0]->id) : null,
-            set::closeLink(''),
-            set::showDisplay(false),
-            set::checkbox(true),
-            set::checkOnClick('any'),
-            to::footer
-            ([
-                $treeMenu ? div
-                (
-                    setClass('bg-canvas px-4 py-2 module-menu'),
-                    btn($lang->chart->preview, setClass('primary'), on::click('previewCharts'))
-                ) : null,
-                $config->edition == 'open' ? div
-                (
-                    setClass('bg-canvas px-4 py-2 module-menu'),
-                    html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
-                ) : null
-            ])
-        ),
-    ),
-    div
-    (
-        setID('chartPanel'),
-        setClass('w-full'),
-        $generateCharts()
-    )
+    setID('chartPanel'),
+    $generateCharts()
 );
-
-render();
diff --git a/module/pivot/ui/preview.html.php b/module/pivot/ui/preview.html.php
index 3ddcc2c077..ae9861fcfe 100644
--- a/module/pivot/ui/preview.html.php
+++ b/module/pivot/ui/preview.html.php
@@ -55,31 +55,31 @@ if($config->edition != 'open')
     );
 }
 
-div
+sidebar
 (
-    setClass('flex gap-4'),
-    sidebar
+    set::width(240),
+    moduleMenu
     (
-        set::width(240),
-        moduleMenu
+        set::title($groups[$groupID]),
+        set::activeKey($currentMenu),
+        set::modules($menus),
+        set::closeLink(''),
+        set::showDisplay(false),
+        set::titleShow(false),
+        to::footer
         (
-            set::title($groups[$groupID]),
-            set::activeKey($currentMenu),
-            set::modules($menus),
-            set::closeLink(''),
-            set::showDisplay(false)
-        ),
-        $config->edition == 'open' ? div
-        (
-            set::width(240),
-            setClass('bg-canvas px-4 py-2 module-menu shadow'),
-            html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
-        ) : null
-    ),
-    div
-    (
-        setID('pivotContent'),
-        setClass('flex col gap-4 w-full'),
-        $generateData()
+            $config->edition == 'open' ? div
+            (
+                set::width(240),
+                setClass('bg-canvas px-4 py-2 module-menu shadow'),
+                html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
+            ) : null
+        )
     )
 );
+div
+(
+    setID('pivotContent'),
+    setClass('flex col gap-4 w-full'),
+    $generateData()
+);