From ef57580ecc8563afb58f46997b8c438e987f464f Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 9 Apr 2021 14:30:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:css=E8=B0=83=E6=95=B4=E3=80=81hbase=20?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 6 +- .../src/views/panel/list/PanelViewShow.vue | 66 ------------------- 2 files changed, 3 insertions(+), 69 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 04b77b38d0..cc0ee213f8 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -121,9 +121,9 @@ public class ChartViewService { } data = datasourceProvider.getData(datasourceRequest); } else if (table.getMode() == 1) {// 抽取 - DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class); - String tableName = dataTableInfoDTO.getTable() + "-" + table.getDataSourceId();// todo hBase table name maybe change - data = sparkCalc.getData(tableName, xAxis, yAxis, "tmp_" + view.getId().split("-")[0]); +// DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class); +// String tableName = dataTableInfoDTO.getTable() + "-" + table.getDataSourceId();// todo hBase table name maybe change + data = sparkCalc.getData(table.getId(), xAxis, yAxis, "tmp_" + view.getId().split("-")[0]); } // 图表组件可再扩展 diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index d9d78f2dba..276bb0e1a3 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -110,72 +110,6 @@ export default { border-top: 1px solid #E6E6E6; } - .padding-lr { - padding: 0 6px; - } - - .itxst { - margin: 10px; - text-align: left; - } - - .col { - width: 40%; - flex: 1; - padding: 10px; - border: solid 1px #eee; - border-radius: 5px; - float: left; - } - - .col + .col { - margin-left: 10px; - } - - .item { - padding: 2px 12px; - margin: 3px 3px 0 3px; - border: solid 1px #eee; - background-color: #f1f1f1; - text-align: left; - display: block; - } - - .item + .item { - border-top: none; - margin-top: 3px; - } - - .item:hover { - background-color: #fdfdfd; - cursor: pointer; - } - - .item-axis { - padding: 2px 12px; - margin: 3px 3px 0 3px; - border: solid 1px #eee; - background-color: #f1f1f1; - text-align: left; - } - - .item-axis:hover { - background-color: #fdfdfd; - cursor: pointer; - } - - .el-form-item { - margin-bottom: 0; - } - - .container { - width: 100%; - height: 600px; - border: 1px solid #000; - position: relative; - box-sizing: border-box; - } - .custom-position { flex: 1; display: flex; From 4812751d682c8e672b90b4e1756bd1f2250b9b73 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 9 Apr 2021 15:55:34 +0800 Subject: [PATCH 2/5] feat(backend):flyway --- .../main/resources/db/migration/V12__panel_table.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/resources/db/migration/V12__panel_table.sql b/backend/src/main/resources/db/migration/V12__panel_table.sql index 77e108dd3c..92b8cc3619 100644 --- a/backend/src/main/resources/db/migration/V12__panel_table.sql +++ b/backend/src/main/resources/db/migration/V12__panel_table.sql @@ -40,12 +40,12 @@ CREATE TABLE `panel_group` ( -- Records of panel_group -- ---------------------------- BEGIN; -INSERT INTO `panel_group` VALUES ('1001', '飞致云', NULL, 0, 'folder', NULL, NULL, 'self', NULL); -INSERT INTO `panel_group` VALUES ('1c78bc65-ea38-40bc-ad73-738a9b386379', '测试仪表盘1', '1001', 1, 'panel', NULL, 1615961778552, NULL, NULL); -INSERT INTO `panel_group` VALUES ('2003', '默认仪表盘1', NULL, NULL, 'panel', NULL, NULL, 'system', NULL); -INSERT INTO `panel_group` VALUES ('2004', '默认仪表盘2', NULL, NULL, 'panel', NULL, NULL, 'system', NULL); -INSERT INTO `panel_group` VALUES ('8ff64eb1-a96a-4218-85cd-01b437d21f2e', '测试仪表盘2', '1001', 1, 'panel', NULL, 1615200099827, NULL, NULL); -INSERT INTO `panel_group` VALUES ('d15f816d-46b7-4859-8ec8-2b19918dc772', 'TSEE', '1001', 1, 'folder', NULL, 1616403978419, NULL, NULL); +INSERT INTO `panel_group` VALUES ('1001', '飞致云', NULL, 0, 'folder', NULL, NULL, 'self', NULL, NULL); +INSERT INTO `panel_group` VALUES ('1c78bc65-ea38-40bc-ad73-738a9b386379', '测试仪表盘1', '1001', 1, 'panel', NULL, 1615961778552, NULL, NULL, NULL); +INSERT INTO `panel_group` VALUES ('2003', '默认仪表盘1', NULL, NULL, 'panel', NULL, NULL, 'system', NULL, NULL); +INSERT INTO `panel_group` VALUES ('2004', '默认仪表盘2', NULL, NULL, 'panel', NULL, NULL, 'system', NULL, NULL); +INSERT INTO `panel_group` VALUES ('8ff64eb1-a96a-4218-85cd-01b437d21f2e', '测试仪表盘2', '1001', 1, 'panel', NULL, 1615200099827, NULL, NULL, NULL); +INSERT INTO `panel_group` VALUES ('d15f816d-46b7-4859-8ec8-2b19918dc772', 'TSEE', '1001', 1, 'folder', NULL, 1616403978419, NULL, NULL, NULL); COMMIT; -- ---------------------------- From 432ddccd8a3c2a5f33734f9e7bbcc1965bdded10 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 9 Apr 2021 17:41:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20kettle=20=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=20hbase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 55bbf4d263..e252383830 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -491,7 +491,7 @@ public class ExtractDataService { case 1: return "Date"; case 2: - return "Long"; + return "BigNumber"; default: return "String"; } From e7391d034c71fddfac1af2187a4cb90634e43d9e Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 9 Apr 2021 17:41:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/service/spark/SparkCalc.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/spark/SparkCalc.java b/backend/src/main/java/io/dataease/service/spark/SparkCalc.java index 52668d7603..ba558edd75 100644 --- a/backend/src/main/java/io/dataease/service/spark/SparkCalc.java +++ b/backend/src/main/java/io/dataease/service/spark/SparkCalc.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import scala.Tuple2; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Base64; @@ -80,7 +81,7 @@ public class SparkCalc { if (StringUtils.isEmpty(l)) { l = "0"; } - list.add(Long.valueOf(l)); + list.add(new BigDecimal(l)); } }); yAxis.forEach(y -> { @@ -91,7 +92,7 @@ public class SparkCalc { if (StringUtils.isEmpty(l)) { l = "0"; } - list.add(Long.valueOf(l)); + list.add(new BigDecimal(l)); } }); iterator.add(RowFactory.create(list.toArray())); From 62b1bbdceda2d57f859dd8313dee5394aadd3502 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 9 Apr 2021 18:11:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/service/spark/SparkCalc.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/spark/SparkCalc.java b/backend/src/main/java/io/dataease/service/spark/SparkCalc.java index ba558edd75..72ef889ab6 100644 --- a/backend/src/main/java/io/dataease/service/spark/SparkCalc.java +++ b/backend/src/main/java/io/dataease/service/spark/SparkCalc.java @@ -81,7 +81,7 @@ public class SparkCalc { if (StringUtils.isEmpty(l)) { l = "0"; } - list.add(new BigDecimal(l)); + list.add(l.contains(".") ? Double.parseDouble(l) : Long.parseLong(l)); } }); yAxis.forEach(y -> { @@ -92,7 +92,7 @@ public class SparkCalc { if (StringUtils.isEmpty(l)) { l = "0"; } - list.add(new BigDecimal(l)); + list.add(l.contains(".") ? Double.parseDouble(l) : Long.parseLong(l)); } }); iterator.add(RowFactory.create(list.toArray()));