|
@@ -367,7 +367,7 @@ export default {
|
|
Instructions: this.chartInfo.Instructions,
|
|
Instructions: this.chartInfo.Instructions,
|
|
SourcesFrom: this.chartInfo.SourcesFrom,
|
|
SourcesFrom: this.chartInfo.SourcesFrom,
|
|
ChartThemeStyle: this.chartInfo.ChartThemeStyle,
|
|
ChartThemeStyle: this.chartInfo.ChartThemeStyle,
|
|
- ChartOtherName:this.chartInfo.ChartOtherName||'别名,我是别名',//图表别名
|
|
|
|
|
|
+ ChartAlias:this.chartInfo.ChartAlias||'',//图表别名
|
|
}
|
|
}
|
|
this.optionMap[id] = { ...defaultOpts, ...this.options,...otherOpts };
|
|
this.optionMap[id] = { ...defaultOpts, ...this.options,...otherOpts };
|
|
}else{
|
|
}else{
|
|
@@ -758,16 +758,16 @@ export default {
|
|
//一行可容纳的中文字体数
|
|
//一行可容纳的中文字体数
|
|
const fontSize = chartTheme?chartTheme.titleOptions.style.fontSize:16
|
|
const fontSize = chartTheme?chartTheme.titleOptions.style.fontSize:16
|
|
let count = parseInt($(`#${refName}`)[0].offsetWidth / fontSize)*1.75
|
|
let count = parseInt($(`#${refName}`)[0].offsetWidth / fontSize)*1.75
|
|
- let {total,newStr} = getStrSize(isShowTitle?options.MyChartTitle:isShowOtherTitle?options.ChartOtherName:'',count)
|
|
|
|
|
|
+ let {total,newStr} = getStrSize(isShowTitle?options.MyChartTitle:isShowOtherTitle?options.ChartAlias:'',count)
|
|
const isPublish = this.$route.path==='/pptpublish'||this.$route.path==='/pptenpublish'
|
|
const isPublish = this.$route.path==='/pptpublish'||this.$route.path==='/pptenpublish'
|
|
- if(isShowTitle||isShowOtherTitle){
|
|
|
|
|
|
+ if(isShowTitle||(isShowOtherTitle&&options.ChartAlias.length)){
|
|
titleHTML = `<div style="
|
|
titleHTML = `<div style="
|
|
text-align:${chartTheme&&chartTheme.titleOptions.align};
|
|
text-align:${chartTheme&&chartTheme.titleOptions.align};
|
|
font-size:${chartTheme&&chartTheme.titleOptions.style.fontSize}px;
|
|
font-size:${chartTheme&&chartTheme.titleOptions.style.fontSize}px;
|
|
color:${chartTheme&&chartTheme.titleOptions.style.color};
|
|
color:${chartTheme&&chartTheme.titleOptions.style.color};
|
|
min-height:18px;word-break: break-all;
|
|
min-height:18px;word-break: break-all;
|
|
">
|
|
">
|
|
- ${isShowTitle?options.MyChartTitle:isShowOtherTitle?options.ChartOtherName:''}
|
|
|
|
|
|
+ ${isShowTitle?options.MyChartTitle:isShowOtherTitle?options.ChartAlias:''}
|
|
</div>`
|
|
</div>`
|
|
}
|
|
}
|
|
let SpecialOption = {
|
|
let SpecialOption = {
|
|
@@ -786,7 +786,7 @@ export default {
|
|
},
|
|
},
|
|
colors: options.colors||chartTheme&&chartTheme.colorsOptions||defaultOpts.colors,
|
|
colors: options.colors||chartTheme&&chartTheme.colorsOptions||defaultOpts.colors,
|
|
title: isPublish?{
|
|
title: isPublish?{
|
|
- text: isShowTitle?newStr:null,
|
|
|
|
|
|
+ text: (isShowTitle||(isShowOtherTitle&&options.ChartAlias.length))?newStr:null,
|
|
margin:5,
|
|
margin:5,
|
|
useHTML:false,
|
|
useHTML:false,
|
|
style:{...chartTheme&&chartTheme.titleOptions.style},
|
|
style:{...chartTheme&&chartTheme.titleOptions.style},
|