Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2

core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java

@@ -114,7 +114,7 @@ public class FontManage {
 
     public List<FontDto> defaultFont() {
         QueryWrapper<CoreFont> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("isDefault", 1);
+        queryWrapper.eq("is_default", 1);
         List<CoreFont> coreFonts = coreFontMapper.selectList(queryWrapper);
         List<FontDto> fontDtos = new ArrayList<>();
         for (CoreFont coreFont : coreFonts) {

core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue

@@ -84,7 +84,7 @@ onMounted(() => {
   <el-form ref="pointForm" :model="state.pointForm" size="small" label-position="top">
     <div style="padding-bottom: 8px">
       <el-space>
-        <el-form-item class="form-item" :class="'form-item-' + themes" :label="t('chart.text')">
+        <el-form-item class="form-item" :class="'form-item-' + themes" label="标注点文本">
           <el-color-picker
             :effect="themes"
             size="default"

core/core-frontend/src/views/chart/components/editor/index.vue

@@ -2219,8 +2219,26 @@ const deleteChartFieldItem = id => {
                         <!--yAxis-->
                         <el-row v-if="showAxis('yAxis')" class="padding-lr drag-data">
                           <div class="form-draggable-title">
-                            <span>
+                            <span class="data-area-label">
-                              {{ chartViewInstance.axisConfig.yAxis.name }}
+                              <span style="margin-right: 4px">
+                                {{ chartViewInstance.axisConfig.yAxis.name }}
+                              </span>
+                              <el-tooltip
+                                v-if="chartViewInstance.axisConfig.yAxis.tooltip"
+                                class="item"
+                                :effect="toolTip"
+                                placement="top"
+                              >
+                                <template #content>
+                                  <span> {{ chartViewInstance.axisConfig.yAxis.tooltip }}</span>
+                                </template>
+                                <el-icon
+                                  class="hint-icon"
+                                  :class="{ 'hint-icon--dark': themes === 'dark' }"
+                                >
+                                  <Icon name="icon_info_outlined" />
+                                </el-icon>
+                              </el-tooltip>
                             </span>
                             <el-tooltip
                               :effect="toolTip"

core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts

@@ -57,7 +57,8 @@ export class FlowMap extends L7ChartView<Scene, L7Config> {
     yAxis: {
       name: `线条粗细 / ${t('chart.quota')}`,
       type: 'q',
-      limit: 1
+      limit: 1,
+      tooltip: '该指标生效时，样式中线条配置的线条宽度属性将失效'
     }
   }
   constructor() {

de-xpack

@@ -1 +1 @@
-Subproject commit 290b7dd191fd0c79c5efde3a4673cc6167e69947
+Subproject commit f60978c3005812c19fa7d78469b9751d68462365

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

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

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/");
     }
 }