+#### java脚本 + +通过Groovy来进行实现的
+[Groovy用法参考](https://my.oschina.net/u/4517014/blog/5526324)
+ #### 字典项 
记得保存 -## HTTP数据集 - -即原有http数据源的功能，原有http数据源不动 diff --git a/doc/docs/guide/datasource.md b/doc/docs/guide/datasource.md index 2dc5e43b..d4df098b 100644 --- a/doc/docs/guide/datasource.md +++ b/doc/docs/guide/datasource.md @@ -18,6 +18,8 @@ 表aj_report.gaea_dict_item, item_extend字段是下拉选择后动态表单渲染的json数据 ``` +**注：** Http数据源功能已经移动到Http数据集中，原功能不变，有Http接口数据请直接使用Http数据集，请注意Http接口数据返回格式必须是Json + ## 操作 - 只有测试通过的数据源才可以保存 @@ -27,25 +29,42 @@ ### JDBC驱动类数据源添加 +##### 发行版 + +```text +1、将jar包上传到 "aj-report.xxx/lib"目录下 +2、启动项目(重启项目) +3、前端页面数据源类型选择"jdbc"，填上对应的驱动类、连接串、用户名密码 +``` + +
+
+ +##### 源码 + +源码推荐使用第二种方式。
+ - 第一种，在report-core/lib目录下添加
- 按照同样的层级将驱动包放置，使用build.sh脚本进行打包，前端页面选择jdbc数据源，填上对应的驱动类即可使用。
+ 按照同样的层级将驱动包放置，使用build.sh脚本进行打包，前端页面数据源类型选择"jdbc" + ，填上对应的驱动类、连接串、用户名密码。
**注意：** 此方式添加的jar包只能使用build.sh进行编译后才会生效。
- 第二种，在pom.xml中添加
- 使用build.sh脚本编译或者maven package编译都可以，前端页面选择jdbc数据源，填上对应驱动。
+ 使用build.sh脚本编译或者maven package编译都可以，前端页面数据源类型选择"jdbc" + ，填上对应的驱动类、连接串、用户名密码。
-**注意：** 底层只实现了mysql的解析，如果你的数据库和mysql差异较大，比如一些函数、关键字和mysql是不同的用法、含义，那就需要重写底层解析代码(datasource)
### 非JDBC驱动类数据源添加 例如原生ES、Redis之类。
-1、在源码中编写解析代码(datasource)
-2、使用页面生成数据字典
-3、添加对应驱动包
- +```text +1、在源码中编写解析代码(datasource) +2、生成数据字典，可在数据字典页面找到"数据源类型"，在"操作"栏中选择"编辑字典项" +3、添加对应驱动包 +``` diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md index 450ea3aa..0d4ec1d8 100644 --- a/doc/docs/guide/question.md +++ b/doc/docs/guide/question.md @@ -12,7 +12,9 @@
-## 版本问题：[开发环境参考](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html) +## 版本问题 + +[开发环境参考](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html) - 底层数据库为Mysql8.0+时，flyway执行SQL报错
- Node.js是V16版本时 npm install失败
@@ -38,25 +40,32 @@ - 页面提示“404”
1、确保访问地址无误，根据部署方式的不同 9095/9528 端口皆可以进入项目，如果一个不行试另一个端口
- 2、确定前端是否启动
- 3、确定后端是否启动
+ 2、确定前端(端口号9528)是否启动
+ 3、确定后端(端口号9095)是否启动
4、如果你是前后端分离部署，看看你前端config配置文件中的BASE_API有没有改成你后端的IP端口
5、使用nginx转发遇到问题也是同上
+## 前端npm install失败 + +1、使用node -v检查你的node.js版本，不要使用Node.js16及以上版本。
+2、使用npm get registry查看npm镜像源，将npm镜像设置为淘宝镜像源(百度查具体步骤)。
+3、使用cnpm install命令替换npm install命令进行编译。
+如果以上3步皆无法解决npm编译问题，请直接使用**发行版**。
+ ## 执行源码编译脚本（build.sh）报错 - 提示：“*** report-ui/dist/* *** No such file or directory”
前端编译失败。
- 大部分原因是Node.js版本过高（高于V14），导致前端编译失败。
+ 大部分原因是Node.js版本过高（高于V14），导致前端编译失败(npm install失败)，可参考***前端npm install失败*进行解决。
另一部分是Nodejs在编译执行初始化时会去下载一些依赖，如果依赖下载不下来，也会导致失败。
- 提示：“report-core/target/aj-report-*.zip *** No such file or directory”
后端编译失败。
- 可能原因有：Maven版本过低/过高，导致后端编译失败
+ 可能原因有：Maven版本过低/过高，导致后端编译失败。可尝试重新执行编译脚本
@@ -80,34 +89,49 @@
-- flyway执行报错1.0.10sql失败
- 错误提示：Caused by: org.flywaydb.core.api.FlywayException: Validate failed: Detected failed
- migration to version 1.0.10 (create report share)
- 请参考此 [Issue](https://gitee.com/anji-plus/report/issues/I47JNE) 解决此问题
+- flyway执行sql相关错误
+ 错误提示：**Error creating bean with name 'flywayInitializer' defined in class XXX migration to version V1.0.XXX.sql + failed**
+ 解析：flyway在执行某个版本里面包含的sql时报错了
+ +- 可能原因：
+ 1、mysql版本问题，在不同版本的mysql中，部分语法可能存在异同
+ 2、mysql配置问题
+ + 解决方案： + 一、禁用flyway，手动执行已有的各版本sql文件
+ 1、在bootstrap.yml配置文件中找到flyway配置项，如图示
+ 
+ 2、将report-core/src/main/resources/db.migration目录下所有的sql文件都执行一次，遇到报错，手动修改sql文件。
+ 3、sql文件中，只有** aj_report **数据库相关的sql是必须的依赖，在确保和aj_report数据库相关sql都执行后在启动服务。
+ + 二、保持flyway开启状态，手动执行报错的那个版本sql文件
+ 1、在report-core/src/main/resources/db.migration目录下找到报错的那个版本sql
+ 2、根据报错提示找到sql文件中具体报错的那一段sql，或者和数据库已有的数据对比，找到没有执行成功的那部分sql
+ 3、手动执行flyway没执行成功的那部分，根据提示，对sql进行修改调整
+ 4、执行完毕后，在aj_report数据库下flyway_schema_history表中找到报错对应的sql文件版本，将对应的success改完1
+ 
## 数据集相关 - 系统异常，后台日志显示“** Data too long for colum ** ”
+ 查询到的数据太多了，无法入库，这里查询入库的数据只作为在使用动态数据时做解析用
1、建议不要使用 "select *"
2、一张图表能承载的数据量是有限的，太多则图表展示不出来、页面卡死等
3、必须使用 "select *" ，或者展示很多数据。解决方法，将测试预览的值删掉只剩一条，注意数据的结构 [{}]
## 大屏图表组件相关 -- 访问白屏
+- 访问大屏，浏览器白屏
设计完大屏，保存后进行预览，发现背景全白
1、回到编辑页面，查看大屏背景颜色是否设置
- 2、查看大屏的宽高，如果宽高都是0（大屏宽高在设计时，有概率性变成0，不知原因）大屏背景图片，颜色，皆无法显示
+ 2、查看大屏的宽高，如果宽高都是0，大屏背景图片，颜色，皆无法显示
3、大屏宽高改成 1920 1080
-- 文本框颜色无法改变
- 使用文本框，改变颜色，无法改变。已知有概率性的出现无法修改文本框颜色的情况。解决方法有以下
- 1、保存退出大屏，重新进入大屏修改文本框颜色
- 2、删掉文本框，重新拖动一个
diff --git a/doc/docs/guide/quicklyDevelop.md b/doc/docs/guide/quicklyDevelop.md index ed2252ad..b43c2cdc 100644 --- a/doc/docs/guide/quicklyDevelop.md +++ b/doc/docs/guide/quicklyDevelop.md @@ -37,7 +37,12 @@ - [Node.js] 14.16.0 - [Windows 10] -已知 **Mysql8.0** 和 **Jdk11** (部分小版本)会出现兼容性问题，后续有解决方法将会在下方 **其他** 大类进行补充 +已知 **Mysql8.0** 部分小版本会出现兼容性问题，后续有解决方法将会在下方 **其他** 大类进行补充 + +## 不支持的版本 + +- [JDK] 1.7及以下/11及以上 +- [Node.js] V16及以上 ## SQL初始化 diff --git a/doc/docs/picture/charts/img_26.png b/doc/docs/picture/charts/img_26.png new file mode 100644 index 00000000..ef148b84 Binary files /dev/null and b/doc/docs/picture/charts/img_26.png differ diff --git a/doc/docs/picture/charts/img_27.png b/doc/docs/picture/charts/img_27.png new file mode 100644 index 00000000..cd9299fc Binary files /dev/null and b/doc/docs/picture/charts/img_27.png differ diff --git a/doc/docs/picture/charts/img_28.png b/doc/docs/picture/charts/img_28.png new file mode 100644 index 00000000..8e5ce642 Binary files /dev/null and b/doc/docs/picture/charts/img_28.png differ diff --git a/doc/docs/picture/charts/img_29.png b/doc/docs/picture/charts/img_29.png new file mode 100644 index 00000000..a954ba5f Binary files /dev/null and b/doc/docs/picture/charts/img_29.png differ diff --git a/doc/docs/picture/charts/img_30.png b/doc/docs/picture/charts/img_30.png new file mode 100644 index 00000000..33d0987b Binary files /dev/null and b/doc/docs/picture/charts/img_30.png differ diff --git a/doc/docs/picture/charts/img_31.png b/doc/docs/picture/charts/img_31.png new file mode 100644 index 00000000..03cc553f Binary files /dev/null and b/doc/docs/picture/charts/img_31.png differ diff --git a/doc/docs/picture/datasource/img_4.png b/doc/docs/picture/datasource/img_4.png new file mode 100644 index 00000000..22b302de Binary files /dev/null and b/doc/docs/picture/datasource/img_4.png differ diff --git a/doc/docs/picture/datasource/img_5.png b/doc/docs/picture/datasource/img_5.png new file mode 100644 index 00000000..44cfda2d Binary files /dev/null and b/doc/docs/picture/datasource/img_5.png differ diff --git a/doc/docs/picture/dateset/img_7.png b/doc/docs/picture/dateset/img_7.png new file mode 100644 index 00000000..3bb9f5b1 Binary files /dev/null and b/doc/docs/picture/dateset/img_7.png differ diff --git a/doc/docs/picture/qusetion/img_6.png b/doc/docs/picture/qusetion/img_6.png new file mode 100644 index 00000000..d41c722f Binary files /dev/null and b/doc/docs/picture/qusetion/img_6.png differ diff --git a/doc/docs/picture/qusetion/img_7.png b/doc/docs/picture/qusetion/img_7.png new file mode 100644 index 00000000..bdbc9c98 Binary files /dev/null and b/doc/docs/picture/qusetion/img_7.png differ diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java index 74ded384..b9214f6f 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java @@ -101,15 +101,17 @@ public class TokenFilter implements Filter { filterChain.doFilter(request, response); return; } - + //获取token + String token = request.getHeader("Authorization"); //针对大屏分享，优先处理 String shareToken = request.getHeader("Share-Token"); - if (StringUtils.isNotBlank(shareToken)) { - //两个接口需要处理 + if (StringUtils.isNotBlank(shareToken) && StringUtils.isBlank(token)) { + //需要处理 // /reportDashboard/getData // /reportDashboard/{reportCode} - String reportCode = JwtUtil.getReportCode(shareToken); - if (!uri.endsWith("/getData") && !uri.contains(reportCode)) { + // /reportExcel/preview + List
-
+
-
+
+ 雷达图2++
+
-
热力图@@ -810,9 +816,9 @@
@font-face { font-family: 'iconfont'; - src: url('iconfont.woff2?t=1650520683161') format('woff2'), - url('iconfont.woff?t=1650520683161') format('woff'), - url('iconfont.ttf?t=1650520683161') format('truetype'); + src: url('iconfont.woff2?t=1666946350865') format('woff2'), + url('iconfont.woff?t=1666946350865') format('woff'), + url('iconfont.ttf?t=1666946350865') format('truetype'); }第二步：定义使用 iconfont 的样式
@@ -838,6 +844,15 @@-
+
-
+
+ + 雷达图2 ++.iconleidatu ++
+
-
@@ -1972,6 +1987,14 @@
-
+
-
+
+ 雷达图2+#iconleidatu+
+
@@ -276,6 +281,7 @@ import dynamicComponents from "./dynamicComponents.vue"; import customColorComponents from "./customColorComponents"; import dynamicAddTable from "./dynamicAddTable.vue"; import customUpload from "./customUpload.vue"; +import dynamicAddRadar from "./dynamicAddRadar"; export default { name: "DynamicForm", components: { @@ -284,7 +290,8 @@ export default { dynamicComponents, customColorComponents, dynamicAddTable, - customUpload + customUpload, + dynamicAddRadar }, model: { prop: "value", diff --git a/report-ui/src/views/bigscreenDesigner/designer/index.vue b/report-ui/src/views/bigscreenDesigner/designer/index.vue index 5a989550..124df5eb 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/index.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/index.vue @@ -12,24 +12,34 @@ class="layout-left" :style="{ width: widthLeftForTools + 'px' }" > - + - - - -
+ 工具栏 +- - {{ widget.label }} --++ ++ +- +
++ + {{ it.label }} ++@@ -170,7 +180,7 @@ class="workbench-container" :style="{ width: bigscreenWidthInWorkbench + 'px', - height: bigscreenHeightInWorkbench + 'px' + height: bigscreenHeightInWorkbench + 'px', }" @mousedown="handleMouseDown" > @@ -197,7 +207,7 @@ 'background-repeat': 'initial', 'background-attachment': 'initial', 'background-origin': 'initial', - 'background-clip': 'initial' + 'background-clip': 'initial', }" @click.self="setOptionsOnClickScreen" @drop="widgetOnDragged($event)" @@ -235,7 +245,7 @@ ++ + + + + diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue similarity index 78% rename from report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue index 79891373..542381da 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/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,33 +169,40 @@ 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 } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -206,56 +214,84 @@ 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, + // 文字角度 + rotate: optionsSetup.textAngleYLeft, textStyle: { - color: optionsSetup.colorY, // y轴 坐标文字颜色 - fontSize: optionsSetup.fontSizeY + // 坐标文字颜色 + color: optionsSetup.colorYLeft, + fontSize: optionsSetup.fontSizeYLeft } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYLeft, + }, axisLine: { - show: true, + show: optionsSetup.lineYLeft, lineStyle: { - color: optionsSetup.lineColorY + width: optionsSetup.lineWidthYLeft, + color: optionsSetup.lineColorYLeft, } }, splitLine: { - show: false, + show: optionsSetup.isShowSplitLineYLeft, + lineStyle: { + color: optionsSetup.splitLineColorYLeft, + width: optionsSetup.splitLineFontWidthYLeft, + } } }, { 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, + // 文字角度 + rotate: optionsSetup.textAngleYRight, textStyle: { - color: optionsSetup.colorY, // y轴 坐标文字颜色 - fontSize: optionsSetup.fontSizeY + // 坐标文字颜色 + color: optionsSetup.colorYRight, + fontSize: optionsSetup.fontSizeYRight } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYRight, + }, axisLine: { - show: true, + show: optionsSetup.lineYRight, lineStyle: { - color: optionsSetup.lineColorY + width: optionsSetup.lineWidthYRight, + color: optionsSetup.lineColorYRight, } }, splitLine: { - show: false, + show: optionsSetup.isShowSplitLineYRight, + lineStyle: { + color: optionsSetup.splitLineColorYRight, + width: optionsSetup.splitLineFontWidthYRight, + } } } ]; @@ -267,6 +303,7 @@ export default { const series = this.options.series; for (const key in series) { if (series[key].type == "line") { + series[key].symbol = optionsSetup.symbol; series[key].showSymbol = optionsSetup.markPoint; series[key].symbolSize = optionsSetup.pointSize; series[key].smooth = optionsSetup.smoothCurve; @@ -323,8 +360,8 @@ export default { trigger: "item", show: true, textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.tipFontSize + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize } }; this.options.tooltip = tooltip; @@ -351,10 +388,10 @@ export default { optionsSetup.longitudinalPosition; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例名称设置 setOptionsLegendName(name){ diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue similarity index 77% rename from report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue index 18f74edc..0123755f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -31,17 +31,7 @@ export default { top: '16%', containLabel: true }, - legend: { - data: ['调解成功', '调解失败', '调解终止', '调解成功率'], - left: '7%', - top: '5%', - textStyle: { - color: '#666666' - }, - itemWidth: 15, - itemHeight: 10, - itemGap: 25 - }, + legend: {}, xAxis: { type: 'category', data: ['2012', '2013', '2014', '2015', '2016', '2017', '2018', '2019'], @@ -132,23 +122,6 @@ export default { }, data: [] }, - { - name: '调解终止', - type: 'bar', - itemStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ - offset: 0, - color: '#01c871' - }, { - offset: 1, - color: '#55f49c' - }]), - barBorderRadius: 6, - } - }, - data: [] - }, { name: '调解成功率', type: 'line', @@ -156,14 +129,13 @@ export default { smooth: false, //平滑曲线显示 symbol: 'circle', //标记的图形为实心圆 symbolSize: 8, //标记的大小 - itemStyle: { + /*itemStyle: { normal: { color: '#ffa43a', borderColor: 'rgba(255, 234, 0, 0.5)', //圆点透明 边框 borderWidth: 5 }, - - }, + },*/ lineStyle: { color: '#ffa43a' }, @@ -213,7 +185,6 @@ export default { this.setOptionsLegend(); this.setOptionsTooltip(); this.setOptionsMargin(); - this.setOptionsColor(); this.setOptionsData(); }, // 标题修改 @@ -226,49 +197,57 @@ 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轴设置 setOptionsX() { const optionsSetup = this.optionsSetup; const xAxis = { - type: 'category', - show: optionsSetup.hideX, // 坐标轴是否显示 - name: optionsSetup.xName, // 坐标轴名称 + type: "category", + // 坐标轴是否显示 + 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 } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -279,53 +258,85 @@ export default { const optionsSetup = this.optionsSetup; const yAxis = [ { - type: 'value', - show: optionsSetup.isShowYLeft, // 坐标轴是否显示 - name: optionsSetup.textNameYLeft, // 坐标轴名称 - nameTextStyle: { //颜色字号 + type: "value", + // 均分 + splitNumber: optionsSetup.splitNumberLeft, + // 坐标轴是否显示 + show: optionsSetup.isShowYLeft, + // 坐标轴名称 + name: optionsSetup.textNameYLeft, + // 别名 + nameTextStyle: { color: optionsSetup.nameColorYLeft, fontSize: optionsSetup.nameFontSizeYLeft }, axisLabel: { show: true, + // 文字角度 + rotate: optionsSetup.textAngleYLeft, textStyle: { - color: optionsSetup.colorY, // y轴 坐标文字颜色 - fontSize: optionsSetup.fontSizeY + // 坐标文字颜色 + color: optionsSetup.colorYLeft, + fontSize: optionsSetup.fontSizeYLeft } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYLeft, + }, axisLine: { - show: true, + show: optionsSetup.lineYLeft, lineStyle: { - color: optionsSetup.lineColorY + width: optionsSetup.lineWidthYLeft, + color: optionsSetup.lineColorYLeft } }, splitLine: { - show: false, + show: optionsSetup.isShowSplitLineYLeft, + lineStyle: { + color: optionsSetup.splitLineColorYLeft, + width: optionsSetup.splitLineFontWidthYLeft, + } } }, { - type: 'value', - show: optionsSetup.isShowYRight, // 坐标轴是否显示 - name: optionsSetup.textNameYRight, // 坐标轴名称 - nameTextStyle: { // 颜色字号 + type: "value", + // 均分 + splitNumber: optionsSetup.splitNumberRight, + // 坐标轴是否显示 + show: optionsSetup.isShowYRight, + // 坐标轴名称 + name: optionsSetup.textNameYRight, + // 别名 + nameTextStyle: { color: optionsSetup.nameColorYRight, fontSize: optionsSetup.nameFontSizeYRight }, axisLabel: { show: true, + // 文字角度 + rotate: optionsSetup.textAngleYRight, textStyle: { - color: optionsSetup.colorY, // y轴 坐标文字颜色 - fontSize: optionsSetup.fontSizeY + // 坐标文字颜色 + color: optionsSetup.colorYRight, + fontSize: optionsSetup.fontSizeYRight } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYRight, + }, axisLine: { - show: true, + show: optionsSetup.lineYRight, lineStyle: { - color: optionsSetup.lineColorY + width: optionsSetup.lineWidthYRight, + color: optionsSetup.lineColorYRight, } }, splitLine: { - show: false, + show: optionsSetup.isShowSplitLineYRight, + lineStyle: { + color: optionsSetup.splitLineColorYRight, + width: optionsSetup.splitLineFontWidthYRight, + } } } ]; @@ -338,8 +349,8 @@ export default { trigger: 'item', show: true, textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.tipFontSize + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize } }; this.options.tooltip = tooltip; @@ -366,13 +377,13 @@ export default { optionsSetup.longitudinalPosition; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例名称设置 - setOptionsLegendName(name){ + setOptionsLegendName(name) { const optionsSetup = this.optionsSetup; const series = this.options.series; const legendName = optionsSetup.legendName; @@ -382,7 +393,7 @@ export default { series[i].name = name[i]; } this.options.legend['data'] = name; - }else { + } else { const arr = legendName.split('|'); for (let i = 0; i < arr.length; i++) { series[i].name = arr[i]; @@ -390,24 +401,6 @@ export default { this.options.legend['data'] = arr } }, - // 颜色修改 - setOptionsColor() { - const optionsSetup = this.optionsSetup; - const customColor = optionsSetup.customColor; - const series = this.options.series; - if (!customColor) return; - const arrColor = []; - for (let i = 0; i < customColor.length; i++) { - arrColor.push(customColor[i].color); - } - for (const i in series) { - if (series[i].type == 'bar') { - series[i].itemStyle.normal['color'] = arrColor[i]; - } else { - series[i].lineStyle['color'] = arrColor[i]; - } - } - }, // 数据处理 setOptionsData() { const optionsData = this.optionsData; // 数据类型 静态 or 动态 @@ -417,6 +410,12 @@ export default { }, staticDataFn(val) { const optionsSetup = this.optionsSetup; + //颜色 + const customColor = optionsSetup.customColor; + const arrColor = []; + for (let i = 0; i < customColor.length; i++) { + arrColor.push(customColor[i].color); + } const series = this.options.series; let axis = []; let bar1 = []; @@ -428,11 +427,17 @@ export default { bar2[i] = val[i].manus; line[i] = val[i].sales; } + const legendName = []; + legendName.push('调解成功'); + legendName.push('调解失败'); + legendName.push('调解成功率'); // x轴 this.options.xAxis.data = axis; // series for (const i in series) { if (series[i].type == 'bar') { + series[i].name = legendName[i]; + series[i].type = 'bar'; series[i].label = { show: optionsSetup.isShowBar, position: 'top', @@ -443,8 +448,12 @@ export default { }; series[i].barWidth = optionsSetup.maxWidth; series[i].itemStyle.normal['barBorderRadius'] = optionsSetup.radius; + series[i].itemStyle.normal['color'] = arrColor[i]; } else if (series[i].type == 'line') { + series[i].name = legendName[i]; + series[i].type = 'line'; series[i].yAxisIndex = 1; + series[i].symbol = optionsSetup.symbol; series[i].showSymbol = optionsSetup.markPoint; series[i].symbolSize = optionsSetup.pointSize; series[i].smooth = optionsSetup.smoothCurve; @@ -457,7 +466,13 @@ export default { opacity: 0 }; } + series[i].itemStyle = { + normal: { + color: arrColor[i], + } + }; series[i].lineStyle = { + color: arrColor[i], width: optionsSetup.lineWidth }; series[i].label = { @@ -472,11 +487,7 @@ export default { } series[0].data = bar1; series[1].data = bar2; - series[3].data = line; - const legendName = []; - legendName.push('调解成功'); - legendName.push('调解失败'); - legendName.push('调解成功率'); + series[2].data = line; this.options.legend['data'] = legendName; this.setOptionsLegendName(legendName); }, @@ -499,10 +510,17 @@ export default { }, renderingFn(val) { const optionsSetup = this.optionsSetup; + //颜色 + const customColor = optionsSetup.customColor; + const arrColor = []; + for (let i = 0; i < customColor.length; i++) { + arrColor.push(customColor[i].color); + } this.options.xAxis.data = val.xAxis; const series = []; const legendName = []; for (const i in val.series) { + legendName.push(val.series[i].name); const obj = {}; if (val.series[i].type == 'bar') { obj.name = val.series[i].name; @@ -518,6 +536,7 @@ export default { obj.barWidth = optionsSetup.maxWidth; obj.itemStyle = { normal: { + color: arrColor[i], barBorderRadius: optionsSetup.radius, } }; @@ -527,6 +546,7 @@ export default { obj.name = val.series[i].name; obj.type = val.series[i].type; obj.yAxisIndex = 1; + obj.symbol = optionsSetup.symbol; obj.showSymbol = optionsSetup.markPoint; obj.symbolSize = optionsSetup.pointSize; obj.smooth = optionsSetup.smoothCurve; @@ -537,9 +557,15 @@ export default { } else { obj.areaStyle = { opacity: 0 - }; + } } + obj.itemStyle = { + normal: { + color: arrColor[i], + } + }; obj.lineStyle = { + color: arrColor[i], width: optionsSetup.lineWidth }; obj.label = { @@ -553,7 +579,6 @@ export default { obj.data = val.series[i].data; series.push(obj); } - legendName.push(val.series[i].name); } this.options.series = series; this.options.legend['data'] = legendName; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue similarity index 94% rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue index 9ef5f5f3..684e5f75 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/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 @@ -172,8 +173,8 @@ export default { trigger: "item", show: true, textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.tipFontSize + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize } }; this.options.tooltip = tooltip; @@ -190,10 +191,10 @@ export default { optionsSetup.longitudinalPosition; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例颜色修改 setOptionsColor() { 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 47dd9268..f3cb9f59 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; }, @@ -176,10 +177,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, @@ -191,19 +192,17 @@ export default { rotate: optionsSetup.textAngleX, textStyle: { // 坐标文字颜色 - color: optionsSetup.Xcolor, + color: optionsSetup.colorX, fontSize: optionsSetup.fontSizeX } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, - splitArea: { - show: false, - }, }; this.options.xAxis = xAxis; }, @@ -211,16 +210,19 @@ export default { setOptionsY() { const optionsSetup = this.optionsSetup; const yAxis = { - type: "category", + type: "value", + scale: optionsSetup.scale, + // 均分 + splitNumber: optionsSetup.splitNumberY, // 坐标轴是否显示 show: optionsSetup.isShowY, // 坐标轴名称 name: optionsSetup.textNameY, nameTextStyle: { - color: optionsSetup.NameColorY, - fontSize: optionsSetup.NameFontSizeY + color: optionsSetup.nameColorY, + fontSize: optionsSetup.nameFontSizeY }, - // y轴反转 + // 轴反转 inverse: optionsSetup.reversalY, axisLabel: { show: true, @@ -235,12 +237,10 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, - splitArea: { - show: false, - }, }; this.options.yAxis = yAxis; }, @@ -277,8 +277,8 @@ export default { position: "top", show: true, textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.tipsLineColor + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize, } }; this.options.tooltip = tooltip; @@ -291,17 +291,17 @@ export default { visualMap.min = optionsSetup.dataMin; visualMap.max = optionsSetup.dataMax; visualMap.textStyle = { - fontSize : optionsSetup.lengedFontSize, - color : optionsSetup.lengedColor + fontSize : optionsSetup.legendFontSize, + color : optionsSetup.legendColor }; - visualMap.inRange.color = optionsSetup.lengedColorList.map((x) => { + visualMap.inRange.color = optionsSetup.legendColorList.map((x) => { return x.color; }); visualMap.left = optionsSetup.lateralPosition; visualMap.top = optionsSetup.longitudinalPosition; visualMap.bottom = optionsSetup.longitudinalPosition; visualMap.orient = optionsSetup.layoutFront; - visualMap.itemWidth = optionsSetup.lengedWidth; + visualMap.itemWidth = optionsSetup.legendWidth; }, setOptionsData() { const optionsData = this.optionsData; // 数据类型 静态 or 动态 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 729ee3b9..e0ccd747 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; }, @@ -359,7 +367,7 @@ export default { name: optionsSetup.textNameYTop, // 坐标轴名称 nameTextStyle: { color: optionsSetup.nameColorYTop, - fontSize: optionsSetup.namefontSizeYTop + fontSize: optionsSetup.nameFontSizeYTop }, axisLabel: { show: true, @@ -380,7 +388,7 @@ export default { splitLine: { show: optionsSetup.splitLineYTop, lineStyle: { - width: optionsSetup.splitLinefontSizeYTop, + width: optionsSetup.splitLineFontWidthYTop, color: optionsSetup.splitLineColorYTop, }, }, @@ -401,7 +409,7 @@ export default { name: optionsSetup.textNameYBottom, // 坐标轴名称 nameTextStyle: { color: optionsSetup.nameColorYBottom, - fontSize: optionsSetup.namefontSizeYBottom + fontSize: optionsSetup.nameFontSizeYBottom }, inverse: true, // 翻转 axisLabel: { @@ -423,7 +431,7 @@ export default { splitLine: { show: optionsSetup.splitLineYBottom, lineStyle: { - width: optionsSetup.splitLinefontSizeYBottom, + width: optionsSetup.splitLineFontWidthYBottom, color: optionsSetup.splitLineColorYBottom, }, }, @@ -439,6 +447,7 @@ export default { const series = this.options.series // 折线 for (const key in series) { + series[key].symbol = optionsSetup.symbol series[key].showSymbol = optionsSetup.markPoint series[key].symbolSize = optionsSetup.pointSize series[key].smooth = optionsSetup.smoothCurve @@ -476,30 +485,30 @@ export default { setOptionsTooltip() { const optionsSetup = this.optionsSetup; let tooltip = {} - if (optionsSetup.tipType == "line") { + if (optionsSetup.tipsType == "line") { tooltip = { - show: optionsSetup.tipShow, + show: optionsSetup.tipsShow, trigger: 'axis', axisPointer: { - type: optionsSetup.tipType, + type: optionsSetup.tipsType, lineStyle: { - color: optionsSetup.tipColor, + color: optionsSetup.tipsColor, type: 'dashed', }, }, } } else { tooltip = { - show: optionsSetup.tipShow, + show: optionsSetup.tipsShow, trigger: 'axis', axisPointer: { - type: optionsSetup.tipType, + type: optionsSetup.tipsType, lineStyle: { - color: optionsSetup.tipColor, + color: optionsSetup.tipsColor, type: 'dashed', }, crossStyle: { - color: optionsSetup.tipColor, + color: optionsSetup.tipsColor, } }, } @@ -538,10 +547,10 @@ export default { optionsSetup.longitudinalPosition; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例名称设置 setOptionsLegendName(name){ 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 6bfd591f..b57c6c20 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; }, @@ -129,10 +131,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, @@ -144,20 +146,22 @@ export default { rotate: optionsSetup.textAngleX, textStyle: { // 坐标文字颜色 - color: optionsSetup.Xcolor, + color: optionsSetup.colorX, fontSize: optionsSetup.fontSizeX } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -168,22 +172,25 @@ export default { const optionsSetup = this.optionsSetup; const yAxis = { type: "value", + scale: optionsSetup.scale, + // 均分 + splitNumber: optionsSetup.splitNumberY, // 坐标轴是否显示 show: optionsSetup.isShowY, // 坐标轴名称 name: optionsSetup.textNameY, nameTextStyle: { - color: optionsSetup.NameColorY, - fontSize: optionsSetup.NameFontSizeY + color: optionsSetup.nameColorY, + fontSize: optionsSetup.nameFontSizeY }, - // y轴反转 + // 轴反转 inverse: optionsSetup.reversalY, axisLabel: { show: true, // 文字角度 rotate: optionsSetup.textAngleY, textStyle: { - // y轴 坐标文字颜色 + // 坐标文字颜色 color: optionsSetup.colorY, fontSize: optionsSetup.fontSizeY } @@ -191,13 +198,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; @@ -225,7 +234,7 @@ export default { trigger: "item", show: true, textStyle: { - color: optionsSetup.lineColor, + color: optionsSetup.tipsColor, fontSize: optionsSetup.tipsFontSize } }; @@ -254,13 +263,13 @@ export default { optionsSetup.longitudinalPosition; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.lengedFontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例名称设置 - setOptionsLegendName(name){ + setOptionsLegendName(name) { const optionsSetup = this.optionsSetup; const series = this.options.series; const legendName = optionsSetup.legendName; @@ -270,7 +279,7 @@ export default { series[i].name = name[i]; } this.options.legend['data'] = name; - }else { + } else { const arr = legendName.split('|'); for (let i = 0; i < arr.length; i++) { series[i].name = arr[i]; @@ -347,7 +356,7 @@ export default { type: "line", data: data, width: optionsSetup.lineWidth, - symbol: 'circle', + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, smooth: optionsSetup.smoothCurve, @@ -434,7 +443,7 @@ export default { type: "line", data: val.series[i].data, width: optionsSetup.lineWidth, - symbol: 'circle', + symbol: optionsSetup.symbol, showSymbol: optionsSetup.markPoint, symbolSize: optionsSetup.pointSize, symbolColor: arrColor[i], 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 8505293e..f650fce8 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; }, @@ -132,33 +134,40 @@ 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 } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -170,32 +179,40 @@ export default { const yAxis = { type: "value", scale: optionsSetup.scale, - splitNumber: optionsSetup.splitNumber,// 均分 - show: optionsSetup.isShowY, // 坐标轴是否显示 - name: optionsSetup.textNameY, // 坐标轴名称 - nameTextStyle: { // 别名 + // 均分 + splitNumber: optionsSetup.splitNumberY, + // 坐标轴是否显示 + show: optionsSetup.isShowY, + // 坐标轴名称 + name: optionsSetup.textNameY, + nameTextStyle: { color: optionsSetup.nameColorY, - fontSize: optionsSetup.namefontSizeY + fontSize: optionsSetup.nameFontSizeY }, - inverse: optionsSetup.reversalY, // 轴反转 + // 轴反转 + inverse: optionsSetup.reversalY, axisLabel: { show: true, - rotate: optionsSetup.ytextAngle, // 文字角度 + // 文字角度 + rotate: optionsSetup.textAngleY, textStyle: { - color: optionsSetup.colorY, // y轴 坐标文字颜色 + // 坐标文字颜色 + color: optionsSetup.colorY, fontSize: optionsSetup.fontSizeY } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; @@ -207,6 +224,7 @@ export default { const series = this.options.series; for (const key in series) { if (series[key].type == "line") { + series[key].symbol = optionsSetup.symbol; series[key].showSymbol = optionsSetup.markPoint; series[key].symbolSize = optionsSetup.pointSize; series[key].smooth = optionsSetup.smoothCurve; @@ -219,7 +237,6 @@ export default { opacity: 0 }; } - series[key].lineStyle = { width: optionsSetup.lineWidth }; @@ -242,7 +259,7 @@ export default { trigger: "item", show: true, textStyle: { - color: optionsSetup.lineColor, + color: optionsSetup.tipsColor, fontSize: optionsSetup.tipsFontSize } }; 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 fccb7274..d9860f68 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue @@ -92,98 +92,100 @@ 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 = 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; }, // 数值设定 setOptionsValue() { - const optionsCollapse = this.optionsSetup; + const optionsSetup = this.optionsSetup; const series = this.options.series; - const numberValue = optionsCollapse.numberValue ? "{c}" : ""; - const percentage = optionsCollapse.percentage ? "({d})%" : ""; + const numberValue = optionsSetup.numberValue ? "{c}" : ""; + const percentage = optionsSetup.percentage ? "({d})%" : ""; const label = { - show: optionsCollapse.isShow, + show: optionsSetup.isShow, formatter: `{a|{b}：${numberValue} ${percentage}}`, rich: { a: { padding: [-30, 15, -20, 15], - color: optionsCollapse.subTextColor, - fontSize: optionsCollapse.fontSize, - fontWeight: optionsCollapse.fontWeight + color: optionsSetup.subTextColor, + fontSize: optionsSetup.fontSize, + fontWeight: optionsSetup.fontWeight } }, - fontSize: optionsCollapse.fontSize, + fontSize: optionsSetup.fontSize, - fontWeight: optionsCollapse.optionsCollapse + fontWeight: optionsSetup.optionsSetup }; for (const key in series) { if (series[key].type == "pie") { series[key].label = label; - series[key].labelLine = { show: optionsCollapse.isShow }; + series[key].labelLine = { show: optionsSetup.isShow }; } } }, // tooltip 设置 setOptionsTooltip() { - const optionsCollapse = this.optionsSetup; + const optionsSetup = this.optionsSetup; const tooltip = { trigger: "item", show: true, textStyle: { - color: optionsCollapse.lineColor, - fontSize: optionsCollapse.fontSize + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize } }; this.options.tooltip = tooltip; }, // 边距设置 setOptionsMargin() { - const optionsCollapse = this.optionsSetup; + const optionsSetup = this.optionsSetup; const grid = { - left: optionsCollapse.marginLeft, - right: optionsCollapse.marginRight, - bottom: optionsCollapse.marginBottom, - top: optionsCollapse.marginTop, + left: optionsSetup.marginLeft, + right: optionsSetup.marginRight, + bottom: optionsSetup.marginBottom, + top: optionsSetup.marginTop, containLabel: true }; this.options.grid = grid; }, // 图例操作 legend setOptionsLegend() { - const optionsCollapse = this.optionsSetup; + const optionsSetup = this.optionsSetup; const legend = this.options.legend; - legend.show = optionsCollapse.isShowLegend; - legend.left = optionsCollapse.lateralPosition == "left" ? 0 : "auto"; - legend.right = optionsCollapse.lateralPosition == "right" ? 0 : "auto"; - legend.top = optionsCollapse.longitudinalPosition == "top" ? 0 : "auto"; + legend.show = optionsSetup.isShowLegend; + legend.left = optionsSetup.lateralPosition == "left" ? 0 : "auto"; + legend.right = optionsSetup.lateralPosition == "right" ? 0 : "auto"; + legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto"; legend.bottom = - optionsCollapse.longitudinalPosition == "bottom" ? 0 : "auto"; - legend.orient = optionsCollapse.layoutFront; + optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; + legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsCollapse.lengedColor, - fontSize: optionsCollapse.fontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsCollapse.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例颜色修改 setOptionsColor() { - const optionsCollapse = this.optionsSetup; - const customColor = optionsCollapse.customColor; + const optionsSetup = this.optionsSetup; + const customColor = optionsSetup.customColor; if (!customColor) return; const arrColor = []; for (let i = 0; i < customColor.length; i++) { 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 1124a94c..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; }, @@ -157,7 +159,7 @@ export default { show: true, textStyle: { color: optionsSetup.lineColor, - fontSize: optionsSetup.fontSize + fontSize: optionsSetup.tipFontSize } }; this.options.tooltip = tooltip; @@ -174,10 +176,10 @@ export default { optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto"; legend.orient = optionsSetup.layoutFront; legend.textStyle = { - color: optionsSetup.lengedColor, - fontSize: optionsSetup.fontSize + color: optionsSetup.legendColor, + fontSize: optionsSetup.legendFontSize }; - legend.itemWidth = optionsSetup.lengedWidth; + legend.itemWidth = optionsSetup.legendWidth; }, // 图例颜色修改 setOptionsColor() { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue new file mode 100644 index 00000000..a1822b17 --- /dev/null +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue @@ -0,0 +1,393 @@ + ++ ++ + + diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue index 01b1c918..b9507f6b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -21,10 +21,10 @@ import widgetVideo from "./widgetVideo.vue"; import WidgetIframe from "./widgetIframe.vue"; import widgetBarchart from "./bar/widgetBarchart.vue"; import widgetLinechart from "./line/widgetLinechart.vue"; -import widgetBarlinechart from "./bar/widgetBarlinechart"; +import widgetBarlinechart from "./barline/widgetBarlinechart"; import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue"; import WidgetPiechart from "./pie/widgetPiechart.vue"; -import WidgetFunnel from "./widgetFunnel.vue"; +import WidgetFunnel from "./funnel/widgetFunnel.vue"; import WidgetGauge from "./percent/widgetGauge.vue"; import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose"; import widgetTable from "./widgetTable.vue"; @@ -36,9 +36,11 @@ import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; import widgetLineCompareChart from "./line/widgetLineCompareChart"; import widgetDecoratePieChart from "./decorate/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "./bar/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "./barline/widgetMoreBarLineChart"; import widgetWordCloud from "./wordcloud/widgetWordCloud"; import widgetHeatmap from "./heatmap/widgetHeatmap"; +import widgetRadar from "./radar/widgetRadar"; +import widgetBarLineStackChart from "./barline/widgetBarLineStackChart"; export default { name: "WidgetTemp", @@ -70,7 +72,9 @@ export default { widgetDecoratePieChart, widgetMoreBarLineChart, widgetWordCloud, - widgetHeatmap + widgetHeatmap, + widgetRadar, + widgetBarLineStackChart }, model: { prop: "value", diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue index f86d7b50..621830d4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue @@ -33,9 +33,9 @@ import WidgetIframe from "./widgetIframe.vue"; import widgetBarchart from "./bar/widgetBarchart.vue"; import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue"; import widgetLinechart from "./line/widgetLinechart.vue"; -import widgetBarlinechart from "./bar/widgetBarlinechart"; +import widgetBarlinechart from "./barline/widgetBarlinechart"; import WidgetPiechart from "./pie/widgetPiechart.vue"; -import WidgetFunnel from "./widgetFunnel.vue"; +import WidgetFunnel from "./funnel/widgetFunnel.vue"; import WidgetGauge from "./percent/widgetGauge.vue"; import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose"; import widgetTable from "./widgetTable.vue"; @@ -47,9 +47,11 @@ import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; import widgetLineCompareChart from "./line/widgetLineCompareChart"; import widgetDecoratePieChart from "./decorate/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "./bar/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "./barline/widgetMoreBarLineChart"; import widgetWordCloud from "./wordcloud/widgetWordCloud"; import widgetHeatmap from "./heatmap/widgetHeatmap"; +import widgetRadar from "./radar/widgetRadar"; +import widgetBarLineStackChart from "./barline/widgetBarLineStackChart"; export default { name: "Widget", @@ -81,7 +83,9 @@ export default { widgetDecoratePieChart, widgetMoreBarLineChart, widgetWordCloud, - widgetHeatmap + widgetHeatmap, + widgetRadar, + widgetBarLineStackChart }, model: { prop: "value", @@ -106,7 +110,9 @@ export default { data: { setup: {}, data: {}, - position: {} + position: {}, +/* leftMargin: null, + topMargin: null*/ } }; }, @@ -118,10 +124,10 @@ export default { return this.value.position.height; }, widgetsLeft() { - return this.value.position.left; + return this.value.position.left// >= this.leftMargin ? this.leftMargin : this.value.position.left; }, widgetsTop() { - return this.value.position.top; + return this.value.position.top// >= this.topMargin ? this.topMargin : this.value.position.top; }, widgetsZIndex() { return this.value.position.zIndex || 1; @@ -133,6 +139,28 @@ export default { handleBlur({ index, left, top, width, height }) { this.$emit("onActivated", { index, left, top, width, height }); this.$refs.draggable.setActive(true); + // 处理widget超出workbench的问题 + //this.handleBoundary({ index, left, top, width, height }) + }, + handleBoundary({ index, left, top, width, height }) { + // 计算workbench的X轴边界值 + // 组件距离左侧宽度 + 组件宽度 > 大屏总宽度时，右侧边界值 = (大屏宽度 - 组件宽度)；左侧边界值 = 0 + const { bigscreenWidth, bigscreenHeight } = this.bigscreen; + const xBoundaryValue = (left + width) > bigscreenWidth ? bigscreenWidth - width : left < 0 ? 0 : left; + // 初始化X轴边界值 + this.leftMargin = left; + // 计算Y轴边界值 + const yBoundaryValue = (top + height) > bigscreenHeight ? bigscreenHeight - height : top < 0 ? 0 : top; + // 初始化Y轴边界值 + this.topMargin = top; + // 若位置超出边界值则重新设置位置 + if (this.leftMargin != xBoundaryValue || this.topMargin != yBoundaryValue) { + this.$nextTick(() => { + this.leftMargin = xBoundaryValue; + this.topMargin = yBoundaryValue; + this.$emit("onActivated", { index, left: xBoundaryValue, top: yBoundaryValue, width, height }); + }) + } } } }; 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 201e5c90..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; }, @@ -130,8 +132,8 @@ export default { trigger: "item", show: true, textStyle: { - color: optionsSetup.lineColor, - fontSize: optionsSetup.fontSize + color: optionsSetup.tipsColor, + fontSize: optionsSetup.tipsFontSize } }; this.options.tooltip = tooltip; diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue index d5576624..2e95413b 100644 --- a/report-ui/src/views/layout/components/Sidebar/index.vue +++ b/report-ui/src/views/layout/components/Sidebar/index.vue @@ -3,7 +3,7 @@+ 
- V0.9.8.6
+ V0.9.9
-
+
+
-
+
+