Browse Source

Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~alex.sung/design into release/10.0

bugfix/10.0
alex.sung 6 years ago
parent
commit
c631e21f13
  1. 4
      designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
  2. 4
      designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
  3. 14
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/AbstractCellAttrPane.java

4
designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java

@ -13,6 +13,7 @@ import com.fr.js.JavaScript;
import com.fr.js.LinkAnimateType; import com.fr.js.LinkAnimateType;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.Dimension;
import java.util.HashMap; import java.util.HashMap;
/** /**
@ -52,8 +53,9 @@ public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
animateTypeUIButtonGroup = new UIButtonGroup<LinkAnimateType>( animateTypeUIButtonGroup = new UIButtonGroup<LinkAnimateType>(
new String[]{LinkAnimateType.RELOAD.toLocaleString(), LinkAnimateType.INCREMENT.toLocaleString()}, new String[]{LinkAnimateType.RELOAD.toLocaleString(), LinkAnimateType.INCREMENT.toLocaleString()},
new LinkAnimateType[]{LinkAnimateType.RELOAD, LinkAnimateType.INCREMENT}); new LinkAnimateType[]{LinkAnimateType.RELOAD, LinkAnimateType.INCREMENT});
animateTypeUIButtonGroup.setPreferredSize(new Dimension(120,20));
animateTypeUIButtonGroup.setSelectedIndex(1);
animateTypeUIButtonGroup.setSelectedIndex(0);
JPanel jp = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel jp = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
jp.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Link_Animate_Type"))); jp.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Link_Animate_Type")));

4
designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@ -111,6 +111,8 @@ public class CellWidgetPropertyPane extends BasicPane {
if (finalCS.isSelectedOneCell(ePane)) { if (finalCS.isSelectedOneCell(ePane)) {
if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去 if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement); tplEC.addCellElement(cellElement);
} else {
cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
} }
setCellWidget(cellWidget, cellElement); setCellWidget(cellWidget, cellElement);
} else { } else {
@ -141,6 +143,8 @@ public class CellWidgetPropertyPane extends BasicPane {
if(finalCS.isSelectedOneCell(ePane)){ if(finalCS.isSelectedOneCell(ePane)){
if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去 if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement); tplEC.addCellElement(cellElement);
} else {
cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
} }
setCellWidget(cellWidget, cellElement); setCellWidget(cellWidget, cellElement);
}else{ }else{

14
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/AbstractCellAttrPane.java

@ -4,6 +4,7 @@ import com.fr.design.mainframe.AbstractAttrPane;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;
import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.FloatSelection;
import com.fr.report.cell.DefaultTemplateCellElement;
import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.TemplateCellElement;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
@ -44,8 +45,17 @@ public abstract class AbstractCellAttrPane extends AbstractAttrPane {
* 分成两个方法的意义在于这个面板如果是个对话框那么可以传cellElement进来update 方便重复使用面板 为了对话框做准备 * 分成两个方法的意义在于这个面板如果是个对话框那么可以传cellElement进来update 方便重复使用面板 为了对话框做准备
*/ */
public void updateBean() { public void updateBean() {
updateBean(this.cellElement); if (elementCasePane == null) {
return;
}
cs = (CellSelection) elementCasePane.getSelection();
TemplateElementCase elementCase = elementCasePane.getEditingElementCase(); TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
elementCase.addCellElement(cellElement); TemplateCellElement cellElement = elementCase.getTemplateCellElement(cs.getColumn(), cs.getRow());
if (cellElement == null) {
cellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
}
this.cellElement = cellElement;
elementCase.addCellElement(this.cellElement);
updateBean(this.cellElement);
} }
} }
Loading…
Cancel
Save