From 3feb486dd4f0f8ca6d91830e6a72930f4a491c23 Mon Sep 17 00:00:00 2001
From: RB <42044143+getrebuild@users.noreply.github.com>
Date: Mon, 1 Sep 2025 15:54:10 +0800
Subject: [PATCH] Improve chart fullscreen UI and add table cell selection

---
 @rbv                                          |  2 +-
 .../resources/web/assets/css/list-page.css    | 23 ++++++++++++++++---
 src/main/resources/web/assets/css/rb-page.css |  6 ++++-
 .../resources/web/assets/js/charts/charts.js  |  5 ++--
 .../resources/web/general/detail-list.html    |  1 +
 .../resources/web/general/record-list.html    |  1 +
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/@rbv b/@rbv
index 8f0e04c31..3c40f82ef 160000
--- a/@rbv
+++ b/@rbv
@@ -1 +1 @@
-Subproject commit 8f0e04c31603daa7893e7afb34f9a86b5e9348c3
+Subproject commit 3c40f82ef6eac7641a651907fefe6a51a14a9c52
diff --git a/src/main/resources/web/assets/css/list-page.css b/src/main/resources/web/assets/css/list-page.css
index b03969f6c..7609fee49 100644
--- a/src/main/resources/web/assets/css/list-page.css
+++ b/src/main/resources/web/assets/css/list-page.css
@@ -348,6 +348,7 @@ See LICENSE and COMMERCIAL in the project root for license information.
   width: 100%;
   height: 240px;
   background-color: #fff;
+  border-radius: 6px;
 }
 
 #asideCharts .chart-box .chart-body {
@@ -367,7 +368,6 @@ See LICENSE and COMMERCIAL in the project root for license information.
 }
 
 #asideCharts .chart-box:hover .chart-oper a.J_source,
-#asideCharts .chart-box:hover .chart-oper a.J_fullscreen,
 #asideCharts .chart-box:hover .chart-oper a.J_chart-edit,
 #asideCharts .chart-box:hover .chart-oper a.J_export {
   display: none !important;
@@ -381,11 +381,28 @@ See LICENSE and COMMERCIAL in the project root for license information.
   position: fixed;
   top: 60px !important;
   left: 230px !important;
-  width: 100% !important;
-  height: 100% !important;
+  right: 0 !important;
+  bottom: 0 !important;
   z-index: 9999;
   background-color: #fff;
   padding: 20px;
+  margin: 0;
+  overflow: hidden;
+  transition: all 0.3s;
+}
+
+#asideCharts .charts-wrap > div.fullscreen .chart-box {
+  height: 100%;
+}
+
+@media (min-width: 768px) and (max-width: 1464px) {
+  #asideCharts .charts-wrap > div.fullscreen {
+    left: 200px !important;
+  }
+}
+
+.rb-collapsible-sidebar-collapsed #asideCharts .charts-wrap > div.fullscreen {
+  left: 60px !important;
 }
 
 #asideCharts .charts-wrap .ui-sortable-helper {
diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css
index 964dd583b..e116d6c05 100644
--- a/src/main/resources/web/assets/css/rb-page.css
+++ b/src/main/resources/web/assets/css/rb-page.css
@@ -3840,10 +3840,14 @@ a.user-show:not([href]) {
 }
 
 .page-aside.widgets {
-  z-index: 2;
+  z-index: 3;
   overflow: hidden;
 }
 
+.page-aside.widgets + .main-content {
+  z-index: 2;
+}
+
 .page-aside.widgets .tab-container {
   min-width: 279px;
   overflow: hidden;
diff --git a/src/main/resources/web/assets/js/charts/charts.js b/src/main/resources/web/assets/js/charts/charts.js
index 8705dce36..83e075a59 100644
--- a/src/main/resources/web/assets/js/charts/charts.js
+++ b/src/main/resources/web/assets/js/charts/charts.js
@@ -109,12 +109,13 @@ class BaseChart extends React.Component {
       const $stack = $('.chart-grid>.grid-stack')
       if (!$stack[0]) {
         // in DataList
-        // $(this._$box).parent().toggleClass('fullscreen')
+        const $wrap = $(this._$box).parent()
+        $wrap.toggleClass('fullscreen')
+        this.resize()
         return
       }
 
       const $boxParent = $(this._$box).parents('.grid-stack-item')
-
       if (this.state.fullscreen) {
         BaseChart.currentFullscreen = this
         if (!this.__chartStackHeight) this.__chartStackHeight = $stack.height()
diff --git a/src/main/resources/web/general/detail-list.html b/src/main/resources/web/general/detail-list.html
index fd1b5337f..7ee370935 100644
--- a/src/main/resources/web/general/detail-list.html
+++ b/src/main/resources/web/general/detail-list.html
@@ -133,6 +133,7 @@
       }
     </script>
     <script th:src="@{/assets/lib/charts/echarts.min.js?v=5.5.0}"></script>
+    <script th:src="@{/assets/lib/charts/tablecellsselection.js}"></script>
     <script th:src="@{/assets/js/charts/charts.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-compatible.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/general/record-list.html b/src/main/resources/web/general/record-list.html
index 2484727c9..c7d09ddbb 100644
--- a/src/main/resources/web/general/record-list.html
+++ b/src/main/resources/web/general/record-list.html
@@ -144,6 +144,7 @@
       }
     </script>
     <script th:src="@{/assets/lib/charts/echarts.min.js?v=5.5.0}"></script>
+    <script th:src="@{/assets/lib/charts/tablecellsselection.js}"></script>
     <script th:src="@{/assets/js/charts/charts.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-compatible.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>