diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 771e574..28775a6 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -384,6 +384,10 @@ declare interface ChartBasicStyle { * 占比图图形底色 */ proportionBackgroundColor: string + /** + * 占比图图形展示选择 + */ + proportionSelect:string } /** * 表头属性 diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue index 6baabfc..4b92aba 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue @@ -96,6 +96,10 @@ const props = defineProps({ allFields: { type: Array, required: true + }, + allGraphcs:{ + type: Array, + required: true } }) @@ -279,6 +283,7 @@ watch( :property-inner="propertyInnerAll['basic-style-selector']" :themes="themes" :chart="chart" + :allGraphcs = "props.allGraphcs" @onBasicStyleChange="onBasicStyleChange" @onMiscChange="onMiscChange" /> diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue index 589ea00..dcd5988 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue @@ -41,7 +41,10 @@ const props = defineProps({ }, propertyInner: { type: Array - } + }, + allGraphcs: { + type: Object + }, }) const showProperty = prop => { const has = props.propertyInner?.includes(prop) @@ -369,6 +372,7 @@ onMounted(() => { } }) }) +