Browse Source

Merge pull request #475 in DESIGN/design from ~NEIL/design-10:release/10.0 to feature/10.0

* commit '323b0402c5645f9f1a34be7096f19cba6c1bc4a0': (26 commits)
  冲突
  冲突
  formatter
  what happen?
  REPORT-11144
  CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
  REPORT-11201 权限管理中的国际化问题
  REPORT-11044 frm中选中块时,老是跳转
  REPORT-11026
  REPORT-11123 【10.0冒烟】表单预览国际化问题,点击没反应
  REPORT-11059 插入行策略,默认值设置为公式,修改公示后不能成功修改!!!
  revert
  冲突
  国家化修改
  REPORT-10676 9patch10, FR9.0设计器支持移动端预览效果
  无JIRA任务,使历史颜色存储最大值生效
  REPORT-11037 最近使用颜色只存不透明颜色
  REPORT-10935 & REPORT-10921
  REPORT-11000【10.0冒烟】插件安装的国际化问题
  REPORT-11000【10.0冒烟】插件的国际化问题
  ...
research/10.0
neil 6 years ago
parent
commit
349ec167f9
  1. 26
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 1
      designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
  3. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  4. 16
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
  5. 4
      designer-base/src/main/java/com/fr/design/extra/PluginUtils.java
  6. 2
      designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java
  7. 9
      designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java
  8. 10
      designer-base/src/main/java/com/fr/design/i18n/Toolkit.java
  9. 3
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  10. 47
      designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java
  11. 2
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  12. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Design_Report_Poly_Report_Block.png
  13. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png
  14. 0
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png
  15. 0
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png
  16. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png
  17. 0
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png
  18. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png
  19. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png
  20. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png
  21. 0
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png
  22. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png
  23. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png
  24. 0
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png
  25. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png
  26. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png
  27. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png
  28. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
  29. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java
  30. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
  31. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
  32. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
  33. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
  34. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java
  35. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
  36. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
  37. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
  38. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
  39. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java
  40. 8
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
  41. 2
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java
  42. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java
  43. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java
  44. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
  45. 14
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java
  46. 4
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
  47. 2
      designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java
  48. 24
      designer-form/src/main/java/com/fr/design/designer/creator/XButton.java
  49. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
  50. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java
  51. 18
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
  52. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java
  53. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java
  54. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java
  55. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
  56. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java
  57. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java
  58. 10
      designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java
  59. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
  60. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java
  61. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
  62. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java
  63. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java
  64. 16
      designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
  65. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
  66. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java
  67. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java
  68. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java
  69. 2
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
  70. 10
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
  71. 2
      designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java
  72. 2
      designer-form/src/main/java/com/fr/design/form/util/XCreatorConstants.java
  73. 9
      designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
  74. 2
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
  75. 4
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  76. 1
      designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

26
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -1,6 +1,7 @@
package com.fr.design.actions.file; package com.fr.design.actions.file;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.config.Configuration;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper; import com.fr.design.RestartHelper;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
@ -28,6 +29,8 @@ import com.fr.general.Inter;
import com.fr.general.log.Log4jConfig; import com.fr.general.log.Log4jConfig;
import com.fr.locale.InterProviderFactory; import com.fr.locale.InterProviderFactory;
import com.fr.third.apache.log4j.Level; import com.fr.third.apache.log4j.Level;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -347,8 +350,17 @@ public class PreferencePane extends BasicPane {
logLevelPane.add(logLevelComboBox); logLevelPane.add(logLevelComboBox);
logLevelComboBox.addActionListener(new ActionListener() { logLevelComboBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Configurations.update(new Worker() {
@Override
public void run() {
Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem());
}
Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem()); @Override
public Class<? extends Configuration>[] targets() {
return new Class[]{Log4jConfig.class};
}
});
} }
}); });
} }
@ -635,7 +647,17 @@ public class PreferencePane extends BasicPane {
designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50); designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
} }
Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem())); Configurations.update(new Worker() {
@Override
public void run() {
Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem()));
}
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{Log4jConfig.class};
}
});
} }

1
designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

