!148 update V1.2.1

Merge pull request !148 from Foming/dev
V1.2.1
Foming 2 years ago committed by Gitee
commit 1ad5ace974
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

@ -44,7 +44,8 @@
定义定义坐标轴中的X轴的相关设置项。<br>
使用建议:
- 可以修改坐标轴的颜色,因为默认是纯白色,所以部分浏览器可能显示不出来;可以设置坐标名(柱状对比图不存在此配置项);如果数值相对密集的话,可以调整"数值间隔"。
- V1.2.0版本默认X轴数值自动换行X轴的label能显示的值的量是估算的因此给了“数值行数”配置项方便进行调整。当“数值行数”有值时默认的自动换行规则不会生效。<br>
- V1.2.0版本默认X轴数值自动换行X轴的label能显示的值的量是估算的因此给了“数值行数”配置项方便进行调整。当“数值行数”有值时默认的自动换行规则不会生效。
- V1.2.1版本取消默认X轴数值自动换行改为由配置项控制。<br>
![img4](../picture/chartsConfig/img_4.png)
@ -92,25 +93,30 @@
文本框和滚动文本这两个组件,修改数据--静态数据,是不会生效的,文本内容配置项中写的内容才是真正的静态数据。<br>
## 超链接--跳转方式
### 超链接--跳转方式
使用建议:
- 默认的跳转方式是本窗口,实际使用还是请选择新窗口。<br>
## 图片/图片地址
### 图片/图片地址
定义图片对应的url链接 <br>
使用建议:
- 这里图片的url因为只要是链接能打开就行了所以适用性范围很广但一般考虑到网络传输、安全性等问题建议自行上传图片然后用系统生成的链接地址注意目前系统赞不支持svg图片因此图片可能存在畸变要注意缩放比例。
- V1.2.0版本支持.svg格式图片上传。 <br>
## 表格--滚动间隔
### 表格--滚动间隔
定义:表格数据滚动的间隔,受到"开启滚动"、"动效时间"、"滚动个数"、"数据--动态数据--刷新时间"影响 <br>
定义:表格数据滚动的间隔,受到"开启滚动"、"动效时间"、"滚动个数"、"数据--动态数据--刷新时间"影响 <br>
使用建议:
- 表格动态数据默认是5s请求一次数据因此每隔5s图表就会刷新一次这时就会重置滚动时间会出现滚动到某个值时回到开头重新滚动。想让表格把每个值都滚动显示到的话可以减少滚动间隔时间去掉动效时间增大滚动个数提高动态数据刷新时间。<br>
## 饼图样式/模式
### 柱状图--竖展示
定义:改变柱状图的展示样式 <br>
![img9](../picture/chartsConfig/img_9.png)
### 饼图--饼图样式/模式
定义:定义饼图显示的样式、模式,涉及饼图、南丁格尔玫瑰图。<br>
使用建议:

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

