From 97d822796b5f056753fe93f07f9350201e05fbec Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 14 Apr 2021 11:27:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):spark=20=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=A8=A1=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=9B=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=88=9B=E5=BB=BA=E6=94=AF=E6=8C=81=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=90=8C=E6=97=B6=E5=B0=86=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=90=8D=E7=A7=B0=E9=BB=98=E8=AE=A4=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?chart=20title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/spark/SparkCalc.java | 3 +- frontend/src/lang/zh.js | 4 ++- frontend/src/views/chart/group/Group.vue | 33 +++++++++++++++--- frontend/src/views/chart/view/ChartEdit.vue | 34 +++++++++---------- 4 files changed, 51 insertions(+), 23 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 936ddb8d57..9c42468c9b 100644 --- a/backend/src/main/java/io/dataease/service/spark/SparkCalc.java +++ b/backend/src/main/java/io/dataease/service/spark/SparkCalc.java @@ -22,6 +22,7 @@ import org.apache.spark.sql.*; import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.StructField; import org.apache.spark.sql.types.StructType; +import org.apache.spark.storage.StorageLevel; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import scala.Tuple2; @@ -144,7 +145,7 @@ public class SparkCalc { }); StructType structType = DataTypes.createStructType(structFields); - Dataset dataFrame = sqlContext.createDataFrame(rdd, structType).persist(); + Dataset dataFrame = sqlContext.createDataFrame(rdd, structType).persist(StorageLevel.MEMORY_AND_DISK_SER()); CacheUtil.getInstance().addCacheData(hTable, dataFrame); dataFrame.count(); return dataFrame; diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index f71ea7c723..2d30594db3 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -697,7 +697,9 @@ export default { rose_type: '玫瑰图模式', radius_mode: '半径', area_mode: '面积', - rose_radius: '圆角' + rose_radius: '圆角', + view_name: '视图名称', + name_can_not_empty: '名称不能为空' }, dataset: { datalist: '数据集', diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 1e40a3f378..e15470f6fd 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -199,10 +199,17 @@ width="70%" class="dialog-css" > + + + + + + +
- {{ $t('chart.cancel') }} - {{ $t('chart.confirm') }} + {{ $t('chart.cancel') }} + {{ $t('chart.confirm') }}
@@ -518,10 +525,24 @@ export default { this.selectTableFlag = true }, + closeCreateChart() { + this.selectTableFlag = false + this.table = {} + }, + createChart() { console.log(this.table) + if (!this.table.name) { + this.$message({ + message: this.$t('chart.name_can_not_empty'), + type: 'error', + showClose: true + }) + return + } const view = {} view.name = this.table.name + view.title = this.table.name view.sceneId = this.currGroup.id view.tableId = this.table.id view.type = 'bar' @@ -540,7 +561,7 @@ export default { }) view.customFilter = JSON.stringify([]) post('/chart/view/save', view).then(response => { - this.selectTableFlag = false + this.closeCreateChart() this.$store.dispatch('chart/setTableId', null) this.$store.dispatch('chart/setTableId', this.table.id) // this.$router.push('/chart/chart-edit') @@ -551,7 +572,7 @@ export default { }, getTable(table) { - this.table = table + this.table = JSON.parse(JSON.stringify(table)) }, refresh() { @@ -630,4 +651,8 @@ export default { .dialog-css >>> .el-dialog__body { padding: 10px 20px 20px; } + + .form-item>>>.el-form-item__label{ + font-size: 12px; + } diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 2dddd7cb81..bd8f4876ef 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -132,23 +132,23 @@ -
- {{ $t('chart.result_filter') }} -
- - - - - -
-
+ + + + + + + + + + + + + + + + + From 74ccd7d30775d53cb40d0f6407110554291874a8 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 14 Apr 2021 11:30:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E4=B8=8D=E5=81=9A...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index bd8f4876ef..5c866a932a 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -132,23 +132,23 @@ - - - - - - - - - - - - - - - - - +
+ {{ $t('chart.result_filter') }} +
+ + + + + +
+
From 6607bb56c5d442d2f2befb0f2d3b0237fc29b52d Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 14 Apr 2021 12:06:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(test):=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/listener/AppStartReadHBaseListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/listener/AppStartReadHBaseListener.java b/backend/src/main/java/io/dataease/listener/AppStartReadHBaseListener.java index 2fc2f731d7..d73e298f78 100644 --- a/backend/src/main/java/io/dataease/listener/AppStartReadHBaseListener.java +++ b/backend/src/main/java/io/dataease/listener/AppStartReadHBaseListener.java @@ -45,14 +45,14 @@ public class AppStartReadHBaseListener implements ApplicationListener datasetTables = datasetTableMapper.selectByExampleWithBLOBs(datasetTableExample); for (DatasetTable table : datasetTables) { - commonThreadPool.addTask(() -> { +// commonThreadPool.addTask(() -> { try { List fields = dataSetTableFieldsService.getFieldsByTableId(table.getId()); sparkCalc.getHBaseDataAndCache(table.getId(), fields); } catch (Exception e) { e.printStackTrace(); } - }); +// }); } } }