Browse Source

Merge remote-tracking branch 'origin/release/9.0' into release/9.0

master
MoMeak 7 years ago
parent
commit
e0b77c0475
  1. 2
      designer/src/com/fr/design/condition/HyperlinkPane.java
  2. 10
      designer/src/com/fr/design/condition/WidgetHighlightPane.java
  3. 5
      designer/src/com/fr/design/mainframe/JWorkBook.java
  4. 5
      designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java
  5. 27
      designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java
  6. 7
      designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java
  7. 4
      designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java
  8. 4
      designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
  9. 7
      designer_base/src/com/fr/design/condition/LiteConditionPane.java
  10. 14
      designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
  11. 4
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
  12. 7
      designer_base/src/com/fr/design/mainframe/JTemplate.java
  13. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java
  14. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java
  15. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java
  16. 3
      designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java
  17. 5
      designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
  18. 4
      designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java
  19. 2
      designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java
  20. 26
      designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java
  21. 7
      designer_form/src/com/fr/design/mainframe/JForm.java
  22. 6
      designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
  23. 4
      designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

2
designer/src/com/fr/design/condition/HyperlinkPane.java

@ -37,7 +37,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
hyperlinkButton.addActionListener(new ActionListener() { hyperlinkButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
NameJavaScriptGroup nameHyperlinks = jsGroup; NameJavaScriptGroup nameHyperlinks = jsGroup;
pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance()); pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(HyperlinkGroupPaneActionImpl.getInstance());
pane.populate(nameHyperlinks); pane.populate(nameHyperlinks);
dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane)); dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane));
dialog.addDialogActionListener(new DialogActionAdapter() { dialog.addDialogActionListener(new DialogActionAdapter() {

10
designer/src/com/fr/design/condition/WidgetHighlightPane.java

@ -6,6 +6,9 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.widget.CellWidgetCardPane;
import com.fr.design.widget.WidgetManageCardPane;
import com.fr.design.widget.WidgetPane; import com.fr.design.widget.WidgetPane;
import com.fr.form.ui.*; import com.fr.form.ui.*;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -35,7 +38,12 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
widgetButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); widgetButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
widgetButton.addActionListener(new ActionListener() { widgetButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final WidgetPane widgetPane = new WidgetPane(); final WidgetPane widgetPane = new WidgetPane() {
@Override
protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {
return new WidgetManageCardPane(pane);
}
};
widgetPane.populate(widget); widgetPane.populate(widget);
BasicDialog dialog = widgetPane.showWindow( BasicDialog dialog = widgetPane.showWindow(
SwingUtilities.getWindowAncestor(conditionAttributesPane)); SwingUtilities.getWindowAncestor(conditionAttributesPane));

5
designer/src/com/fr/design/mainframe/JWorkBook.java

@ -854,6 +854,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
return ReportHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider); return ReportHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider);
} }
@Override
public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
return ReportHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider);
}
public void setAuthorityMode(boolean isUpMode) { public void setAuthorityMode(boolean isUpMode) {
centerPane.setAuthorityMode(isUpMode); centerPane.setAuthorityMode(isUpMode);
} }

5
designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java

