diff --git a/core/frontend/src/views/chart/components/normal/LabelNormal.vue b/core/frontend/src/views/chart/components/normal/LabelNormal.vue index b973e11d31..f1197d19bd 100644 --- a/core/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/core/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -203,7 +203,6 @@ export default { } if (this.chart.customStyle) { const customStyle = JSON.parse(this.chart.customStyle) - console.log(customStyle) if (customStyle.text) { this.title_show = customStyle.text.show this.title_class.fontSize = customStyle.text.fontSize + 'px' @@ -229,7 +228,6 @@ export default { }, colorThreshold(valueColor, setBg) { - console.log(valueColor, setBg) if (this.chart.senior) { const senior = JSON.parse(this.chart.senior) if (senior.threshold && senior.threshold.labelThreshold && senior.threshold.labelThreshold.length > 0) { diff --git a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue index df0d5314a6..d67d0dfa8f 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue @@ -120,7 +120,6 @@ v-show="showProperty('customColor')" class="custom-color-style" > - aaa
+ + + - +
+ + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelector.vue new file mode 100644 index 0000000000..52c9bc67e7 --- /dev/null +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelector.vue @@ -0,0 +1,292 @@ + + + + + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelectorAntV.vue deleted file mode 100644 index 7ca0b08909..0000000000 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/SizeSelectorAntV.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TitleSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TitleSelector.vue index 938dd29c36..4796a15120 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TitleSelector.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TitleSelector.vue @@ -235,6 +235,10 @@ export default { .form-item ::v-deep .el-form-item__label{ font-size: 12px; } + +.form-item ::v-deep .el-checkbox__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue index 2461555af5..4010193615 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue @@ -125,6 +125,10 @@ export default { .form-item ::v-deep .el-form-item__label { font-size: 12px; } + +.form-item ::v-deep .el-checkbox__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelectorAntV.vue index 111041be39..0198b37f4f 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelectorAntV.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelectorAntV.vue @@ -206,6 +206,10 @@ export default { .form-item ::v-deep .el-form-item__label{ font-size: 12px; } + +.form-item ::v-deep .el-checkbox__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue new file mode 100644 index 0000000000..56b459462a --- /dev/null +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue @@ -0,0 +1,413 @@ + + + + + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisExtSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisExtSelectorAntV.vue new file mode 100644 index 0000000000..e87b87317b --- /dev/null +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisExtSelectorAntV.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisSelectorAntV.vue new file mode 100644 index 0000000000..0dce869d04 --- /dev/null +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisSelectorAntV.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/chartmix.js b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/chartmix.js index 697800dd8d..1402516f78 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/chartmix.js +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/chartmix.js @@ -63,6 +63,12 @@ export function hexColorToRGBA(hex, alpha) { } } +export function setGradientColor(rawColor, show = false, angle = 0) { + const item = rawColor.split(',') + item.splice(3, 1, '0.3)') + return show ? `l(${angle}) 0:${item.join(',')} 1:${rawColor}` : rawColor +} + diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js index 6030857ca0..b13d0f26b7 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js @@ -12,53 +12,14 @@ export const DEFAULT_COLOR_CASE = { } export const DEFAULT_SIZE = { barDefault: true, - barWidth: 40, - barGap: 0.4, + barWidthPercent: 50, lineWidth: 2, lineType: 'solid', - lineSymbol: 'marker', + lineSymbol: 'circle', lineSymbolSize: 4, lineSmooth: true, - lineArea: false, - pieInnerRadius: 0, - pieOuterRadius: 80, - pieRoseType: 'radius', - pieRoseRadius: 5, - funnelWidth: 80, - radarShape: 'polygon', - radarSize: 80, - tableTitleFontSize: 12, - tableItemFontSize: 12, - tableTitleHeight: 36, - tableItemHeight: 36, - tablePageSize: '20', - tableColumnMode: 'custom', - tableColumnWidth: 100, - tableHeaderAlign: 'left', - tableItemAlign: 'right', - gaugeMin: 0, - gaugeMax: 100, - gaugeStartAngle: 225, - gaugeEndAngle: -45, - dimensionFontSize: 18, - quotaFontSize: 18, - spaceSplit: 10, - dimensionShow: true, - quotaShow: true, - scatterSymbol: 'marker', + scatterSymbol: 'circle', scatterSymbolSize: 15, - symbolOpacity: 5, - symbolStrokeWidth: 1, - treemapWidth: 80, - treemapHeight: 80, - liquidMax: 100, - liquidSize: 80, - liquidOutlineBorder: 4, - liquidOutlineDistance: 8, - liquidWaveLength: 128, - liquidWaveCount: 3, - liquidShape: 'circle', - tablePageMode: 'page' } export const COLOR_PANEL = [ '#ff4500', @@ -73,6 +34,27 @@ export const COLOR_PANEL = [ '#FFFFFF' ] +export const CHART_FONT_FAMILY = [ + { name: '微软雅黑', value: 'Microsoft YaHei' }, + { name: '宋体', value: 'SimSun' }, + { name: '黑体', value: 'SimHei' }, + { name: '楷体', value: 'KaiTi' } +] + +export const CHART_FONT_LETTER_SPACE = [ + { name: '0px', value: '0' }, + { name: '1px', value: '1' }, + { name: '2px', value: '2' }, + { name: '3px', value: '3' }, + { name: '4px', value: '4' }, + { name: '5px', value: '5' }, + { name: '6px', value: '6' }, + { name: '7px', value: '7' }, + { name: '8px', value: '8' }, + { name: '9px', value: '9' }, + { name: '10px', value: '10' } +] + export const DEFAULT_LABEL = { show: true, position: 'middle', @@ -406,9 +388,9 @@ export function hexColorToRGBA(hex, alpha) { } -export const DEFAULT_YAXIS_EXT_STYLE = { +export const DEFAULT_YAXIS_STYLE = { show: true, - position: 'right', + position: 'left', name: '', nameTextStyle: { color: '#333333', @@ -421,6 +403,14 @@ export const DEFAULT_YAXIS_EXT_STYLE = { rotate: 0, formatter: '{value}' }, + axisLine: { + show: false, + lineStyle: { + color: '#cccccc', + width: 1, + style: 'solid' + } + }, splitLine: { show: true, lineStyle: { @@ -435,6 +425,59 @@ export const DEFAULT_YAXIS_EXT_STYLE = { max: null, split: null, splitCount: null + }, + axisLabelFormatter: { + type: 'auto', // auto,value,percent + unit: 1, // 换算单位 + suffix: '', // 单位后缀 + decimalCount: 2, // 小数位数 + thousandSeparator: true// 千分符 + } +} +export const DEFAULT_YAXIS_EXT_STYLE = { + show: true, + position: 'right', + name: '', + nameTextStyle: { + color: '#333333', + fontSize: 12 + }, + axisLabel: { + show: true, + color: '#333333', + fontSize: '12', + rotate: 0, + formatter: '{value}' + }, + axisLine: { + show: false, + lineStyle: { + color: '#cccccc', + width: 1, + style: 'solid' + } + }, + splitLine: { + show: true, + lineStyle: { + color: '#cccccc', + width: 1, + style: 'solid' + } + }, + axisValue: { + auto: true, + min: null, + max: null, + split: null, + splitCount: null + }, + axisLabelFormatter: { + type: 'auto', // auto,value,percent + unit: 1, // 换算单位 + suffix: '', // 单位后缀 + decimalCount: 2, // 小数位数 + thousandSeparator: true// 千分符 } } @@ -515,53 +558,6 @@ export const DEFAULT_XAXIS_STYLE = { } } -export const DEFAULT_YAXIS_STYLE = { - show: true, - position: 'left', - name: '', - nameTextStyle: { - color: '#333333', - fontSize: 12 - }, - axisLabel: { - show: true, - color: '#333333', - fontSize: '12', - rotate: 0, - formatter: '{value}' - }, - axisLine: { - show: false, - lineStyle: { - color: '#cccccc', - width: 1, - style: 'solid' - } - }, - splitLine: { - show: true, - lineStyle: { - color: '#cccccc', - width: 1, - style: 'solid' - } - }, - axisValue: { - auto: true, - min: null, - max: null, - split: null, - splitCount: null - }, - axisLabelFormatter: { - type: 'auto', // auto,value,percent - unit: 1, // 换算单位 - suffix: '', // 单位后缀 - decimalCount: 2, // 小数位数 - thousandSeparator: true// 千分符 - } -} - export function transAxisPosition(chart, axis) { if (chart.type.includes('horizontal')) { switch (axis.position) { diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue index 29e5a6af84..2bc5a0c21c 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue @@ -33,15 +33,14 @@