Browse Source
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0 * commit '12abfe93d64c1612bfc61ab26709a09bed5a5974': 完善富文本组件样式 标签边框增加形状 标签增加边框和背景 标签增加文本方向feature/big-screen
11 changed files with 298 additions and 34 deletions
@ -0,0 +1,17 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.plugin.chart.column.VanChartColumnPlot; |
||||
import com.fr.van.chart.designer.style.VanChartStylePane; |
||||
import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane; |
||||
|
||||
public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane { |
||||
|
||||
public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) { |
||||
super(plot, parent); |
||||
} |
||||
|
||||
protected boolean hasLabelOrientationPane() { |
||||
return !((VanChartColumnPlot) this.getPlot()).isBar(); |
||||
} |
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.van.chart.designer.style.VanChartStylePane; |
||||
import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane; |
||||
|
||||
import java.awt.BorderLayout; |
||||
|
||||
public class VanChartColumnPlotLabelPane extends VanChartPlotLabelPane { |
||||
|
||||
public VanChartColumnPlotLabelPane(Plot plot, VanChartStylePane parent) { |
||||
super(plot, parent); |
||||
} |
||||
|
||||
protected void createLabelPane() { |
||||
VanChartColumnPlotLabelDetailPane labelDetailPane = new VanChartColumnPlotLabelDetailPane(getPlot(), getParentPane()); |
||||
setLabelDetailPane(labelDetailPane); |
||||
getLabelPane().add(labelDetailPane, BorderLayout.CENTER); |
||||
} |
||||
} |
||||
@ -0,0 +1,58 @@
|
||||
package com.fr.van.chart.designer.component.border; |
||||
|
||||
import com.fr.chart.base.AttrBorder; |
||||
import com.fr.chart.chartglyph.Marker; |
||||
import com.fr.chart.chartglyph.MarkerFactory; |
||||
import com.fr.design.gui.ilable.UILabel; |
||||
import com.fr.design.gui.xcombox.MarkerComboBox; |
||||
import com.fr.design.i18n.Toolkit; |
||||
import com.fr.design.layout.TableLayout; |
||||
import com.fr.design.utils.gui.UIComponentUtils; |
||||
import com.fr.design.widget.FRWidgetFactory; |
||||
import com.fr.plugin.chart.base.AttrBorderWithShape; |
||||
import com.fr.plugin.chart.marker.type.MarkerType; |
||||
|
||||
import java.awt.Component; |
||||
|
||||
public class VanChartBorderWithShapePane extends VanChartBorderWithRadiusPane { |
||||
|
||||
private MarkerComboBox shapePane; |
||||
|
||||
protected void initComponents() { |
||||
shapePane = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers()); |
||||
super.initComponents(); |
||||
} |
||||
|
||||
protected Component[][] getUseComponent() { |
||||
return new Component[][]{ |
||||
new Component[]{null, null}, |
||||
new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), |
||||
UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)}, |
||||
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), currentLineColorPane}, |
||||
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shape")), |
||||
UIComponentUtils.wrapWithBorderLayoutPane(shapePane)}, |
||||
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), getRadius()} |
||||
}; |
||||
} |
||||
|
||||
protected double[] getRowSize() { |
||||
double p = TableLayout.PREFERRED; |
||||
return new double[]{p, p, p, p, p}; |
||||
} |
||||
|
||||
public void populate(AttrBorder border) { |
||||
super.populate(border); |
||||
|
||||
if (border instanceof AttrBorderWithShape) { |
||||
shapePane.setSelectedMarker((Marker.createMarker(((AttrBorderWithShape) border).getShape()))); |
||||
} |
||||
} |
||||
|
||||
public void update(AttrBorder border) { |
||||
super.update(border); |
||||
|
||||
if (border instanceof AttrBorderWithShape) { |
||||
((AttrBorderWithShape) border).setShape(MarkerType.parse(shapePane.getSelectedMarkder().getMarkerType())); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
.editor-insert-param-inactivated-font .b-font { |
||||
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); |
||||
} |
||||
.editor-insert-param-inactivated-font .b-font:before { |
||||
content: "\e6ea"; |
||||
color: inherit; |
||||
} |
||||
.editor-insert-param-inactivated-font.disabled .b-font:before { |
||||
content: "\e6ea"; |
||||
color: inherit; |
||||
} |
||||
.editor-insert-param-active-font .b-font { |
||||
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); |
||||
} |
||||
.editor-insert-param-active-font .b-font:before { |
||||
content: "\e6ea"; |
||||
color: #23beef; |
||||
} |
||||
.editor-insert-param-active-font.disabled .b-font:before { |
||||
content: "\e6ea"; |
||||
color: #23beef; |
||||
} |
||||
Loading…
Reference in new issue