Merge pull request #6066 from ulleo/dev

fix bugs

core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -1474,6 +1474,8 @@ public class ChartViewService {
 
         List<PluginViewField> pluginViewFields = fieldMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().map(field -> {
             PluginViewField pluginViewField = BeanUtils.copyBean(new PluginViewField(), field);
+            pluginViewField.setFilter(gson.fromJson(gson.toJson(field.getFilter()), new TypeToken<List<PluginChartCustomFilterItem>>() {
+            }.getType()));
             pluginViewField.setTypeField(entry.getKey());
             return pluginViewField;
         })).collect(Collectors.toList());

core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java

@@ -2,6 +2,7 @@ package io.dataease.service.chart;
 
 import cn.hutool.core.util.ReflectUtil;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.dataease.commons.model.PluginViewSetImpl;
 import io.dataease.commons.utils.TableUtils;
 import io.dataease.controller.request.chart.ChartExtRequest;
@@ -14,6 +15,7 @@ import io.dataease.plugins.common.constants.DatasetType;
 import io.dataease.plugins.common.constants.datasource.SQLConstants;
 import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
+import io.dataease.plugins.common.dto.chart.ChartViewFieldFilterDTO;
 import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
@@ -247,6 +249,9 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
             methodName = "getYWheres";
         }
         ChartViewFieldDTO chartViewFieldDTO = BeanUtils.copyBean(new ChartViewFieldDTO(), field);
+        chartViewFieldDTO.setFilter(gson.fromJson(gson.toJson(field.getFilter()), new TypeToken<List<ChartViewFieldFilterDTO>>() {
+        }.getType()));
+
         Object execResult;
         if ((execResult = execProviderMethod(queryProvider, methodName, chartViewFieldDTO, originField, fieldAlias)) != null) {
             String where = (String) execResult;

core/frontend/src/components/canvas/components/editor/SettingMenu.vue

@@ -5,7 +5,7 @@
         trigger="click"
         @mouseup="handleMouseUp"
       >
-        <slot name="icon"/>
+        <slot name="icon" />
         <el-dropdown-menu v-if="curComponent">
           <el-dropdown-item
             v-if="editFilter.includes(curComponent.type)"
@@ -17,8 +17,7 @@
             v-if="curComponent.type != 'custom-button'"
             icon="el-icon-document-copy"
             @click.native="copy"
-          ><span>{{ $t('panel.copy') }}&nbsp(<span v-show="systemOS==='Mac'"><i class="icon iconfont icon-command"
-          />+ D</span> <span v-show="systemOS!=='Mac'">Control + D</span>)</span>
+          ><span>{{ $t('panel.copy') }}&nbsp;(<span v-show="systemOS==='Mac'"><i class="icon iconfont icon-command" />+ D</span> <span v-show="systemOS!=='Mac'">Control + D</span>)</span>
           </el-dropdown-item>
           <el-dropdown-item
             icon="el-icon-delete"
@@ -34,7 +33,7 @@
           <el-dropdown-item v-if="!curComponent.auxiliaryMatrix">
             <el-dropdown placement="right-start">
               <span class="el-icon-copy-document">
-                {{ $t('panel.level') }} <i class="el-icon-arrow-right el-icon--right"/>
+                {{ $t('panel.level') }} <i class="el-icon-arrow-right el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
@@ -93,13 +92,13 @@
           <el-dropdown-item
             v-if="curComponent.type != 'custom-button'"
             @click.native="hyperlinksSet"
-          ><i class="icon iconfont icon-chaolianjie1"/>{{ $t('panel.hyperlinks') }}
+          ><i class="icon iconfont icon-chaolianjie1" />{{ $t('panel.hyperlinks') }}
           </el-dropdown-item>
           <el-dropdown-item
             v-if="curComponent.type !== 'view' && !curComponent.auxiliaryMatrix"
             @click.native="positionAdjust"
           >
-            <i class="el-icon-map-location"/>
+            <i class="el-icon-map-location" />
             {{ $t('panel.position_adjust') }}
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -180,7 +179,7 @@ import TabCarouselDialog from '@/components/canvas/components/editor/TabCarousel
 import CustomTabsSort from '@/components/widget/deWidget/CustomTabsSort'
 
 export default {
-  components: { CustomTabsSort, HyperlinksDialog,TabCarouselDialog },
+  components: { CustomTabsSort, HyperlinksDialog, TabCarouselDialog },
   data() {
     return {
       tabCarouselVisible: false,
@@ -193,7 +192,8 @@ export default {
         'text',
         'label',
         'flow-map',
-        'bidirectional-bar'
+        'bidirectional-bar',
+        'race-bar'
       ],
       linkageExcludeViewType: [
         'richTextView',
@@ -202,7 +202,8 @@ export default {
         'text',
         'label',
         'flow-map',
-        'bidirectional-bar'
+        'bidirectional-bar',
+        'race-bar'
       ],
       copyData: null,
       hyperlinksSetVisible: false,