From ded38386ebabfcc69b2f6fd067ab4750510450bb Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:54:17 +0800 Subject: [PATCH 1/7] Update README.md --- README.md | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 0af2e887db..d54760694c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

License: GPL v3 Codacy - Latest release Stars FOSSA Status

@@ -13,20 +12,18 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数据并洞察业务趋势，从而实现业务的改进与优化。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。 -![de-architecture](https://dataease.io/images/screenshot/de-chart-new.jpg) - **DataEase 的功能包括：** -- 图表展示：支持 PC 端、移动端、大屏; -- 图表制作：支持丰富的图表类型(Apache ECharts / AntV)、支持拖拉拽方式快速制作仪表板; -- 数据引擎：支持直连模式、本地模式(基于 Apache Doris / Kettle 实现); +- 图表展示：支持 PC 端、移动端、大屏及嵌入式使用场景; +- 图表制作：支持丰富的图表类型、支持拖拉拽方式快速制作仪表板; +- 数据引擎：基于 Apache Calcite，实现统一的 SQL 解析、验证、优化和执行; - 数据连接：支持数据仓库/数据湖、OLAP 数据库、OLTP 数据库、Excel 数据文件、API 等各种数据源。 ## DataEase 的优势 - 开源开放：零门槛，线上快速获取和安装；快速获取用户反馈、按月发布新版本； - 简单易用：极易上手，通过鼠标点击和拖拽即可完成分析； -- 秒级响应：集成 Apache Doris，超大数据量下秒级查询返回延时； +- 全场景支持：多平台支持、多种嵌入式方案支持； - 安全分享：支持多种数据分享方式，确保数据安全。 ## DataEase 支持的数据源 @@ -53,20 +50,8 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 Kylin

-## DataEase 模板市场 - -- [模板市场](https://dataease.io/templates/) - -![模板市场](https://dataease.io/images/templates/templates.gif) - ## 快速开始 -**在线体验** - -- 环境地址： -- 用户名：demo -- 密码：dataease - **一键安装** 仅需两步快速安装 DataEase： @@ -83,17 +68,13 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash - [在线文档](https://dataease.io/docs/) - [社区论坛](https://bbs.fit2cloud.com/c/de/6) -**加入微信交流群** - - - ## DataEase 的技术栈 - 前端：[Vue.js](https://vuejs.org/)、[Element](https://element.eleme.cn/) -- 图库：[Apache ECharts](https://github.com/apache/echarts)、[AntV](https://antv.vision/zh) +- 图库：[AntV](https://antv.vision/zh) - 后端：[Spring Boot](https://spring.io/projects/spring-boot) - 中间件：[MySQL](https://www.mysql.com/) -- 数据处理：[Kettle](https://github.com/pentaho/pentaho-kettle)、[Apache Doris](https://github.com/apache/doris/) +- 数据处理：[Apache Calcite](https://github.com/apache/calcite/) - 基础设施：[Docker](https://www.docker.com/) ## Star History From 36454aa1a940f6c5c4375afa750f97106af3cfa9 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 24 Oct 2023 09:59:25 +0800 Subject: [PATCH 2/7] Update README.md --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index d54760694c..3fe5c50c82 100644 --- a/README.md +++ b/README.md @@ -34,20 +34,14 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 oracle sqlserver mariadb - elasticsearch clickhouse doris mongodb redshift - hive DB2 API TiDB StarRocks - PrestoDB - dm - KingBase - Kylin

## 快速开始 From e665e94d002d0d8f40520fe2447d4b51be71a888 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 24 Oct 2023 10:16:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?style:=20=E6=9F=A5=E8=AF=A2=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=BE=91=E6=A0=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/chart/components/editor/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 3a01f2c668..2dbecc1930 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -1118,7 +1118,7 @@ const onRefreshChange = val => { {{ view.title }} - +
From 4f778aa9ecc40db34c11d5d1cd9a61b67d09ab07 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Tue, 24 Oct 2023 11:19:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98/?= =?UTF-8?q?=E6=B0=B4=E6=B3=A2=E5=9B=BE=E5=8A=A8=E6=80=81=E5=80=BC=E6=97=A0?= =?UTF-8?q?=E6=95=88=E6=97=B6=E8=BE=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E7=BA=A2=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor-style/components/MiscSelector.vue | 61 +++++++++++-------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue index f2f10d118c..87e96ce028 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue @@ -225,7 +225,7 @@ const getQuotaField = id => { } const isValidField = field => { - return field.id !== 'count' && field.deType !== 0 && field.deType !== 1 && field.deType !== 5 + return field.id !== '-1' && state.quotaData.findIndex(ele => ele.id === field.id) !== -1 } const showProperty = prop => props.propertyInner?.includes(prop) @@ -310,27 +310,25 @@ onMounted(() => { - - - - - - - {{ item.name }} - + + + + {{ item.name }} @@ -339,8 +337,8 @@ onMounted(() => { @@ -403,27 +401,25 @@ onMounted(() => { - - - - - - - {{ item.name }} - + + + + {{ item.name }} @@ -547,8 +543,9 @@ onMounted(() => { { flex-direction: row; justify-content: space-between; } + :deep(.dynamic-item) { width: 100px !important; } } + .field-item { float: left; color: #8492a6; font-size: 12px; } + .margin-bottom-8 { margin-bottom: 8px !important; } + .series-select-option { display: flex; align-items: center; justify-content: start; padding: 0 11px; } + +.invalid-field { + ::v-deep(.ed-input__wrapper) { + box-shadow: 0 0 0 1px rgb(245, 74, 69) inset !important; + } +} From cb48921b2b610ba37f6d4187d7f0a9ed0c03e943 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:22:52 +0800 Subject: [PATCH 5/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3fe5c50c82..4352dd9327 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,14 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 - 数据引擎：基于 Apache Calcite，实现统一的 SQL 解析、验证、优化和执行; - 数据连接：支持数据仓库/数据湖、OLAP 数据库、OLTP 数据库、Excel 数据文件、API 等各种数据源。 -## DataEase 的优势 +**DataEase 的优势：** - 开源开放：零门槛，线上快速获取和安装；快速获取用户反馈、按月发布新版本； - 简单易用：极易上手，通过鼠标点击和拖拽即可完成分析； - 全场景支持：多平台支持、多种嵌入式方案支持； - 安全分享：支持多种数据分享方式，确保数据安全。 -## DataEase 支持的数据源 +**DataEase 支持的数据源：**

excel From b6744ad279b6dfe19d5f7aaad1d7efa904ebad85 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 24 Oct 2023 11:23:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20eslint=E5=AF=BC=E8=87=B4=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/visualized/data/datasource/form/EditorDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue index 04288b807b..28f8bc5257 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue @@ -134,7 +134,7 @@ const initForm = type => { if (type === 'oracle') { form.value.configuration.connectionType = 'sid' } - + form.value.type = type setTimeout(() => { dsForm.value.clearValidate() From da85d49c94a98f6eb7122d82f620f27621e5ae2d Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 24 Oct 2023 14:39:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E5=9B=BE=E8=A1=A8=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 1 + .../editor-style/components/TitleSelector.vue | 447 +++++++++++------- .../views/chart/components/views/index.vue | 17 +- 3 files changed, 281 insertions(+), 184 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 325315cf9f..f647db8531 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -951,6 +951,7 @@ export default { field_can_not_empty: '字段不能为空', conditions_can_not_empty: '字段的条件不能为空，若无条件，请直接删除该字段', remark: '备注', + remark_show: '显示备注', remark_edit: '编辑备注', remark_bg_color: '背景填充', quota_font_family: '值字体', diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue index 178d77c595..feea8b5fc1 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue @@ -1,5 +1,5 @@ diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index abb47d9833..390577b877 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -101,6 +101,10 @@ const snapshotStore = snapshotStoreWithOut() const state = reactive({ initReady: true, //curComponent 切换期间 不接收外部的calcData 和 renderChart 事件 title_show: true, + title_remark: { + show: false, + remark: '' + }, title_class: { fontSize: '18px', color: '#303133', @@ -240,6 +244,9 @@ const initTitle = () => { customStyle.background.alpha ) } + + state.title_remark.show = customStyle.text.remarkShow + state.title_remark.remark = customStyle.text.remark } } @@ -563,8 +570,16 @@ const toolTip = computed(() => {

+ + + + + +