@ -9,7 +9,6 @@ import com.fr.design.utils.DesignUtils;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.general.web.ParameterConstants;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import com.fr.stable.web.AbstractWebletCreator; import com.fr.stable.web.AbstractWebletCreator;

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@ -102,8 +102,10 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
message.setText(database.connectMessage(connect)); message.setText(database.connectMessage(connect));
if (connect) { if (connect) {
uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
}else{ }else{
uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
} }
} catch (Exception exp) { } catch (Exception exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

16
designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@ -344,8 +344,24 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
* *
* @param listener 观察者监听事件 * @param listener 观察者监听事件
*/ */
@Override
public void registerNameListener(GlobalNameListener listener) { public void registerNameListener(GlobalNameListener listener) {
globalNameListener = listener; globalNameListener = listener;
for (Editor card : cards) {
doLoop(card, listener);
}
}
private void doLoop(Container card, GlobalNameListener listener) {
for (int i = 0, len = card.getComponentCount(); i < len; i++) {
Component tmpComp = card.getComponent(i);
if (tmpComp instanceof Container) {
doLoop((Container) tmpComp, listener);
}
if (tmpComp instanceof GlobalNameObserver) {
((GlobalNameObserver) tmpComp).registerNameListener(listener);
}
}
} }
/** /**

4
designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@ -2,7 +2,6 @@ package com.fr.design.extra;
import com.fr.base.TemplateUtils; import com.fr.base.TemplateUtils;
import com.fr.general.CloudCenter; import com.fr.general.CloudCenter;
import com.fr.general.http.HttpClient; import com.fr.general.http.HttpClient;
import com.fr.json.JSONArray; import com.fr.json.JSONArray;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
@ -18,6 +17,7 @@ import com.fr.stable.EncodeConstants;
import com.fr.stable.ProductConstants; import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@ -172,7 +172,7 @@ public class PluginUtils {
return ""; return "";
} }
return com.fr.design.i18n.Toolkit.i18nText(getInterKeyByErrorCode(errorCode)); return com.fr.design.i18n.Toolkit.i18nCompatibleServerText(getInterKeyByErrorCode(errorCode));
} }
private static String getInterKeyByErrorCode(PluginErrorCode errorCode) { private static String getInterKeyByErrorCode(PluginErrorCode errorCode) {

2
designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java

@ -11,7 +11,7 @@ import java.util.Map;
* @since 8.0 * @since 8.0
* 自定义预览方式接口 * 自定义预览方式接口
*/ */
public interface PreviewProvider extends Mutable{ public interface PreviewProvider extends Mutable {
String MARK_STRING = "PreviewProvider"; String MARK_STRING = "PreviewProvider";

9
designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java

@ -24,7 +24,14 @@ public abstract class ObjectJControlPane extends JListControlPane {
@Override @Override
public BasicBeanPane createPaneByCreators(NameableCreator creator) { public BasicBeanPane createPaneByCreators(NameableCreator creator) {
try { try {
return Reflect.on(creator.getUpdatePane()).create(object).get(); Class target = creator.getUpdatePane();
Reflect reflect = Reflect.on(target);
// 判断是否存在对应构造函数
if (reflect.matchConstructor(object)) {
return reflect.create(object).get();
}
return reflect.create().get();
} catch (Exception e) { } catch (Exception e) {
return super.createPaneByCreators(creator); return super.createPaneByCreators(creator);
} }

10
designer-base/src/main/java/com/fr/design/i18n/Toolkit.java

@ -37,4 +37,14 @@ public class Toolkit {
public static String i18nTextArray(String[] keys) { public static String i18nTextArray(String[] keys) {
return InterProviderFactory.getProvider().getLocText(keys); return InterProviderFactory.getProvider().getLocText(keys);
} }
/**
* 兼容设计器里插件管理的部分
* 下一个版本将会废弃
*
* @deprecated
*/
public static String i18nCompatibleServerText(String key) {
return InterProviderFactory.getProvider().getLocText(key);
}
} }

3
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -16,6 +16,7 @@ import com.fr.design.actions.edit.RedoAction;
import com.fr.design.actions.edit.UndoAction; import com.fr.design.actions.edit.UndoAction;
import com.fr.design.actions.file.SaveAsTemplateAction; import com.fr.design.actions.file.SaveAsTemplateAction;
import com.fr.design.actions.file.SaveTemplateAction; import com.fr.design.actions.file.SaveTemplateAction;
import com.fr.design.actions.file.WebPreviewUtils;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.designer.TargetComponent; import com.fr.design.designer.TargetComponent;
import com.fr.design.dialog.InformationWarnPane; import com.fr.design.dialog.InformationWarnPane;
@ -1101,6 +1102,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* @param provider 预览模式 * @param provider 预览模式
*/ */
public void previewMenuActionPerformed(PreviewProvider provider) { public void previewMenuActionPerformed(PreviewProvider provider) {
setPreviewType(provider);
WebPreviewUtils.preview(this, provider);
} }

47
designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java

@ -5,8 +5,7 @@ import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLReadable;
import com.fr.stable.xml.XMLableReader; import com.fr.stable.xml.XMLableReader;
import java.awt.*; import java.awt.Color;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -17,10 +16,9 @@ import java.util.List;
*/ */
public class ColorSelectConfigManager implements XMLReadable { public class ColorSelectConfigManager implements XMLReadable {
// 最近使用的颜色个数 // 最大存储的最近使用的颜色个数
private int colorNums = 20; private int colorNum = 20;
private boolean init = true;
// 最近使用颜色 // 最近使用颜色
private List<Color> colors = new ArrayList<Color>(); private List<Color> colors = new ArrayList<Color>();
private static final String RECENT_COLOR_TAG = "RecentColors"; private static final String RECENT_COLOR_TAG = "RecentColors";
@ -33,35 +31,30 @@ public class ColorSelectConfigManager implements XMLReadable {
} }
public int getColorNum() { public int getColorNum() {
return colorNums; return colorNum;
} }
public void setColorNum(int colorNums) { public void setColorNum(int colorNum) {
this.colorNums = colorNums; this.colorNum = colorNum;
} }
/** /**
* 添加颜色到最近使用队列中 * 添加颜色到最近使用队列中
* *
* @param color 颜色 * @param color 颜色
*/ */
public void addToColorQueue(Color color) { public void addToColorQueue(Color color) {
if(color == null){
// 将透明度不为 0% 的 颜色去掉
if (color == null || color.getAlpha() != 0xff) {
return; return;
} }
// 过滤重复的最近使用颜色 // 过滤重复的最近使用颜色
// 因为有个后进先出的问题,最近使用的颜色需要放到最前面所以没用set // 最近使用的颜色需要放到"最前面","最前面"是在面板部分做的,是 colors 的逆序,因此保证最新的放在 list 的最后,
if (colors.contains(color)) { colors.remove(color);
colors.remove(color);
}
colors.add(color); colors.add(color);
/*@author yaohwu*/
//将历史颜色信息保存到xml文件中去
if (colors != null && !colors.isEmpty()) {
this.setColorsToFile(colors);
}
} }
public void readXML(XMLableReader reader) { public void readXML(XMLableReader reader) {
@ -71,8 +64,11 @@ public class ColorSelectConfigManager implements XMLReadable {
String tagName = reader.getTagName(); String tagName = reader.getTagName();
if (reader.isChildNode()) { if (reader.isChildNode()) {
if (ComparatorUtils.equals(COLOR_TAG, tagName)) { if (ComparatorUtils.equals(COLOR_TAG, tagName)) {
Color color = null; Color color = reader.getAttrAsColor("colors", null);
colors.add(reader.getAttrAsColor("colors", color)); // 将透明度不为 0% 的 颜色去掉
if (color != null && color.getAlpha() == 0xff) {
colors.add(color);
}
} }
} }
} }
@ -82,11 +78,18 @@ public class ColorSelectConfigManager implements XMLReadable {
public void writeXML(XMLPrintWriter writer) { public void writeXML(XMLPrintWriter writer) {
writer.startTAG(RECENT_COLOR_TAG); writer.startTAG(RECENT_COLOR_TAG);
if (this.colors != null && !this.colors.isEmpty()) { if (this.colors != null && !this.colors.isEmpty()) {
for (int i = 0; i < this.colors.size(); i++) { // 只应该存储 max 个,其他颜色存了也没用
// 从 colors 的尾部开始计算,从尾往头数 max 个,但是存储的时候还是要从头往尾
int size = colors.size();
int beginIndex = size > colorNum ? size - colorNum : 0;
for (int i = beginIndex; i < this.colors.size(); i++) {
writer.startTAG(COLOR_TAG); writer.startTAG(COLOR_TAG);
writer.attr("colors", colors.get(i).getRGB()); writer.attr("colors", colors.get(i).getRGB());
writer.end(); writer.end();
} }
} }
writer.end(); writer.end();
} }

2
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -44,7 +44,7 @@ public abstract class CustomJobPane extends BasicBeanPane {
UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
editButton.setPreferredSize(new Dimension( editButton.setPreferredSize(new Dimension(
GraphHelper.getLocTextWidth("Fine-Design_Basic_Edit") + 20, GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20,
classNameTextField.getPreferredSize().height)); classNameTextField.getPreferredSize().height));
reportletNamePane.add(browserButton); reportletNamePane.add(browserButton);

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Design_Report_Poly_Report_Block.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

0
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png → designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

0
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png → designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 144 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 B

0
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png → designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

0
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png → designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 548 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 861 B

0
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png → designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png

Before

Width:  |  Height:  |  Size: 718 B

After

Width:  |  Height:  |  Size: 718 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1002 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
* @return 返回标题. * @return 返回标题.
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
} }

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java

@ -58,7 +58,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
JPanel categoryPane = new JPanel(new BorderLayout(4, 0)); JPanel categoryPane = new JPanel(new BorderLayout(4, 0));
categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category"));
categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT));
addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java

@ -41,7 +41,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
categoryCombox = new UIComboBox(); categoryCombox = new UIComboBox();
JPanel categoryPane = new JPanel(new BorderLayout(4,0)); JPanel categoryPane = new JPanel(new BorderLayout(4,0));
categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")) ; UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ;
label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
categoryCombox.setPreferredSize(new Dimension(100,20)); categoryCombox.setPreferredSize(new Dimension(100,20));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java

@ -25,7 +25,7 @@ import java.util.List;
* @version 创建时间2012-12-21 下午04:51:50 * @version 创建时间2012-12-21 下午04:51:50
*/ */
public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane { public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane {
private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"); private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name");
private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value"); private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value");
private UIComboBox nameBox; private UIComboBox nameBox;

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java

@ -96,7 +96,7 @@ public class ChartDatapointLabelPane extends BasicPane{
boolean isGuidline = plot.isSupportLeadLine(); boolean isGuidline = plot.isSupportLeadLine();
if(plot.isSupportCategoryFilter()) { if(plot.isSupportCategoryFilter()) {
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name")); isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name"));
} }
isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java

@ -108,7 +108,7 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {
valueTextAttrPane = new ChartTextAttrNoColorPane(); valueTextAttrPane = new ChartTextAttrNoColorPane();
unitTextAttrPane = new ChartTextAttrNoColorPane(); unitTextAttrPane = new ChartTextAttrNoColorPane();
cateTextAttrPane = new ChartTextAttrNoColorPane(); cateTextAttrPane = new ChartTextAttrNoColorPane();
categoryName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); categoryName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name"));
categoryName.setSelected(true); categoryName.setSelected(true);
categoryName.addActionListener(new ActionListener() { categoryName.addActionListener(new ActionListener() {
@Override @Override

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java

@ -46,7 +46,7 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{stylePane, null}, new Component[]{stylePane, null},
new Component[]{new JSeparator(), null}, new Component[]{new JSeparator(), null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}
} ; } ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java

@ -248,7 +248,7 @@ public class CustomDefaultSeriesPane extends BasicPane{
double[] columnSize = { p, f }; double[] columnSize = { p, f };
double[] rowSize = { p,p,p,p}; double[] rowSize = { p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
@ -317,7 +317,7 @@ public class CustomDefaultSeriesPane extends BasicPane{
double[] columnSize = { p,f }; double[] columnSize = { p,f };
double[] rowSize = { p,p }; double[] rowSize = { p,p };
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}
}; };

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java

@ -383,7 +383,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane<CustomAttr>{
double[] rowSize = { p,p,p }; double[] rowSize = { p,p,p };
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{positionPane, null}, new Component[]{positionPane, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}
}; };
@ -457,7 +457,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane<CustomAttr>{
double[] rowSize = { p,p,p,p,p}; double[] rowSize = { p,p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{positionPane, null}, new Component[]{positionPane, null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java

@ -57,7 +57,7 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{
double[] columnSize = { p, f }; double[] columnSize = { p, f };
double[] rowSize = { p,p,p,p,p,p,p}; double[] rowSize = { p,p,p,p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java

@ -54,8 +54,8 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{
double[] columnSize = { p, f }; double[] columnSize = { p, f };
double[] rowSize = { p,p,p,p,p}; double[] rowSize = { p,p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Type")),lineStyle },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak}
} ; } ;

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java

@ -52,14 +52,14 @@ public class StockSeriesPane extends AbstractPlotSeriesPane {
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), upBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), upBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Background")), upBackColor},
new Component[]{new JSeparator(),null}, new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Bar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Bar_Border_Style_And_Color")), null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), downBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), downBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Background")), downBackColor},
} ; } ;
JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

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

@ -26,7 +26,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
protected void initComponents() { protected void initComponents() {
String[] labels = fieldLabel(); String[] labels = fieldLabel();
TinyFormulaPane[] formulaPanes = formulaPanes(); Component[] formulaPanes = fieldComponents();
int len = Math.min(labels.length, formulaPanes.length); int len = Math.min(labels.length, formulaPanes.length);
@ -42,13 +42,17 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
Arrays.fill(rowSize, p); Arrays.fill(rowSize, p);
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15)); panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }
protected Component[] fieldComponents() {
return formulaPanes();
}
protected abstract String[] fieldLabel(); protected abstract String[] fieldLabel();
protected abstract TinyFormulaPane[] formulaPanes(); protected abstract TinyFormulaPane[] formulaPanes();

2
designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java

@ -47,7 +47,7 @@ public abstract class AbstractExtendedChartTableDataPane<T extends AbstractDataC
if (hasFunction()) { if (hasFunction()) {
function = new CalculateComboBox(); function = new CalculateComboBox();
components[len] = new Component[]{new UILabel("function", SwingConstants.LEFT), function}; components[len] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), function};
} }
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

6
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java

@ -3,7 +3,6 @@ package com.fr.van.chart.designer.component;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.base.VanChartAttrMarker;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
@ -25,7 +24,7 @@ public class VanChartMarkerPane extends BasicPane {
private JPanel centerPane; private JPanel centerPane;
private CardLayout cardLayout; private CardLayout cardLayout;
private BasicBeanPane commonMarkerPane; private VanChartCommonMarkerPane commonMarkerPane;
private BasicBeanPane imageMarkerPane; private BasicBeanPane imageMarkerPane;
@ -75,7 +74,7 @@ public class VanChartMarkerPane extends BasicPane {
return new VanChartImageMarkerPane(); return new VanChartImageMarkerPane();
} }
protected BasicBeanPane<VanChartAttrMarker> createCommonMarkerPane() { protected VanChartCommonMarkerPane createCommonMarkerPane() {
return new VanChartCommonMarkerPane(){ return new VanChartCommonMarkerPane(){
protected double[] getcolumnSize () { protected double[] getcolumnSize () {
double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
@ -111,6 +110,7 @@ public class VanChartMarkerPane extends BasicPane {
commonMarkerPane.populateBean(marker); commonMarkerPane.populateBean(marker);
} else { } else {
imageMarkerPane.populateBean(marker); imageMarkerPane.populateBean(marker);
commonMarkerPane.setDefaultValue();
} }
checkCenterPane(); checkCenterPane();

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java

@ -18,6 +18,6 @@ public class CategoryNameFormatPaneWithCheckBox extends VanChartFormatPaneWithCh
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name");
} }
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

@ -6,7 +6,6 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.xcombox.MarkerComboBox; import com.fr.design.gui.xcombox.MarkerComboBox;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.base.VanChartAttrMarker;
import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.plugin.chart.marker.type.MarkerType;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@ -154,6 +153,9 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
return "commonMarker"; return "commonMarker";
} }
public void setDefaultValue() {
}
@Override @Override
public void populateBean(VanChartAttrMarker marker) { public void populateBean(VanChartAttrMarker marker) {
if(marker == null){ if(marker == null){

14
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java

@ -4,11 +4,11 @@ import com.fr.base.background.ColorBackground;
import com.fr.chart.chartglyph.Marker; import com.fr.chart.chartglyph.Marker;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent;
import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.base.VanChartAttrMarker;
import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.plugin.chart.marker.type.MarkerType;
import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
import java.awt.Color;
import java.awt.Component; import java.awt.Component;
/** /**
@ -44,6 +44,16 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane {
@Override @Override
protected void updateColor(VanChartAttrMarker marker) { protected void updateColor(VanChartAttrMarker marker) {
marker.setColorBackground(ColorBackground.getInstance(colorSelect.getSelectObject())); Color color = colorSelect.getSelectObject();
color = color == null ? new Color(248, 182, 44) : color;
marker.setColorBackground(ColorBackground.getInstance(color));
}
@Override
public void setDefaultValue() {
getMarkerPane().setSelectedMarker(Marker.createMarker(MarkerType.MARKER_STAR));
colorSelect.setSelectObject(new Color(248, 182, 44));
} }
} }

4
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java

@ -9,12 +9,12 @@ import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent;
import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.base.VanChartAttrMarker;
import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.plugin.chart.gantt.VanChartGanttPlot;
import com.fr.stable.CoreConstants; import com.fr.stable.CoreConstants;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.designer.component.VanChartMarkerPane; import com.fr.van.chart.designer.component.VanChartMarkerPane;
import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane; import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -82,7 +82,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
protected JPanel createMarkerPane() { protected JPanel createMarkerPane() {
markerPane = new VanChartMarkerPane(){ markerPane = new VanChartMarkerPane(){
@Override @Override
protected BasicBeanPane<VanChartAttrMarker> createCommonMarkerPane() { protected VanChartCommonMarkerPane createCommonMarkerPane() {
return new VanChartGanttCommonMarkerPane(); return new VanChartGanttCommonMarkerPane();
} }

2
designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java

@ -138,7 +138,7 @@ public class CompositeComponentAdapter implements ComponentAdapter {
public void adjustGroupNamesPosition(ArrayList<String> groupNames){ public void adjustGroupNamesPosition(ArrayList<String> groupNames){
for(String groupName : groupNames){ for(String groupName : groupNames){
if(groupName.equals("Form-Basic_Properties")){ if(groupName.equals("Fine-Design_Basic_Form_Basic_Properties")){
groupNames.remove(groupName); groupNames.remove(groupName);
groupNames.add(0,groupName); groupNames.add(0,groupName);
break; break;

24
designer-form/src/main/java/com/fr/design/designer/creator/XButton.java

@ -90,28 +90,28 @@ public class XButton extends XWidgetCreator {
protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{
CRPropertyDescriptor[] crPropertyDescriptors = { CRPropertyDescriptor[] crPropertyDescriptors = {
new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")) new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"))
.setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")) new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))
.setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("hotkeys", this.data.getClass()) new CRPropertyDescriptor("hotkeys", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setEditorClass(ShortCutTextEditor.class) .setEditorClass(ShortCutTextEditor.class)
}; };
@ -163,7 +163,7 @@ public class XButton extends XWidgetCreator {
return new CRPropertyDescriptor[]{ return new CRPropertyDescriptor[]{
new CRPropertyDescriptor("text", this.data.getClass()) new CRPropertyDescriptor("text", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -173,7 +173,7 @@ public class XButton extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -183,10 +183,10 @@ public class XButton extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")) new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))
.setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName( new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setEditorClass(ShortCutTextEditor.class) .setEditorClass(ShortCutTextEditor.class)

2
designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@ -115,7 +115,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
}), }),
new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
WLayoutBorderStyleEditor.class).setI18NName( WLayoutBorderStyleEditor.class).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override

6
designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java

@ -30,7 +30,7 @@ public class XCheckBox extends XWidgetCreator {
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] {
new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")) new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -40,7 +40,7 @@ public class XCheckBox extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -53,7 +53,7 @@ public class XCheckBox extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize")
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}); });
} }

18
designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java

@ -35,10 +35,10 @@ public class XCheckBoxGroup extends XFieldEditor {
CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] {
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")},super.supportedDescriptor());
CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
return properties; return properties;
} }
@ -46,26 +46,26 @@ public class XCheckBoxGroup extends XFieldEditor {
private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class),
new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName( new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") };
if (((CheckBoxGroup) this.toData()).isReturnString()) { if (((CheckBoxGroup) this.toData()).isReturnString()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] { crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] {
new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") });
} }
if (!((CheckBoxGroup) this.toData()).isAdaptive()) { if (!((CheckBoxGroup) this.toData()).isAdaptive()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
} }
return crp; return crp;
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java

@ -40,9 +40,9 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor {
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll( return (CRPropertyDescriptor[]) ArrayUtils.addAll(
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}, super.supportedDescriptor()); }, super.supportedDescriptor());
} }

8
designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java

@ -33,19 +33,19 @@ public class XComboCheckBox extends XComboBox {
"Advanced"), "Advanced"),
new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass(
InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")) InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] { .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") } : new CRPropertyDescriptor[] {
new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced"), "Advanced"),
new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") });
} }
@Override @Override

2
designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java

@ -61,7 +61,7 @@ public class XDateEditor extends XDirectWriteEditor {
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName( new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format")).setEditorClass(formatClass()).setRendererClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format")).setEditorClass(formatClass()).setRendererClass(
DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName( new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Start_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Start_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced").setEditorClass(DateRangeEditor.class), "Advanced").setEditorClass(DateRangeEditor.class),

6
designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java

@ -90,7 +90,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
}), }),
new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
WLayoutBorderStyleEditor.class).setI18NName( WLayoutBorderStyleEditor.class).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -100,10 +100,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
}), }),
new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class) new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}; };
CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor(); CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor();
return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraTableEditor); return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraTableEditor);

2
designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java

@ -34,7 +34,7 @@ public class XFileUploader extends XFieldEditor {
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("allowTypes", this.data.getClass()) new CRPropertyDescriptor("allowTypes", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}); });
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java

@ -43,10 +43,10 @@ public class XIframeEditor extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("overflowx", this.data.getClass()).setI18NName( new CRPropertyDescriptor("overflowx", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("overflowy", this.data.getClass()).setI18NName( new CRPropertyDescriptor("overflowy", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("parameters", this.data.getClass()) new CRPropertyDescriptor("parameters", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters")).setEditorClass(ParameterEditor.class) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters")).setEditorClass(ParameterEditor.class)
.setRendererClass(ParameterRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, .setRendererClass(ParameterRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,

10
designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java

@ -59,7 +59,7 @@ public class XLabel extends XWidgetCreator {
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(
WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -70,17 +70,17 @@ public class XLabel extends XWidgetCreator {
}), }),
new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName( new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Wrap_Text")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Wrap_Text")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName( new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")).setEditorClass(ItemCellEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")).setEditorClass(ItemCellEditor.class)
.setRendererClass(LabelHorizontalAlignmentRenderer.class).putKeyValue( .setRendererClass(LabelHorizontalAlignmentRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")) new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font"))
.setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}); XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")});
} }
@Override @Override

6
designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java

@ -66,7 +66,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")),
new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
WLayoutBorderStyleEditor.class).setI18NName( WLayoutBorderStyleEditor.class).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
@ -76,7 +76,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
}), }),
new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
}; };
} }
@ -99,7 +99,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException { public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException {
return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced");
} }
/** /**

6
designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java

@ -38,13 +38,13 @@ public class XMultiFileUploader extends XFieldEditor {
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("singleFile", this.data.getClass()) new CRPropertyDescriptor("singleFile", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Single_File_Upload")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Single_File_Upload"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("accept", this.data.getClass()) new CRPropertyDescriptor("accept", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("maxSize", this.data.getClass()) new CRPropertyDescriptor("maxSize", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}); });
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java

@ -44,7 +44,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
new CRPropertyDescriptor("widgetValue", this.data.getClass()) new CRPropertyDescriptor("widgetValue", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value"))
.setEditorClass(WidgetValueEditor.class) .setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")} .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")}
,super.supportedDescriptor()); ,super.supportedDescriptor());
CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass()) CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass())
.setEditorClass(InChangeBooleanEditor.class) .setEditorClass(InChangeBooleanEditor.class)
@ -71,7 +71,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),
new CRPropertyDescriptor("waterMark", this.data.getClass()) new CRPropertyDescriptor("waterMark", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) new CRPropertyDescriptor("regErrorMessage", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate") .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate")

8
designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java

@ -42,10 +42,10 @@ public class XRadioGroup extends XFieldEditor {
CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] {
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")},super.supportedDescriptor());
CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
return properties; return properties;
} }
@ -53,11 +53,11 @@ public class XRadioGroup extends XFieldEditor {
private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class)};
if (!toData().isAdaptive()) { if (!toData().isAdaptive()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
} }
return crp; return crp;
} }

2
designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java

@ -45,7 +45,7 @@ public class XTreeComboBoxEditor extends XTreeEditor {
protected CRPropertyDescriptor[] addWaterMark(CRPropertyDescriptor[] crp) throws IntrospectionException { protected CRPropertyDescriptor[] addWaterMark(CRPropertyDescriptor[] crp) throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( return (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
} }
protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{ protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{

16
designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java

@ -40,10 +40,10 @@ public class XTreeEditor extends XWidgetCreator {
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),
@ -54,10 +54,10 @@ public class XTreeEditor extends XWidgetCreator {
: new CRPropertyDescriptor[]{ : new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),}; XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),};
@ -66,10 +66,10 @@ public class XTreeEditor extends XWidgetCreator {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp,
new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize")
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName( crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)); XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class));
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName( crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
@ -79,9 +79,9 @@ public class XTreeEditor extends XWidgetCreator {
crp = this.addCustomData(crp); crp = this.addCustomData(crp);
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("selectLeafOnly", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("selectLeafOnly", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("returnFullPath", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("returnFullPath", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"));
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), crp); return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), crp);
} }

2
designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java

@ -74,7 +74,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")),
new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
WLayoutBorderStyleEditor.class).setI18NName( WLayoutBorderStyleEditor.class).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override

8
designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java

@ -61,16 +61,16 @@ public class XWParameterLayout extends XWAbsoluteLayout {
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")),
new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class) new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class)
.setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")) .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class) new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class)
.setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position")) .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("useParamsTemplate", this.data.getClass()).setEditorClass(BooleanEditor.class) new CRPropertyDescriptor("useParamsTemplate", this.data.getClass()).setEditorClass(BooleanEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
}; };
return ArrayUtils.addAll(propertyTableEditor, getExtraTableEditor()); return ArrayUtils.addAll(propertyTableEditor, getExtraTableEditor());

2
designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java

@ -57,7 +57,7 @@ public abstract class XWidgetCreator extends XCreator {
}), }),
new CRPropertyDescriptor("labelName", this.data.getClass(), "getLabelName", "setLabelName") new CRPropertyDescriptor("labelName", this.data.getClass(), "getLabelName", "setLabelName")
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}; };
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java

@ -26,8 +26,8 @@ public abstract class XWriteAbleRepeatEditor extends XDirectWriteEditor {
return (CRPropertyDescriptor[]) ArrayUtils.addAll( return (CRPropertyDescriptor[]) ArrayUtils.addAll(
super.supportedDescriptor(), super.supportedDescriptor(),
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
}); });
} }
} }

2
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@ -373,7 +373,7 @@ public class XWCardLayout extends XLayoutContainer {
}), }),
new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
CardTagWLayoutBorderStyleEditor.class).setI18NName( CardTagWLayoutBorderStyleEditor.class).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override

10
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@ -177,7 +177,7 @@ public class XWTabFitLayout extends XWFitLayout {
return new CRPropertyDescriptor[]{ return new CRPropertyDescriptor[]{
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@Override @Override
public void propertyChange() { public void propertyChange() {
@ -192,16 +192,16 @@ public class XWTabFitLayout extends XWFitLayout {
CRPropertyDescriptor[] crPropertyDescriptors = { CRPropertyDescriptor[] crPropertyDescriptors = {
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"),
new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced") XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
}; };
return crPropertyDescriptors[i]; return crPropertyDescriptors[i];
} }

2
designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@ -72,7 +72,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass()) CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass())
.setEditorClass(RefinedDoubleEditor.class) .setEditorClass(RefinedDoubleEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightpercent")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightpercent"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced");
ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties(); ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
defaultList.add(heightLimitProperty); defaultList.add(heightLimitProperty);
return defaultList.toArray(new CRPropertyDescriptor[defaultList.size()]); return defaultList.toArray(new CRPropertyDescriptor[defaultList.size()]);

2
designer-form/src/main/java/com/fr/design/form/util/XCreatorConstants.java

@ -19,7 +19,7 @@ public class XCreatorConstants {
public static final String WIDGETNAME = "widgetName"; public static final String WIDGETNAME = "widgetName";
// 描述属性的分类 // 描述属性的分类
public static final String PROPERTY_CATEGORY = "category"; public static final String PROPERTY_CATEGORY = "category";
public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties"; public static final String DEFAULT_GROUP_NAME = "Fine-Design_Basic_Form_Basic_Properties";
public static final String PROPERTY_VALIDATE = "Fine-Design_Basic_Validate"; public static final String PROPERTY_VALIDATE = "Fine-Design_Basic_Validate";
public static final Color FORM_BG = new Color(255, 255, 255); public static final Color FORM_BG = new Color(255, 255, 255);
// 拖拽标识块的大小 // 拖拽标识块的大小

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

@ -540,16 +540,16 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
layout(); layout();
if (isValid) { if (isValid) {
XLayoutContainer root = designer.getRootComponent(); 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)) { if (value == 0 && isScrollNotVisible(bar)) {
return; return;
} }
@ -560,12 +560,11 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
bar.setValue(0); bar.setValue(0);
bar.setEnabled(false); bar.setEnabled(false);
} else { } else {
//参数面板拖拽过程中value一直为当前value
int oldValue = verticalValue;
setScrollBarMax(value, bar); setScrollBarMax(value, bar);
bar.setEnabled(true); bar.setEnabled(true);
bar.setMaximum(value); bar.setMaximum(value);
bar.setValue(value); bar.setValue(value);
//参数面板拖拽过程中value一直为当前value
bar.setValue(oldValue); 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); this.remove(title);
// 如果是空值就说明采用服务器配置了 // 如果是空值就说明采用服务器配置了
if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) { 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(); populateServerSettings();
this.add(title, 0); this.add(title, 0);
return; return;

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

@ -10,7 +10,6 @@ import com.fr.design.DesignModelAdapter;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.actions.AllowAuthorityEditAction; import com.fr.design.actions.AllowAuthorityEditAction;
import com.fr.design.actions.ExitAuthorityEditAction; import com.fr.design.actions.ExitAuthorityEditAction;
import com.fr.design.actions.file.WebPreviewUtils;
import com.fr.design.actions.file.export.CSVExportAction; import com.fr.design.actions.file.export.CSVExportAction;
import com.fr.design.actions.file.export.EmbeddedExportExportAction; import com.fr.design.actions.file.export.EmbeddedExportExportAction;
import com.fr.design.actions.file.export.ExcelExportAction; import com.fr.design.actions.file.export.ExcelExportAction;
@ -924,8 +923,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
*/ */
@Override @Override
public void previewMenuActionPerformed(PreviewProvider provider) { public void previewMenuActionPerformed(PreviewProvider provider) {
setPreviewType(provider); super.previewMenuActionPerformed(provider);
WebPreviewUtils.preview(this, provider);
} }
/** /**

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

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

Loading…
Cancel
Save