diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 6f0e89ff45..23e6f46136 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -32,6 +32,7 @@ import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; +import com.fr.design.utils.ParameterUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.sql.SqlUtils; @@ -218,8 +219,7 @@ public class DBTableDataPane extends AbstractTableDataPane { paramTexts[1] = SqlUtils.tryPureSqlText(pageQuery); List existParameterList = editorPane.update(); Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[existParameterList.size()]); - - editorPane.populate(ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps)); + editorPane.populate(ParameterUtils.analyzeAndUnionParameters(paramTexts, ps)); } private JToolBar createToolBar() { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java index 2cf170c55e..571e13d447 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java @@ -19,6 +19,7 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itextfield.UITextField; import com.fr.general.ComparatorUtils; +import com.fr.log.FineLoggerFactory; import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -95,9 +96,8 @@ public class MultiTDTableDataPane extends AbstractTableDataPane> entryIt = resMap.entrySet().iterator(); - while (entryIt.hasNext()) { - TableDataWrapper tableDataWrappe = entryIt.next().getValue(); + for (Entry stringTableDataWrapperEntry : resMap.entrySet()) { + TableDataWrapper tableDataWrappe = stringTableDataWrapperEntry.getValue(); String tmp = tableDataWrappe.getTableDataName(); if (!ComparatorUtils.equals(tableDataWrappe.getTableDataName(), multiName)) { centerPanel.add(new BarPanel(tmp, tableDataWrappe.getIcon())); @@ -111,13 +111,10 @@ public class MultiTDTableDataPane extends AbstractTableDataPane { + MultiTDTableData td = MultiTDTableDataPane.this.updateBean(); + td.setTableDataSource(DesignTableDataManager.getEditingTableDataSource()); + new TemplateTableDataWrapper(td).previewData(); }; } @@ -126,12 +123,12 @@ public class MultiTDTableDataPane extends AbstractTableDataPane(new ParameterTableModel() { + editorPane = new UITableEditorPane<>(new ParameterTableModel() { @Override public UITableEditAction[] createAction() { return new UITableEditAction[]{new RefreshAction()}; } - }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Default_Parameter")); + }, StringUtils.BLANK + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Default_Parameter")); jpanel.add(editorPane, BorderLayout.CENTER); @@ -162,29 +159,32 @@ public class MultiTDTableDataPane extends AbstractTableDataPane existParameterList = new ArrayList(); - Iterator> dataItera = choosenTableData.entrySet().iterator(); - List parameterName = new ArrayList(); - while (dataItera.hasNext()) { - Entry entry = dataItera.next(); - TableData td = resMap.get(entry.getKey()).getTableData(); - ParameterProvider[] currentparameters = td.getParameters(Calculator.createCalculator()); - for (int i=0; i existParameterList = new ArrayList<>(); + List parameterName = new ArrayList<>(); + for (Entry entry : choosenTableData.entrySet()) { + TableData td = resMap.get(entry.getKey()).getTableData(); + ParameterProvider[] currentParameters = td.getParameters(Calculator.createCalculator()); + for (ParameterProvider currentParameter : currentParameters) { + if (parameterName.contains(currentParameter.getName())) { + continue; + } + parameterName.add(currentParameter.getName()); + try { + //采用给新的界面刷新参数时,clone一个值过去,不然会出现联动修改 + existParameterList.add((ParameterProvider) currentParameter.clone()); + } catch (CloneNotSupportedException e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } } ParameterProvider[] texts = ParameterHelper.analyze4Parameters(paramTexts, true); - for (int i=0; i> it = choosenTableData.entrySet().iterator(); - while (it.hasNext()) { - Entry entry = it.next(); + for (Entry entry : choosenTableData.entrySet()) { td.addTableData(entry.getKey(), entry.getValue()); } List paramList = editorPane.update(); if (paramList != null) { - td.setDefineParameters(paramList.toArray(new Parameter[paramList.size()])); + td.setDefineParameters(paramList.toArray(new Parameter[0])); } return td; @@ -348,9 +346,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane { + final UIFormula formulaPane = FormulaFactory.createFormulaPane(); + formulaPane.populate(BaseFormula.createFormulaBuilder().build(formulaContentTextField.getText())); + formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(MultiTDTableDataPane.this), new DialogActionAdapter() { + public void doOk() { + BaseFormula formula = formulaPane.update(); + if (formula == null) { + formulaContentTextField.setText(StringUtils.EMPTY); + } else { + formulaContentTextField.setText(formula.getContent().substring(1)); } - }).setVisible(true); - } + MultiTDTableDataPane.this.refresh(); + } + }).setVisible(true); }; } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java index 0297353ee0..03927ca468 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java @@ -9,14 +9,17 @@ import com.fr.stable.Constants; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingUtilities; +import javax.swing.border.Border; import java.awt.AWTEvent; import java.awt.BasicStroke; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.Dialog; import java.awt.Frame; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.Insets; import java.awt.Point; import java.awt.Polygon; import java.awt.Rectangle; @@ -29,303 +32,312 @@ import java.awt.event.MouseEvent; /** * @author Jerry - * 非模态悬浮对话框，气泡形状 + * 非模态悬浮对话框，气泡形状 */ public abstract class UIBubbleFloatPane extends BasicBeanPane { - private static final long serialVersionUID = -6386018511442190959L; - private static int OFF_LEFT = 10; + private static final long serialVersionUID = -6386018511442190959L; + private static int OFF_LEFT = 10; private static final int ARROR_PARALLEL = 30; private static final int ARROR_VERTICAL = 20; private static final int TITLE_HEIGHT = 60; private static final double TIME_DEFAULT = 0.5; private static final double TIME_GAP = 0.1; - private BasicBeanPane contentPane; - private Rectangle bounds; - private int arrowPosition; - private double time = 0.5; - - private UIDialog showDialog; - - /** - * @param arrowPosition 箭头的位置，上下左右，暂时只处理了左边，后面用到了再说 TODO - * @param arrowPoint 箭头的坐标点 - * @param contentPane 对话框中的Panel - */ - public UIBubbleFloatPane(int arrowPosition, Point arrowPoint, BasicBeanPane contentPane) { - this(arrowPosition, arrowPoint, contentPane, contentPane.getPreferredSize().width, contentPane.getPreferredSize().height); - } - - /** - * 这个方法主要用于那些宽度和高度有变化的面板，因为显然外面的气泡要固定大小，不然忽大忽小，体验太差了 - * - * @param arrowPosition 箭头的位置，上下左右，暂时只处理了左边，后面用到了再说 TODO - * @param arrowPoint 箭头的坐标点 - * @param contentPane 对话框中的Panel - * @param width 对话框中的Panel的宽度，写死了 - * @param height 对话框中的Panel的高度，写死了 - */ - public UIBubbleFloatPane(int arrowPosition, Point arrowPoint, BasicBeanPane contentPane, int width, int height) { - this.contentPane = contentPane; - this.arrowPosition = arrowPosition; - this.time = initBoundsTime(arrowPosition, arrowPoint, width, height); - if (arrowPosition == Constants.LEFT) { - this.bounds = new Rectangle(arrowPoint.x - width, (int) (arrowPoint.y - height * time), width, height); - } else if (arrowPosition == Constants.TOP) { - this.bounds = new Rectangle((int) (arrowPoint.x - width * time), arrowPoint.y , width, height); - } else if (arrowPosition == Constants.RIGHT) { - this.bounds = new Rectangle(arrowPoint.x - OFF_LEFT * 2 - width, (int) (arrowPoint.y - height * time), width, height); - } - - initComponents(); - } + private BasicBeanPane contentPane; + private Rectangle bounds; + private int arrowPosition; + private double time = 0.5; + + private UIDialog showDialog; + + /** + * @param arrowPosition 箭头的位置，上下左右，暂时只处理了左边，后面用到了再说 TODO + * @param arrowPoint 箭头的坐标点 + * @param contentPane 对话框中的Panel + */ + public UIBubbleFloatPane(int arrowPosition, Point arrowPoint, BasicBeanPane contentPane) { + this(arrowPosition, arrowPoint, contentPane, contentPane.getPreferredSize().width, contentPane.getPreferredSize().height); + } + + /** + * 这个方法主要用于那些宽度和高度有变化的面板，因为显然外面的气泡要固定大小，不然忽大忽小，体验太差了 + * + * @param arrowPosition 箭头的位置，上下左右，暂时只处理了左边，后面用到了再说 TODO + * @param arrowPoint 箭头的坐标点 + * @param contentPane 对话框中的Panel + * @param width 对话框中的Panel的宽度，写死了 + * @param height 对话框中的Panel的高度，写死了 + */ + public UIBubbleFloatPane(int arrowPosition, Point arrowPoint, BasicBeanPane contentPane, int width, int height) { + this.contentPane = contentPane; + this.arrowPosition = arrowPosition; + this.time = initBoundsTime(arrowPosition, arrowPoint, width, height); + if (arrowPosition == Constants.LEFT) { + this.bounds = new Rectangle(arrowPoint.x - width, (int) (arrowPoint.y - height * time), width, height); + } else if (arrowPosition == Constants.TOP) { + this.bounds = new Rectangle((int) (arrowPoint.x - width * time), arrowPoint.y, width, height); + } else if (arrowPosition == Constants.RIGHT) { + this.bounds = new Rectangle(arrowPoint.x - OFF_LEFT * 2 - width, (int) (arrowPoint.y - height * time), width, height); + } + + initComponents(); + } /** * show对话框 + * * @param fatherPane 上一层界面 parentPane - * @param ob 传入的内容，在show之前populate + * @param ob 传入的内容，在show之前populate */ - public void show(JComponent fatherPane, T ob) { - populateBean(ob); - UIDialog dialog = showUnsizedWindow(SwingUtilities.getWindowAncestor(fatherPane)); - showDialog = dialog; - Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); - dialog.setVisible(true); - } - - /** - * 数据展现 - */ - public void populateBean(T ob) { - contentPane.populateBean(ob); - } - - /** - * 停止编辑, 更新至最新的面板到属性保存 - */ - public T updateBean() { - updateContentPane(); - return contentPane.updateBean(); - } - - /** - * 需要实现更新内容，将updateBean传值给对象即可，在窗口消失的时候会被调用 - */ - protected abstract void updateContentPane(); - - /** - * 以对话框的形式弹出 - * - * @param window 窗口 - * @return 对话框 - */ - public UIDialog showUnsizedWindow(Window window) { - CustomShapedDialog dg = null; - if (window instanceof Frame) { - dg = new CustomShapedDialog((Frame) window); - } else { - dg = new CustomShapedDialog((Dialog) window); - } - if (arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { - dg.setSize(bounds.width + ARROR_PARALLEL, bounds.height + ARROR_VERTICAL); - } else { - dg.setSize(bounds.width + ARROR_VERTICAL, bounds.height + ARROR_PARALLEL); - } - - dg.setLocation(bounds.x, bounds.y); - dg.setBackground(Color.blue); - dg.setResizable(false); - return dg; - } - - @Override - protected String title4PopupWindow() { - return null; - } - - private double initBoundsTime(int arrowPosition, Point arrowPoint, int width, int height) { - int x = arrowPoint.x; - int y = arrowPoint.y; - int screenWidth = Toolkit.getDefaultToolkit().getScreenSize().width; - int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height - TITLE_HEIGHT; - double time = TIME_DEFAULT; - - if (arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { - while (y + time * height > screenHeight && time > 0) { - time -= TIME_GAP; - } - - while (y - (1 - time) * height < 0 && time < 1) { - time += TIME_GAP; - } - } else if (arrowPosition == Constants.TOP) { - while (x + time * width > screenWidth && time > 0) { - time -= TIME_GAP; - } - - while (x - (1 - time) * width < 0 && time < 1) { - time += TIME_GAP; - } - } - return 1 - time; - } - - private AWTEventListener awt = new AWTEventListener() { - public void eventDispatched(AWTEvent event) { - doSomeInAll(event); - } - }; - - private void doSomeInAll(AWTEvent event) { - if (event instanceof MouseEvent) { - MouseEvent mv = (MouseEvent) event; - if (mv.getClickCount() > 0) { - Point point = new Point((int) (mv.getLocationOnScreen().getX()) - 2 * OFF_LEFT, (int) mv.getLocationOnScreen().getY()); - // 判断鼠标点击是否在边界内 - if (!containsPoint(point) && showDialog != null) { - updateContentPane(); - showDialog.setVisible(false); - Toolkit.getDefaultToolkit().removeAWTEventListener(awt); - } - } - } - } + public void show(JComponent fatherPane, T ob) { + populateBean(ob); + if (showDialog == null) { + showDialog = showUnsizedWindow(SwingUtilities.getWindowAncestor(fatherPane)); + } + Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); + showDialog.setVisible(true); + } + + /** + * 数据展现 + */ + public void populateBean(T ob) { + contentPane.populateBean(ob); + } + + /** + * 停止编辑, 更新至最新的面板到属性保存 + */ + public T updateBean() { + updateContentPane(); + return contentPane.updateBean(); + } + + /** + * 需要实现更新内容，将updateBean传值给对象即可，在窗口消失的时候会被调用 + */ + protected abstract void updateContentPane(); + + /** + * 以对话框的形式弹出 + * + * @param window 窗口 + * @return 对话框 + */ + public UIDialog showUnsizedWindow(Window window) { + CustomShapedDialog dg = null; + if (window instanceof Frame) { + dg = new CustomShapedDialog((Frame) window); + } else { + dg = new CustomShapedDialog((Dialog) window); + } + if (arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { + dg.setSize(bounds.width + ARROR_PARALLEL, bounds.height + ARROR_VERTICAL); + } else { + dg.setSize(bounds.width + ARROR_VERTICAL, bounds.height + ARROR_PARALLEL); + } + + dg.setLocation(bounds.x, bounds.y); + dg.setBackground(Color.blue); + dg.setResizable(false); + return dg; + } + + @Override + protected String title4PopupWindow() { + return null; + } + + private double initBoundsTime(int arrowPosition, Point arrowPoint, int width, int height) { + int x = arrowPoint.x; + int y = arrowPoint.y; + int screenWidth = Toolkit.getDefaultToolkit().getScreenSize().width; + int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height - TITLE_HEIGHT; + double time = TIME_DEFAULT; + + if (arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { + while (y + time * height > screenHeight && time > 0) { + time -= TIME_GAP; + } + + while (y - (1 - time) * height < 0 && time < 1) { + time += TIME_GAP; + } + } else if (arrowPosition == Constants.TOP) { + while (x + time * width > screenWidth && time > 0) { + time -= TIME_GAP; + } + + while (x - (1 - time) * width < 0 && time < 1) { + time += TIME_GAP; + } + } + return 1 - time; + } + + private AWTEventListener awt = new AWTEventListener() { + public void eventDispatched(AWTEvent event) { + doSomeInAll(event); + } + }; + + private void doSomeInAll(AWTEvent event) { + if (event instanceof MouseEvent) { + MouseEvent mv = (MouseEvent) event; + if (mv.getClickCount() > 0) { + Point point = new Point((int) (mv.getLocationOnScreen().getX()) - 2 * OFF_LEFT, (int) mv.getLocationOnScreen().getY()); + // 判断鼠标点击是否在边界内 + if (!containsPoint(point) && showDialog != null) { + updateContentPane(); + showDialog.setVisible(false); + Toolkit.getDefaultToolkit().removeAWTEventListener(awt); + } + } + } + } private boolean containsPoint(Point point) { - if(arrowPosition == Constants.TOP){ + if (arrowPosition == Constants.TOP) { //箭头和按钮也算在pane内 Rectangle judgedBounds = new Rectangle(bounds.x, bounds.y - OFF_LEFT * 2, bounds.width, bounds.height + OFF_LEFT * 2 + OFF_LEFT); - return judgedBounds.contains(point); + return judgedBounds.contains(point); } return bounds.contains(point); } - private void initComponents() { - if(arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { - this.setBounds(20, 10, bounds.width, bounds.height); - } else { - this.setBounds(10, 10, bounds.width, bounds.height); - } - - this.setLayout(new BorderLayout()); - this.add(contentPane, BorderLayout.CENTER); - } + private void initComponents() { + if (arrowPosition == Constants.LEFT || arrowPosition == Constants.RIGHT) { + this.setBounds(20, 10, bounds.width, bounds.height); + } else { + this.setBounds(10, 10, bounds.width, bounds.height); + } + + this.setLayout(new BorderLayout()); + this.add(contentPane, BorderLayout.CENTER); + } - private class CustomShapedDialog extends UIDialog { + private class CustomShapedDialog extends UIDialog { private static final int GAP_SMALL = 10; private static final int GAP = 20; private static final int GAP_BIG = 30; - public CustomShapedDialog(Frame parent) { - super(parent); - this.initComponents(); - } - - public CustomShapedDialog(Dialog parent) { - super(parent); - this.initComponents(); - } - - - private Shape getCustomShap() { - Polygon polygon = new Polygon(); - if (arrowPosition == Constants.LEFT) { - polygon.addPoint(GAP_SMALL, 0); - polygon.addPoint(bounds.width + GAP_BIG, 0); - polygon.addPoint(bounds.width + GAP_BIG, bounds.height + GAP); - polygon.addPoint(GAP_SMALL, bounds.height + GAP); - polygon.addPoint(GAP_SMALL, (int) ((bounds.height + GAP) * time) - GAP_SMALL); - polygon.addPoint(0, (int) ((bounds.height + GAP) * time - GAP)); - polygon.addPoint(GAP_SMALL, (int) ((bounds.height + GAP) * time - GAP_BIG)); - polygon.addPoint(GAP_SMALL, 0); - } else if (arrowPosition == Constants.TOP) { - polygon.addPoint(0, GAP_SMALL); - polygon.addPoint((int) (bounds.width * time + GAP_SMALL), GAP_SMALL); - polygon.addPoint((int) (bounds.width * time + GAP), 0); - polygon.addPoint((int) (bounds.getWidth() * time + GAP_BIG), GAP_SMALL); - polygon.addPoint(bounds.width + GAP, GAP_SMALL); - polygon.addPoint(bounds.width + GAP, bounds.height + GAP_BIG); - polygon.addPoint(0, bounds.height + GAP_BIG); - polygon.addPoint(0, GAP_SMALL); - } else if (arrowPosition == Constants.RIGHT) { - polygon.addPoint(0, 0); - polygon.addPoint(bounds.width + GAP, 0); - polygon.addPoint(bounds.width + GAP, (int) ((bounds.height + GAP) * time) - GAP_BIG); - polygon.addPoint(bounds.width + GAP_BIG, (int) ((bounds.height + GAP) * time) - GAP); - polygon.addPoint(bounds.width + GAP, (int) ((bounds.height + GAP) * time) - GAP_SMALL); - polygon.addPoint(bounds.width + GAP, bounds.height + GAP); - polygon.addPoint(0, bounds.height + GAP); - polygon.addPoint(0, 0); - } - - return polygon; - } - - private Shape getShape4Board() { - Polygon polygon = new Polygon(); - if (arrowPosition == Constants.LEFT) { - polygon.addPoint(GAP_SMALL, 1); - polygon.addPoint(bounds.width + GAP_BIG - 1, 1); - polygon.addPoint(bounds.width + GAP_BIG - 1, bounds.height + GAP - 1); - polygon.addPoint(GAP_SMALL + 1, bounds.height + GAP - 1); - polygon.addPoint(GAP_SMALL + 1, (int) ((bounds.height + GAP) * time) - GAP_SMALL); - polygon.addPoint(1, (int) ((bounds.height + GAP) * time - GAP)); - polygon.addPoint(GAP_SMALL + 1, (int) ((bounds.height + GAP) * time - GAP_BIG)); - polygon.addPoint(GAP_SMALL + 1, 1); - } else if (arrowPosition == Constants.TOP) { - polygon.addPoint(1, GAP_SMALL + 1); - polygon.addPoint((int) (bounds.width * time + GAP_SMALL), GAP_SMALL + 1); - polygon.addPoint((int) (bounds.width * time + GAP), 1); - polygon.addPoint((int) (bounds.getWidth() * time + GAP_BIG), GAP_SMALL + 1); - polygon.addPoint(bounds.width + GAP - 1, GAP_SMALL + 1); - polygon.addPoint(bounds.width + GAP - 1, bounds.height + GAP_BIG - 1); - polygon.addPoint(1, bounds.height + GAP_BIG - 1); - polygon.addPoint(1, GAP_SMALL + 1); - } else if(arrowPosition == Constants.RIGHT) { - polygon.addPoint(1, 1); - polygon.addPoint(bounds.width + GAP - 1, 1); - polygon.addPoint(bounds.width + GAP - 1, (int) ((bounds.height + GAP) * time) - GAP_BIG); - polygon.addPoint(bounds.width + GAP_BIG - 1, (int) ((bounds.height + GAP) * time) - GAP); - polygon.addPoint(bounds.width + GAP - 1, (int) ((bounds.height + GAP) * time) - GAP_SMALL); - polygon.addPoint(bounds.width + GAP - 1, bounds.height + GAP - 1); - polygon.addPoint(1, bounds.height + GAP - 1); - polygon.addPoint(1, 0); - } - return polygon; - } - - /** - * 画出界面的样式, 边框等. - */ - public void paint(Graphics g) { - super.paint(g); - Graphics2D g2d = (Graphics2D) g; - Stroke oldStroke = g2d.getStroke(); - g2d.setStroke(new BasicStroke(2, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); - g2d.setColor(new Color(51, 51, 51)); - g2d.drawPolygon((Polygon) getShape4Board()); - g2d.setStroke(oldStroke); - } - - protected void initComponents() { - setUndecorated(true); - try { - AWTUtilities.setWindowShape(CustomShapedDialog.this, this.getCustomShap()); - } catch (UnsupportedOperationException e) { + public CustomShapedDialog(Frame parent) { + super(parent); + this.initComponents(); + } + + public CustomShapedDialog(Dialog parent) { + super(parent); + this.initComponents(); + } + + + private Shape getCustomShap() { + Polygon polygon = new Polygon(); + if (arrowPosition == Constants.LEFT) { + polygon.addPoint(GAP_SMALL, 0); + polygon.addPoint(bounds.width + GAP_BIG, 0); + polygon.addPoint(bounds.width + GAP_BIG, bounds.height + GAP); + polygon.addPoint(GAP_SMALL, bounds.height + GAP); + polygon.addPoint(GAP_SMALL, (int) ((bounds.height + GAP) * time) - GAP_SMALL); + polygon.addPoint(0, (int) ((bounds.height + GAP) * time - GAP)); + polygon.addPoint(GAP_SMALL, (int) ((bounds.height + GAP) * time - GAP_BIG)); + polygon.addPoint(GAP_SMALL, 0); + } else if (arrowPosition == Constants.TOP) { + polygon.addPoint(0, GAP_SMALL - 2); + polygon.addPoint((int) (bounds.width * time + GAP_SMALL), GAP_SMALL - 2); + polygon.addPoint((int) (bounds.width * time + GAP), 0); + polygon.addPoint((int) (bounds.getWidth() * time + GAP_BIG), GAP_SMALL - 2); + polygon.addPoint(bounds.width + GAP, GAP_SMALL - 2); + polygon.addPoint(bounds.width + GAP, bounds.height + GAP_BIG); + polygon.addPoint(0, bounds.height + GAP_BIG); + polygon.addPoint(0, GAP_SMALL - 2); + } else if (arrowPosition == Constants.RIGHT) { + polygon.addPoint(0, 0); + polygon.addPoint(bounds.width + GAP, 0); + polygon.addPoint(bounds.width + GAP, (int) ((bounds.height + GAP) * time) - GAP_BIG); + polygon.addPoint(bounds.width + GAP_BIG, (int) ((bounds.height + GAP) * time) - GAP); + polygon.addPoint(bounds.width + GAP, (int) ((bounds.height + GAP) * time) - GAP_SMALL); + polygon.addPoint(bounds.width + GAP, bounds.height + GAP); + polygon.addPoint(0, bounds.height + GAP); + polygon.addPoint(0, 0); + } + + return polygon; + } + + private Shape getShape4Board() { + Polygon polygon = new Polygon(); + if (arrowPosition == Constants.LEFT) { + polygon.addPoint(GAP_SMALL, 1); + polygon.addPoint(bounds.width + GAP_BIG - 1, 1); + polygon.addPoint(bounds.width + GAP_BIG - 1, bounds.height + GAP - 1); + polygon.addPoint(GAP_SMALL + 1, bounds.height + GAP - 1); + polygon.addPoint(GAP_SMALL + 1, (int) ((bounds.height + GAP) * time) - GAP_SMALL); + polygon.addPoint(1, (int) ((bounds.height + GAP) * time - GAP)); + polygon.addPoint(GAP_SMALL + 1, (int) ((bounds.height + GAP) * time - GAP_BIG)); + polygon.addPoint(GAP_SMALL + 1, 1); + } else if (arrowPosition == Constants.TOP) { + polygon.addPoint(1, GAP_SMALL - 1); + polygon.addPoint((int) (bounds.width * time + GAP_SMALL), GAP_SMALL - 1); + polygon.addPoint((int) (bounds.width * time + GAP), 1); + polygon.addPoint((int) (bounds.getWidth() * time + GAP_BIG), GAP_SMALL - 1); + polygon.addPoint(bounds.width + GAP - 1, GAP_SMALL - 1); + polygon.addPoint(bounds.width + GAP - 1, bounds.height + GAP_BIG - 1); + polygon.addPoint(1, bounds.height + GAP_BIG - 1); + polygon.addPoint(1, GAP_SMALL - 1); + } else if (arrowPosition == Constants.RIGHT) { + polygon.addPoint(1, 1); + polygon.addPoint(bounds.width + GAP - 1, 1); + polygon.addPoint(bounds.width + GAP - 1, (int) ((bounds.height + GAP) * time) - GAP_BIG); + polygon.addPoint(bounds.width + GAP_BIG - 1, (int) ((bounds.height + GAP) * time) - GAP); + polygon.addPoint(bounds.width + GAP - 1, (int) ((bounds.height + GAP) * time) - GAP_SMALL); + polygon.addPoint(bounds.width + GAP - 1, bounds.height + GAP - 1); + polygon.addPoint(1, bounds.height + GAP - 1); + polygon.addPoint(1, 0); + } + return polygon; + } + + protected void initComponents() { + setUndecorated(true); + try { + AWTUtilities.setWindowShape(CustomShapedDialog.this, this.getCustomShap()); + } catch (UnsupportedOperationException e) { FineLoggerFactory.getLogger().info("Not support"); - } - final JPanel contentPane = (JPanel) this.getContentPane(); - this.setLayout(null); - contentPane.add(UIBubbleFloatPane.this); - setVisible(true); - } - - /** - * 检查 - */ - public void checkValid() throws Exception { - - } - } + } + final JPanel contentPane = (JPanel) this.getContentPane(); + this.setLayout(null); + contentPane.add(UIBubbleFloatPane.this); + contentPane.setBorder(new Border() { + @Override + public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { + Graphics2D g2d = (Graphics2D) g; + Stroke oldStroke = g2d.getStroke(); + g2d.setStroke(new BasicStroke(2, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); + g2d.setColor(new Color(51, 51, 51)); + g2d.drawPolygon((Polygon) getShape4Board()); + g2d.setStroke(oldStroke); + } + + @Override + public Insets getBorderInsets(Component c) { + return null; + } + + @Override + public boolean isBorderOpaque() { + return false; + } + }); + } + + /** + * 检查 + */ + public void checkValid() throws Exception { + + } + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index 7d04113078..4506bb9a6c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -23,7 +23,7 @@ import java.util.List; * @editor zhou * @since 2012-3-28下午3:07:44 */ -public abstract class UITableModelAdapter extends AbstractTableModel implements UITableEditorLoader { +public abstract class UITableModelAdapter extends AbstractTableModel implements UITableEditorLoader { /** * @@ -37,7 +37,6 @@ public abstract class UITableModelAdapter extends AbstractTabl // list里放的是一行数据 private List list = new ArrayList(); - @SuppressWarnings({ "unchecked", "rawtypes" }) protected UITableModelAdapter(String[] columnNames) { this.columnNames = columnNames; table = new JTable(this); @@ -101,8 +100,8 @@ public abstract class UITableModelAdapter extends AbstractTabl } } - public void setRowAt(T value, int rowIndwx) { - this.list.set(rowIndwx, value); + public void setRowAt(T value, int rowIndex) { + this.list.set(rowIndex, value); } /** diff --git a/designer-base/src/main/java/com/fr/design/utils/ParameterUtils.java b/designer-base/src/main/java/com/fr/design/utils/ParameterUtils.java new file mode 100644 index 0000000000..b50e9950e1 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/utils/ParameterUtils.java @@ -0,0 +1,61 @@ +package com.fr.design.utils; + +import com.fr.base.Parameter; +import com.fr.base.ParameterHelper; +import com.fr.general.ComparatorUtils; +import com.fr.stable.ArrayUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +/** + * @Author: Yuan.Wang + * @Date: 2020/8/11 + */ +public class ParameterUtils { + /** + * 获得新的参数集合,返回的集合中的参数的顺序为：新增参数全部放在后面，以保证原有参数的相对顺序 + * + * @param paramTexts sql语句 + * @param oldParameters 旧的参数集合 + * @return 新参数集合 + */ + public static Parameter[] analyzeAndUnionParameters(String[] paramTexts, Parameter[] oldParameters) { + Parameter[] newParameters = ParameterHelper.analyze4Parameters(paramTexts, false); + return unionParametersInRelativeOrder(oldParameters, newParameters); + } + + /** + * 合并新旧参数集合，新增参数全部放在后面，以保证原有参数的相对顺序 + * + * @param oldParameters 旧的参数集合 + * @param newParameters 新的参数集合 + * @return 新参数集合 + */ + private static Parameter[] unionParametersInRelativeOrder(Parameter[] oldParameters, Parameter[] newParameters) { + if (ArrayUtils.isEmpty(newParameters) || ArrayUtils.isEmpty(oldParameters)) { + return newParameters; + } + + Parameter[] result = new Parameter[newParameters.length]; + List newParameterList = new ArrayList<>(Arrays.asList(newParameters)); + int i = 0; + //遍历旧参数数组中的参数，如果新参数list中存在同名参数，将该参数加入到result里，同时删除list中的同名参数 + for (Parameter oldParameter : oldParameters) { + Iterator iterator = newParameterList.listIterator(); + while (iterator.hasNext()) { + Parameter newParameter = iterator.next(); + if (ComparatorUtils.equals(oldParameter.getName(), newParameter.getName())) { + result[i++] = oldParameter; + iterator.remove(); + break; + } + } + } + //将新参数list中的剩余参数添加到result中 + System.arraycopy(newParameterList.toArray(new Parameter[0]), 0, result, i, newParameterList.size()); + return result; + } +} diff --git a/designer-base/src/test/java/com/fr/design/utils/ParameterUtilsTest.java b/designer-base/src/test/java/com/fr/design/utils/ParameterUtilsTest.java new file mode 100644 index 0000000000..26a470e34d --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/utils/ParameterUtilsTest.java @@ -0,0 +1,38 @@ +package com.fr.design.utils; + +import com.fr.base.Parameter; +import junit.framework.TestCase; + +/** + * @Author: Yuan.Wang + * @Date: 2020/8/11 + */ +public class ParameterUtilsTest extends TestCase { + public void testAnalyzeAndUnionParameters() { + String[] paramTexts = {"${a}${b}${d}", ""}; + Parameter[] oldParameters = new Parameter[]{new Parameter("c"), new Parameter("b"), new Parameter("a")}; + Parameter[] rightResult = new Parameter[]{new Parameter("b"), new Parameter("a"), new Parameter("d")}; + Parameter[] result = ParameterUtils.analyzeAndUnionParameters(paramTexts, oldParameters); + assertEquals(result.length, rightResult.length); + for (int i = 0; i < rightResult.length; i++) { + assertEquals(rightResult[i].getName(), result[i].getName()); + } + + paramTexts = new String[]{"${a}${b}${d}", ""}; + oldParameters = new Parameter[]{}; + rightResult = new Parameter[]{new Parameter("a"), new Parameter("b"), new Parameter("d")}; + result = ParameterUtils.analyzeAndUnionParameters(paramTexts, oldParameters); + assertEquals(result.length,rightResult.length); + + paramTexts = new String[]{"${b}", ""}; + oldParameters = new Parameter[]{new Parameter("b"), new Parameter("a"), new Parameter("d")}; + rightResult = new Parameter[]{new Parameter("b")}; + result = ParameterUtils.analyzeAndUnionParameters(paramTexts, oldParameters); + assertEquals(result.length,rightResult.length); + assertEquals(result.length, rightResult.length); + for (int i = 0; i < rightResult.length; i++) { + assertEquals(rightResult[i].getName(), result[i].getName()); + } + + } +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java index 3c5e992b92..241a93ea09 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java @@ -1,7 +1,6 @@ package com.fr.van.chart.designer.style; import com.fr.base.BaseUtils; -import com.fr.base.Style; import com.fr.chart.chartattr.Plot; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.UIBubbleFloatPane; @@ -61,6 +60,7 @@ public class VanChartPlotLegendPane extends BasicPane { private UIButtonGroup layoutButton; private JPanel layoutPane; private VanChartFloatPositionPane customFloatPositionPane; + private UIBubbleFloatPane uiBubbleFloatPane; //区域显示策略 恢复用注释。下面4行删除。 private UIButtonGroup customSize; @@ -80,7 +80,7 @@ public class VanChartPlotLegendPane extends BasicPane { initComponents(); } - public VanChartPlotLegendPane(VanChartStylePane parent){ + public VanChartPlotLegendPane(VanChartStylePane parent) { this.parent = parent; initComponents(); } @@ -118,9 +118,9 @@ public class VanChartPlotLegendPane extends BasicPane { new Component[]{legendPane}, }; - JPanel panel = TableLayoutHelper.createTableLayoutPane(components,row,col); + JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); this.setLayout(new BorderLayout()); - this.add(panel,BorderLayout.CENTER); + this.add(panel, BorderLayout.CENTER); addLegendListener(); } @@ -133,7 +133,7 @@ public class VanChartPlotLegendPane extends BasicPane { }); } - protected JPanel createLegendPaneWithoutHighlight(){ + protected JPanel createLegendPaneWithoutHighlight() { borderPane = new VanChartBorderWithRadiusPane(); backgroundPane = new VanChartBackgroundWithOutImagePane(); @@ -141,19 +141,19 @@ public class VanChartPlotLegendPane extends BasicPane { double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - double[] rowSize = { p,p,p,p,p,p,p}; + double[] rowSize = {p, p, p, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, - new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), createDisplayStrategy()),null} + new Component[]{createTitlePositionPane(new double[]{p, p, p}, columnSize), null}, + new Component[]{createTitleStylePane(), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), createDisplayStrategy()), null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } - protected JPanel createLegendPane(){ + protected JPanel createLegendPane() { borderPane = new VanChartBorderWithRadiusPane(); backgroundPane = new VanChartBackgroundWithOutImagePane(); highlightPane = createHighlightPane(); @@ -166,14 +166,14 @@ public class VanChartPlotLegendPane extends BasicPane { double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - double[] rowSize = { p,p,p,p,p,p,p,p}; + double[] rowSize = {p, p, p, p, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, - new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel),null}, + new Component[]{createTitlePositionPane(new double[]{p, p, p}, columnSize), null}, + new Component[]{createTitleStylePane(), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel), null}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } @@ -205,12 +205,12 @@ public class VanChartPlotLegendPane extends BasicPane { customFloatPositionButton.setEventBannded(true); Component[][] components = new Component[][]{ - new Component[]{null,null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),location}, - new Component[]{null,customFloatPositionButton} + new Component[]{null, null}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), location}, + new Component[]{null, customFloatPositionButton} }; - customFloatPositionPane = new VanChartFloatPositionPane(); + customFloatPositionPane = new VanChartFloatPositionPane(); layoutPane = createLayoutPane(); initPositionListener(); @@ -241,7 +241,7 @@ public class VanChartPlotLegendPane extends BasicPane { return TableLayout4VanChartHelper.createGapTableLayoutPane(components, new double[]{p, p}, new double[]{f, e}); } - private void initPositionListener(){ + private void initPositionListener() { location.addChangeListener(new ChangeListener() { @Override @@ -262,18 +262,20 @@ public class VanChartPlotLegendPane extends BasicPane { checkLayoutPaneVisible(); checkDisplayStrategyUse(); - if(customFloatPositionPane == null) { - customFloatPositionPane = new VanChartFloatPositionPane(); + if (customFloatPositionPane == null) { + customFloatPositionPane = new VanChartFloatPositionPane(); + } + if (uiBubbleFloatPane == null) { + Point comPoint = customFloatPositionButton.getLocationOnScreen(); + Point arrowPoint = new Point(comPoint.x + customFloatPositionButton.getWidth() / 2 - GAP, comPoint.y + customFloatPositionButton.getHeight()); + uiBubbleFloatPane = new UIBubbleFloatPane(Constants.TOP, arrowPoint, customFloatPositionPane, WIDTH, HEIGHT) { + @Override + public void updateContentPane() { + parent.attributeChanged(); + } + }; } - Point comPoint = customFloatPositionButton.getLocationOnScreen(); - Point arrowPoint = new Point(comPoint.x + customFloatPositionButton.getWidth()/2 - GAP, comPoint.y + customFloatPositionButton.getHeight()); - UIBubbleFloatPane