From 9eda656e503a357db84e08f50e601d35ed94f596 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Tue, 27 Aug 2024 10:32:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8-=E6=B5=81=E5=90=91?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20=E6=B7=BB=E5=8A=A0=E7=BA=BF=E6=9D=A1?= =?UTF-8?q?=E7=B2=97=E7=BB=86=E6=B3=A8=E9=87=8A=E5=9B=BE=E6=A0=87=E5=8F=8A?= =?UTF-8?q?=E6=A0=87=E6=B3=A8=E9=85=8D=E7=BD=AE=E6=96=87=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/FlowMapPointSelector.vue | 2 +- .../views/chart/components/editor/index.vue | 22 +++++++++++++++++-- .../js/panel/charts/map/flow-map.ts | 3 ++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue index 34e83b113b..4ff853c0ee 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue @@ -84,7 +84,7 @@ onMounted(() => {
- + {
- - {{ chartViewInstance.axisConfig.yAxis.name }} + + + {{ chartViewInstance.axisConfig.yAxis.name }} + + + + + + + { yAxis: { name: `线条粗细 / ${t('chart.quota')}`, type: 'q', - limit: 1 + limit: 1, + tooltip: '该指标生效时，样式中线条配置的线条宽度属性将失效' } } constructor() { From 53dfe69e85d240e445f5a1d476984e6ff794b6e5 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 27 Aug 2024 10:47:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E9=A3=9E=E4=B9=A6=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 290b7dd191..f60978c300 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 290b7dd191fd0c79c5efde3a4673cc6167e69947 +Subproject commit f60978c3005812c19fa7d78469b9751d68462365 From d981b108770510361e465cacff14d9b535076713 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Aug 2024 12:29:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dataease/docker-compose.yml | 1 + installer/install.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml index f4f783c313..75e445c21a 100644 --- a/installer/dataease/docker-compose.yml +++ b/installer/dataease/docker-compose.yml @@ -15,6 +15,7 @@ services: - ${DE_BASE}/dataease2.0/data/appearance:/opt/dataease2.0/data/appearance - ${DE_BASE}/dataease2.0/data/exportData:/opt/dataease2.0/data/exportData - ${DE_BASE}/dataease2.0/data/plugin:/opt/dataease2.0/data/plugin + - ${DE_BASE}/dataease2.0/data/font:/opt/dataease2.0/data/font depends_on: DE_MYSQL_HOST: condition: service_healthy diff --git a/installer/install.sh b/installer/install.sh index e82402dd8e..610470def4 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -104,7 +104,7 @@ function prepare_de_run_base() { env | grep DE_ >.env mkdir -p ${DE_RUN_BASE}/{cache,logs,conf} - mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo,appearance,exportData,plugin} + mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo,appearance,exportData,plugin,font} mkdir -p ${DE_RUN_BASE}/apisix/logs mkdir -p ${DE_RUN_BASE}/task/logs chmod 777 ${DE_RUN_BASE}/apisix/logs ${DE_RUN_BASE}/data/etcd_data ${DE_RUN_BASE}/task/logs From 12d91604141e6c4909f273e962716ee70f64778c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Aug 2024 13:41:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index 9c5668fa87..63b98c8b13 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -69,6 +69,7 @@ public class WhitelistUtils { || StringUtils.startsWithAny(requestURI, "/websocket") || StringUtils.startsWithAny(requestURI, "/map/") || StringUtils.startsWithAny(requestURI, "/typeface/download") + || StringUtils.startsWithAny(requestURI, "/typeface/defaultFont") || StringUtils.startsWithAny(requestURI, "/communicate/down/"); } } From 2b4b935b4f10938c97045edefab0eaf5dbcc9250 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Aug 2024 14:02:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/font/manage/FontManage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java index 702d579f58..48d021d73b 100644 --- a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java +++ b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java @@ -114,7 +114,7 @@ public class FontManage { public List defaultFont() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("isDefault", 1); + queryWrapper.eq("is_default", 1); List coreFonts = coreFontMapper.selectList(queryWrapper); List fontDtos = new ArrayList<>(); for (CoreFont coreFont : coreFonts) {