Browse Source
* commit '1a7a439b1bed9d69d56c9d97eb750670fff48b65': (33 commits) REPORT-40147 表单双击tab标签会出现不应该有的设置 CHART-15947 修改富文本编辑器参数显示 REPORT-38537 部分面板显示不全 修复一下ToolKit的导包问题和HistoryTemplateListPane的过时方法问题 代码修改 提到final REPORT-38618 【回归】表单-下方缩放缩小之后，拖入tab块，查看右侧边框线消失 REPORT-40459 【回归】右侧属性面板富文本编辑按钮变短 【问题原因】实际上不是编辑按钮变短了，而是上面的两个Label变短了，在使用TableLayout.FILL的情况下，后面跟着的输入框还有UICombox变长了，而编辑按钮前面的占位空白Label是写死size的，没有保持一致，所以空白Label不变的情况下，编辑按钮显得短了 【改动方案】将占位Label的宽度修改为与前面自动计算宽度的两个Label一致，这样后面跟的东西宽度就都是一致的 MOBILE-29490 【H5】10.4.80升级到10.4.90后，模板中有些内容显示不全 MOBILE-29490 【H5】10.4.80升级到10.4.90后，模板中有些内容显示不全 REPORT-39308 参数输入面板参数名显示不完整 REPORT-38376 设计器目录树等树控件JDK11下显示不全 删除多余的setDirty 甘特图和框架图标签内容增加样式 通用和自定义中都支持样式 REPORT-40525 表单进行拖拽组件，来回切换模板，再拖拽，显示很有问题 更新修改：之前在改REPORT-38534这个bug的时候，看到DesignState里面有个参数面板状态，以为不会干扰判断，刚才测试另一个bug发现参数面板这边，剪切复制按钮也是保持一直可用的，所以要增加一层判断，如果此时是WORK_SHEET状态，还需要判断是编辑报表块还是编辑参数面板，仅当编辑报表块时按钮不能置灰 完善富文本组件样式 REPORT-40458 【回归】设计器重启以后会卡住，面板除了菜单栏其他都动不了 【问题原因】editingTemplate没有判空，当时自己测试发现是不会出现null情况的，这个问题是因为安装了一个新引擎插件后，插件那边某个方法可能会在setCurrentEditingTemplate之前，调用checkCombineUp方法，此时getCurrentEditingTemplate会拿到null值，然后出现npe 【改动思路】增加判空 上传多了，撤销一下 ...research/11.0
superman
4 years ago
37 changed files with 743 additions and 310 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