Browse Source
* commit '413f9331cdee8d720c5b248dec6d448c65c933ea': (24 commits) REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗（提示自定义样式已丢失）同时打开了，没有设置弹窗优先级 REPORT-55377 升级 tomcat 版本修复公开漏洞 for duchamp mode CHART-21376 fix:大屏模板组合图新增类型 默认样式 CHART-21357 fix:新增坐标轴样式 CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来 REPORT-61356 fix 统一api使用入口 REPORT-60253 安装大数据集导出插件后，模板从本地切换到远程，再切换到本地，触发保存模板会弹窗 保存失败，有npe报错 REPORT-61356 设计器启动加载完成后，停留的空白时间变长 REPORT-60661 国际化url适配 REPORT-60661 国际化url适配 REPORT-60661 国际化url适配 BI-95654 拷贝数据连接时复制了identity CHART-21219 特殊形状柱形图触发保存 REPORT-60752 【10.0】tab组件，移动端属性设置样式模板，从默认切换到自定义后不保存关闭窗口，再次进入后，选项会显示自定义，应该还是默认才对 REPORT-60561 全局自适应-样式细节优化 REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题 REPORT-59476 文本控件校验规则支持国际化 REPORT-60528 决策报表，给一个高度较小的tab内拖入报表块，会触发弹窗提示“超出或者小于tablayout边界，不能调整大小”；客户模板的弹窗不断触发导致设计器无法操作使用 REPORT-56437 & REPORT-58955 国际化问题调整 ...final/10.0
superman
3 years ago
31 changed files with 525 additions and 77 deletions
@ -0,0 +1,89 @@
|
||||
package com.fr.van.chart.config; |
||||
|
||||
import com.fr.base.ChartPreStyleConfig; |
||||
import com.fr.chart.base.ChartBaseUtils; |
||||
import com.fr.chart.base.ChartConstants; |
||||
import com.fr.general.Background; |
||||
import com.fr.general.FRFont; |
||||
import com.fr.general.GeneralUtils; |
||||
import com.fr.stable.CodeUtils; |
||||
import com.fr.stable.Constants; |
||||
|
||||
import java.awt.Color; |
||||
import java.awt.Font; |
||||
|
||||
/** |
||||
* @author shine |
||||
* @version 10.0 |
||||
* Created by shine on 2021/6/25 |
||||
*/ |
||||
public class DefaultStyleConstants { |
||||
static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 14, new Color(241, 246, 255)); |
||||
static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191)); |
||||
|
||||
static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191)); |
||||
static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(200, 211, 228)); |
||||
static final Color AXIS_LINE = new Color(46, 75, 102); |
||||
static final Color GRID_LINE = new Color(30, 55, 78); |
||||
|
||||
static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191)); |
||||
static final Color DATA_SHEET_BORDER = new Color(46, 75, 102); |
||||
|
||||
static final Color BORDER = Color.BLACK; |
||||
static final int BORDER_WIDTH = Constants.LINE_NONE; |
||||
static final int SPECIAL_BORDER_WIDTH = Constants.LINE_THIN; |
||||
|
||||
static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 10, new Color(232, 232, 232)); |
||||
|
||||
static final Color GAUGE_PANE_BACK_COLOR = null; |
||||
static final Color GAUGE_HINGE = null; |
||||
static final Color GAUGE_PANE_BACK_COLOR_4_RING = new Color(72, 73, 79); |
||||
static final Color GAUGE_SLOT_BACKGROUND_COLOR = new Color(72, 73, 79); |
||||
private static final String FONT_NAME = ChartBaseUtils.getLocalDefaultFont("verdana"); |
||||
static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 9, new Color(232, 232, 232));//试管仪表盘标签的默认样式
|
||||
static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 8, new Color(159, 173, 191)); |
||||
static final FRFont RING_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//百分比圆环仪表盘值标签的默认样式
|
||||
static final FRFont POINTER_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//多指针仪表盘值标签的默认样式
|
||||
static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 10, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
|
||||
|
||||
static final Color MAP_NULL_VALUE_COLOR = new Color(168, 168, 168); |
||||
static final Color MAP_BORDER = Color.BLACK; |
||||
static final Color MAP_LEGEND_BACK = Color.BLACK; |
||||
static final Color MAP_TITLE_BACK = Color.BLACK; |
||||
|
||||
static final Color DRILL_MAP_DRILL_TOOLS_BACK = Color.BLACK; |
||||
static final float DRILL_MAP_DRILL_TOOLS_BACK_OPACITY = 0.8f; |
||||
|
||||
//todo vancharts
|
||||
private static final Color GANTT_OUT_LINE = GRID_LINE; |
||||
private static final FRFont GANTT_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 8, new Color(217, 217, 217)); |
||||
private static final Color GANTT_BORDER_LINE = new Color(30, 36, 58); |
||||
private static final Color GAUGE_TICK = new Color(39, 49, 71); |
||||
|
||||
static final Background BACK = null; |
||||
|
||||
static String COLORS = null; |
||||
|
||||
static { |
||||
ChartPreStyleConfig config = ChartPreStyleConfig.getInstance(); |
||||
try { |
||||
DefaultStyleConstants.COLORS = CodeUtils.cjkDecode("\u7ecf\u5178\u9ad8\u4eae"); |
||||
// 没有经典高亮, 用新特性
|
||||
if (config.getPreStyle(DefaultStyleConstants.COLORS) == null) { |
||||
DefaultStyleConstants.COLORS = CodeUtils.cjkDecode("\u65b0\u7279\u6027"); |
||||
} |
||||
// 没有新特性, 用第一个配色
|
||||
if (config.getPreStyle(DefaultStyleConstants.COLORS) == null) { |
||||
if (config.names().hasNext()) { |
||||
|
||||
String name = GeneralUtils.objectToString(config.names().next()); |
||||
if (config.getPreStyle(name) != null) { |
||||
DefaultStyleConstants.COLORS = name; |
||||
} |
||||
} |
||||
} |
||||
} catch (Exception e) { |
||||
e.printStackTrace(); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,178 @@
|
||||
package com.fr.van.chart.config; |
||||
|
||||
import com.fr.chart.base.AttrBorder; |
||||
import com.fr.chart.base.AttrFillStyle; |
||||
import com.fr.chart.base.ChartConstants; |
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.chart.chartglyph.ConditionAttr; |
||||
import com.fr.chart.chartglyph.DataSheet; |
||||
import com.fr.config.predefined.ColorFillStyle; |
||||
import com.fr.design.mainframe.chart.mode.ChartEditContext; |
||||
import com.fr.plugin.chart.PiePlot4VanChart; |
||||
import com.fr.plugin.chart.attr.axis.VanChartAxis; |
||||
import com.fr.plugin.chart.attr.plot.VanChartPlot; |
||||
import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; |
||||
import com.fr.plugin.chart.base.AttrLabel; |
||||
import com.fr.plugin.chart.base.AttrLabelDetail; |
||||
import com.fr.plugin.chart.custom.type.CustomPlotType; |
||||
import com.fr.plugin.chart.gauge.VanChartGaugePlot; |
||||
import com.fr.plugin.chart.map.VanChartMapPlot; |
||||
import com.fr.plugin.chart.type.GaugeStyle; |
||||
|
||||
/** |
||||
* @author shine |
||||
* @version 10.0 |
||||
* Created by shine on 2021/10/22 |
||||
* vanchart的抽出来，因为主体代码 新增y轴 组合图新增图表都要用 |
||||
*/ |
||||
public class DefaultStyleHelper4Van { |
||||
|
||||
public static void dealVanPlot4Custom(VanChartPlot plot, CustomPlotType customPlotType) { |
||||
if (!ChartEditContext.duchampMode()) { |
||||
return; |
||||
} |
||||
dealVanPlotCommonAttr(plot); |
||||
switch (customPlotType) { |
||||
case PIE: |
||||
case DIFFERENT_PIE: |
||||
case SAME_PIE: |
||||
dealPie(plot); |
||||
break; |
||||
case SLOT: |
||||
case POINTER_360: |
||||
case POINTER_180: |
||||
case CUVETTE: |
||||
case RING: |
||||
dealGauge(plot); |
||||
break; |
||||
case COLUMN: |
||||
case LINE: |
||||
case AREA: |
||||
case BUBBLE: |
||||
case RADAR: |
||||
case STACK_RADAR: |
||||
case SCATTER: |
||||
default: |
||||
break; |
||||
} |
||||
|
||||
} |
||||
|
||||
public static VanChartAxis dealAxisDefault(VanChartAxis axis) { |
||||
if (!ChartEditContext.duchampMode()) { |
||||
return axis; |
||||
} |
||||
axis.getTitle().getTextAttr().setFRFont(DefaultStyleConstants.AXIS_TITLE); |
||||
axis.getTextAttr().setFRFont(DefaultStyleConstants.AXIS_LABEL); |
||||
axis.setAxisColor(DefaultStyleConstants.AXIS_LINE); |
||||
axis.setMainGridColor(DefaultStyleConstants.GRID_LINE); |
||||
return axis; |
||||
} |
||||
|
||||
static void dealVanPlotCommonAttr(Plot plot) { |
||||
if (!ChartEditContext.duchampMode()) { |
||||
return; |
||||
} |
||||
if (plot instanceof VanChartPlot) { |
||||
VanChartPlot vanChartPlot = (VanChartPlot) plot; |
||||
|
||||
ColorFillStyle colorFillStyle = new ColorFillStyle(); |
||||
colorFillStyle.setColorStyle(ChartConstants.COLOR_ACC); |
||||
colorFillStyle.setFillStyleName(DefaultStyleConstants.COLORS); |
||||
AttrFillStyle plotFillStyle = vanChartPlot.getPlotFillStyle(); |
||||
if (plotFillStyle == null) { |
||||
plotFillStyle = new AttrFillStyle(); |
||||
vanChartPlot.setPlotFillStyle(plotFillStyle); |
||||
} |
||||
plotFillStyle.setColorFillStyle(colorFillStyle); |
||||
|
||||
if (vanChartPlot.getLegend() != null) { |
||||
vanChartPlot.getLegend().setFRFont(DefaultStyleConstants.LEGEND); |
||||
} |
||||
|
||||
if (vanChartPlot instanceof VanChartRectanglePlot) { |
||||
VanChartRectanglePlot vanChartRectanglePlot = (VanChartRectanglePlot) vanChartPlot; |
||||
|
||||
for (VanChartAxis axis : vanChartRectanglePlot.getXAxisList()) { |
||||
dealAxisDefault(axis); |
||||
} |
||||
for (VanChartAxis axis : vanChartRectanglePlot.getYAxisList()) { |
||||
dealAxisDefault(axis); |
||||
} |
||||
} |
||||
|
||||
dealBorder(vanChartPlot); |
||||
|
||||
DataSheet dataSheet = vanChartPlot.getDataSheet(); |
||||
dataSheet.getTextAttr().setFRFont(DefaultStyleConstants.DATA_SHEET); |
||||
dataSheet.setBorderColor(DefaultStyleConstants.DATA_SHEET_BORDER); |
||||
} |
||||
|
||||
} |
||||
|
||||
private static void dealBorder(VanChartPlot vanChartPlot) { |
||||
ConditionAttr defaultAttr = vanChartPlot.getConditionCollection().getDefaultAttr(); |
||||
AttrBorder attrBorder = defaultAttr.getExisted(AttrBorder.class); |
||||
if (attrBorder != null) { |
||||
attrBorder.setBorderColor(DefaultStyleConstants.BORDER); |
||||
attrBorder.setBorderStyle(defaultBorderWidth(vanChartPlot)); |
||||
} |
||||
} |
||||
|
||||
private static int defaultBorderWidth(VanChartPlot vanChartPlot) { |
||||
//pie multipie treemap map drillmap heatmap
|
||||
if (vanChartPlot instanceof PiePlot4VanChart |
||||
|| vanChartPlot instanceof VanChartMapPlot) { |
||||
return DefaultStyleConstants.SPECIAL_BORDER_WIDTH; |
||||
} |
||||
return DefaultStyleConstants.BORDER_WIDTH; |
||||
} |
||||
|
||||
static void dealPie(Plot plot) { |
||||
if (plot instanceof PiePlot4VanChart) { |
||||
ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr(); |
||||
AttrLabel attrLabel = defaultAttr.getExisted(AttrLabel.class); |
||||
if (attrLabel == null) { |
||||
attrLabel = ((PiePlot4VanChart) plot).getDefaultAttrLabel(); |
||||
defaultAttr.addDataSeriesCondition(attrLabel); |
||||
} |
||||
attrLabel.getSecondLabelDetail().getTextAttr().setFRFont(DefaultStyleConstants.PIE_CATEGORY_LABEL); |
||||
} |
||||
} |
||||
|
||||
static void dealGauge(Plot param) { |
||||
if (!(param instanceof VanChartGaugePlot)) { |
||||
return; |
||||
} |
||||
VanChartGaugePlot plot = (VanChartGaugePlot) param; |
||||
plot.getGaugeDetailStyle().setPaneBackgroundColor(plot.getGaugeStyle() == GaugeStyle.RING ? DefaultStyleConstants.GAUGE_PANE_BACK_COLOR_4_RING : DefaultStyleConstants.GAUGE_PANE_BACK_COLOR); |
||||
plot.getGaugeDetailStyle().setSlotBackgroundColor(DefaultStyleConstants.GAUGE_SLOT_BACKGROUND_COLOR); |
||||
plot.getGaugeDetailStyle().setHingeColor(DefaultStyleConstants.GAUGE_HINGE); |
||||
|
||||
ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr(); |
||||
AttrLabel attrLabel = defaultAttr.getExisted(AttrLabel.class); |
||||
if (attrLabel != null) { |
||||
AttrLabelDetail detail = attrLabel.getAttrLabelDetail(); |
||||
AttrLabelDetail valueDetail = attrLabel.getGaugeValueLabelDetail(); |
||||
|
||||
switch (plot.getGaugeStyle()) { |
||||
case POINTER: |
||||
case POINTER_SEMI: |
||||
detail.getContent().getCategoryFormat().setEnable(false); |
||||
detail.getTextAttr().setFRFont(DefaultStyleConstants.POINTER_CATE_LABEL_FONT); |
||||
valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.POINTER_VALUE_LABEL_FONT); |
||||
break; |
||||
case RING: |
||||
case SLOT: |
||||
valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.RING_VALUE_LABEL_FONT); |
||||
break; |
||||
case THERMOMETER: |
||||
detail.getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_LABEL_FONT); |
||||
valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_LABEL_FONT); |
||||
plot.getGaugeAxis().getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_AXIS_LABEL); |
||||
break; |
||||
} |
||||
|
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue