style

src/main/resources/web/assets/css/charts.css

@@ -609,6 +609,12 @@ See LICENSE and COMMERCIAL in the project root for license information.
   color: #4285f4 !important;
 }
 
+.chart-box.DataList .table td .badge {
+  padding: 3px 6px;
+  line-height: 1;
+  font-size: 13px;
+}
+
 /* for tablecellsselection.js */
 
 .tcs::selection {

src/main/resources/web/assets/js/charts/chart-design.js

@@ -140,6 +140,9 @@ $(document).ready(() => {
     .attr('title', $L('保存并返回'))
     .off('click')
     .on('click', () => {
+      const hasError = $('#chart-preview .has-error').text()
+      if (hasError) return RbHighbar.create(hasError)
+
       const cfg = build_config()
       if (!cfg) return RbHighbar.create($L('当前图表无数据'))
 
@@ -485,7 +488,7 @@ function render_preview(_color) {
   )
 }
 function render_preview_error(err) {
-  $('#chart-preview').html(`<h4 class="chart-undata must-center">${err}</h4>`)
+  $('#chart-preview').html(`<h4 class="chart-undata must-center has-error">${err}</h4>`)
 }
 
 // 构造配置

src/main/resources/web/assets/js/charts/charts.js

@@ -386,8 +386,8 @@ const ECHART_VALUE_LABEL2 = function (dataFlags = []) {
 const ECHART_TOOLTIP_FORMATTER = function (i, dataFlags = []) {
   if (!Array.isArray(i)) i = [i] // Object > Array
   const tooltip = [`<b>${i[0].name}</b>`]
-  i.forEach((a, idx) => {
+  i.forEach((a) => {
-    tooltip.push(`${a.marker} ${a.seriesName} : ${formatThousands(a.value, dataFlags[idx])}`)
+    tooltip.push(`${a.marker} ${a.seriesName} : ${formatThousands(a.value, dataFlags[a.seriesIndex])}`)
   })
   return tooltip.join('<br>')
 }
@@ -1538,7 +1538,6 @@ class ChartCNMap extends BaseChart {
       .find('.chart-body')
       .height(H - (window.render_preview_chart ? 0 : 40))
     this.__lastHW = [H, W]
-    console.log(this.__lastHW)
   }
 
   export() {