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

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -464,7 +464,7 @@ public class DataSetTableService {
     }
 
     public Map<String, Object> getPreviewData(DataSetTableRequest dataSetTableRequest, Integer page, Integer pageSize,
-            List<DatasetTableField> extFields) throws Exception {
+                                              List<DatasetTableField> extFields) throws Exception {
         Map<String, Object> map = new HashMap<>();
         DatasetTableField datasetTableField = DatasetTableField.builder().tableId(dataSetTableRequest.getId())
                 .checked(Boolean.TRUE).build();
@@ -926,8 +926,8 @@ public class DataSetTableService {
                             DorisTableUtils.dorisFieldName(
                                     datasetTableField.getTableId() + "_" + datasetTableField.getDataeaseName()))
                             || StringUtils.equalsIgnoreCase(tableField.getFieldName(),
-                                    DorisTableUtils.dorisFieldNameShort(datasetTableField.getTableId() + "_"
-                                            + datasetTableField.getOriginName()))) {
+                            DorisTableUtils.dorisFieldNameShort(datasetTableField.getTableId() + "_"
+                                    + datasetTableField.getOriginName()))) {
                         tableField.setRemarks(datasetTableField.getName());
                         break;
                     }
@@ -990,7 +990,7 @@ public class DataSetTableService {
                             DorisTableUtils.dorisFieldName(
                                     datasetTableField.getTableId() + "_" + datasetTableField.getDataeaseName()))
                             || StringUtils.equalsIgnoreCase(tableField.getFieldName(), DorisTableUtils.dorisFieldName(
-                                    datasetTableField.getTableId() + "_" + datasetTableField.getOriginName()))) {
+                            datasetTableField.getTableId() + "_" + datasetTableField.getOriginName()))) {
                         tableField.setRemarks(datasetTableField.getName());
                         break;
                     }
