From 0e8f0420e7412a38be906467724b559568d64f48 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Mon, 7 Nov 2022 16:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../configure/barCharts/widget-bar-compare.js | 76 ++++++++++-
.../barCharts/widget-bar-line-stack.js | 6 +-
.../configure/barCharts/widget-bar-stack.js | 70 +++++++---
.../configure/barCharts/widget-barchart.js | 48 +++++--
.../barlineChart/widget-barlinechart.js | 58 +++++---
.../barlineChart/widget-gradient-barchart.js | 76 +++++++----
.../barlineChart/widget-more-bar-line.js | 58 +++++---
.../configure/funnelCharts/widget-funnel.js | 50 +++++--
.../tools/configure/heatmap/widget-heatmap.js | 56 ++++++--
.../lineCharts/widget-line-compare.js | 76 ++++++++++-
.../configure/lineCharts/widget-line-stack.js | 48 +++++--
.../configure/lineCharts/widget-linechart.js | 76 +++++++----
.../mapCharts/widget-airbubble-map.js | 80 +++++++----
.../configure/mapCharts/widget-line-map.js | 56 ++++++--
.../pieCharts/widget-pie-nightingale.js | 58 +++++---
.../configure/pieCharts/widget-piechart.js | 58 +++++---
.../tools/configure/texts/widget-radar.js | 128 ++++++++++++++++++
.../wordcloudCharts/widget-word-cloud.js | 58 +++++---
.../widget/bar/widgetBarCompareChart.vue | 22 ++-
.../widget/bar/widgetBarLineStackChart.vue | 36 +++--
.../widget/bar/widgetBarStackChart.vue | 6 +-
.../designer/widget/bar/widgetBarchart.vue | 7 +-
.../widget/bar/widgetBarlinechart.vue | 70 ++++++----
.../bar/widgetGradientColorBarchart.vue | 7 +-
.../widget/bar/widgetMoreBarLineChart.vue | 7 +-
.../designer/widget/heatmap/widgetHeatmap.vue | 31 +++--
.../widget/line/widgetLineCompareChart.vue | 22 ++-
.../widget/line/widgetLineStackChart.vue | 6 +-
.../designer/widget/line/widgetLinechart.vue | 6 +-
.../widget/map/widgetAirBubbleMap.vue | 24 ++--
.../designer/widget/map/widgetLineMap.vue | 8 +-
.../widget/pie/widgetPieNightingaleRose.vue | 8 +-
.../designer/widget/pie/widgetPiechart.vue | 10 +-
.../designer/widget/radar/widgetRadar.vue | 26 +++-
.../designer/widget/widget.vue | 10 +-
.../designer/widget/widgetFunnel.vue | 7 +-
.../widget/wordcloud/widgetWordCloud.vue | 6 +-
37 files changed, 1079 insertions(+), 376 deletions(-)
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
index 5441684c..87147012 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
@@ -58,7 +58,7 @@ export const widgetBarCompare = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -66,7 +66,7 @@ export const widgetBarCompare = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -80,6 +80,14 @@ export const widgetBarCompare = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -95,12 +103,17 @@ export const widgetBarCompare = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -115,6 +128,57 @@ export const widgetBarCompare = {
],
value: 'center'
},
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js
index 10f84c02..53ff6fd6 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js
@@ -310,7 +310,7 @@ export const widgetBarLineStack = {
{
type: 'el-input-text',
label: '轴别名',
- name: 'xName',
+ name: 'nameX',
required: false,
placeholder: '',
value: ''
@@ -318,7 +318,7 @@ export const widgetBarLineStack = {
{
type: 'vue-color',
label: '别名颜色',
- name: 'xNameColor',
+ name: 'nameColorX',
required: false,
placeholder: '',
value: '#fff'
@@ -326,7 +326,7 @@ export const widgetBarLineStack = {
{
type: 'el-input-number',
label: '别名字号',
- name: 'xNameFontSize',
+ name: 'nameFontSizeX',
required: false,
placeholder: '',
value: 14
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
index e127250b..b0097b95 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
@@ -78,7 +78,7 @@ export const widgetBarStack = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -86,7 +86,7 @@ export const widgetBarStack = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -100,6 +100,14 @@ export const widgetBarStack = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -107,20 +115,25 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -129,15 +142,15 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -151,6 +164,14 @@ export const widgetBarStack = {
placeholder: '',
value: 'rgba(30, 144, 255, 1)'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -158,20 +179,25 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
index 7bcca5e2..8e1b8072 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
@@ -74,7 +74,7 @@ export const widgetBarchart = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -82,7 +82,7 @@ export const widgetBarchart = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -96,6 +96,14 @@ export const widgetBarchart = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -111,12 +119,17 @@ export const widgetBarchart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -133,7 +146,7 @@ export const widgetBarchart = {
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -147,6 +160,14 @@ export const widgetBarchart = {
placeholder: '',
value: 'rgba(30, 144, 255, 1)'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -162,12 +183,17 @@ export const widgetBarchart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js
index 047bd93f..ff7e873e 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js
@@ -119,19 +119,19 @@ export const widgetBarlinechart = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -139,7 +139,15 @@ export const widgetBarlinechart = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -156,12 +164,17 @@ export const widgetBarlinechart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -174,11 +187,11 @@ export const widgetBarlinechart = {
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -190,7 +203,15 @@ export const widgetBarlinechart = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -207,12 +228,17 @@ export const widgetBarlinechart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js
index d2967583..3dae2312 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js
@@ -66,7 +66,7 @@ export const widgetGradientBarchart = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -74,7 +74,7 @@ export const widgetGradientBarchart = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -86,7 +86,15 @@ export const widgetGradientBarchart = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -95,20 +103,25 @@ export const widgetGradientBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 22
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -117,15 +130,15 @@ export const widgetGradientBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -137,29 +150,42 @@ export const widgetGradientBarchart = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: '#90979c'
+ value: 'rgba(30, 144, 255, 1)'
},
{
- type: 'el-input-text',
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
label: '字体粗细',
name: 'subTextFontWeight',
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js
index bcfe27aa..b01347c8 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js
@@ -111,19 +111,19 @@ export const widgetMoreBarLine = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -131,7 +131,15 @@ export const widgetMoreBarLine = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -148,12 +156,17 @@ export const widgetMoreBarLine = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -166,11 +179,11 @@ export const widgetMoreBarLine = {
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -182,7 +195,15 @@ export const widgetMoreBarLine = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -199,12 +220,17 @@ export const widgetMoreBarLine = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
index f280fb4c..7b8a4490 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
@@ -45,15 +45,15 @@ export const widgetFunnel = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: false,
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -67,6 +67,14 @@ export const widgetFunnel = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -82,12 +90,17 @@ export const widgetFunnel = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -104,7 +117,7 @@ export const widgetFunnel = {
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -118,6 +131,14 @@ export const widgetFunnel = {
placeholder: '',
value: 'rgba(30, 144, 255, 1)'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -133,12 +154,17 @@ export const widgetFunnel = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 16
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
index 34424011..201cf15a 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
@@ -37,19 +37,19 @@ export const widgetHeatmap = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -57,7 +57,15 @@ export const widgetHeatmap = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -74,12 +82,17 @@ export const widgetHeatmap = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 16
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -96,7 +109,7 @@ export const widgetHeatmap = {
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -108,7 +121,15 @@ export const widgetHeatmap = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -125,12 +146,17 @@ export const widgetHeatmap = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 16
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
index 203c1fb3..0e470f7b 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
@@ -90,7 +90,7 @@ export const widgetLineCompare = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -98,7 +98,7 @@ export const widgetLineCompare = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -112,6 +112,14 @@ export const widgetLineCompare = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -127,12 +135,17 @@ export const widgetLineCompare = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -147,6 +160,57 @@ export const widgetLineCompare = {
],
value: 'center'
},
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
index 438e7d42..a7d9c341 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
@@ -98,7 +98,7 @@ export const widgetLineStack = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
@@ -106,7 +106,7 @@ export const widgetLineStack = {
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -120,6 +120,14 @@ export const widgetLineStack = {
placeholder: '',
value: '#FFD700'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -135,12 +143,17 @@ export const widgetLineStack = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -157,7 +170,7 @@ export const widgetLineStack = {
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -171,6 +184,14 @@ export const widgetLineStack = {
placeholder: '',
value: 'rgba(30, 144, 255, 1)'
},
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
{
type: 'el-select',
label: '字体粗细',
@@ -186,12 +207,17 @@ export const widgetLineStack = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
index 8870c319..3c8aa5f5 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
@@ -90,15 +90,15 @@ export const widgetLinechart = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: false
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
@@ -110,7 +110,15 @@ export const widgetLinechart = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -119,20 +127,25 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -141,15 +154,15 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -161,7 +174,15 @@ export const widgetLinechart = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -170,20 +191,25 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
index 0485ef1a..e7f99b7f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
@@ -37,19 +37,19 @@ export const widgetAirbubbleMap = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -57,7 +57,15 @@ export const widgetAirbubbleMap = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -66,20 +74,25 @@ export const widgetAirbubbleMap = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -88,15 +101,15 @@ export const widgetAirbubbleMap = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -108,7 +121,15 @@ export const widgetAirbubbleMap = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -117,20 +138,25 @@ export const widgetAirbubbleMap = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 12
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
index eb589c62..facf96cb 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
@@ -36,19 +36,19 @@ export const widgetLineMap = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -56,7 +56,15 @@ export const widgetLineMap = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -73,12 +81,17 @@ export const widgetLineMap = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -95,7 +108,7 @@ export const widgetLineMap = {
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -107,7 +120,15 @@ export const widgetLineMap = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -124,12 +145,17 @@ export const widgetLineMap = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 12
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
index 3a008b55..a025e8ac 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
@@ -49,19 +49,19 @@ export const widgetPieNightingale = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -69,7 +69,15 @@ export const widgetPieNightingale = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -86,12 +94,17 @@ export const widgetPieNightingale = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -104,11 +117,11 @@ export const widgetPieNightingale = {
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -120,7 +133,15 @@ export const widgetPieNightingale = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -137,12 +158,17 @@ export const widgetPieNightingale = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 12
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
index 612a62c3..348f8910 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
@@ -49,19 +49,19 @@ export const widgetPiechart = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -69,7 +69,15 @@ export const widgetPiechart = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -86,12 +94,17 @@ export const widgetPiechart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -104,11 +117,11 @@ export const widgetPiechart = {
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -120,7 +133,15 @@ export const widgetPiechart = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -137,12 +158,17 @@ export const widgetPiechart = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 12
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js
index 2eda822d..304df48d 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js
@@ -26,6 +26,134 @@ export const widgetRadar = {
value: ''
},
[
+ {
+ name: '标题设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '标题显示',
+ name: 'isNoTitle',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '标题名',
+ name: 'titleText',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'textColor',
+ required: false,
+ placeholder: '',
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体位置',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ ],
+ },
{
name: '雷达设置',
list: [
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js
index 836603f6..542a77be 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js
@@ -29,19 +29,19 @@ export const widgetWordCloud = {
list: [
{
type: 'el-switch',
- label: '标题',
+ label: '标题显示',
name: 'isNoTitle',
required: false,
placeholder: '',
- value: true
+ value: true,
},
{
type: 'el-input-text',
- label: '标题',
+ label: '标题名',
name: 'titleText',
required: false,
placeholder: '',
- value: ''
+ value: '',
},
{
type: 'vue-color',
@@ -49,7 +49,15 @@ export const widgetWordCloud = {
name: 'textColor',
required: false,
placeholder: '',
- value: '#fff'
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -66,12 +74,17 @@ export const widgetWordCloud = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'textFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
required: false,
placeholder: '',
- value: 20
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
{
type: 'el-select',
@@ -84,11 +97,11 @@ export const widgetWordCloud = {
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
- value: 'left'
+ value: 'center'
},
{
type: 'el-input-text',
- label: '副标题',
+ label: '副标题名',
name: 'subText',
required: false,
placeholder: '',
@@ -100,7 +113,15 @@ export const widgetWordCloud = {
name: 'subTextColor',
required: false,
placeholder: '',
- value: ''
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
},
{
type: 'el-select',
@@ -117,12 +138,17 @@ export const widgetWordCloud = {
value: 'normal'
},
{
- type: 'el-input-number',
- label: '字体字号',
- name: 'subTextFontSize',
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
required: false,
placeholder: '',
- value: 12
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
},
],
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
index 5bedea45..13af828f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
@@ -286,15 +286,23 @@ export default {
},
// 标题修改
setOptionsTitle() {
- const optionsCollapse = this.optionsSetup;
+ const optionsSetup = this.optionsSetup;
const title = {};
- title.text = optionsCollapse.titleText;
- title.show = optionsCollapse.isNoTitle;
- title.left = optionsCollapse.textAlign;
+ title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
+ title.left = optionsSetup.textAlign;
title.textStyle = {
- color: optionsCollapse.textColor,
- fontSize: optionsCollapse.textFontSize,
- fontWeight: optionsCollapse.textFontWeight
+ color: optionsSetup.textColor,
+ fontSize: optionsSetup.textFontSize,
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
+ };
+ title.subtext = optionsSetup.subText;
+ title.subtextStyle = {
+ color: optionsSetup.subTextColor,
+ fontWeight: optionsSetup.subTextFontWeight,
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue
index 4ab70524..2e94ef35 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue
@@ -166,10 +166,10 @@ export default {
// 坐标轴是否显示
show: optionsSetup.hideX,
// 坐标轴名称
- name: optionsSetup.xName,
+ name: optionsSetup.nameX,
nameTextStyle: {
- color: optionsSetup.xNameColor,
- fontSize: optionsSetup.xNameFontSize
+ color: optionsSetup.nameColorX,
+ fontSize: optionsSetup.nameFontSizeX
},
// 轴反转
inverse: optionsSetup.reversalX,
@@ -206,17 +206,22 @@ export default {
const yAxis = [
{
type: "value",
- splitNumber: optionsSetup.splitNumberLeft,// 均分
- show: optionsSetup.isShowYLeft, // 坐标轴是否显示
- name: optionsSetup.textNameYLeft, // 坐标轴名称
- nameTextStyle: { // 别名
+ // 均分
+ splitNumber: optionsSetup.splitNumberLeft,
+ // 坐标轴是否显示
+ show: optionsSetup.isShowYLeft,
+ // 坐标轴名称
+ name: optionsSetup.textNameYLeft,
+ // 别名
+ nameTextStyle: {
color: optionsSetup.nameColorYLeft,
fontSize: optionsSetup.nameFontSizeYLeft
},
axisLabel: {
show: true,
textStyle: {
- color: optionsSetup.colorYLeft, // y轴 坐标文字颜色
+ // 坐标文字颜色
+ color: optionsSetup.colorYLeft,
fontSize: optionsSetup.fontSizeYLeft
}
},
@@ -232,17 +237,22 @@ export default {
},
{
type: "value",
- splitNumber: optionsSetup.splitNumberRight,// 均分
- show: optionsSetup.isShowYRight, // 坐标轴是否显示
- name: optionsSetup.textNameYRight, // 坐标轴名称
- nameTextStyle: { // 别名
+ // 均分
+ splitNumber: optionsSetup.splitNumberRight,
+ // 坐标轴是否显示
+ show: optionsSetup.isShowYRight,
+ // 坐标轴名称
+ name: optionsSetup.textNameYRight,
+ // 别名
+ nameTextStyle: {
color: optionsSetup.nameColorYRight,
fontSize: optionsSetup.nameFontSizeYRight
},
axisLabel: {
show: true,
textStyle: {
- color: optionsSetup.colorYRight, // y轴 坐标文字颜色
+ // 坐标文字颜色
+ color: optionsSetup.colorYRight,
fontSize: optionsSetup.fontSizeYRight
}
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
index a2e6fb3d..10f38738 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
@@ -111,13 +111,15 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
index 77250c0d..1a94b1be 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
@@ -111,15 +111,16 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
-
this.options.title = title;
},
// X轴设置
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue
index 4a5b33ee..e0995288 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue
@@ -152,15 +152,16 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
-
this.options.title = title;
},
// X轴设置
@@ -168,20 +169,25 @@ export default {
const optionsSetup = this.optionsSetup;
const xAxis = {
type: "category",
- show: optionsSetup.hideX, // 坐标轴是否显示
- name: optionsSetup.xName, // 坐标轴名称
+ // 坐标轴是否显示
+ show: optionsSetup.hideX,
+ // 坐标轴名称
+ name: optionsSetup.nameX,
nameTextStyle: {
color: optionsSetup.nameColorX,
fontSize: optionsSetup.nameFontSizeX
},
- nameRotate: optionsSetup.textAngle, // 文字角度
- inverse: optionsSetup.reversalX, // 轴反转
+ // 轴反转
+ inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
- interval: optionsSetup.textInterval, // 文字间隔
- rotate: optionsSetup.textAngle, // 文字角度
+ // 文字间隔
+ interval: optionsSetup.textInterval,
+ // 文字角度
+ rotate: optionsSetup.textAngleX,
textStyle: {
- color: optionsSetup.Xcolor, // x轴 坐标文字颜色
+ // 坐标文字颜色
+ color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX
}
},
@@ -206,25 +212,29 @@ export default {
const yAxis = [
{
type: "value",
- splitNumber: optionsSetup.splitNumberLeft,// 均分
- show: optionsSetup.isShowYLeft, // 坐标轴是否显示
- name: optionsSetup.textNameYLeft, // 坐标轴名称
- nameTextStyle: { // 别名
+ // 均分
+ splitNumber: optionsSetup.splitNumberLeft,
+ // 坐标轴是否显示
+ show: optionsSetup.isShowYLeft,
+ // 坐标轴名称
+ name: optionsSetup.textNameYLeft,
+ // 别名
+ nameTextStyle: {
color: optionsSetup.nameColorYLeft,
- fontSize: optionsSetup.namefontSizeYLeft
+ fontSize: optionsSetup.nameFontSizeYLeft
},
- inverse: optionsSetup.reversalY, // 轴反转
axisLabel: {
show: true,
textStyle: {
- color: optionsSetup.colorY, // y轴 坐标文字颜色
- fontSize: optionsSetup.fontSizeY
+ // 坐标文字颜色
+ color: optionsSetup.colorYLeft,
+ fontSize: optionsSetup.fontSizeYLeft
}
},
axisLine: {
show: true,
lineStyle: {
- color: optionsSetup.lineColorY
+ color: optionsSetup.lineColorYLeft
}
},
splitLine: {
@@ -233,25 +243,29 @@ export default {
},
{
type: "value",
- splitNumber: optionsSetup.splitNumberRight,// 均分
- show: optionsSetup.isShowYRight, // 坐标轴是否显示
- name: optionsSetup.textNameYRight, // 坐标轴名称
- nameTextStyle: { // 别名
+ // 均分
+ splitNumber: optionsSetup.splitNumberRight,
+ // 坐标轴是否显示
+ show: optionsSetup.isShowYRight,
+ // 坐标轴名称
+ name: optionsSetup.textNameYRight,
+ // 别名
+ nameTextStyle: {
color: optionsSetup.nameColorYRight,
- fontSize: optionsSetup.namefontSizeYRight
+ fontSize: optionsSetup.nameFontSizeYRight
},
- inverse: optionsSetup.reversalY, // 轴反转
axisLabel: {
show: true,
textStyle: {
- color: optionsSetup.colorY, // y轴 坐标文字颜色
- fontSize: optionsSetup.fontSizeY
+ // 坐标文字颜色
+ color: optionsSetup.colorYRight,
+ fontSize: optionsSetup.fontSizeYRight
}
},
axisLine: {
show: true,
lineStyle: {
- color: optionsSetup.lineColorY
+ color: optionsSetup.lineColorYRight
}
},
splitLine: {
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
index 5bcb9336..14c519b0 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
@@ -181,15 +181,16 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
-
this.options.title = title;
},
// X轴设置
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
index 71906ec0..2c771bf7 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue
@@ -226,15 +226,16 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
-
this.options.title = title;
},
// X轴设置
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
index 7f87ca4b..ac7c9157 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
@@ -150,21 +150,22 @@ export default {
// 标题修改
setOptionsTitle() {
const optionsSetup = this.optionsSetup;
- const title = {
- text: optionsSetup.titleText,
- show: optionsSetup.isNoTitle,
- left: optionsSetup.textAlign,
- textStyle: {
- color: optionsSetup.textColor,
- fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
- },
- subtext: optionsSetup.subText,
- subtextStyle: {
- color: optionsSetup.subTextColor,
- fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
- },
+ const title = {};
+ title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
+ title.left = optionsSetup.textAlign;
+ title.textStyle = {
+ color: optionsSetup.textColor,
+ fontSize: optionsSetup.textFontSize,
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
+ };
+ title.subtext = optionsSetup.subText;
+ title.subtextStyle = {
+ color: optionsSetup.subTextColor,
+ fontWeight: optionsSetup.subTextFontWeight,
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
index bb7efbc3..7a7bb817 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
@@ -282,15 +282,23 @@ export default {
},
// 标题修改
setOptionsTitle() {
- const optionsCollapse = this.optionsSetup;
+ const optionsSetup = this.optionsSetup;
const title = {};
- title.text = optionsCollapse.titleText;
- title.show = optionsCollapse.isNoTitle;
- title.left = optionsCollapse.textAlign;
+ title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
+ title.left = optionsSetup.textAlign;
title.textStyle = {
- color: optionsCollapse.textColor,
- fontSize: optionsCollapse.textFontSize,
- fontWeight: optionsCollapse.textFontWeight
+ color: optionsSetup.textColor,
+ fontSize: optionsSetup.textFontSize,
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
+ };
+ title.subtext = optionsSetup.subText;
+ title.subtextStyle = {
+ color: optionsSetup.subTextColor,
+ fontWeight: optionsSetup.subTextFontWeight,
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
index ea515268..3cae810f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
@@ -111,13 +111,15 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
index e4cf13e9..fad1d90a 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
@@ -117,13 +117,15 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
index f16f75ae..1fcd4824 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
@@ -437,21 +437,23 @@ export default {
},
// 标题设置
setOptionsTitle() {
- const optionsCollapse = this.optionsSetup;
+ const optionsSetup = this.optionsSetup;
const title = {};
- title.show = optionsCollapse.isNoTitle;
- title.text = optionsCollapse.titleText;
- title.left = optionsCollapse.textAlign;
+ title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
+ title.left = optionsSetup.textAlign;
title.textStyle = {
- color: optionsCollapse.textColor,
- fontSize: optionsCollapse.textFontSize,
- fontWeight: optionsCollapse.textFontWeight
+ color: optionsSetup.textColor,
+ fontSize: optionsSetup.textFontSize,
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
- title.subtext = optionsCollapse.subText;
+ title.subtext = optionsSetup.subText;
title.subtextStyle = {
- color: optionsCollapse.subTextColor,
- fontWeight: optionsCollapse.subTextFontWeight,
- fontSize: optionsCollapse.subTextFontSize
+ color: optionsSetup.subTextColor,
+ fontWeight: optionsSetup.subTextFontWeight,
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue
index 0eea8b8b..67f2ec43 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue
@@ -350,19 +350,21 @@ export default {
setOptionsTitle() {
const optionsSetup = this.optionsSetup;
const title = {};
- title.show = optionsSetup.isNoTitle;
title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
title.left = optionsSetup.textAlign;
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
index 81abb529..d9860f68 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
@@ -100,13 +100,15 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
@@ -176,7 +178,7 @@ export default {
legend.orient = optionsSetup.layoutFront;
legend.textStyle = {
color: optionsSetup.legendColor,
- fontSize: optionsSetup.fontSize
+ fontSize: optionsSetup.legendFontSize
};
legend.itemWidth = optionsSetup.legendWidth;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
index f6e365a4..523f42aa 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
@@ -105,19 +105,21 @@ export default {
setOptionsTitle() {
const optionsSetup = this.optionsSetup;
const title = {};
- title.show = optionsSetup.isNoTitle;
title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
title.left = optionsSetup.textAlign;
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},
@@ -175,7 +177,7 @@ export default {
legend.orient = optionsSetup.layoutFront;
legend.textStyle = {
color: optionsSetup.legendColor,
- fontSize: optionsSetup.fontSize
+ fontSize: optionsSetup.legendFontSize
};
legend.itemWidth = optionsSetup.legendWidth;
},
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue
index d8abc3f7..a1822b17 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue
@@ -61,6 +61,7 @@ export default {
},
methods: {
editorOptions() {
+ this.setOptionsTitle();
this.setOptionIndicator();
this.setOptionsRadar();
this.setOptionsLegend();
@@ -68,6 +69,28 @@ export default {
this.setOptionsMargin();
this.setOptionsData();
},
+ // 标题修改
+ setOptionsTitle() {
+ const optionsSetup = this.optionsSetup;
+ const title = {};
+ title.text = optionsSetup.titleText;
+ title.show = optionsSetup.isNoTitle;
+ title.left = optionsSetup.textAlign;
+ title.textStyle = {
+ color: optionsSetup.textColor,
+ fontSize: optionsSetup.textFontSize,
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
+ };
+ title.subtext = optionsSetup.subText;
+ title.subtextStyle = {
+ color: optionsSetup.subTextColor,
+ fontWeight: optionsSetup.subTextFontWeight,
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
+ };
+ this.options.title = title;
+ },
// 雷达设置相关
setOptionIndicator() {
const optionsSetup = this.optionsSetup;
@@ -105,7 +128,6 @@ export default {
this.options.radar.shape = optionsSetup.radarShape;
this.options.radar.splitNumber = optionsSetup.splitNumber;
},
-
// 图例配置
setOptionsLegend() {
const optionsSetup = this.optionsSetup;
@@ -200,7 +222,7 @@ export default {
for (const j in radarKeys) {
for (const k in val) {
if (val[k].name == name[i]) {
- values[j] = val[k][radarKeys[j]];
+ values[j] = val[k][radarKeys[j]];
}
}
}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
index 9910f66b..f1120b2e 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
@@ -111,8 +111,8 @@ export default {
setup: {},
data: {},
position: {},
- leftMargin: null,
- topMargin: null
+/* leftMargin: null,
+ topMargin: null*/
}
};
},
@@ -124,10 +124,10 @@ export default {
return this.value.position.height;
},
widgetsLeft() {
- return this.value.position.left >= this.leftMargin ? this.leftMargin : this.value.position.left;
+ return this.value.position.left// >= this.leftMargin ? this.leftMargin : this.value.position.left;
},
widgetsTop() {
- return this.value.position.top >= this.topMargin ? this.topMargin : this.value.position.top;
+ return this.value.position.top// >= this.topMargin ? this.topMargin : this.value.position.top;
},
widgetsZIndex() {
return this.value.position.zIndex || 1;
@@ -140,7 +140,7 @@ export default {
this.$emit("onActivated", { index, left, top, width, height });
this.$refs.draggable.setActive(true);
// 处理widget超出workbench的问题
- this.handleBoundary({ index, left, top, width, height })
+ //this.handleBoundary({ index, left, top, width, height })
},
handleBoundary({ index, left, top, width, height }) {
// 计算workbench的X轴边界值
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue
index b45a7791..684e5f75 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue
@@ -154,15 +154,16 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
-
this.options.title = title;
},
// 提示语设置 tooltip
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
index ec769458..acad3ff4 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
@@ -103,13 +103,15 @@ export default {
title.textStyle = {
color: optionsSetup.textColor,
fontSize: optionsSetup.textFontSize,
- fontWeight: optionsSetup.textFontWeight
+ fontWeight: optionsSetup.textFontWeight,
+ fontStyle: optionsSetup.textFontStyle,
};
title.subtext = optionsSetup.subText;
title.subtextStyle = {
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.subTextFontWeight,
- fontSize: optionsSetup.subTextFontSize
+ fontSize: optionsSetup.subTextFontSize,
+ fontStyle: optionsSetup.subTextFontStyle,
};
this.options.title = title;
},