Browse Source

Merge pull request #681 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0

* commit 'b749d6115ef64057b211900d6510dfb5f44aa3b8':
  REPORT-13457 远程设计参数面板拖拽卡顿问题 & 部分拖拽场景的空指针和数组越界异常,泛型改写
bugfix/10.0
yaoh.wu 6 years ago
parent
commit
b3116deb14
  1. 166
      designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
  2. 5
      designer-base/src/main/java/com/fr/design/designer/TargetComponent.java
  3. 5
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
  4. 5
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
  5. 11
      designer-base/src/main/java/com/fr/design/mainframe/BaseJForm.java
  6. 2
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  7. 6
      designer-base/src/main/java/com/fr/design/mainframe/JTemplateProvider.java
  8. 66
      designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java
  9. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
  10. 22
      designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
  11. 6
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
  12. 17
      designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java
  13. 4
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  14. 20
      designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java
  15. 1
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
  16. 11
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  17. 60
      designer-realize/src/main/java/com/fr/design/mainframe/WorkBookModelAdapter.java

166
designer-base/src/main/java/com/fr/design/DesignModelAdapter.java

@ -3,6 +3,8 @@ package com.fr.design;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.io.BaseBook; import com.fr.base.io.BaseBook;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JTemplateProvider; import com.fr.design.mainframe.JTemplateProvider;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
@ -14,68 +16,159 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 当前的设计器模式 * 设计器模式 FormModel or WorkBookModel
* <p>
* 指的是编辑的模板是普通报表还是决策报表
* *
* @author zhou * @author zhou
* @since 2012-7-26上午11:24:54 * @since 2012-7-26上午11:24:54
*/ */
public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplateProvider> { public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplateProvider<T>> {
/**
* 当前的设计模式 FormModel or WorkBookModel
*/
private static DesignModelAdapter<?, ?> currentModelAdapter; private static DesignModelAdapter<?, ?> currentModelAdapter;
/**
* 模板
*/
protected S jTemplate; protected S jTemplate;
/**
* 全部的参数包括全局参数模板参数和数据集参数
*/
private Parameter[] parameters;
/**
* 数据集参数
*/
private Parameter[] tableDataParameters;
/**
* 模板参数
*/
private Parameter[] templateParameters;
public DesignModelAdapter(S jTemplate) { public DesignModelAdapter(S jTemplate) {
this.jTemplate = jTemplate; this.jTemplate = jTemplate;
updateCachedParameter();
setCurrentModelAdapter(this); setCurrentModelAdapter(this);
} }
public static void setCurrentModelAdapter(DesignModelAdapter<?, ?> model) {
currentModelAdapter = model;
}
public static DesignModelAdapter<?, ?> getCurrentModelAdapter() {
return currentModelAdapter;
}
/**
* 获取当前编辑的模板
*
* @return template
* @see DesignerFrameFileDealerPane#setCurrentEditingTemplate(JTemplate)
* @see HistoryTemplateListCache#getCurrentEditingTemplate()
* @deprecated use {@link HistoryTemplateListCache#setCurrentEditingTemplate(JTemplate)} instead
*/
@Deprecated
public S getjTemplate() { public S getjTemplate() {
return jTemplate; return jTemplate;
} }
/**
* 设置当前编辑的模板
* 不要脱离上下文直接调用
*
* @param jTemplate jt
* @see DesignerFrameFileDealerPane#setCurrentEditingTemplate(JTemplate)
* @deprecated use {@link HistoryTemplateListCache#setCurrentEditingTemplate(JTemplate)} instead
*/
@Deprecated
public void setjTemplate(S jTemplate) { public void setjTemplate(S jTemplate) {
this.jTemplate = jTemplate; this.jTemplate = jTemplate;
} }
public T getBook() { public T getBook() {
return (T) ((JTemplate) jTemplate).getTarget(); return jTemplate.getTarget();
} }
public static void setCurrentModelAdapter(DesignModelAdapter<?, ?> model) {
currentModelAdapter = model;
}
public static DesignModelAdapter<?, ?> getCurrentModelAdapter() {
return currentModelAdapter;
}
/** /**
* 响应目标改变事件. * 响应正在编辑的模板改变事件.
*/ */
public void fireTargetModified() { public void fireTargetModified() {
((JTemplate) this.jTemplate).fireTargetModified(); this.jTemplate.fireTargetModified();
} }
/**
* 获取悬浮元素名称数组
*
* @return String[] 悬浮元素名称数组
*/
public String[] getFloatNames() { public String[] getFloatNames() {
return new String[0]; return new String[0];
} }
/**
* 获取编辑模板的所有参数
* <p>
* 由于在参数面板拖动过程中频繁获取
* 远程设计时数据集参数rpc 调用需要考虑网络等因素,因此会比较缓慢,引起参数面板拖动卡顿,
* 所以缓存一下,并且在参数改动时及时缓存
*
* @return Parameter[] 模板的所有参数
*/
public Parameter[] getParameters() { public Parameter[] getParameters() {
return new Parameter[0]; return parameters == null ? new Parameter[0] : parameters;
} }
// 报表参数 /**
* 模板参数报表参数
* <p>
* 既然全部参数都,那么这个也缓存一下,并且在参数改动时及时缓存
*
* @return Parameter[] 模板参数
* @deprecated use {@link DesignModelAdapter#getTemplateParameters()} instead
*/
@Deprecated
public Parameter[] getReportParameters() { public Parameter[] getReportParameters() {
return new Parameter[0]; return getTableDataParameters();
}
/**
* 模板参数报表参数
* <p>
* 既然全部参数都,那么这个也缓存一下,并且在参数改动时及时缓存
*
* @return Parameter[] 模板参数
*/
public Parameter[] getTemplateParameters() {
return templateParameters == null ? new Parameter[0] : templateParameters;
} }
/** /**
* 数据源参数 * 数据源参数
* <p>
* 既然全部参数都,那么这个也缓存一下,并且在参数改动时及时缓存
* *
* @return * @return Parameter[] 数据源参数
*/ */
public Parameter[] getTableDataParameters() { public Parameter[] getTableDataParameters() {
return new Parameter[0]; return tableDataParameters == null ? new Parameter[0] : tableDataParameters;
}
/**
* 重命名TableData后的一些操作
*
* @param oldName 旧名字
* @param newName 新名字.
* @return 返回是否名字一样.
*/
public boolean renameTableData(String oldName, String newName) {
return renameTableData(oldName, newName, true);
} }
/** /**
@ -101,17 +194,6 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
return true; return true;
} }
/**
* 重命名TableData后的一些操作
*
* @param oldName 旧名字
* @param newName 新名字.
* @return 返回是否名字一样.
*/
public boolean renameTableData(String oldName, String newName) {
return renameTableData(oldName, newName, true);
}
/** /**
* 重命名tabledata * 重命名tabledata
* *
@ -132,6 +214,19 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
public abstract List<WidgetName> getWidgetsName(); public abstract List<WidgetName> getWidgetsName();
/**
* 更新缓存的参数
*/
public void updateCachedParameter() {
// 全部参数
this.parameters = getLatestParameters();
// 数据及参数
this.tableDataParameters = getLatestTableDataParameters();
// 模板参数
this.templateParameters = getLatestTemplateParameters();
}
/** /**
* 环境改变. * 环境改变.
*/ */
@ -146,4 +241,19 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
* 控件配置改变. * 控件配置改变.
*/ */
public abstract void widgetConfigChanged(); public abstract void widgetConfigChanged();
/**
* 获取变更后的模板参数
*/
protected abstract Parameter[] getLatestTemplateParameters();
/**
* 获取变更后的数据集参数
*/
protected abstract Parameter[] getLatestTableDataParameters();
/**
* 获取变更后的全部参数
*/
protected abstract Parameter[] getLatestParameters();
} }

5
designer-base/src/main/java/com/fr/design/designer/TargetComponent.java

@ -3,6 +3,7 @@ package com.fr.design.designer;
import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedEvent;
import com.fr.design.event.TargetModifiedListener; import com.fr.design.event.TargetModifiedListener;
import com.fr.design.mainframe.AuthorityEditPane; import com.fr.design.mainframe.AuthorityEditPane;
import com.fr.design.mainframe.JTemplateProvider;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
import com.fr.design.menu.MenuDef; import com.fr.design.menu.MenuDef;
import com.fr.design.menu.ShortCut; import com.fr.design.menu.ShortCut;
@ -15,7 +16,7 @@ import javax.swing.JPanel;
/** /**
* 模板设计界面 * 模板设计界面
*/ */
public abstract class TargetComponent<T> extends JComponent { public abstract class TargetComponent<T> extends JComponent implements JTemplateProvider<T> {
private T target; private T target;
public TargetComponent(T t) { public TargetComponent(T t) {
@ -34,6 +35,7 @@ public abstract class TargetComponent<T> extends JComponent {
public abstract void stopEditing(); public abstract void stopEditing();
@Override
public T getTarget() { public T getTarget() {
return target; return target;
} }
@ -82,6 +84,7 @@ public abstract class TargetComponent<T> extends JComponent {
/** /**
* Fire template modified listeners. * Fire template modified listeners.
*/ */
@Override
public void fireTargetModified() { public void fireTargetModified() {
// Guaranteed to return a non-null array // Guaranteed to return a non-null array
Object[] listeners = listenerList.getListenerList(); Object[] listeners = listenerList.getListenerList();

5
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@ -5,6 +5,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.DesignTableDataManager;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JVirtualTemplate; import com.fr.design.mainframe.JVirtualTemplate;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
@ -99,6 +100,10 @@ public class HistoryTemplateListCache implements CallbackEvent {
return this.editingTemplate; return this.editingTemplate;
} }
/**
* @param jt jt
* @see DesignerFrameFileDealerPane#setCurrentEditingTemplate(JTemplate)
*/
public void setCurrentEditingTemplate(JTemplate<?, ?> jt) { public void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
this.editingTemplate = jt; this.editingTemplate = jt;
//如果当前历史面板中没有 //如果当前历史面板中没有

5
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java

@ -1,6 +1,7 @@
package com.fr.design.file; package com.fr.design.file;
import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.base.chart.chartdata.CallbackEvent;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
@ -60,6 +61,10 @@ public class HistoryTemplateListPane implements CallbackEvent {
return instead().getCurrentEditingTemplate(); return instead().getCurrentEditingTemplate();
} }
/**
* @param jt jt
* @see DesignerFrameFileDealerPane#setCurrentEditingTemplate(JTemplate)
*/
public void setCurrentEditingTemplate(JTemplate<?, ?> jt) { public void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
instead().setCurrentEditingTemplate(jt); instead().setCurrentEditingTemplate(jt);

11
designer-base/src/main/java/com/fr/design/mainframe/BaseJForm.java

@ -1,16 +1,16 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
import javax.swing.JComponent;
import com.fr.form.FormElementCaseContainerProvider; import com.fr.form.FormElementCaseContainerProvider;
import javax.swing.JComponent;
/** /**
* Author : Shockway * Author : Shockway
* Date: 13-7-15 * Date: 13-7-15
* Time: 上午10:28 * Time: 上午10:28
*/ */
public interface BaseJForm extends JTemplateProvider { public interface BaseJForm<T> extends JTemplateProvider<T> {
String XML_TAG = "JForm"; String XML_TAG = "JForm";
int FORM_TAB = 0; int FORM_TAB = 0;
@ -32,11 +32,6 @@ public interface BaseJForm extends JTemplateProvider {
*/ */
void refreshSelectedWidget(); void refreshSelectedWidget();
/**
* 获取当前的Target
*/
Object getTarget();
/** /**
* 执行撤销 * 执行撤销
* *

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

@ -75,7 +75,7 @@ import java.util.regex.Pattern;
/** /**
* 报表设计和表单设计的编辑区域(设计器编辑的IO文件) * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
*/ */
public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, JTemplateProvider, DesignerProxy { public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy {
// TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
private static final int PREFIX_NUM = 3000; private static final int PREFIX_NUM = 3000;
private FILE editingFILE = null; private FILE editingFILE = null;

6
designer-base/src/main/java/com/fr/design/mainframe/JTemplateProvider.java

@ -1,6 +1,8 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
public interface JTemplateProvider { public interface JTemplateProvider<T> {
public void fireTargetModified(); void fireTargetModified();
T getTarget();
} }

66
designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

@ -7,12 +7,22 @@ import com.fr.design.designer.beans.LayoutAdapter;
import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.beans.location.Direction; import com.fr.design.designer.beans.location.Direction;
import com.fr.design.designer.beans.location.Location; import com.fr.design.designer.beans.location.Location;
import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.XConnector;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
import com.fr.design.designer.creator.XWAbsoluteLayout;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.FormSelectionUtils; import com.fr.design.mainframe.FormSelectionUtils;
import com.fr.design.utils.ComponentUtils; import com.fr.design.utils.ComponentUtils;
import java.awt.*; import java.awt.Component;
import java.awt.Cursor;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
@ -94,8 +104,11 @@ public class StateModel {
return; return;
} }
XCreator comp = designer.getComponentAt(e.getX(), e.getY(), selectionModel.getSelection().getSelectedCreators()); XLayoutContainer container = getMouseLocationContainer(e);
XLayoutContainer container = XCreatorUtils.getHotspotContainer(comp); if (container == null) {
return;
}
XCreator creator = selectionModel.getSelection().getSelectedCreator(); XCreator creator = selectionModel.getSelection().getSelectedCreator();
Component creatorContainer = XCreatorUtils.getParentXLayoutContainer(creator); Component creatorContainer = XCreatorUtils.getParentXLayoutContainer(creator);
if (creatorContainer != null && creatorContainer != container if (creatorContainer != null && creatorContainer != container
@ -141,11 +154,8 @@ public class StateModel {
* @param mouseReleasedY 鼠标释放位置Y * @param mouseReleasedY 鼠标释放位置Y
*/ */
private void adding(int mouseReleasedX, int mouseReleasedY) { private void adding(int mouseReleasedX, int mouseReleasedY) {
// 当前鼠标所在的组件 // 当前鼠标所在组件的容器
XCreator hoveredComponent = designer.getComponentAt(mouseReleasedX, mouseReleasedY, selectionModel.getSelection().getSelectedCreators()); XLayoutContainer container = getMouseLocationContainer(mouseReleasedX, mouseReleasedY);
// 获取该组件所在的焦点容器
XLayoutContainer container = XCreatorUtils.getHotspotContainer(hoveredComponent);
boolean success = false; boolean success = false;
@ -166,6 +176,33 @@ public class StateModel {
designer.setPainter(null); designer.setPainter(null);
} }
/**
* 获取鼠标所在位置组件的容器
*
* @param e MouseEvent
* @return 鼠标所在位置的组件的容器
*/
private XLayoutContainer getMouseLocationContainer(MouseEvent e) {
return getMouseLocationContainer(e.getX(), e.getY());
}
/**
* 获取鼠标所在位置组件的容器
*
* @param x x 鼠标所在位置x
* @param y y 鼠标所在位置y
* @return 鼠标所在位置的组件的容器
*/
private XLayoutContainer getMouseLocationContainer(int x, int y) {
// 当前鼠标所在的组件
XCreator hoveredComponent = designer.getComponentAt(x, y, selectionModel.getSelection().getSelectedCreators());
if (hoveredComponent == null) {
return null;
}
// 获取该组件所在的焦点容器
return XCreatorUtils.getHotspotContainer(hoveredComponent);
}
/** /**
* 是否拖拽 * 是否拖拽
* *
@ -246,7 +283,7 @@ public class StateModel {
if (p != null) { if (p != null) {
try { try {
designer.setCursor(XConnector.connectorCursor); designer.setCursor(XConnector.connectorCursor);
} catch (Exception e) { } catch (Exception ignored) {
} }
} else { } else {
designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@ -433,11 +470,11 @@ public class StateModel {
// 拖拽时画依附线用到的painter // 拖拽时画依附线用到的painter
private void setDependLinePainter(MouseEvent e) { private void setDependLinePainter(MouseEvent e) {
XCreator comp = designer.getComponentAt(e.getX(), e.getY(), selectionModel.getSelection().getSelectedCreators()); XLayoutContainer container = getMouseLocationContainer(e);
if (comp == null) { if (container == null) {
return; return;
} }
XLayoutContainer container = XCreatorUtils.getHotspotContainer(comp);
XCreator creator = selectionModel.getSelection().getSelectedCreator(); XCreator creator = selectionModel.getSelection().getSelectedCreator();
HoverPainter painter = AdapterBus.getContainerPainter(designer, container); HoverPainter painter = AdapterBus.getContainerPainter(designer, container);
designer.setPainter(painter); designer.setPainter(painter);
@ -479,9 +516,8 @@ public class StateModel {
* @return xy值 * @return xy值
*/ */
public Point getMouseXY(MouseEvent e) { public Point getMouseXY(MouseEvent e) {
Point p1 = new Point(e.getX() + designer.getArea().getHorizontalValue(), e.getY() return new Point(e.getX() + designer.getArea().getHorizontalValue(), e.getY()
+ designer.getArea().getVerticalValue()); + designer.getArea().getVerticalValue());
return p1;
} }
} }

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

@ -66,9 +66,11 @@ import com.fr.plugin.manage.PluginFilter;
import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEvent;
import com.fr.plugin.observer.PluginEventListener; import com.fr.plugin.observer.PluginEventListener;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.third.javax.annotation.Nonnull;
import javax.swing.*; import javax.swing.Icon;
import java.awt.*; import java.awt.Container;
import java.awt.Dimension;
/** /**
* XCreator的相关处理 * XCreator的相关处理
@ -284,7 +286,7 @@ public class XCreatorUtils {
* @param creator 组件 * @param creator 组件
* @return 返回顶层容器 * @return 返回顶层容器
*/ */
public static XLayoutContainer getHotspotContainer(XCreator creator) { public static XLayoutContainer getHotspotContainer(@Nonnull XCreator creator) {
if (creator.isDedicateContainer()) { if (creator.isDedicateContainer()) {
return (XLayoutContainer) creator.getParent(); return (XLayoutContainer) creator.getParent();
} }

22
designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java

@ -3,19 +3,28 @@ package com.fr.design.mainframe;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
import com.fr.design.designer.creator.XWFitLayout;
import com.fr.design.designer.treeview.ComponentTreeCellRenderer; import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
import com.fr.design.designer.treeview.ComponentTreeModel; import com.fr.design.designer.treeview.ComponentTreeModel;
import com.fr.design.gui.itree.UITreeUI; import com.fr.design.gui.itree.UITreeUI;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.BorderFactory;
import javax.swing.DropMode;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
import javax.swing.SwingUtilities;
import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreeSelectionModel;
import java.awt.*; import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -118,8 +127,10 @@ public class ComponentTree extends JTree {
public void setAndScrollSelectionPath(TreePath[] treepath) { public void setAndScrollSelectionPath(TreePath[] treepath) {
setSelectionPaths(treepath); setSelectionPaths(treepath);
if (treepath.length > 0) {
scrollPathToVisible(treepath[0]); scrollPathToVisible(treepath[0]);
} }
}
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
@ -330,8 +341,7 @@ public class ComponentTree extends JTree {
return contentPane; return contentPane;
} }
private BufferedImage componentToImage(Component comp) throws IOException private BufferedImage componentToImage(Component comp) throws IOException {
{
BufferedImage im = new BufferedImage(comp.getWidth(), comp.getHeight(), BufferedImage.TYPE_INT_ARGB); BufferedImage im = new BufferedImage(comp.getWidth(), comp.getHeight(), BufferedImage.TYPE_INT_ARGB);
comp.paint(im.getGraphics()); comp.paint(im.getGraphics());
return im; return im;

6
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -65,6 +65,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger; import com.fr.general.FRLogger;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.bridge.StableFactory; import com.fr.stable.bridge.StableFactory;
import com.fr.third.javax.annotation.Nullable;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.JComponent; import javax.swing.JComponent;
@ -918,7 +919,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
* @return 是则返回true * @return 是则返回true
*/ */
public boolean isRoot(XCreator comp) { public boolean isRoot(XCreator comp) {
return comp == rootComponent || comp.acceptType(XWAbsoluteBodyLayout.class); return comp != null && (comp == rootComponent || comp.acceptType(XWAbsoluteBodyLayout.class));
} }
// 计算鼠标事件e所发生的位置相对根组件的位置关系 // 计算鼠标事件e所发生的位置相对根组件的位置关系
@ -980,6 +981,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
return getComponentAt(x, y, null); return getComponentAt(x, y, null);
} }
@Nullable
public XCreator getComponentAt(int x, int y, XCreator[] except) { public XCreator getComponentAt(int x, int y, XCreator[] except) {
XLayoutContainer container = y < paraHeight - formArea.getVerticalValue() ? paraComponent : rootComponent; XLayoutContainer container = y < paraHeight - formArea.getVerticalValue() ? paraComponent : rootComponent;
XCreator comp = xCreatorAt(x + formArea.getHorizontalValue(), y + formArea.getVerticalValue(), container, XCreator comp = xCreatorAt(x + formArea.getHorizontalValue(), y + formArea.getVerticalValue(), container,
@ -1191,8 +1193,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
} }
return designerActions.toArray(new UpdateAction[designerActions.size()]); return designerActions.toArray(new UpdateAction[designerActions.size()]);
} }
/** /**
* 扩展菜单项 * 扩展菜单项
*
* @param actions * @param actions
*/ */
public void dmlActions(List<UpdateAction> actions) { public void dmlActions(List<UpdateAction> actions) {

17
designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java

@ -12,7 +12,6 @@ import com.fr.form.ui.DataControl;
import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.MultiFileEditor; import com.fr.form.ui.MultiFileEditor;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.main.parameter.ReportParameterAttr;
import com.fr.script.Calculator; import com.fr.script.Calculator;
import com.fr.stable.ParameterProvider; import com.fr.stable.ParameterProvider;
import com.fr.stable.js.WidgetName; import com.fr.stable.js.WidgetName;
@ -20,9 +19,9 @@ import com.fr.stable.js.WidgetName;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm> { public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm<Form>> {
public FormModelAdapter(BaseJForm jForm) { public FormModelAdapter(BaseJForm<Form> jForm) {
super(jForm); super(jForm);
} }
@ -32,6 +31,7 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm> {
public void envChanged() { public void envChanged() {
WidgetToolBarPane.refresh(); WidgetToolBarPane.refresh();
jTemplate.refreshAllNameWidgets(); jTemplate.refreshAllNameWidgets();
} }
/** /**
@ -40,6 +40,8 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm> {
public void parameterChanged() { public void parameterChanged() {
//实时更新参数 //实时更新参数
jTemplate.populateParameter(); jTemplate.populateParameter();
// 更新缓存的参数
updateCachedParameter();
} }
/** /**
@ -106,16 +108,15 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm> {
return linkAbleList.toArray(new Widget[linkAbleList.size()]); return linkAbleList.toArray(new Widget[linkAbleList.size()]);
} }
// 报表参数
@Override @Override
public Parameter[] getReportParameters() { protected Parameter[] getLatestTemplateParameters() {
Parameter[] rpa = this.getBook().getTemplateParameters(); Parameter[] rpa = this.getBook().getTemplateParameters();
return rpa == null ? new Parameter[0] : rpa; return rpa == null ? new Parameter[0] : rpa;
} }
// 数据源参数
@Override @Override
public Parameter[] getTableDataParameters() { protected Parameter[] getLatestTableDataParameters() {
TableDataSource source = this.getBook(); TableDataSource source = this.getBook();
Calculator c = Calculator.createCalculator(); Calculator c = Calculator.createCalculator();
c.setAttribute(TableDataSource.KEY, source); c.setAttribute(TableDataSource.KEY, source);
@ -131,7 +132,7 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm> {
} }
@Override @Override
public Parameter[] getParameters() { protected Parameter[] getLatestParameters() {
return this.getBook().getParameters(); return this.getBook().getParameters();
} }
} }

4
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -86,7 +86,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm { public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> {
private static final String FORM_CARD = "FORM"; private static final String FORM_CARD = "FORM";
private static final String ELEMENTCASE_CARD = "ELEMENTCASE"; private static final String ELEMENTCASE_CARD = "ELEMENTCASE";
@ -139,7 +139,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
return DesignState.JFORM; return DesignState.JFORM;
} }
public TemplateProcessInfo getProcessInfo() { public TemplateProcessInfo<Form> getProcessInfo() {
if (processInfo == null) { if (processInfo == null) {
processInfo = new JFormProcessInfo(template); processInfo = new JFormProcessInfo(template);
} }

20
designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java

@ -3,21 +3,21 @@
*/ */
package com.fr.design.actions.report; package com.fr.design.actions.report;
import java.awt.event.ActionEvent;
import javax.swing.SwingUtilities;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.design.DesignModelAdapter;
import com.fr.design.actions.JWorkBookAction; import com.fr.design.actions.JWorkBookAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.JWorkBook; import com.fr.design.mainframe.JWorkBook;
import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.KeySetUtils;
import com.fr.design.parameter.ParameterArrayPane; import com.fr.design.parameter.ParameterArrayPane;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.parameter.ReportParameterAttr; import com.fr.main.parameter.ReportParameterAttr;
import javax.swing.SwingUtilities;
import java.awt.event.ActionEvent;
/** /**
* Report Parameter * Report Parameter
*/ */
@ -37,7 +37,7 @@ public class ReportParameterAction extends JWorkBookAction{
* @return 是否执行成功 * @return 是否执行成功
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
final JWorkBook jwb = getEditingComponent(); JWorkBook jwb = getEditingComponent();
if (jwb == null) { if (jwb == null) {
return; return;
} }
@ -59,10 +59,8 @@ public class ReportParameterAction extends JWorkBookAction{
for (int i = 0; i < parameters.length; i++) { for (int i = 0; i < parameters.length; i++) {
copyReportParameterAttr.addParameter(parameters[i]); copyReportParameterAttr.addParameter(parameters[i]);
} }
jwb.fireTargetModified(); DesignModelAdapter.getCurrentModelAdapter().fireTargetModified();
jwb.updateReportParameterAttr(); DesignModelAdapter.getCurrentModelAdapter().parameterChanged();
jwb.populateReportParameterAttr();
} }
}); });
parameterArrayDialog.setVisible(true); parameterArrayDialog.setVisible(true);

1
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@ -862,6 +862,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
/** /**
* 响应目标变动. * 响应目标变动.
*/ */
@Override
public void fireTargetModified() { public void fireTargetModified() {
// marks:自动计算 // marks:自动计算
TemplateElementCase report = this.getEditingElementCase(); TemplateElementCase report = this.getEditingElementCase();

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

@ -204,7 +204,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
} }
@Override @Override
public TemplateProcessInfo getProcessInfo() { public TemplateProcessInfo<WorkBook> getProcessInfo() {
if (processInfo == null) { if (processInfo == null) {
processInfo = new JWorkBookProcessInfo(template); processInfo = new JWorkBookProcessInfo(template);
} }
@ -309,10 +309,10 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
centerPane.setUpPaneHeight(hasParameterPane() ? parameterPane.getPreferredSize().height : 0); centerPane.setUpPaneHeight(hasParameterPane() ? parameterPane.getPreferredSize().height : 0);
} }
@Override
/** /**
* *
*/ */
@Override
public void setComposite() { public void setComposite() {
super.setComposite(); super.setComposite();
reportComposite.setComponents(); reportComposite.setComponents();
@ -544,10 +544,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
// //////////////////////OLD BELOW///////////////////////// // //////////////////////OLD BELOW/////////////////////////
// //////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////
@Override
/** /**
* set target * set target
*/ */
@Override
public void setTarget(WorkBook book) { public void setTarget(WorkBook book) {
if (book == null) { if (book == null) {
return; return;
@ -1098,7 +1099,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
FILE newFile = createNewEmptyFile(); FILE newFile = createNewEmptyFile();
//如果文件已经打开, 那么就覆盖关闭掉他 //如果文件已经打开, 那么就覆盖关闭掉他
MutilTempalteTabPane.getInstance().closeFileTemplate(newFile); MutilTempalteTabPane.getInstance().closeFileTemplate(newFile);
final TemplateWorkBook tpl = this.getTarget(); final WorkBook tpl = this.getTarget();
// 弹出输入参数 // 弹出输入参数
java.util.Map<String, Object> parameterMap = inputParameters(tpl); java.util.Map<String, Object> parameterMap = inputParameters(tpl);
@ -1106,7 +1107,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
String fullPath = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), newFile.getPath()); String fullPath = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), newFile.getPath());
FileOutputStream fileOutputStream = new FileOutputStream(fullPath); FileOutputStream fileOutputStream = new FileOutputStream(fullPath);
EmbeddedTableDataExporter exporter = new EmbeddedTableDataExporter(); EmbeddedTableDataExporter exporter = new EmbeddedTableDataExporter();
exporter.export(fileOutputStream, (WorkBook) tpl, parameterMap); exporter.export(fileOutputStream, tpl, parameterMap);
} catch (Exception e1) { } catch (Exception e1) {
FRContext.getLogger().error(e1.getMessage()); FRContext.getLogger().error(e1.getMessage());
} }

60
designer-realize/src/main/java/com/fr/design/mainframe/WorkBookModelAdapter.java

@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
*
* @author zhou * @author zhou
* @since 2012-7-26下午2:03:12 * @since 2012-7-26下午2:03:12
*/ */
@ -35,37 +34,10 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
super(jworkbook); super(jworkbook);
} }
@Override
public Parameter[] getParameters() {
return this.getBook().getParameters();
}
// 报表参数
@Override
public Parameter[] getReportParameters() {
ReportParameterAttr rpa = this.getBook().getReportParameterAttr();
return rpa == null ? new Parameter[0] : rpa.getParameters();
}
// 数据源参数
@Override
public Parameter[] getTableDataParameters() {
TableDataSource source = this.getBook();
Calculator c = Calculator.createCalculator();
c.setAttribute(TableDataSource.KEY, source);
java.util.List<ParameterProvider> list = new java.util.ArrayList<ParameterProvider>();
java.util.Iterator<String> nameIt = this.getBook().getTableDataNameIterator();
while (nameIt.hasNext()) {
TableData td = source.getTableData(nameIt.next());
if (td.getParameters(c) != null) {
list.addAll(java.util.Arrays.asList(td.getParameters(c)));
}
}
return list.toArray(new Parameter[list.size()]);
}
/** /**
* 重命名TableData后的一些操作 * 重命名TableData后的一些操作
*
* @param oldName 旧名字 * @param oldName 旧名字
* @param newName 新名字 * @param newName 新名字
* @return 返回是否刷新. * @return 返回是否刷新.
@ -97,6 +69,7 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
public void parameterChanged() { public void parameterChanged() {
jTemplate.updateReportParameterAttr(); jTemplate.updateReportParameterAttr();
jTemplate.populateReportParameterAttr(); jTemplate.populateReportParameterAttr();
updateCachedParameter();
} }
/** /**
@ -110,8 +83,36 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
jTemplate.refreshAllNameWidgets(); jTemplate.refreshAllNameWidgets();
} }
@Override
protected Parameter[] getLatestTemplateParameters() {
ReportParameterAttr rpa = this.getBook().getReportParameterAttr();
return rpa == null ? new Parameter[0] : rpa.getParameters();
}
@Override
protected Parameter[] getLatestTableDataParameters() {
TableDataSource source = this.getBook();
Calculator c = Calculator.createCalculator();
c.setAttribute(TableDataSource.KEY, source);
java.util.List<ParameterProvider> list = new java.util.ArrayList<ParameterProvider>();
java.util.Iterator<String> nameIt = this.getBook().getTableDataNameIterator();
while (nameIt.hasNext()) {
TableData td = source.getTableData(nameIt.next());
if (td.getParameters(c) != null) {
list.addAll(java.util.Arrays.asList(td.getParameters(c)));
}
}
return list.toArray(new Parameter[list.size()]);
}
@Override
protected Parameter[] getLatestParameters() {
return this.getBook().getParameters();
}
/** /**
* 返回控件的名字 * 返回控件的名字
*
* @return widgetName 控件列表. * @return widgetName 控件列表.
*/ */
public List<WidgetName> getWidgetsName() { public List<WidgetName> getWidgetsName() {
@ -139,6 +140,7 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
/** /**
* 返回悬浮元素的名字数组 * 返回悬浮元素的名字数组
*
* @return 返回数组. * @return 返回数组.
*/ */
public String[] getFloatNames() { public String[] getFloatNames() {

Loading…
Cancel
Save