@ -23,7 +23,8 @@ import java.awt.*;
public class ReportHyperlinkGroupPane extends HyperlinkGroupPane { public class ReportHyperlinkGroupPane extends HyperlinkGroupPane {
private static ReportHyperlinkGroupPane singleton; private static ReportHyperlinkGroupPane singleton;
private ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { // 仅供继承使用,外部通过 getInstance 获取实例
protected ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
super(hyperlinkGroupPaneActionProvider); super(hyperlinkGroupPaneActionProvider);
} }
@ -35,7 +36,7 @@ public class ReportHyperlinkGroupPane extends HyperlinkGroupPane {
return singleton; return singleton;
} }
private void refreshPane() { protected void refreshPane() {
ElementCasePane reportPane = ((JWorkBook)HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()).getEditingElementCasePane(); ElementCasePane reportPane = ((JWorkBook)HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()).getEditingElementCasePane();
if (reportPane == null) { if (reportPane == null) {
return; return;

27
designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java

@ -0,0 +1,27 @@
package com.fr.design.mainframe;
import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
/**
* Created by plough on 2017/9/4.
*/
public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{
private static ReportHyperlinkGroupPaneNoPop singleton;
private ReportHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
super(hyperlinkGroupPaneActionProvider);
}
public static ReportHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
if (singleton == null) {
singleton = new ReportHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider);
}
singleton.refreshPane();
return singleton;
}
@Override
protected boolean isNewStyle() {
return false;
}
}

7
designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java

@ -2,8 +2,6 @@ package com.fr.design.widget;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;
import java.awt.*;
/** /**
* 没有悬浮弹窗的控件事件编辑面板 * 没有悬浮弹窗的控件事件编辑面板
* Created by plough on 2017/8/28. * Created by plough on 2017/8/28.
@ -17,9 +15,4 @@ public class WidgetEventPaneNoPop extends WidgetEventPane {
protected boolean isNewStyle() { protected boolean isNewStyle() {
return false; return false;
} }
@Override
protected void popupEditDialog(Point mousePos) {
// no pop, do nothing
}
} }

4
designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java

@ -55,14 +55,14 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
@Override @Override
protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) { protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
treeSettingPane.setValue(e.getDictionary()); treeSettingPane.setValue(e.getNodeOrDict());
treeRootPane.populate(e.getTreeAttr()); treeRootPane.populate(e.getTreeAttr());
} }
@Override @Override
protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() { protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() {
TreeComboBoxEditor editor = new TreeComboBoxEditor(); TreeComboBoxEditor editor = new TreeComboBoxEditor();
editor.setDictionary((Dictionary)treeSettingPane.getValue()); editor.setNodeOrDict(treeSettingPane.getValue());
editor.setTreeAttr(treeRootPane.update()); editor.setTreeAttr(treeRootPane.update());
return editor; return editor;
} }

4
designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
@Override @Override
protected void populateSubFieldEditorBean(TreeEditor e) { protected void populateSubFieldEditorBean(TreeEditor e) {
this.accessibleTreeModelEditor.setValue(e.getDictionary()); this.accessibleTreeModelEditor.setValue(e.getNodeOrDict());
treeRootPane.populate(e.getTreeAttr()); treeRootPane.populate(e.getTreeAttr());
if (this.removeRepeatCheckBox != null) { if (this.removeRepeatCheckBox != null) {
this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat()); this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat());
@ -40,7 +40,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
@Override @Override
protected TreeEditor updateSubFieldEditorBean() { protected TreeEditor updateSubFieldEditorBean() {
TreeEditor editor = new TreeEditor(); TreeEditor editor = new TreeEditor();
editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue()); editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
editor.setTreeAttr(treeRootPane.update()); editor.setTreeAttr(treeRootPane.update());
if (this.removeRepeatCheckBox != null) { if (this.removeRepeatCheckBox != null) {
editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected()); editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected());

7
designer_base/src/com/fr/design/condition/LiteConditionPane.java

@ -167,9 +167,6 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
TreePath selectedTreePath = conditionsTree.getSelectionPath(); TreePath selectedTreePath = conditionsTree.getSelectionPath();
if (selectedTreePath == null) { if (selectedTreePath == null) {
// 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
formulaTextArea.setText(StringUtils.EMPTY);
return; return;
} }
@ -856,6 +853,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition())); rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition()));
rootTreeNode.removeAllChildren(); rootTreeNode.removeAllChildren();
// 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
formulaTextArea.setText(StringUtils.EMPTY);
// peter:需要构建成ListCondition,加入到里面. // peter:需要构建成ListCondition,加入到里面.
if (liteCondition instanceof ListCondition) { if (liteCondition instanceof ListCondition) {
ListCondition listCondition = (ListCondition) liteCondition; ListCondition listCondition = (ListCondition) liteCondition;

14
designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@ -27,22 +27,17 @@ import java.awt.event.WindowEvent;
public abstract class UIControlPane extends BasicPane implements UnrepeatedNameHelper { public abstract class UIControlPane extends BasicPane implements UnrepeatedNameHelper {
protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30
protected JPanel controlUpdatePane; protected JPanel controlUpdatePane;
private ShortCut4JControlPane[] shorts; private ShortCut4JControlPane[] shorts;
private NameableCreator[] creators; private NameableCreator[] creators;
private ToolBarDef toolbarDef; private ToolBarDef toolbarDef;
private UIToolbar toolBar; private UIToolbar toolBar;
private UIToolbar topToolBar; private UIToolbar topToolBar;
protected PopupEditDialog popupEditDialog; protected PopupEditDialog popupEditDialog;
// peter:这是整体的一个cardLayout Pane // peter:这是整体的一个cardLayout Pane
protected CardLayout cardLayout; protected CardLayout cardLayout;
protected JPanel cardPane; protected JPanel cardPane;
protected BasePlot plot; protected BasePlot plot;
public UIControlPane() { public UIControlPane() {
this.initComponentPane(); this.initComponentPane();
} }
@ -128,8 +123,15 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
this.add(getLeftPane(), BorderLayout.CENTER); this.add(getLeftPane(), BorderLayout.CENTER);
this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 15)); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 15));
} else { } else {
// 增加边框
JPanel leftPaneWrapper = new JPanel(new BorderLayout());
leftPaneWrapper.add(getLeftPane(), BorderLayout.CENTER);
leftPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
JPanel rightPaneWrapper = new JPanel(new BorderLayout());
rightPaneWrapper.add(cardPane, BorderLayout.CENTER);
rightPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
// SplitPane // SplitPane
JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftPaneWrapper, rightPaneWrapper);
mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
mainSplitPane.setOneTouchExpandable(true); mainSplitPane.setOneTouchExpandable(true);
this.add(mainSplitPane, BorderLayout.CENTER); this.add(mainSplitPane, BorderLayout.CENTER);

4
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -390,7 +390,8 @@ public abstract class UIListControlPane extends UIControlPane {
} }
} }
protected void popupEditDialog(Point mousePos) { private void popupEditDialog(Point mousePos) {
if (isNewStyle()) {
Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex); Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) { if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) {
return; return;
@ -398,6 +399,7 @@ public abstract class UIListControlPane extends UIControlPane {
popupEditDialog.setLocation(getPopupDialogLocation()); popupEditDialog.setLocation(getPopupDialogLocation());
popupEditDialog.setVisible(true); popupEditDialog.setVisible(true);
} }
}
private Point getPopupDialogLocation() { private Point getPopupDialogLocation() {
Point resultPos = new Point(0, 0); Point resultPos = new Point(0, 0);

7
designer_base/src/com/fr/design/mainframe/JTemplate.java

@ -890,6 +890,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
*/ */
public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider); public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
/**
* 返回当前支持的超链界面pane
* 没有悬浮弹窗显示为两列
* @return 超链连接界面
*/
public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
/** /**
* 是否是图表 * 是否是图表
* *

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -197,7 +197,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
} }
protected JPanel createLineStylePane(double[] row, double[] col){ protected JPanel createLineStylePane(double[] row, double[] col){
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineStyle = createLineComboBox();
axisLineColor = new ColorSelectBox(100); axisLineColor = new ColorSelectBox(100);
String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"),Inter.getLocText("Plugin-ChartF_Close")}; String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"),Inter.getLocText("Plugin-ChartF_Close")};
AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
@ -208,6 +208,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel);
} }
protected LineComboBox createLineComboBox() {
return new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
}
protected Component[][] getLineStylePaneComponents() { protected Component[][] getLineStylePaneComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{null,null} , new Component[]{null,null} ,

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java

@ -1,11 +1,13 @@
package com.fr.plugin.chart.designer.style.axis.radar; package com.fr.plugin.chart.designer.style.axis.radar;
import com.fr.design.gui.icombobox.LineComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.style.axis.VanChartBaseAxisPane; import com.fr.plugin.chart.designer.style.axis.VanChartBaseAxisPane;
import com.fr.stable.CoreConstants;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -40,4 +42,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane {
new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor},
}; };
} }
protected LineComboBox createLineComboBox() {
return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
}
} }

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java

@ -1,6 +1,7 @@
package com.fr.plugin.chart.designer.style.axis.radar; package com.fr.plugin.chart.designer.style.axis.radar;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icombobox.LineComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
@ -10,6 +11,7 @@ import com.fr.plugin.chart.attr.axis.VanChartValueAxis;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.style.axis.VanChartValueAxisPane; import com.fr.plugin.chart.designer.style.axis.VanChartValueAxisPane;
import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutSecTick; import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutSecTick;
import com.fr.stable.CoreConstants;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -43,6 +45,10 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
} }
protected LineComboBox createLineComboBox() {
return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
}
protected JPanel createMinMaxValuePane(double[] row, double[] col) { protected JPanel createMinMaxValuePane(double[] row, double[] col) {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;

3
designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java

@ -7,7 +7,6 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.FRLogger; import com.fr.general.FRLogger;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartTools;
import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane;
import com.fr.plugin.chart.map.MapIndependentVanChart; import com.fr.plugin.chart.map.MapIndependentVanChart;
@ -116,7 +115,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
Plot plot = chart.getPlot(); Plot plot = chart.getPlot();
if(plot instanceof VanChartMapPlot) { if(plot instanceof VanChartMapPlot) {
sourceChoosePane.updateBean((VanChartMapPlot) plot); sourceChoosePane.updateBean((VanChartMapPlot) plot);
if(typeChanged && samePlot){ if(!samePlot || (typeChanged && samePlot)){
resetAttr(plot); resetAttr(plot);
} }
} }

5
designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@ -567,8 +567,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
} }
private void resetViewCenter(VanChartMapPlot mapPlot) { private void resetViewCenter(VanChartMapPlot mapPlot) {
mapPlot.getViewCenter().setAuto(true); mapPlot.setViewCenter(new ViewCenter());
viewCenterCom.setSelectedIndex(0); viewCenterCom.setSelectedIndex(0);
longitude.setValue(0);
latitude.setValue(0);
longAndLatPane.setVisible(false);
} }
private void resetZoomLevel(VanChartMapPlot mapPlot) { private void resetZoomLevel(VanChartMapPlot mapPlot) {

4
designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java

@ -39,7 +39,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI
//主题色 //主题色
private Color subColor; private Color subColor;
private int max = 154; private int max = 150;
private int min = 4; private int min = 4;
//选中的颜色 //选中的颜色
@ -77,7 +77,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI
iniListener(); iniListener();
this.setPreferredSize(new Dimension(10 + max, MAX_VERTICAL)); this.setPreferredSize(new Dimension(5 + max, MAX_VERTICAL));
} }
private void initColorsAndDist() { private void initColorsAndDist() {

2
designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java

@ -12,7 +12,7 @@ import com.fr.js.EmailJavaScript;
public class FormHyperlinkGroupPane extends HyperlinkGroupPane{ public class FormHyperlinkGroupPane extends HyperlinkGroupPane{
private static FormHyperlinkGroupPane singleton; private static FormHyperlinkGroupPane singleton;
private FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { protected FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
super(hyperlinkGroupPaneActionProvider); super(hyperlinkGroupPaneActionProvider);
} }

26
designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java

@ -0,0 +1,26 @@
package com.fr.design.gui.xpane;
import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
/**
* Created by plough on 2017/9/5.
*/
public class FormHyperlinkGroupPaneNoPop extends FormHyperlinkGroupPane{
private static FormHyperlinkGroupPaneNoPop singleton;
private FormHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
super(hyperlinkGroupPaneActionProvider);
}
public static FormHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
if (singleton == null) {
singleton = new FormHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider);
}
return singleton;
}
@Override
protected boolean isNewStyle() {
return false;
}
}

