From 26deecae506318999c15f70c1c89249535aa0fb7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 13 Aug 2024 14:46:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/CanvasCore.vue | 14 +- .../custom-component/common/CommonAttr.vue | 6 +- .../common/CommonBorderSetting.vue | 137 +++++++++++------- .../common/CommonStyleSet.vue | 50 ------- .../src/models/chart/editor.d.ts | 1 + .../editor/editor-style/ChartStyle.vue | 35 ++++- .../views/chart/components/editor/index.vue | 6 + .../js/panel/charts/bar/bidirectional-bar.ts | 2 + .../components/js/panel/charts/bar/common.ts | 3 + .../js/panel/charts/bar/progress-bar.ts | 2 + .../js/panel/charts/bar/waterfall.ts | 2 + .../components/js/panel/charts/line/common.ts | 2 + .../js/panel/charts/line/stock-line.ts | 1 + .../js/panel/charts/liquid/liquid.ts | 2 + .../components/js/panel/charts/map/common.ts | 2 + .../js/panel/charts/map/flow-map.ts | 1 + .../js/panel/charts/map/heat-map.ts | 1 + .../js/panel/charts/map/symbolic-map.ts | 1 + .../panel/charts/others/chart-mix-common.ts | 2 + .../js/panel/charts/others/funnel.ts | 2 + .../js/panel/charts/others/gauge.ts | 2 + .../js/panel/charts/others/indicator.ts | 2 + .../js/panel/charts/others/quadrant.ts | 1 + .../js/panel/charts/others/radar.ts | 1 + .../js/panel/charts/others/rich-text.ts | 3 +- .../js/panel/charts/others/sankey-common.ts | 2 + .../js/panel/charts/others/scatter.ts | 1 + .../js/panel/charts/others/treemap.ts | 2 + .../js/panel/charts/others/word-cloud.ts | 2 + .../components/js/panel/charts/pie/common.ts | 2 + .../js/panel/charts/table/common.ts | 2 + .../js/panel/charts/table/table-pivot.ts | 1 + 32 files changed, 183 insertions(+), 110 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index e7f242a9eb..51e56d9970 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -202,6 +202,18 @@ const height = ref(0) const isShowArea = ref(false) const svgFilterAttrs = ['width', 'height', 'top', 'left', 'rotate', 'backgroundColor'] const commonFilterAttrs = ['width', 'height', 'top', 'left', 'rotate'] +const commonFilterAttrsFilterBorder = [ + 'width', + 'height', + 'top', + 'left', + 'rotate', + 'borderActive', + 'borderWidth', + 'borderRadius', + 'borderStyle', + 'borderColor' +] const userViewEnlargeRef = ref(null) const customDatasetParamsRef = ref(null) const linkJumpRef = ref(null) @@ -515,7 +527,7 @@ const handleContextMenu = e => { } const getComponentStyle = style => { - return getStyle(style, commonFilterAttrs) + return getStyle(style, style.borderActive ? commonFilterAttrs : commonFilterAttrsFilterBorder) } const getSvgComponentStyle = style => { diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue index 116571ac31..385ce77957 100644 --- a/core/core-frontend/src/custom-component/common/CommonAttr.vue +++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue @@ -97,7 +97,7 @@ const colorPickerWidth = computed(() => { }) const borderSettingShow = computed(() => { - return !!element.value.style['borderActive'] + return !!element.value.style['borderStyle'] }) // 暂时关闭 @@ -186,14 +186,14 @@ const stopEvent = e => { diff --git a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue index ab8508ee2c..308c11994a 100644 --- a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue +++ b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue @@ -13,14 +13,14 @@ const { canvasStyleData } = storeToRefs(dvMainStore) const props = withDefaults( defineProps<{ themes?: EditorTheme - element: any + styleInfo: any }>(), { themes: 'dark' } ) const emits = defineEmits(['onStyleAttrChange']) -const { themes, element } = toRefs(props) +const { themes, styleInfo } = toRefs(props) const state = reactive({ fontSize: [], isSetting: false, @@ -38,16 +38,16 @@ const borderStyleList = [ ] const styleInit = () => { - if (element.value) { + if (styleInfo.value) { Object.keys(styleMounted.value).forEach(key => { styleMounted.value[key] = Math.round( - (element.value.style[key] * 100) / canvasStyleData.value.scale + (styleInfo.value[key] * 100) / canvasStyleData.value.scale ) }) } } -const styleForm = computed(() => element.value.style) +const styleForm = computed(() => styleInfo.value) const changeStyle = params => { snapshotStore.recordSnapshotCache() @@ -55,18 +55,16 @@ const changeStyle = params => { } const changeStylePre = key => { - changeStyle({ key: key, value: element.value.style[key] }) + changeStyle({ key: key, value: styleInfo.value[key] }) } const sizeChange = key => { - element.value.style[key] = Math.round( - (styleMounted.value[key] * canvasStyleData.value.scale) / 100 - ) - changeStyle({ key: key, value: element.value.style[key] }) + styleInfo.value[key] = (styleMounted.value[key] * canvasStyleData.value.scale) / 100 + changeStyle({ key: key, value: styleInfo.value[key] }) } watch( - () => element.value, + () => styleInfo.value, () => { styleInit() }, @@ -80,52 +78,85 @@ watch( diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue index 1c345c5698..86d800adf1 100644 --- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue +++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue @@ -350,7 +350,6 @@ const state = reactive({ const styleColorKeyArray = [ { value: 'color', label: '颜色', width: 90, icon: 'dv-style-color' }, - { value: 'borderColor', label: '边框颜色', width: 90, icon: 'dv-style-borderColor' }, { value: 'headFontColor', label: '头部字体颜色', @@ -388,34 +387,6 @@ const fontSizeList = computed(() => { return arr }) -const borderWidthList = computed(() => { - const arr = [] - for (let i = 0; i <= 20; i = i + 1) { - arr.push({ - name: i + '', - value: i - }) - } - return arr -}) - -const borderRadiusList = computed(() => { - const arr = [] - for (let i = 0; i <= 50; i = i + 1) { - arr.push({ - name: i + '', - value: i - }) - } - return arr -}) - -const borderStyleList = [ - { name: '实线', value: 'solid' }, - { name: '虚线', value: 'dashed' }, - { name: '点线', value: 'dotted' } -] - const styleOptionKeyArrayPre = [ { value: 'fontFamily', @@ -466,27 +437,6 @@ const styleOptionKeyArray = [ customOption: opacitySizeList, width: '90px', icon: 'dv-style-opacity' - }, - { - value: 'borderWidth', - label: '边框宽度', - customOption: borderWidthList.value, - width: '90px', - icon: 'dv-style-borderSize' - }, - { - value: 'borderRadius', - label: '圆角', - customOption: borderRadiusList.value, - width: '90px', - icon: 'dv-style-borderRadius' - }, - { - value: 'borderStyle', - label: '边框样式', - customOption: borderStyleList, - width: '90px', - icon: 'dv-style-borderStyle' } ] diff --git a/core/core-frontend/src/models/chart/editor.d.ts b/core/core-frontend/src/models/chart/editor.d.ts index 58b3bd8a86..72186e22dc 100644 --- a/core/core-frontend/src/models/chart/editor.d.ts +++ b/core/core-frontend/src/models/chart/editor.d.ts @@ -1,5 +1,6 @@ declare type EditorProperty = | 'background-overall-component' + | 'border-style' | 'basic-style-selector' | 'dual-basic-style-selector' | 'label-selector' 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 ae8f4b7b00..2d151b4241 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 @@ -27,6 +27,7 @@ import QuadrantSelector from '@/views/chart/components/editor/editor-style/compo import FlowMapLineSelector from '@/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue' import FlowMapPointSelector from '@/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue' import CommonEvent from '@/custom-component/common/CommonEvent.vue' +import CommonBorderSetting from '@/custom-component/common/CommonBorderSetting.vue' const dvMainStore = dvMainStoreWithOut() const { dvInfo, batchOptStatus } = storeToRefs(dvMainStore) @@ -43,6 +44,10 @@ const props = defineProps({ type: Object, required: false }, + commonBorderPop: { + type: Object, + required: false + }, eventInfo: { type: Object, required: false @@ -90,8 +95,15 @@ const props = defineProps({ } }) -const { chart, themes, properties, propertyInnerAll, commonBackgroundPop, selectorSpec } = - toRefs(props) +const { + chart, + themes, + properties, + propertyInnerAll, + commonBackgroundPop, + commonBorderPop, + selectorSpec +} = toRefs(props) const emit = defineEmits([ 'onColorChange', 'onMiscChange', @@ -104,6 +116,7 @@ const emit = defineEmits([ 'onLegendChange', 'onBasicStyleChange', 'onBackgroundChange', + 'onStyleAttrChange', 'onTableHeaderChange', 'onTableCellChange', 'onTableTotalChange', @@ -192,6 +205,10 @@ const onBackgroundChange = (val, prop) => { state.initReady && emit('onBackgroundChange', val, prop) } +const onStyleAttrChange = ({ key, value }) => { + state.initReady && emit('onStyleAttrChange', { custom: 'style', property: key, value: value }) +} + const onTableHeaderChange = (val, prop) => { emit('onTableHeaderChange', val, prop) } @@ -318,6 +335,20 @@ watch( component-position="component" /> + + + diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 21180059c3..70f7ffddfd 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -1053,6 +1053,10 @@ const onBackgroundChange = val => { curComponent.value.commonBackground = val } +const onStyleAttrChange = val => { + curComponent.value.style[val.property] = val.value +} + const onAssistLineChange = val => { view.value.senior.assistLineCfg = val.data if (val.requestData) { @@ -2776,6 +2780,7 @@ const deleteChartFieldItem = id => { :property-inner-all="chartViewInstance.propertyInner" :selector-spec="chartViewInstance.selectorSpec" :common-background-pop="curComponent?.commonBackground" + :common-border-pop="curComponent?.style" :event-info="curComponent?.events" :chart="view" :themes="themes" @@ -2794,6 +2799,7 @@ const deleteChartFieldItem = id => { @onIndicatorNameChange="onIndicatorNameChange" @onLegendChange="onLegendChange" @onBackgroundChange="onBackgroundChange" + @onStyleAttrChange="onStyleAttrChange" @onBasicStyleChange="onBasicStyleChange" @onTableHeaderChange="onTableHeaderChange" @onTableCellChange="onTableCellChange" diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts index 2aef190e8c..ed2f0bfb2c 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts @@ -49,6 +49,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView< axis: AxisType[] = ['xAxis', 'yAxis', 'yAxisExt', 'filter', 'drill', 'extLabel', 'extTooltip'] properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'x-axis-selector', 'dual-y-axis-selector', @@ -62,6 +63,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView< ] propertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient', 'layout'], 'x-axis-selector': ['position', 'axisLabel', 'axisLine', 'splitLine'], 'y-axis-selector': [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/common.ts index b6578c4795..622c1d654a 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/common.ts @@ -1,5 +1,6 @@ export const BAR_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -14,6 +15,7 @@ export const BAR_EDITOR_PROPERTY: EditorProperty[] = [ ] export const BAR_RANGE_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -28,6 +30,7 @@ export const BAR_RANGE_EDITOR_PROPERTY: EditorProperty[] = [ export const BAR_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient', 'radiusColumnBar'], 'label-selector': ['fontSize', 'color', 'labelFormatter'], 'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter', 'show'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts index 6fef38049f..fd9e6db110 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts @@ -34,6 +34,7 @@ export class ProgressBar extends G2PlotChartView { } properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -47,6 +48,7 @@ export class ProgressBar extends G2PlotChartView { ...BAR_EDITOR_PROPERTY_INNER, 'legend-selector': null, 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient'], 'label-selector': ['hPosition', 'color', 'fontSize'], 'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'show'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/waterfall.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/waterfall.ts index 5357fe6663..f8d694b5c1 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/waterfall.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/waterfall.ts @@ -11,6 +11,7 @@ import { isEmpty } from 'lodash-es' export class Waterfall extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -21,6 +22,7 @@ export class Waterfall extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient'], 'label-selector': ['fontSize', 'color', 'vPosition', 'labelFormatter'], 'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/common.ts index f1f7a5ed9c..7d88df7f9e 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/common.ts @@ -1,5 +1,6 @@ export const LINE_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'x-axis-selector', 'y-axis-selector', @@ -14,6 +15,7 @@ export const LINE_EDITOR_PROPERTY: EditorProperty[] = [ ] export const LINE_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'label-selector': ['fontSize', 'color'], 'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'show'], 'basic-style-selector': [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts index 010545e475..1775d25737 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/stock-line.ts @@ -17,6 +17,7 @@ const DEFAULT_DATA = [] export class StockLine extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'x-axis-selector', 'y-axis-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts index 8f71c29927..53524a18ee 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts @@ -16,6 +16,7 @@ const DEFAULT_LIQUID_DATA = [] export class Liquid extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'misc-selector', @@ -24,6 +25,7 @@ export class Liquid extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha'], 'label-selector': ['fontSize', 'color', 'labelFormatter'], 'misc-selector': ['liquidShape', 'liquidSize', 'liquidMaxType', 'liquidMaxField'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts index 18335669da..7589f4d2b8 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts @@ -1,5 +1,6 @@ export const MAP_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector', 'label-selector', @@ -12,6 +13,7 @@ export const MAP_EDITOR_PROPERTY: EditorProperty[] = [ export const MAP_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'areaBorderColor', 'zoom'], 'title-selector': [ 'title', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts index 8d7d3c494c..3ac0b2f8a9 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts @@ -21,6 +21,7 @@ const { t } = useI18n() export class FlowMap extends L7ChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector', 'flow-map-line-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/heat-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/heat-map.ts index b12600bc21..21fdf99bd4 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/heat-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/heat-map.ts @@ -21,6 +21,7 @@ const { t } = useI18n() export class HeatMap extends L7ChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector' ] diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts index da57787b44..d02a0c8798 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts @@ -22,6 +22,7 @@ const { t } = useI18n() export class SymbolicMap extends L7ChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector', 'label-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts index ac6b0d8d35..e881172469 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts @@ -2,6 +2,7 @@ import { DEFAULT_BASIC_STYLE } from '@/views/chart/components/editor/util/chart' export const CHART_MIX_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'dual-basic-style-selector', 'x-axis-selector', 'dual-y-axis-selector', @@ -16,6 +17,7 @@ export const CHART_MIX_EDITOR_PROPERTY: EditorProperty[] = [ ] export const CHART_MIX_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'label-selector': ['fontSize', 'color'], 'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'show'], 'dual-basic-style-selector': [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/funnel.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/funnel.ts index 35d1b652e1..ec14363616 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/funnel.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/funnel.ts @@ -14,6 +14,7 @@ const { t } = useI18n() export class Funnel extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -24,6 +25,7 @@ export class Funnel extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'seriesColor'], 'label-selector': ['fontSize', 'color', 'hPosition', 'showQuota', 'conversionTag'], 'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/gauge.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/gauge.ts index 60e937847a..6f7062d1f1 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/gauge.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/gauge.ts @@ -21,6 +21,7 @@ const DEFAULT_DATA = [] export class Gauge extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'misc-selector', @@ -29,6 +30,7 @@ export class Gauge extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient', 'gaugeAxisLine', 'gaugePercentLabel'], 'label-selector': ['fontSize', 'color', 'labelFormatter'], 'title-selector': [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts index 22f8973a12..2ce5c7934b 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts @@ -8,6 +8,7 @@ const { t } = useI18n() export class IndicatorChartView extends AbstractChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'title-selector', 'indicator-value-selector', 'indicator-name-selector', @@ -16,6 +17,7 @@ export class IndicatorChartView extends AbstractChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'title-selector': [ 'title', 'fontSize', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/quadrant.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/quadrant.ts index 4ddcc8456d..cc1400b945 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/quadrant.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/quadrant.ts @@ -16,6 +16,7 @@ const { t } = useI18n() export class Quadrant extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'x-axis-selector', 'y-axis-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts index db57672dff..a2e01f71d4 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts @@ -13,6 +13,7 @@ const { t } = useI18n() export class Radar extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts index 3b54e11a33..b1963e47f0 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts @@ -6,9 +6,10 @@ const { t } = useI18n() * 富文本图表 */ export class RichTextChartView extends AbstractChartView { - properties: EditorProperty[] = ['background-overall-component', 'threshold'] + properties: EditorProperty[] = ['background-overall-component', 'border-style', 'threshold'] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], threshold: ['tableThreshold'] } axis: AxisType[] = ['xAxis', 'yAxis', 'filter'] diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts index 90790b3fc3..d080ac6a39 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts @@ -1,5 +1,6 @@ export const SANKEY_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'label-selector', 'tooltip-selector', @@ -10,6 +11,7 @@ export const SANKEY_EDITOR_PROPERTY: EditorProperty[] = [ export const SANKEY_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'gradient'], 'label-selector': ['fontSize', 'color', 'labelFormatter'], 'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts index bef607ecd4..ea2633b899 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts @@ -16,6 +16,7 @@ const { t } = useI18n() export class Scatter extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'x-axis-selector', 'y-axis-selector', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/treemap.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/treemap.ts index 8a12792044..0acf5777c7 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/treemap.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/treemap.ts @@ -16,6 +16,7 @@ const { t } = useI18n() export class Treemap extends G2PlotChartView { properties: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector', 'legend-selector', @@ -26,6 +27,7 @@ export class Treemap extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha', 'seriesColor'], 'label-selector': ['fontSize', 'color', 'showDimension', 'showQuota', 'showProportion'], 'legend-selector': ['icon', 'orient', 'fontSize', 'color', 'hPosition', 'vPosition'], diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/word-cloud.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/word-cloud.ts index 13afe0fa93..a83805b01c 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/word-cloud.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/word-cloud.ts @@ -19,6 +19,7 @@ export class WordCloud extends G2PlotChartView { properties: EditorProperty[] = [ 'basic-style-selector', 'background-overall-component', + 'border-style', 'title-selector', 'tooltip-selector', 'misc-selector', @@ -27,6 +28,7 @@ export class WordCloud extends G2PlotChartView { ] propertyInner: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'basic-style-selector': ['colors', 'alpha'], 'title-selector': [ 'title', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/pie/common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/pie/common.ts index 390700af28..f328109dbd 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/pie/common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/pie/common.ts @@ -4,6 +4,7 @@ const { t } = useI18n() export const PIE_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'title-selector', 'legend-selector', @@ -14,6 +15,7 @@ export const PIE_EDITOR_PROPERTY: EditorProperty[] = [ ] export const PIE_EDITOR_PROPERTY_INNER: EditorPropertyInner = { 'background-overall-component': ['all'], + 'border-style': ['all'], 'label-selector': [ 'fontSize', 'color', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/common.ts index 20ab6289e6..08b146e102 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/common.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/common.ts @@ -1,5 +1,6 @@ export const TABLE_EDITOR_PROPERTY: EditorProperty[] = [ 'background-overall-component', + 'border-style', 'basic-style-selector', 'table-header-selector', 'table-cell-selector', @@ -12,6 +13,7 @@ export const TABLE_EDITOR_PROPERTY: EditorProperty[] = [ 'linkage' ] export const TABLE_EDITOR_PROPERTY_INNER: EditorPropertyInner = { + 'border-style': ['all'], 'background-overall-component': ['all'], 'basic-style-selector': ['tableColumnMode', 'tableBorderColor', 'tableScrollBarColor', 'alpha'], 'table-header-selector': [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts index 08cc77152d..d0fa4bcb78 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts @@ -14,6 +14,7 @@ const { t } = useI18n() */ export class TablePivot extends S2ChartView { properties: EditorProperty[] = [ + 'border-style', 'background-overall-component', 'basic-style-selector', 'table-header-selector',