From 3f8088d9b4a1454a3000231a33a5190b71594f15 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Wed, 13 Oct 2021 17:46:42 +0800 Subject: [PATCH 01/11] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 12c3980b2c..ec6fcb0210 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,17 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 - 秒级响应：集成 Apache Doris，超大数据量下秒级查询返回延时； - 安全分享：支持多种数据分享方式，确保数据安全。 +### DataEase 已支持的数据源: + +- MySQL +- Oracle +- SQL Server +- PostgreSQL +- Elasticsearch +- MariaDB +- Doris +- ClickHouse + ## UI 展示 ![de-ui](https://www.fit2cloud.com/dataease/images/screenshot/dataease-v1.gif) From 6f8e75601cf8ab2dcc36a5185fdde59d246e96f0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 13 Oct 2021 18:44:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E3=80=91=E8=BF=BD=E5=8A=A0excel=E6=97=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BAexcel=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddExcel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index 4ec282d36b..79133cbc06 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -165,7 +165,7 @@ export default { }, tableId: { type: String, - default: null + default: '' }, editType: { type: Number, From 131d964546951f0c621a0dc5d87e91fa5ac2e885 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 14 Oct 2021 10:16:31 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20excel=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AD=97=E6=AE=B5=E6=A0=87=E7=A4=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=87=8D=E6=96=B0=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/TabDataPreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue index c849810db2..e839cda85d 100644 --- a/frontend/src/views/dataset/data/TabDataPreview.vue +++ b/frontend/src/views/dataset/data/TabDataPreview.vue @@ -22,7 +22,7 @@ > Date: Thu, 14 Oct 2021 11:18:22 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=ABes=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/EsProvider.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java index dba8980fca..69948926f0 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -231,16 +231,17 @@ public class EsProvider extends DatasourceProvider { throw new Exception(JSONObject.parseObject(response).getJSONObject("error").getString("reason")); } String version = JSONObject.parseObject(response).getJSONObject("version").getString("number"); - if(Integer.valueOf(version.substring(0,1)) < 6 ){ + + if(Integer.valueOf(version.split("\\.")[0]) < 6 ){ throw new Exception(Translator.get("i18n_es_limit")); } - if(Integer.valueOf(version.substring(2,3)) < 3 ){ + if(Integer.valueOf(version.split("\\.")[1]) < 3 ){ throw new Exception(Translator.get("i18n_es_limit")); } - if(Integer.valueOf(version.substring(0,1)) == 6 ) { + if(Integer.valueOf(version.split("\\.")[0]) == 6 ) { esConfiguration.setUri("_xpack/sql"); } - if(Integer.valueOf(version.substring(0,1)) == 7 ) { + if(Integer.valueOf(version.split("\\.")[0]) == 7 ) { esConfiguration.setUri("_sql"); } datasourceRequest.getDatasource().setConfiguration(new Gson().toJson(esConfiguration)); From c06725a8abcf77d21db2648c0f69b4cc40718d6b Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Thu, 14 Oct 2021 11:55:56 +0800 Subject: [PATCH 05/11] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ec6fcb0210..f5a37f3bab 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,18 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 ### DataEase 已支持的数据源: +- Excel - MySQL - Oracle - SQL Server - PostgreSQL - Elasticsearch - MariaDB -- Doris +- Apache Doris - ClickHouse +> 更多数据源支持持续增加中... + ## UI 展示 ![de-ui](https://www.fit2cloud.com/dataease/images/screenshot/dataease-v1.gif) From 21059d197db535028a9e05b441a168bcd262745f Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Thu, 14 Oct 2021 14:04:06 +0800 Subject: [PATCH 06/11] Update README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 12c3980b2c..f5a37f3bab 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,20 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 - 秒级响应：集成 Apache Doris，超大数据量下秒级查询返回延时； - 安全分享：支持多种数据分享方式，确保数据安全。 +### DataEase 已支持的数据源: + +- Excel +- MySQL +- Oracle +- SQL Server +- PostgreSQL +- Elasticsearch +- MariaDB +- Apache Doris +- ClickHouse + +> 更多数据源支持持续增加中... + ## UI 展示 ![de-ui](https://www.fit2cloud.com/dataease/images/screenshot/dataease-v1.gif) From c274aece5b1519c2dd41848573cd48fbeffadcfa Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:40:41 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95main=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/commons/utils/ExcelReaderUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java index 0f866bd233..d44ccbd1ce 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java @@ -1,9 +1,6 @@ package io.dataease.commons.utils; import com.google.gson.Gson; import io.dataease.datasource.dto.TableFiled; -import org.apache.poi.hssf.usermodel.HSSFCell; - -import java.io.FileInputStream; import java.io.InputStream; import java.util.List; @@ -70,10 +67,10 @@ public class ExcelReaderUtil { } } - public static void main(String[] args) throws Exception { + /* public static void main(String[] args) throws Exception { String file ="各省市GDP-表格_加内容.xlsx"; ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file)); - } + } */ } From 74ec45a45856e6a12f8ef0aa69ce63adccae7302 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:41:28 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=80=89=E9=A1=B9=E5=AE=BD=E5=BA=A6=E6=97=A0=E9=99=90?= =?UTF-8?q?=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/DeWidget/DeSelect.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 2c8470b6b6..602711bbaa 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -10,13 +10,17 @@ :placeholder="$t(options.attrs.placeholder)" :popper-append-to-body="inScreen" @change="changeValue" + @focus="setOptionWidth" > + > + {{ item[options.attrs.label] }} + @@ -43,7 +47,8 @@ export default { data() { return { options: null, - showNumber: false + showNumber: false, + selectOptionWidth: 0 } }, computed: { @@ -119,6 +124,12 @@ export default { text: item } }) + }, + setOptionWidth(event) { + // 下拉框弹出时，设置弹框的宽度 + this.$nextTick(() => { + this.selectOptionWidth = event.srcElement.offsetWidth + 'px' + }) } } From 03ab93664d3b46d30cae6e3c1ff4a8a058b9e39c Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:58:35 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E6=9C=AA=E9=80=89=E6=8B=A9=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=97=B6=E6=8B=96=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 5 ++++- frontend/src/components/widget/DeWidget/DeTabs.vue | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index f05cbdcffa..bb197ccc33 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -211,7 +211,10 @@ export default { created() { this.refId = uuid.v1 // this.filter.filter = this.$store.getters.conditions - this.getData(this.element.propValue.viewId) + if (this.element && this.element.propValue && this.element.propValue.viewId) { + this.getData(this.element.propValue.viewId) + } + // this.initAreas() }, mounted() { diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 18fa38d54a..fbeea71071 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -35,7 +35,7 @@
- +
From 6e2dd0187be1469bda83a0de9053d53ce8975355 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 14 Oct 2021 16:44:51 +0800 Subject: [PATCH 10/11] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=B6=85=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/Hyperlinks.vue | 120 ++++++ .../components/canvas/components/TextAttr.vue | 18 +- .../canvas/custom-component/VText.vue | 15 +- .../canvas/custom-component/component-list.js | 8 + frontend/src/lang/en.js | 8 +- frontend/src/lang/tw.js | 8 +- frontend/src/lang/zh.js | 8 +- frontend/src/styles/deicon/demo_index.html | 400 ++++++++++-------- frontend/src/styles/deicon/iconfont.css | 14 +- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 14 + frontend/src/styles/deicon/iconfont.ttf | Bin 16320 -> 17284 bytes frontend/src/styles/deicon/iconfont.woff | Bin 17537 -> 10628 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 8360 -> 8940 bytes 14 files changed, 424 insertions(+), 191 deletions(-) create mode 100644 frontend/src/components/canvas/components/Editor/Hyperlinks.vue diff --git a/frontend/src/components/canvas/components/Editor/Hyperlinks.vue b/frontend/src/components/canvas/components/Editor/Hyperlinks.vue new file mode 100644 index 0000000000..45da866b42 --- /dev/null +++ b/frontend/src/components/canvas/components/Editor/Hyperlinks.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 516070e87e..db382e2368 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -1,6 +1,6 @@