7
designer_form/src/com/fr/design/mainframe/JForm.java

@ -22,6 +22,7 @@ import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.xpane.FormHyperlinkGroupPane; import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction; import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction;
import com.fr.design.mainframe.actions.FormMobileAttrAction; import com.fr.design.mainframe.actions.FormMobileAttrAction;
@ -147,10 +148,16 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
* *
* @return 超链连接界面 * @return 超链连接界面
*/ */
@Override
public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
return FormHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider); return FormHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider);
} }
@Override
public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
return FormHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider);
}
//表单返回 FORM_TAB or ELEMENTCASE_TAB //表单返回 FORM_TAB or ELEMENTCASE_TAB
public int getEditingReportIndex() { public int getEditingReportIndex() {
return this.index; return this.index;

6
designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java

@ -45,10 +45,8 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
public FreeButton updateSubButtonPane() { public FreeButton updateSubButtonPane() {
FreeButton freeButton = (FreeButton) creator.toData(); FreeButton freeButton = (FreeButton) creator.toData();
backgroundCompPane.update(freeButton); backgroundCompPane.update(freeButton);
FRFont frFont = freeButton.getFont(); FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
if(frFont != null){ freeButton.setFont(frFontPane.update(frFont));
frFontPane.update(frFont);
}
return freeButton; return freeButton;
} }
} }

4
designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
@Override @Override
protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) { protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
accessibleTreeModelEditor.setValue(e.getDictionary()); accessibleTreeModelEditor.setValue(e.getNodeOrDict());
formWidgetValuePane.populate(e); formWidgetValuePane.populate(e);
treeRootPane.populate(e.getTreeAttr()); treeRootPane.populate(e.getTreeAttr());
mutiSelect.setSelected(e.isMultipleSelection()); mutiSelect.setSelected(e.isMultipleSelection());
@ -88,7 +88,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
editor.setAjax(loadAsync.isSelected()); editor.setAjax(loadAsync.isSelected());
editor.setSelectLeafOnly(returnLeaf.isSelected()); editor.setSelectLeafOnly(returnLeaf.isSelected());
editor.setReturnFullPath(returnPath.isSelected()); editor.setReturnFullPath(returnPath.isSelected());
editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue()); editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
return editor; return editor;
} }

Loading…
Cancel
Save