diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java index b63b12c58e..2c6da656f9 100644 --- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java +++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java @@ -1,5 +1,6 @@ package io.dataease.dto.chart; +import com.google.gson.annotations.SerializedName; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.swagger.annotations.ApiModelProperty; @@ -32,4 +33,12 @@ public class ChartViewDTO extends ChartViewWithBLOBs { private List drillFilters; @ApiModelProperty("视图存放位置") private String position; + @SerializedName("xaxis") + private String xAxis; + @SerializedName("xaxisExt") + private String xAxisExt; + @SerializedName("yaxis") + private String yAxis; + @SerializedName("yaxisExt") + private String yAxisExt; } diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js index 4c96177f2d..8751c8eea9 100644 --- a/frontend/src/views/chart/chart/table/table-info.js +++ b/frontend/src/views/chart/chart/table/table-info.js @@ -412,12 +412,15 @@ function getCurrentField(valueFieldList, field) { } catch (err) { list = JSON.parse(JSON.stringify(valueFieldList)) } - for (let i = 0; i < list.length; i++) { - const f = list[i] - if (field.dataeaseName === f.dataeaseName) { - res = f - break + if (list) { + for (let i = 0; i < list.length; i++) { + const f = list[i] + if (field.dataeaseName === f.dataeaseName) { + res = f + break + } } } + return res } diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 81371bf86a..820119b829 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -342,6 +342,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -415,6 +416,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -488,6 +490,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -560,6 +563,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -625,6 +629,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -764,7 +769,6 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -940,6 +944,11 @@ export const TYPE_CONFIGS = [ 'orient', 'textStyle', 'hPosition' + ], + 'split-selector-ant-v': [ + 'splitForm', + 'name', + 'lineStyle' ] } }, @@ -1069,6 +1078,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -1367,18 +1377,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1441,18 +1456,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1527,14 +1547,17 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'y-axis-ext-selector': [ 'show', @@ -1605,18 +1628,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1679,18 +1707,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1753,19 +1786,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1828,20 +1865,24 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1893,7 +1934,7 @@ export const TYPE_CONFIGS = [ 'labelLine', 'fontSize', 'color', - 'position-v', + 'position-pie', 'formatter' ], 'tooltip-selector': [ @@ -2134,18 +2175,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -2355,13 +2401,15 @@ export function getColors(chart, colors, reset) { } else { series = JSON.parse(chart.yaxis) } - for (let i = 0; i < series.length; i++) { - const s = series[i] - seriesColors.push({ - name: s.name, - color: colors[i % colors.length], - isCustom: false - }) + if (series) { + for (let i = 0; i < series.length; i++) { + const s = series[i] + seriesColors.push({ + name: s.name, + color: colors[i % colors.length], + isCustom: false + }) + } } } else { if (chart.data) { diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 4ca7b6734e..f04f4f9e67 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -2521,8 +2521,7 @@ export default { .view-panel-Mask { display: flex; height: calc(100vh - 60px); - background-color: #5c5e61; - opacity: 0.7; + background-color: rgba(92,94,97, 0.7); position:absolute; top:0px; left: 0px; diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 91b952da3d..10d34fc7eb 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -531,6 +531,9 @@ export default { if (!userCache) { this.tData = res.data } + this.$nextTick(() => { + this.$refs.datasetTreeRef.filter(this.filterText) + }) }) }, diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 0516c57943..4a2b2c8bc8 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -809,7 +809,8 @@ export default { } this.currentFilterCom.id = newComponentId this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix - this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE + this.currentFilterCom.mobileStyle = deepCopy(BASE_MOBILE_STYLE) + this.currentFilterCom['hyperlinks'] = deepCopy(HYPERLINKS) this.currentFilterCom.commonBackground = this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND) if (this.currentWidget.filterDialog) {