Merge pull request #10478 from dataease/pr@v2.7@fix_sync_menu

fix(X-Pack): 同步管理菜单无法展示

core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java

@@ -87,12 +87,12 @@ public class MenuManage {
     }
 
     private boolean isXpackMenu(CoreMenu coreMenu) {
+        if (coreMenu.getId().equals(21L)) return false;
         return coreMenu.getId().equals(7L)
                 || coreMenu.getPid().equals(7L)
                 || coreMenu.getId().equals(14L)
                 || coreMenu.getId().equals(17L)
                 || coreMenu.getId().equals(18L)
-                || coreMenu.getId().equals(21L)
                 || coreMenu.getPid().equals(21L)
                 || coreMenu.getId().equals(25L)
                 || coreMenu.getId().equals(26L)

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -130,9 +130,10 @@ const showTypeError = computed(() => {
   if (!curComponent.value) return false
   if (!curComponent.value.checkedFields?.length) return false
   if (!fields.value?.length) return false
-  if (!!curComponent.value.parameters.length) {
+  if (!!curComponent.value.parameters.length && isTimeParameter.value) {
     const timeArr = curComponent.value.parameters.map(ele => ele.type[1])
-    if (timeArr.length !== new Set(timeArr).size) {
+    const [typeOne] = timeArr
+    if (timeArr.some(ele => ele !== typeOne)) {
       return true
     }
   }

core/core-frontend/src/layout/components/LayoutTransition.vue

@@ -0,0 +1,7 @@
+<script lang="ts" setup>
+import { useRoute } from 'vue-router'
+const route = useRoute()
+</script>
+<template>
+  <router-view :key="route.path" />
+</template>

core/core-frontend/src/router/establish.ts

@@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash'
 import { XpackComponent } from '@/components/plugin'
 const modules = import.meta.glob('../views/**/*.vue')
 export const Layout = () => import('@/layout/index.vue')
+export const LayoutTransition = () => import('@/layout/components/LayoutTransition.vue')
 const pluginComponent = 'components/plugin'
 // 后端控制路由生成
 export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRecordRaw[] => {
@@ -37,12 +38,14 @@ export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRe
       let comModule = null
       if (route.component === pluginComponent) {
         comModule = XpackComponent
-      } else {
+      } else if (!route.component.startsWith('Layout')) {
         comModule = modules[`../views/${route.component}/index.vue`]
       }
 
       if (route.component === 'Layout') {
         data.component = Layout
+      } else if (route.component === 'LayoutTransition') {
+        data.component = LayoutTransition
       } else if (!comModule) {
       } else {
         data.component = comModule

core/core-frontend/src/style/index.less

@@ -7,7 +7,6 @@
 
   color-scheme: light dark;
 
-  font-synthesis: none;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-size-adjust: 100%;

core/core-frontend/src/views/chart/components/editor/util/chart.ts

@@ -389,7 +389,7 @@ export const DEFAULT_INDICATOR_STYLE: ChartIndicatorStyle = {
   fontFamily: 'Microsoft YaHei',
   letterSpace: 0,
   fontShadow: false,
-  backgroundColor: '#fff',
+  backgroundColor: '',
 
   suffixEnable: true,
   suffix: '',

core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue

@@ -785,6 +785,8 @@ const mousedownDrag = () => {
               v-if="scope.row.type[0] === 'DATETIME-YEAR'"
               v-model="scope.row.defaultValue"
               type="year"
+              format="YYYY"
+              value-format="YYYY"
               :placeholder="t('dataset.select_year')"
             />
 

de-xpack

@@ -1 +1 @@
-Subproject commit a12eea394d8d5edf2941988819b08676e512a11e
+Subproject commit 220e68e53d135ba8bd7bb55baa6a6071f301b20f

installer/install.sh

@@ -33,6 +33,7 @@ function check_and_prepare_env_params() {
    if [ -f /usr/bin/dectl ]; then
       # 获取已安装的 DataEase 的运行目录
       DE_BASE=$(grep "^DE_BASE=" /usr/bin/dectl | cut -d'=' -f2)
+      DE_BASE_OLD=$DE_BASE
       sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl
       \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl
 
@@ -54,6 +55,10 @@ function check_and_prepare_env_params() {
 
    set -a
    source ${CURRENT_DIR}/install.conf
+   if [[ $DE_BASE_OLD ]];then
+      DE_BASE=$DE_BASE_OLD
+      export DE_BASE=$DE_BASE_OLD
+   fi
    if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then
       source $DE_BASE/dataease2.0/.env
       INSTALL_TYPE='upgrade'
@@ -61,7 +66,7 @@ function check_and_prepare_env_params() {
       conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE)
       if [[ $DE_INSTALL_MODE == 'community' ]] && [[ $conf_install_mode == 'enterprise' ]];then
          DE_INSTALL_MODE=$conf_install_mode
-         export DE_INSTALL_MODE
+         export DE_INSTALL_MODE=$conf_install_mode
       fi
       log_content "升级安装"
    else

pom.xml

@@ -19,7 +19,7 @@
     </parent>
 
     <properties>
-        <dataease.version>2.7.0</dataease.version>
+        <dataease.version>2.7.1</dataease.version>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>

sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeItem.java

@@ -1,5 +1,7 @@
 package io.dataease.api.chart.filter;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import lombok.Data;
 
@@ -13,6 +15,7 @@ import java.util.List;
 public class FilterTreeItem implements Serializable {
     private String type;// 'item' or 'tree'
     // item
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long fieldId;
     private DatasetTableFieldDTO field;// field object
     private String filterType;// 'logic' or 'enum'