@@ -1073,7 +1073,7 @@ public class DataSetTableService {
     }
 
     public String getCustomSQLDatasource(DataTableInfoDTO dataTableInfoDTO, List<DataSetTableUnionDTO> list,
-            Datasource ds) {
+                                         Datasource ds) {
         DatasourceTypes datasourceTypes = DatasourceTypes.valueOf(ds.getType());
         String keyword = datasourceTypes.getKeywordPrefix() + "%s" + datasourceTypes.getKeywordSuffix();
         Map<String, String[]> customInfo = new TreeMap<>();
@@ -1260,7 +1260,7 @@ public class DataSetTableService {
 
     // 递归计算出所有子级的checkedFields和unionParam
     private void getUnionSQLDorisJoin(List<UnionDTO> childrenDs, Map<String, String[]> checkedInfo,
-            List<UnionParamDTO> unionList, List<DatasetTableField> checkedFields) {
+                                      List<UnionParamDTO> unionList, List<DatasetTableField> checkedFields) {
         for (int i = 0; i < childrenDs.size(); i++) {
             UnionDTO unionDTO = childrenDs.get(i);
             String tableId = unionDTO.getCurrentDs().getId();
@@ -1398,7 +1398,7 @@ public class DataSetTableService {
 
     // 递归计算出所有子级的checkedFields和unionParam
     private void getUnionSQLDatasourceJoin(List<UnionDTO> childrenDs, Map<String, String[]> checkedInfo,
-            List<UnionParamDTO> unionList, String keyword, List<DatasetTableField> checkedFields) {
+                                           List<UnionParamDTO> unionList, String keyword, List<DatasetTableField> checkedFields) {
         for (int i = 0; i < childrenDs.size(); i++) {
             UnionDTO unionDTO = childrenDs.get(i);
 
@@ -1703,10 +1703,10 @@ public class DataSetTableService {
         if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) {
             return;
         }
-        if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd())){
+        if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd())) {
             datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim());
         }
-        if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete())){
+        if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete())) {
             datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim());
         }
         if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) {

frontend/src/components/widget/DeWidget/DeTabs.vue

@@ -35,7 +35,26 @@
         </span>
 
         <div v-if="activeTabName === item.name" class="de-tab-content">
-          <user-view v-if="item.content && item.content.propValue && item.content.propValue.viewId" :ref="item.name" :in-tab="true" :is-edit="isEdit" :active="active" :element="item.content" :filters="item.content.filters" :out-style="outStyle" />
+          <!-- <user-view
+            v-if="item.content && item.content.propValue && item.content.propValue.viewId"
+            :ref="item.name"
+            :in-tab="true"
+            :is-edit="isEdit"
+            :active="active"
+            :element="item.content"
+            :filters="item.content.filters"
+            :out-style="outStyle"
+          /> -->
+          <user-view
+            v-if="item.content && item.content.propValue && item.content.propValue.viewId"
+            :ref="item.name"
+            :in-tab="true"
+            :is-edit="isEdit"
+            :active="active"
+            :element="item.content"
+            :filters="filterMap[item.content.propValue && item.content.propValue.viewId]"
+            :out-style="outStyle"
+          />
         </div>
 
       </el-tab-pane>
@@ -96,7 +115,7 @@ import bus from '@/utils/bus'
 import componentList from '@/components/canvas/custom-component/component-list'
 import { mapState } from 'vuex'
 import { chartCopy } from '@/api/chart/chart'
-
+import { buildFilterMap } from '@/utils/conditionUtil'
 export default {
   name: 'DeTabls',
   components: { ViewSelect },
@@ -142,7 +161,12 @@ export default {
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
+    filterMap() {
+      const map = buildFilterMap(this.componentData)
+      return map
+    },
     ...mapState([
+      'componentData',
       'curComponent',
       'mobileLayoutStatus'
     ])

frontend/src/utils/conditionUtil.js

@@ -46,6 +46,11 @@ export const buildFilterMap = panelItems => {
     if (element.type === 'view') {
       result[element.propValue.viewId] = []
     }
+    if (element.type === 'de-tabs') {
+      element.options.tabList && element.options.tabList.forEach(tab => {
+        result[tab.content.propValue.viewId] = []
+      })
+    }
   })
   panelItems.forEach(element => {
     if (element.type !== 'custom') {

frontend/src/views/chart/view/ChartEdit.vue

@@ -622,7 +622,7 @@
                     />
                   </el-collapse-item>
                   <el-collapse-item
-                    v-show="view.render && view.render === 'antv' && chart.type !== 'map' && chart.type !== 'waterfall' && chart.type !== 'word-cloud' && chart.type !== 'treemap'"
+                    v-show="view.render && view.render === 'antv' && chart.type !== 'map' && chart.type !== 'waterfall' && chart.type !== 'word-cloud' && chart.type !== 'treemap' && chart.type !== 'funnel'"
                     name="size"
                     :title="(chart.type && chart.type.includes('table')) ? $t('chart.table_config') : $t('chart.size')"
                   >

frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue

@@ -40,13 +40,13 @@
           v-if="element.options.attrs.default.isDynamic && element.options.attrs.default.dkey === (defaultSetting.relativeOptions.length - 1)"
           label=""
         >
-          <el-input
+          <el-input-number
             v-model="element.options.attrs.default.dynamicPrefix"
-            type="number"
+            controls-position="right"
             size="mini"
             :min="1"
             :max="12"
-            @input="dynamicPrefixChange"
+            @change="dynamicPrefixChange"
           />
         </el-form-item>
 

frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue

@@ -33,13 +33,13 @@
           v-if="element.options.attrs.default.isDynamic && element.options.attrs.default.dkey === 4"
           :label="$t('dataset.start_time')"
         >
-          <el-input
+          <el-input-number
             v-model="element.options.attrs.default.sDynamicPrefix"
-            type="number"
+            controls-position="right"
             size="mini"
             :min="0"
             :max="10"
-            @input="sDynamicPrefixChange"
+            @change="sDynamicPrefixChange"
           />
         </el-form-item>
 
@@ -86,13 +86,13 @@
           v-if="element.options.attrs.default.isDynamic && element.options.attrs.default.dkey === 4"
           :label="$t('dataset.end_time')"
         >
-          <el-input
+          <el-input-number
             v-model="element.options.attrs.default.eDynamicPrefix"
-            type="number"
+            controls-position="right"
             size="mini"
             :min="0"
             :max="10"
-            @input="eDynamicPrefixChange"
+            @change="eDynamicPrefixChange"
           />
         </el-form-item>