Browse Source
* commit '0afa354f2f7e7acb674471f12c757cc8a1334d31': (33 commits) update update update REPORT-3980 [9.0一轮回归]单元格形态数据字典公式无法保存 REPORT-3981 [9.0一轮回归]插入行策略默认值设置后，切换到其他单元格选择默认值时不为空 修改代码质量 REPORT-3163 合作开发9.0设计器=>交互验收=》统一改成“事件” REPORT-3163 合作开发9.0设计器=>交互验收=》点击插入按钮，带指向箭头的弹窗被关闭了 REPORT-3163 合作开发9.0设计器=>交互验收=》用不到的属性面板不继承 REPORT-3163 合作开发9.0设计器=>控件设置事件编辑面板边框调整 REPORT-3163 合作开发9.0设计器=>弹出框不可用时，显示提示 REPORT-3163 合作开发9.0设计器=>交互验收=》修复一些bug REPORT-3163 合作开发9.0设计器=>交互验收=》弹出的属性面板被弹回后，其对应tab应为选中状态 REPORT-3163 合作开发9.0设计器=>交互验收=》属性面板弹出时，底部有一个表示可以缩放的控件 REPORT-3163 合作开发9.0设计器=>交互验收=》鼠标悬停时应无颜色变化 REPORT-3163 合作开发9.0设计器=>交互验收=》属性面板弹出时，应该有一个统一的固定位置 REPORT-3163 合作开发9.0设计器=>交互验收=》属性面板弹出时，应该加边框线 9.0新图表设置面板修改 特效面板修改，其中超链和条件显示的代码需要再整理整理 REPORT-3983 [9.0一轮回归]选中一片单元格，样式边框外边框、内边框显示异常 REPORT-3163 合作开发9.0设计器=>交互验收=》属性栏收起，没有tab是选中状态 REPORT-3163 合作开发9.0设计器=>交互验收=》继承 REPORT-2354 将原来存在finereportEnv中的登录信息移到config.xml中 ...master
xiaoxia
7 years ago
134 changed files with 1618 additions and 967 deletions
@ -0,0 +1,31 @@ |
|||||||
|
package com.fr.design.bbs; |
||||||
|
|
||||||
|
import com.fr.base.ConfigManager; |
||||||
|
import com.fr.base.FRContext; |
||||||
|
import com.fr.stable.StringUtils; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by ibm on 2017/8/21. |
||||||
|
*/ |
||||||
|
public class BBSLoginUtils { |
||||||
|
|
||||||
|
public static void bbsLogin(String username, String password){ |
||||||
|
try{ |
||||||
|
ConfigManager.getProviderInstance().setBbsUsername(username); |
||||||
|
ConfigManager.getProviderInstance().setBbsPassword(password); |
||||||
|
FRContext.getCurrentEnv().writeResource(ConfigManager.getProviderInstance()); |
||||||
|
}catch (Exception e){ |
||||||
|
FRContext.getLogger().error(e.getMessage()); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public static void bbsLogout(){ |
||||||
|
try{ |
||||||
|
ConfigManager.getProviderInstance().setBbsUsername(StringUtils.EMPTY); |
||||||
|
ConfigManager.getProviderInstance().setBbsPassword(StringUtils.EMPTY); |
||||||
|
FRContext.getCurrentEnv().writeResource(ConfigManager.getProviderInstance()); |
||||||
|
}catch (Exception e){ |
||||||
|
FRContext.getLogger().error(e.getMessage()); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,47 @@ |
|||||||
|
package com.fr.design.gui.itextfield; |
||||||
|
|
||||||
|
import java.awt.event.FocusEvent; |
||||||
|
import java.awt.event.FocusListener; |
||||||
|
import javax.swing.text.Document; |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* Created by ibm on 2017/8/16. |
||||||
|
*/ |
||||||
|
public class UIPropertyTextField extends UITextField{ |
||||||
|
|
||||||
|
public UIPropertyTextField() { |
||||||
|
super(); |
||||||
|
} |
||||||
|
|
||||||
|
public UIPropertyTextField(int columns) { |
||||||
|
super(columns); |
||||||
|
} |
||||||
|
|
||||||
|
public UIPropertyTextField(String text, int columns) { |
||||||
|
super(text, columns); |
||||||
|
} |
||||||
|
|
||||||
|
public UIPropertyTextField(String text) { |
||||||
|
super(text); |
||||||
|
} |
||||||
|
|
||||||
|
public UIPropertyTextField(Document doc, String text, int columns) { |
||||||
|
super(doc, text, columns); |
||||||
|
} |
||||||
|
|
||||||
|
protected void initListener() { |
||||||
|
if (shouldResponseChangeListener()) { |
||||||
|
addFocusListener(new FocusListener() { |
||||||
|
@Override |
||||||
|
public void focusGained(FocusEvent e) { |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void focusLost(FocusEvent e) { |
||||||
|
attributeChange(); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 177 B |
|
Before Width: | Height: | Size: 172 B After Width: | Height: | Size: 165 B |
@ -0,0 +1,84 @@ |
|||||||
|
package com.fr.plugin.chart.designer.other; |
||||||
|
|
||||||
|
import com.fr.base.chart.BasePlot; |
||||||
|
import com.fr.chart.chartattr.Plot; |
||||||
|
import com.fr.chart.chartglyph.ConditionAttr; |
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.design.gui.controlpane.NameObjectCreator; |
||||||
|
import com.fr.design.gui.controlpane.UnrepeatedNameHelper; |
||||||
|
import com.fr.design.gui.ilist.ListModelElement; |
||||||
|
import com.fr.general.Inter; |
||||||
|
import com.fr.general.NameObject; |
||||||
|
import com.fr.plugin.chart.designer.component.ConditionUIMenuNameableCreator; |
||||||
|
import com.fr.stable.Nameable; |
||||||
|
|
||||||
|
import java.lang.reflect.Constructor; |
||||||
|
import java.lang.reflect.InvocationTargetException; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by mengao on 2017/8/18. |
||||||
|
*/ |
||||||
|
public class ChartConditionNameObjectCreator extends NameObjectCreator { |
||||||
|
private BasePlot plot; |
||||||
|
private ConditionUIMenuNameableCreator conditionUIMenuNameableCreator; |
||||||
|
|
||||||
|
public ChartConditionNameObjectCreator(BasePlot plot, String menuName, Class clazz, Class<? extends BasicBeanPane> updatePane) { |
||||||
|
super(menuName, clazz, updatePane); |
||||||
|
this.plot = plot; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* create Nameable |
||||||
|
* |
||||||
|
* @param helper |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
public Nameable createNameable(UnrepeatedNameHelper helper) { |
||||||
|
Constructor<? extends ConditionUIMenuNameableCreator> constructor = null; |
||||||
|
try { |
||||||
|
constructor = clazzOfInitCase.getConstructor(Plot.class, String.class, Object.class, Class.class); |
||||||
|
ConditionUIMenuNameableCreator conditionUIMenuNameableCreator = constructor.newInstance(plot, Inter.getLocText("Chart-Condition_Attributes"), new ConditionAttr(), getUpdatePane()); |
||||||
|
return new NameObject(helper.createUnrepeatedName(this.menuName()), conditionUIMenuNameableCreator); |
||||||
|
|
||||||
|
} catch (NoSuchMethodException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (IllegalAccessException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (InstantiationException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (InvocationTargetException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @param ob |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
public Object acceptObject2Populate(Object ob) { |
||||||
|
if (ob instanceof NameObject) { |
||||||
|
ob = ((NameObject) ob).getObject(); |
||||||
|
} |
||||||
|
if (clazzOfObject != null && clazzOfObject.isInstance(ob)) { |
||||||
|
doSthChanged4Icon(ob); |
||||||
|
conditionUIMenuNameableCreator = (ConditionUIMenuNameableCreator) ((ConditionUIMenuNameableCreator) ob).clone(); |
||||||
|
return ob; |
||||||
|
} |
||||||
|
|
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* save update bean |
||||||
|
* |
||||||
|
* @param wrapper |
||||||
|
* @param bean |
||||||
|
*/ |
||||||
|
public void saveUpdatedBean(ListModelElement wrapper, Object bean) { |
||||||
|
conditionUIMenuNameableCreator.setObj(bean); |
||||||
|
((NameObject) wrapper.wrapper).setObject(conditionUIMenuNameableCreator); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,84 @@ |
|||||||
|
package com.fr.plugin.chart.designer.other; |
||||||
|
|
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.design.gui.controlpane.NameObjectCreator; |
||||||
|
import com.fr.design.gui.controlpane.UnrepeatedNameHelper; |
||||||
|
import com.fr.design.gui.ilist.ListModelElement; |
||||||
|
import com.fr.design.gui.imenutable.UIMenuNameableCreator; |
||||||
|
import com.fr.general.NameObject; |
||||||
|
import com.fr.stable.Nameable; |
||||||
|
|
||||||
|
import java.lang.reflect.Constructor; |
||||||
|
import java.lang.reflect.InvocationTargetException; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by mengao on 2017/8/21. |
||||||
|
*/ |
||||||
|
public class ChartHyperlinkNameObjectCreartor extends NameObjectCreator { |
||||||
|
private Object object; |
||||||
|
private UIMenuNameableCreator uIMenuNameableCreator; |
||||||
|
|
||||||
|
|
||||||
|
public ChartHyperlinkNameObjectCreartor(Object object, String menuName, Class clazz, Class<? extends BasicBeanPane> updatePane) { |
||||||
|
super(menuName, clazz, updatePane); |
||||||
|
this.object = object; |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* create Nameable |
||||||
|
* |
||||||
|
* @param helper |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
public Nameable createNameable(UnrepeatedNameHelper helper) { |
||||||
|
Constructor<? extends UIMenuNameableCreator> constructor = null; |
||||||
|
try { |
||||||
|
constructor = clazzOfInitCase.getConstructor(String.class, Object.class, Class.class); |
||||||
|
UIMenuNameableCreator uIMenuNameableCreator = constructor.newInstance(menuName, object, getUpdatePane()); |
||||||
|
return new NameObject(helper.createUnrepeatedName(this.menuName()), uIMenuNameableCreator); |
||||||
|
|
||||||
|
} catch (NoSuchMethodException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (IllegalAccessException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (InstantiationException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (InvocationTargetException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @param ob |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
public Object acceptObject2Populate(Object ob) { |
||||||
|
if (ob instanceof NameObject) { |
||||||
|
ob = ((NameObject) ob).getObject(); |
||||||
|
} |
||||||
|
if (clazzOfObject != null && clazzOfObject.isInstance(ob)) { |
||||||
|
doSthChanged4Icon(ob); |
||||||
|
uIMenuNameableCreator = ((UIMenuNameableCreator) ob).clone(); |
||||||
|
if (uIMenuNameableCreator.getObj() != null && object.getClass().isInstance(uIMenuNameableCreator.getObj())) { |
||||||
|
return ob; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* save update bean |
||||||
|
* |
||||||
|
* @param wrapper |
||||||
|
* @param bean |
||||||
|
*/ |
||||||
|
public void saveUpdatedBean(ListModelElement wrapper, Object bean) { |
||||||
|
uIMenuNameableCreator.setObj(bean); |
||||||
|
((NameObject) wrapper.wrapper).setObject(uIMenuNameableCreator); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,102 @@ |
|||||||
|
package com.fr.plugin.chart.designer.other; |
||||||
|
|
||||||
|
import com.fr.base.chart.BasePlot; |
||||||
|
import com.fr.chart.chartattr.Plot; |
||||||
|
import com.fr.chart.chartglyph.ConditionAttr; |
||||||
|
import com.fr.chart.chartglyph.ConditionCollection; |
||||||
|
import com.fr.design.ChartTypeInterfaceManager; |
||||||
|
import com.fr.design.beans.BasicBeanPane; |
||||||
|
import com.fr.design.gui.controlpane.NameableCreator; |
||||||
|
import com.fr.design.gui.controlpane.UIListControlPane; |
||||||
|
import com.fr.design.gui.imenutable.UIMenuNameableCreator; |
||||||
|
import com.fr.design.mainframe.DesignerContext; |
||||||
|
import com.fr.general.Inter; |
||||||
|
import com.fr.general.NameObject; |
||||||
|
import com.fr.plugin.chart.attr.plot.VanChartPlot; |
||||||
|
import com.fr.plugin.chart.designer.component.ConditionUIMenuNameableCreator; |
||||||
|
import com.fr.stable.Nameable; |
||||||
|
|
||||||
|
import java.lang.reflect.Constructor; |
||||||
|
import java.lang.reflect.InvocationTargetException; |
||||||
|
|
||||||
|
/** |
||||||
|
* Created by mengao on 2017/8/18. |
||||||
|
*/ |
||||||
|
public class VanChartListControlPane extends UIListControlPane { |
||||||
|
|
||||||
|
public VanChartListControlPane(BasePlot plot) { |
||||||
|
super(plot); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void populate(Nameable[] nameableArray) { |
||||||
|
initComponentPane(); |
||||||
|
super.populate(nameableArray); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public NameableCreator[] createNameableCreators() { |
||||||
|
return new ChartConditionNameObjectCreator[]{new ChartConditionNameObjectCreator(this.plot, Inter.getLocText("Condition_Attributes"), ConditionUIMenuNameableCreator.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
protected BasicBeanPane createPaneByCreators(NameableCreator creator) { |
||||||
|
Constructor<? extends BasicBeanPane> constructor = null; |
||||||
|
try { |
||||||
|
constructor = creator.getUpdatePane().getConstructor(Plot.class); |
||||||
|
return constructor.newInstance(plot); |
||||||
|
|
||||||
|
} catch (InstantiationException e) { |
||||||
|
throw new RuntimeException(e); |
||||||
|
} catch (IllegalAccessException e) { |
||||||
|
throw new RuntimeException(e); |
||||||
|
} catch (NoSuchMethodException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} catch (InvocationTargetException e) { |
||||||
|
e.printStackTrace(); |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void saveSettings() { |
||||||
|
if (isPopulating) { |
||||||
|
return; |
||||||
|
} |
||||||
|
updateConditionCollection(((VanChartPlot) plot).getConditionCollection()); |
||||||
|
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public String getAddItemText() { |
||||||
|
return Inter.getLocText("FR-Designer_Add_Condition"); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public String title4PopupWindow() { |
||||||
|
return Inter.getLocText("Condition_Attributes"); |
||||||
|
} |
||||||
|
|
||||||
|
protected Object getob2Populate(Object ob2Populate) { |
||||||
|
return ((ConditionUIMenuNameableCreator) ob2Populate).getObj(); |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Update. |
||||||
|
*/ |
||||||
|
public void updateConditionCollection(ConditionCollection cc) { |
||||||
|
Nameable[] nameables = this.update(); |
||||||
|
|
||||||
|
cc.clearConditionAttr(); |
||||||
|
|
||||||
|
for (int i = 0; i < nameables.length; i++) { |
||||||
|
UIMenuNameableCreator uiMenuNameableCreator = (UIMenuNameableCreator) ((NameObject) nameables[i]).getObject(); |
||||||
|
ConditionAttr ca = (ConditionAttr) uiMenuNameableCreator.getObj(); |
||||||
|
ca.setName(nameables[i].getName()); |
||||||
|
cc.addConditionAttr(ca); |
||||||
|
|
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue