diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/io/dataease/base/domain/ChartView.java index 69777d3f87..569746859c 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartView.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartView.java @@ -1,38 +1,39 @@ package io.dataease.base.domain; import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ChartView implements Serializable { - @ApiModelProperty("ID") private String id; - @ApiModelProperty("名称") + private String name; - @ApiModelProperty("分组ID") - private String sceneId; - @ApiModelProperty("数据集ID") - private String tableId; - @ApiModelProperty("图表类型") - private String type; - @ApiModelProperty("chart渲染方式") - private String render; - @ApiModelProperty("展示结果") - private Integer resultCount; - @ApiModelProperty("展示模式") - private String resultMode; - @ApiModelProperty("标题") + private String title; - @ApiModelProperty("创建人") + + private String sceneId; + + private String tableId; + + private String type; + + private String render; + + private Integer resultCount; + + private String resultMode; + private String createBy; - @ApiModelProperty("创建时间") + private Long createTime; - @ApiModelProperty("更新时间") + private Long updateTime; - @ApiModelProperty("样式优先级") + private String stylePriority; + private String chartType; + + private Boolean isPlugin; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java index 9def62d21e..51a45711b1 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java @@ -244,6 +244,76 @@ public class ChartViewExample { return (Criteria) this; } + public Criteria andTitleIsNull() { + addCriterion("title is null"); + return (Criteria) this; + } + + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); + return (Criteria) this; + } + + public Criteria andTitleEqualTo(String value) { + addCriterion("title =", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotEqualTo(String value) { + addCriterion("title <>", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThan(String value) { + addCriterion("title >", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThanOrEqualTo(String value) { + addCriterion("title >=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThan(String value) { + addCriterion("title <", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThanOrEqualTo(String value) { + addCriterion("title <=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleBetween(String value1, String value2) { + addCriterion("title between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotBetween(String value1, String value2) { + addCriterion("title not between", value1, value2, "title"); + return (Criteria) this; + } + public Criteria andSceneIdIsNull() { addCriterion("scene_id is null"); return (Criteria) this; @@ -654,76 +724,6 @@ public class ChartViewExample { return (Criteria) this; } - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - public Criteria andCreateByIsNull() { addCriterion("create_by is null"); return (Criteria) this; @@ -983,6 +983,136 @@ public class ChartViewExample { addCriterion("style_priority not between", value1, value2, "stylePriority"); return (Criteria) this; } + + public Criteria andChartTypeIsNull() { + addCriterion("chart_type is null"); + return (Criteria) this; + } + + public Criteria andChartTypeIsNotNull() { + addCriterion("chart_type is not null"); + return (Criteria) this; + } + + public Criteria andChartTypeEqualTo(String value) { + addCriterion("chart_type =", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeNotEqualTo(String value) { + addCriterion("chart_type <>", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeGreaterThan(String value) { + addCriterion("chart_type >", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeGreaterThanOrEqualTo(String value) { + addCriterion("chart_type >=", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeLessThan(String value) { + addCriterion("chart_type <", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeLessThanOrEqualTo(String value) { + addCriterion("chart_type <=", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeLike(String value) { + addCriterion("chart_type like", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeNotLike(String value) { + addCriterion("chart_type not like", value, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeIn(List values) { + addCriterion("chart_type in", values, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeNotIn(List values) { + addCriterion("chart_type not in", values, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeBetween(String value1, String value2) { + addCriterion("chart_type between", value1, value2, "chartType"); + return (Criteria) this; + } + + public Criteria andChartTypeNotBetween(String value1, String value2) { + addCriterion("chart_type not between", value1, value2, "chartType"); + return (Criteria) this; + } + + public Criteria andIsPluginIsNull() { + addCriterion("is_plugin is null"); + return (Criteria) this; + } + + public Criteria andIsPluginIsNotNull() { + addCriterion("is_plugin is not null"); + return (Criteria) this; + } + + public Criteria andIsPluginEqualTo(Boolean value) { + addCriterion("is_plugin =", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginNotEqualTo(Boolean value) { + addCriterion("is_plugin <>", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginGreaterThan(Boolean value) { + addCriterion("is_plugin >", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginGreaterThanOrEqualTo(Boolean value) { + addCriterion("is_plugin >=", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginLessThan(Boolean value) { + addCriterion("is_plugin <", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginLessThanOrEqualTo(Boolean value) { + addCriterion("is_plugin <=", value, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginIn(List values) { + addCriterion("is_plugin in", values, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginNotIn(List values) { + addCriterion("is_plugin not in", values, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginBetween(Boolean value1, Boolean value2) { + addCriterion("is_plugin between", value1, value2, "isPlugin"); + return (Criteria) this; + } + + public Criteria andIsPluginNotBetween(Boolean value1, Boolean value2) { + addCriterion("is_plugin not between", value1, value2, "isPlugin"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java index 6fdd140eac..d928332ac5 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java +++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java @@ -1,8 +1,6 @@ package io.dataease.base.domain; import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,27 +9,26 @@ import lombok.ToString; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ChartViewWithBLOBs extends ChartView implements Serializable { - @ApiModelProperty("x轴") private String xAxis; - @ApiModelProperty("x轴(Row)") + private String xAxisExt; - @ApiModelProperty("y轴") + private String yAxis; - @ApiModelProperty("副y轴") + private String yAxisExt; - @ApiModelProperty("堆叠") + private String extStack; - @ApiModelProperty("气泡") + private String extBubble; - @ApiModelProperty("图形属性") + private String customAttr; - @ApiModelProperty("组件样式") + private String customStyle; - @ApiModelProperty("过滤条件") + private String customFilter; - @ApiModelProperty("下钻字段") + private String drillFields; - @ApiModelProperty("快照") + private String snapshot; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml index 5cd892b888..d7e9404ad0 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml @@ -4,17 +4,19 @@ + - + + @@ -88,8 +90,8 @@ - id, `name`, scene_id, table_id, `type`, render, result_count, result_mode, title, - create_by, create_time, update_time, style_priority + id, `name`, title, scene_id, table_id, `type`, render, result_count, result_mode, + create_by, create_time, update_time, style_priority, chart_type, is_plugin x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, @@ -144,24 +146,24 @@ - insert into chart_view (id, `name`, scene_id, - table_id, `type`, render, - result_count, result_mode, title, + insert into chart_view (id, `name`, title, + scene_id, table_id, `type`, + render, result_count, result_mode, create_by, create_time, update_time, - style_priority, x_axis, x_axis_ext, - y_axis, y_axis_ext, ext_stack, - ext_bubble, custom_attr, custom_style, - custom_filter, drill_fields, snapshot - ) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, - #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, - #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, + style_priority, chart_type, is_plugin, + x_axis, x_axis_ext, y_axis, + y_axis_ext, ext_stack, ext_bubble, + custom_attr, custom_style, custom_filter, + drill_fields, snapshot) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, + #{sceneId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, + #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, - #{yAxis,jdbcType=LONGVARCHAR}, #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, - #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, - #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR} - ) + #{stylePriority,jdbcType=VARCHAR}, #{chartType,jdbcType=VARCHAR}, #{isPlugin,jdbcType=BIT}, + #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, + #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, + #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, + #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}) insert into chart_view @@ -172,6 +174,9 @@ `name`, + + title, + scene_id, @@ -190,9 +195,6 @@ result_mode, - - title, - create_by, @@ -205,6 +207,12 @@ style_priority, + + chart_type, + + + is_plugin, + x_axis, @@ -246,6 +254,9 @@ #{name,jdbcType=VARCHAR}, + + #{title,jdbcType=VARCHAR}, + #{sceneId,jdbcType=VARCHAR}, @@ -264,9 +275,6 @@ #{resultMode,jdbcType=VARCHAR}, - - #{title,jdbcType=VARCHAR}, - #{createBy,jdbcType=VARCHAR}, @@ -279,6 +287,12 @@ #{stylePriority,jdbcType=VARCHAR}, + + #{chartType,jdbcType=VARCHAR}, + + + #{isPlugin,jdbcType=BIT}, + #{xAxis,jdbcType=LONGVARCHAR}, @@ -329,6 +343,9 @@ `name` = #{record.name,jdbcType=VARCHAR}, + + title = #{record.title,jdbcType=VARCHAR}, + scene_id = #{record.sceneId,jdbcType=VARCHAR}, @@ -347,9 +364,6 @@ result_mode = #{record.resultMode,jdbcType=VARCHAR}, - - title = #{record.title,jdbcType=VARCHAR}, - create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -362,6 +376,12 @@ style_priority = #{record.stylePriority,jdbcType=VARCHAR}, + + chart_type = #{record.chartType,jdbcType=VARCHAR}, + + + is_plugin = #{record.isPlugin,jdbcType=BIT}, + x_axis = #{record.xAxis,jdbcType=LONGVARCHAR}, @@ -404,17 +424,19 @@ update chart_view set id = #{record.id,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR}, + title = #{record.title,jdbcType=VARCHAR}, scene_id = #{record.sceneId,jdbcType=VARCHAR}, table_id = #{record.tableId,jdbcType=VARCHAR}, `type` = #{record.type,jdbcType=VARCHAR}, render = #{record.render,jdbcType=VARCHAR}, result_count = #{record.resultCount,jdbcType=INTEGER}, result_mode = #{record.resultMode,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, style_priority = #{record.stylePriority,jdbcType=VARCHAR}, + chart_type = #{record.chartType,jdbcType=VARCHAR}, + is_plugin = #{record.isPlugin,jdbcType=BIT}, x_axis = #{record.xAxis,jdbcType=LONGVARCHAR}, x_axis_ext = #{record.xAxisExt,jdbcType=LONGVARCHAR}, y_axis = #{record.yAxis,jdbcType=LONGVARCHAR}, @@ -434,17 +456,19 @@ update chart_view set id = #{record.id,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR}, + title = #{record.title,jdbcType=VARCHAR}, scene_id = #{record.sceneId,jdbcType=VARCHAR}, table_id = #{record.tableId,jdbcType=VARCHAR}, `type` = #{record.type,jdbcType=VARCHAR}, render = #{record.render,jdbcType=VARCHAR}, result_count = #{record.resultCount,jdbcType=INTEGER}, result_mode = #{record.resultMode,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, - style_priority = #{record.stylePriority,jdbcType=VARCHAR} + style_priority = #{record.stylePriority,jdbcType=VARCHAR}, + chart_type = #{record.chartType,jdbcType=VARCHAR}, + is_plugin = #{record.isPlugin,jdbcType=BIT} @@ -455,6 +479,9 @@ `name` = #{name,jdbcType=VARCHAR}, + + title = #{title,jdbcType=VARCHAR}, + scene_id = #{sceneId,jdbcType=VARCHAR}, @@ -473,9 +500,6 @@ result_mode = #{resultMode,jdbcType=VARCHAR}, - - title = #{title,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, @@ -488,6 +512,12 @@ style_priority = #{stylePriority,jdbcType=VARCHAR}, + + chart_type = #{chartType,jdbcType=VARCHAR}, + + + is_plugin = #{isPlugin,jdbcType=BIT}, + x_axis = #{xAxis,jdbcType=LONGVARCHAR}, @@ -527,17 +557,19 @@ update chart_view set `name` = #{name,jdbcType=VARCHAR}, + title = #{title,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, table_id = #{tableId,jdbcType=VARCHAR}, `type` = #{type,jdbcType=VARCHAR}, render = #{render,jdbcType=VARCHAR}, result_count = #{resultCount,jdbcType=INTEGER}, result_mode = #{resultMode,jdbcType=VARCHAR}, - title = #{title,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, style_priority = #{stylePriority,jdbcType=VARCHAR}, + chart_type = #{chartType,jdbcType=VARCHAR}, + is_plugin = #{isPlugin,jdbcType=BIT}, x_axis = #{xAxis,jdbcType=LONGVARCHAR}, x_axis_ext = #{xAxisExt,jdbcType=LONGVARCHAR}, y_axis = #{yAxis,jdbcType=LONGVARCHAR}, @@ -554,17 +586,19 @@ update chart_view set `name` = #{name,jdbcType=VARCHAR}, + title = #{title,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, table_id = #{tableId,jdbcType=VARCHAR}, `type` = #{type,jdbcType=VARCHAR}, render = #{render,jdbcType=VARCHAR}, result_count = #{resultCount,jdbcType=INTEGER}, result_mode = #{resultMode,jdbcType=VARCHAR}, - title = #{title,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, - style_priority = #{stylePriority,jdbcType=VARCHAR} + style_priority = #{stylePriority,jdbcType=VARCHAR}, + chart_type = #{chartType,jdbcType=VARCHAR}, + is_plugin = #{isPlugin,jdbcType=BIT} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql index 1a1c8cc3a2..7657d638ed 100644 --- a/backend/src/main/resources/db/migration/V32__1.8.sql +++ b/backend/src/main/resources/db/migration/V32__1.8.sql @@ -310,3 +310,6 @@ delete from chart_group where id in ( ALTER TABLE `panel_link_mapping` ADD COLUMN `uuid` varchar(8) NULL COMMENT 'uuid' AFTER `user_id`; + +ALTER TABLE `chart_view` +ADD COLUMN `is_plugin` bit(1) NULL COMMENT '是否插件' AFTER `chart_type`; diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index a2f3bd3cd1..6162ddc46a 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -17,7 +17,7 @@ plugin.value === this.chart.type) + // this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type) if (newVal === 'map' && newVal !== oldVal) { this.initAreas() } @@ -347,12 +344,7 @@ export default { deep: true } }, - beforeCreate() { - pluginTypes().then(res => { - this.plugins = res.data - this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type) - }) - }, + created() { this.refId = uuid.v1 if (this.element && this.element.propValue && this.element.propValue.viewId) { diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 6207b3e8a0..f90c4f38b1 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -218,7 +218,7 @@ v-model="view.type" style="width: 100%" > - + @@ -420,6 +420,11 @@ export default { currentKey: null } }, + computed: { + chartType() { + return this.view.type + } + }, watch: { saveStatus() { }, @@ -436,6 +441,9 @@ export default { searchType(val) { this.searchPids = [] this.$refs.chartTreeRef.filter(this.filterText) + }, + chartType(val) { + this.view.isPlugin = val && this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(val) } }, @@ -733,6 +741,7 @@ export default { view.sceneId = this.currGroup.id view.tableId = this.table.id view.type = this.view.type + view.isPlugin = this.view.isPlugin view.render = this.view.render view.resultMode = 'custom' view.resultCount = 1000 diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index e7c85caaa6..0d94a7d8e5 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -160,7 +160,7 @@ :disabled="!hasDataPermission('manage',param.privileges)" @change="changeChartType()" > - + @@ -220,7 +220,7 @@ - +
@@ -820,7 +820,7 @@
plugin.value === this.chart.type) + this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal) if (newVal === 'map' && newVal !== oldVal) { this.initAreas() } @@ -1232,12 +1231,7 @@ export default { }, activated() { }, - beforeCreate() { - pluginTypes().then(res => { - this.plugins = res.data - this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type) - }) - }, + methods: { bindPluginEvent() { bus.$on('show-dimension-edit-filter', this.showDimensionEditFilter) diff --git a/frontend/src/views/chart/view/ChartType.vue b/frontend/src/views/chart/view/ChartType.vue index b52e190f6b..b270062578 100644 --- a/frontend/src/views/chart/view/ChartType.vue +++ b/frontend/src/views/chart/view/ChartType.vue @@ -1,5 +1,5 @@