@ -14,7 +14,7 @@
<groupId>com.anji-plus</groupId>
<artifactId>aj-report</artifactId>
<version>1.2.0.RELEASE</version>
<version>1.2.1.RELEASE</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -384,6 +384,14 @@ export const widgetBarDoubleYaxis = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -403,6 +403,14 @@ export const widgetBarStack = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -411,6 +411,14 @@ export const widgetBarchart = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -309,6 +309,14 @@ export const widgetGradientBarchart = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -371,6 +371,14 @@ export const widgetBarLineStack = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',
@ -815,6 +823,40 @@ export const widgetBarLineStack = {
{
name: '提示语设置',
list: [
{
type: 'el-switch',
label: '显示',
name: 'isShowTooltip',
required: false,
placeholder: '',
value: true
},
{
type: 'el-select',
label: '触发类型',
name: 'tooltipTrigger',
required: false,
placeholder: '',
selectOptions: [
{ code: 'item', name: '数据项' },
{ code: 'axis', name: '坐标轴' },
],
value: 'axis'
},
{
type: 'el-select',
label: '指示器类型',
name: 'tooltipAxisPointerType',
required: false,
placeholder: '',
selectOptions: [
{ code: 'none', name: '无' },
{ code: 'line', name: '直线' },
{ code: 'shadow', name: '阴影' },
{ code: 'cross', name: '十字准星' },
],
value: 'shadow'
},
{
type: 'el-input-number',
label: '字体字号',

@ -387,6 +387,14 @@ export const widgetBarlinechart = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -391,6 +391,14 @@ export const widgetMoreBarLine = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -366,6 +366,14 @@ export const widgetLineStack = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -358,6 +358,14 @@ export const widgetLinechart = {
placeholder: '',
value: 14,
},
{
type: 'el-switch',
label: '数值自动换行',
name: 'textRowsBreakAuto',
required: false,
placeholder: '',
value: false,
},
{
type: 'el-input-text',
label: '数值行数',

@ -185,6 +185,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -464,7 +475,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -523,7 +536,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},

@ -144,6 +144,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -382,17 +393,6 @@ export default {
legendName.push(yAxisList[i]);
}
this.options.series = series;
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = xAxisList;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = xAxisList;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
// xXlabel
const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX);
const axisLabel = {
@ -416,7 +416,20 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = xAxisList;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = xAxisList;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -445,18 +458,6 @@ export default {
for (let i = 0; i < customColor.length; i++) {
arrColor.push(customColor[i].color);
}
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
const series = [];
const legendName = [];
for (const i in val.series) {
@ -523,7 +524,21 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -151,6 +151,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -335,18 +346,6 @@ export default {
}
const legendName = [];
legendName.push("bar");
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = axis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = axis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
for (const i in series) {
if (series[i].type == "bar") {
series[i].type = "bar";
@ -416,8 +415,22 @@ export default {
}
return str
}
};
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = axis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = axis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
this.options.xAxis.axisLabel = axisLabel;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -451,18 +464,6 @@ export default {
}
const series = [];
const legendName = [];
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
for (const i in val.series) {
legendName.push(val.series[i].name);
const obj = {};
@ -537,8 +538,22 @@ export default {
}
return str
}
};
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
this.options.xAxis.axisLabel = axisLabel;
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -227,6 +227,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -429,21 +440,6 @@ export default {
axis[i] = val[i].axis;
data[i] = val[i].data;
}
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = axis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = axis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
if (series[0].type == "bar") {
series[0].data = data;
}
// xXlabel
const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX);
const axisLabel = {
@ -467,7 +463,24 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = axis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = axis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
if (series[0].type == "bar") {
series[0].data = data;
}
},
//
dynamicDataFn(refreshTime) {
@ -491,22 +504,6 @@ export default {
});
},
renderingFn(optionsSetup, val) {
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
}
const series = this.options.series;
if (series[0].type == "bar") {
series[0].data = val.series[0].data;
}
// xXlabel
const xAxisDataLength = val.length !== 0 ? val.xAxis.length : 1;
const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX);
@ -531,7 +528,25 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
// x
if (optionsSetup.verticalShow) {
this.options.xAxis.data = [];
this.options.yAxis.data = val.xAxis;
this.options.xAxis.type = "value";
this.options.yAxis.type = "category";
} else {
this.options.xAxis.data = val.xAxis;
this.options.yAxis.data = [];
this.options.xAxis.type = "category";
this.options.yAxis.type = "value";
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
}
const series = this.options.series;
if (series[0].type == "bar") {
series[0].data = val.series[0].data;
}
},
},
};

@ -179,6 +179,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -291,8 +302,11 @@ export default {
setOptionsTooltip() {
const optionsSetup = this.optionsSetup;
const tooltip = {
trigger: "item",
show: true,
show: optionsSetup.isShowTooltip,
trigger: optionsSetup.tooltipTrigger,
axisPointer:{
type: optionsSetup.tooltipAxisPointerType,
},
textStyle: {
color: optionsSetup.tipsColor,
fontSize: optionsSetup.tipsFontSize,
@ -516,7 +530,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.series = series;
this.options.xAxis.data = xAxisList;
this.options.yAxis.data = [];
@ -647,7 +663,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -186,6 +186,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -493,7 +504,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -552,7 +565,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},

@ -246,6 +246,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -551,7 +562,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -671,7 +684,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -144,6 +144,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -428,7 +439,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -531,7 +544,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -158,6 +158,17 @@ export default {
},
//
inverse: optionsSetup.reversalX,
axisLabel: {
show: true,
interval: optionsSetup.textInterval,
//
rotate: optionsSetup.textAngleX,
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
@ -380,7 +391,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
@ -477,7 +490,9 @@ export default {
return str
}
}
this.options.xAxis.axisLabel = axisLabel;
if (optionsSetup.textRowsBreakAuto) {
this.options.xAxis.axisLabel = axisLabel;
}
this.options.series = series;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);

@ -151,7 +151,6 @@ export default {
},
},
fontSize: optionsSetup.fontSize,
fontWeight: optionsSetup.optionsSetup,
};
for (const key in series) {
@ -166,7 +165,6 @@ export default {
const optionsSetup = this.optionsSetup;
const tooltip = {
trigger: "item",
show: true,
textStyle: {
color: optionsSetup.tipsColor,
fontSize: optionsSetup.tipsFontSize,

@ -3,7 +3,7 @@
<div class="admin-title" @click="goBigScreen">
<div class="con">
<img src="../../../../../static/logo-dp.png" width="50" />
<span class="version">V1.2.0</span>
<span class="version">V1.2.1</span>
</div>
</div>
<el-menu

Loading…
Cancel
Save