Browse Source
* commit 'a81c8c0792e84916d873b6bbf6c25ee6ddd721be': (50 commits) 无jira任务, 冲突 MOBILE-24561 通过箭头按钮触发下拉框，进行修改，会导致保存失败 REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题 国际化 tooltip CHART-11779 远程设计 地图资源增加刷新按钮 CHART-11852 CHART-11634改出来的问题，条件属性的标签没有parentPane REPORT-19946 linux设计器 CHART-11634 bug退回：值标签没有位置 报npe MOBILE-24394 组件冻结选项操作后，进行保存失败 CHART-11634 试管仪表盘从横向变成纵向 标签位置应该从上下变成左右 REPORT-20328 sonar问题修复 REPORT-24455 切换远程工作目录，新建模板保存，保存的特别慢 REPORT-24085 稳定共创：在文件树二级目录下删除模板，会直接跳到上一级目录 by joe.jiang 无jira任务 适配一些老插件的属性监听界面 REPORT-24357 [冒烟]条件属性中缩进属性，设置完毕不点击原来的焦点，缩进距离无法保存 10.0同步 REPORT-23943 进入参数面板，点击预定义控件，弹框无法缩回 REPORT-23960 linux设计器-rhel系统，超级链接问题 REPORT-23954 linux设计器-rhel系统，条件属性问题 fix ...bugfix/10.0
neil
5 years ago
51 changed files with 737 additions and 268 deletions
@ -0,0 +1,57 @@ |
|||||||
|
package com.fr.design.formula; |
||||||
|
|
||||||
|
import com.fr.stable.StringUtils; |
||||||
|
|
||||||
|
/** |
||||||
|
* @author Joe |
||||||
|
* @version 10.0 |
||||||
|
* Created by Joe on 10/30/2019 |
||||||
|
*/ |
||||||
|
public enum FormulaConstants { |
||||||
|
|
||||||
|
PAGE_NUMBER("$$page_number", "Page_Number"), |
||||||
|
TOTAL_PAGE_NUMBER("$$totalPage_number", "Total_Page_Number"), |
||||||
|
FINE_USERNAME("$fine_username", "Fine_Username"), |
||||||
|
FINE_ROLE("$fine_role", "Fine_Role"), |
||||||
|
FINE_POSITION("$fine_position", "Fine_Position"), |
||||||
|
NULL("NULL", "Null"), |
||||||
|
NOFILTER("NOFILTER", "No_Filter"), |
||||||
|
REPORT_NAME("reportName", "Report_Name"), |
||||||
|
FORMLET_NAME("formletName", "Formlet_Name"), |
||||||
|
SERVLET_URL("servletURL", "Servlet_URL"), |
||||||
|
SERVER_SCHEMA("serverSchema", "Server_Schema"), |
||||||
|
SERVER_NAME("serverName", "Server_Name"), |
||||||
|
SERVER_PORT("serverPort", "Server_Port"), |
||||||
|
SERVER_URL("serverURL", "Server_URL"), |
||||||
|
CONTEXT_PATH("contextPath", "Context_Path"), |
||||||
|
SESSION_ID("sessionID", "SessionID"); |
||||||
|
|
||||||
|
private String key; |
||||||
|
private String value; |
||||||
|
private static final String KEY_PREFIX = "Fine-Design_CurReport_Variable_"; |
||||||
|
|
||||||
|
private FormulaConstants(String key, String value) { |
||||||
|
this.key = key; |
||||||
|
this.value = KEY_PREFIX + value; |
||||||
|
} |
||||||
|
|
||||||
|
public String getKey() { |
||||||
|
return key; |
||||||
|
} |
||||||
|
|
||||||
|
public String getValue() { |
||||||
|
return value; |
||||||
|
} |
||||||
|
|
||||||
|
public static String getValueByKey(String key) { |
||||||
|
for (FormulaConstants formulaConstant : values()) { |
||||||
|
if (formulaConstant.getKey().equals(key)) { |
||||||
|
return formulaConstant.getValue(); |
||||||
|
} |
||||||
|
} |
||||||
|
return StringUtils.EMPTY; |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,36 @@ |
|||||||
|
package com.fr.design.gui.ibutton; |
||||||
|
|
||||||
|
|
||||||
|
import javax.swing.*; |
||||||
|
import java.util.LinkedHashMap; |
||||||
|
import java.util.Map; |
||||||
|
|
||||||
|
/** |
||||||
|
* 互斥的按钮 |
||||||
|
* @author hades |
||||||
|
* @version 10.0 |
||||||
|
* Created by hades on 2019/11/12 |
||||||
|
*/ |
||||||
|
public class ModeButtonGroup<T> extends ButtonGroup { |
||||||
|
|
||||||
|
private Map<T, AbstractButton> buttonMap = new LinkedHashMap<>(); |
||||||
|
|
||||||
|
public void put(T t, AbstractButton button) { |
||||||
|
add(button); |
||||||
|
buttonMap.put(t, button); |
||||||
|
} |
||||||
|
|
||||||
|
public void setSelectButton(T t) { |
||||||
|
buttonMap.get(t).setSelected(true); |
||||||
|
} |
||||||
|
|
||||||
|
public T getCurrentSelected() { |
||||||
|
for (Map.Entry<T, AbstractButton> entry : buttonMap.entrySet()) { |
||||||
|
if (entry.getValue().isSelected()) { |
||||||
|
return entry.getKey(); |
||||||
|
} |
||||||
|
} |
||||||
|
return buttonMap.entrySet().iterator().next().getKey(); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,36 @@ |
|||||||
|
package com.fr.design.widget.ui.designer.layout; |
||||||
|
|
||||||
|
import com.fr.design.designer.creator.XCreator; |
||||||
|
import com.fr.design.mainframe.FormDesigner; |
||||||
|
import com.fr.design.widget.ui.designer.AbstractDataModify; |
||||||
|
import com.fr.form.ui.container.WSortLayout; |
||||||
|
|
||||||
|
/** |
||||||
|
* @author hades |
||||||
|
* @version 9.0 |
||||||
|
* Created by hades on 2019/11/18 |
||||||
|
*/ |
||||||
|
public abstract class AbstractFRLayoutDefinePane<T extends WSortLayout> extends AbstractDataModify<T> { |
||||||
|
|
||||||
|
|
||||||
|
public AbstractFRLayoutDefinePane(XCreator xCreator) { |
||||||
|
super(xCreator); |
||||||
|
} |
||||||
|
|
||||||
|
public AbstractFRLayoutDefinePane(XCreator xCreator, FormDesigner designer) { |
||||||
|
super(xCreator, designer); |
||||||
|
} |
||||||
|
|
||||||
|
protected void copyLayoutAttr(WSortLayout srcLayout, WSortLayout destLayout) { |
||||||
|
destLayout.clearListeners(); |
||||||
|
destLayout.clearMobileWidgetList(); |
||||||
|
for (int i = 0, len = srcLayout.getMobileWidgetListSize(); i < len; i++) { |
||||||
|
destLayout.addMobileWidget(srcLayout.getMobileWidget(i)); |
||||||
|
} |
||||||
|
destLayout.setSorted(true); |
||||||
|
for (int i = 0, len = srcLayout.getListenerSize(); i < len; i++) { |
||||||
|
destLayout.addListener(srcLayout.getListener(i)); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue