Browse Source

Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0

final/10.0
Wim.Zhai 6 years ago
parent
commit
0d72d523e0
  1. 6
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
  2. 9
      designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
  3. 2
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
  4. 2
      designer-realize/src/main/java/com/fr/start/Designer.java
  5. 1
      designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

6
designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@ -25,7 +25,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
protected void initComponents() {
String[] labels = fieldLabel();
TinyFormulaPane[] formulaPanes = formulaPanes();
Component[] formulaPanes = fieldComponents();
int len = Math.min(labels.length, formulaPanes.length);
@ -50,6 +50,10 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
this.add(panel, BorderLayout.CENTER);
}
protected Component[] fieldComponents() {
return formulaPanes();
}
protected abstract String[] fieldLabel();
protected abstract TinyFormulaPane[] formulaPanes();

9
designer-form/src/main/java/com/fr/design/mainframe/FormArea.java

@ -540,16 +540,16 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
layout();
if (isValid) {
XLayoutContainer root = designer.getRootComponent();
setScrollBarProperties(root.getWidth() - designer.getWidth(), horScrollBar);
setScrollBarProperties(root.getWidth() - designer.getWidth(), horScrollBar, horizontalValue);
//计算滚动条值的时候应该算上参数面板的高度
setScrollBarProperties(designer.getParaHeight() + root.getHeight() - designer.getHeight(), verScrollBar);
setScrollBarProperties(designer.getParaHeight() + root.getHeight() - designer.getHeight(), verScrollBar, verticalValue);
}
}
/**
* 设置滚动条的属性
*/
private void setScrollBarProperties(int value, FormScrollBar bar) {
private void setScrollBarProperties(int value, FormScrollBar bar, int oldValue) {
if (value == 0 && isScrollNotVisible(bar)) {
return;
}
@ -560,12 +560,11 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
bar.setValue(0);
bar.setEnabled(false);
} else {
//参数面板拖拽过程中value一直为当前value
int oldValue = verticalValue;
setScrollBarMax(value, bar);
bar.setEnabled(true);
bar.setMaximum(value);
bar.setValue(value);
//参数面板拖拽过程中value一直为当前value
bar.setValue(oldValue);
}
}

2
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java

@ -273,7 +273,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
this.remove(title);
// 如果是空值就说明采用服务器配置了
if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerToolbar_Choose_Role"));
title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"));
populateServerSettings();
this.add(title, 0);
return;

2
designer-realize/src/main/java/com/fr/start/Designer.java

@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.file.WebPreviewUtils;
import com.fr.design.actions.file.newReport.NewPolyReportAction;
@ -102,6 +103,7 @@ public class Designer extends BaseDesigner {
DesignUtils.clientSend(args);
return;
}
RestartHelper.deleteRecordFilesWhenStart();
preloadResource();

1
designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@ -23,7 +23,6 @@ public class PreStartActivator extends Activator {
@Override
public void start() {
RestartHelper.deleteRecordFilesWhenStart();
CloudCenter.getInstance();
if (checkMultiStart()) {
return;

Loading…
Cancel
Save