From d63dc7eb3ccd8910b8643f62141a70dbdab7aa1a Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 30 Oct 2017 10:55:03 +0800 Subject: [PATCH 1/7] REPORT-4892 --- .../tabledatapane/DBTableDataPane.java | 1 + .../src/com/fr/design/images/data/field.png | Bin 1109 -> 190 bytes 2 files changed, 1 insertion(+) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 947e17106..8919535f0 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -184,6 +184,7 @@ public class DBTableDataPane extends AbstractTableDataPane { toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction()); } isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); + isShareCheckBox.setBackground(Color.WHITE); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); UIToolbar editToolBar = ToolBarDef.createJToolBar(); diff --git a/designer_base/src/com/fr/design/images/data/field.png b/designer_base/src/com/fr/design/images/data/field.png index 080cc1077812ee20e2f20a3749fa13e46095f30c..3ce09b689596a926c442ff6e9383d49ac9ef87ab 100644 GIT binary patch delta 153 zcmV;K0A~Ny2)+T383+ad001BJ|6!3K7=IabMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0000>Nkl}O34_suG#Cs32rvMd5NIG2r8|NE0000}1 zg`_yJGB6%#IhM}Ap}@n~z;H+a%1BDAIDLTQvB9QK1`I3$&5IN!sIrL)rU$ZcD2OfC z^C4P+?c;sJ(?&o!Zf4=b)oN Date: Mon, 30 Oct 2017 12:00:17 +0800 Subject: [PATCH 2/7] REPORT-4892 --- .../src/com/fr/design/images/m_format/cell.png | Bin 374 -> 477 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/designer_base/src/com/fr/design/images/m_format/cell.png b/designer_base/src/com/fr/design/images/m_format/cell.png index 2f42e1e4ca41e4604de566b7a115e46e3871b842..e000c81b7c654076c7a359f25b2f5cd412e08af1 100644 GIT binary patch delta 451 zcmV;!0X+Wp0^I|UB!2;OQb$4nuFf3k0004(NkliA^b`Cx3*TFPFiQA^F3_Sj5iFqQ4m+2S}y{6Nt z@oKf|1qlEcN?7F?s@cGs^;XL%DrKz_d6x{1$77jhv*~`>LNp5xRco)pHk6z(&HNp@ zPlTBMfZf3mLq{kPdIUepxpx3a*#q&%%OOev zBpCqI>;R2YAx~(D@gj;qnpc zwE`fnhe`(m4OG~`f=4qfP(gqnh~HxghYd`4qPT%T8Zy9^4v=k^hxr}o)CMHE|HuX~ tVbLsr7V_w6;2@Ni2dQNo@Z1OxU;uRtT|77&0DS-e002ovPDHLkV1j5(gvkH^ From 29b8fc4332e78c292539be8c214f9e35d37cb022 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 1 Nov 2017 10:22:05 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascript/beautify/BeautifyOption.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/designer_base/src/com/fr/design/javascript/beautify/BeautifyOption.java b/designer_base/src/com/fr/design/javascript/beautify/BeautifyOption.java index 227197a4b..a1fcc9dc2 100644 --- a/designer_base/src/com/fr/design/javascript/beautify/BeautifyOption.java +++ b/designer_base/src/com/fr/design/javascript/beautify/BeautifyOption.java @@ -35,21 +35,37 @@ public class BeautifyOption { } + /** + * 缩进个数，默认为4 + * @param indentSize 缩进个数 + */ public BeautifyOption indentSize(int indentSize) { this.indentSize = indentSize; return this; } + /** + * 缩进使用的字符，默认为一个空格 + * @param indentChar 缩进字符 + */ public BeautifyOption indentChar(String indentChar) { this.indentChar = indentChar; return this; } + /** + * 是否使用tab来作为缩进字符，默认为false + * @param indentWithTabs 使用tab作为缩进字符则返回true，否则返回false + */ public BeautifyOption indentWithTabs(boolean indentWithTabs) { this.indentWithTabs = indentWithTabs; return this; } + /** + * 换行符，默认为"\n" + * @param eol 换行符 + */ public BeautifyOption eol(String eol) { this.eol = eol; return this; From ef32c7aa0fadaa192bae13a6bc4f4574e9f725fd Mon Sep 17 00:00:00 2001 From: hzzz Date: Wed, 1 Nov 2017 14:12:38 +0800 Subject: [PATCH 4/7] sonarqube --- .../tabledatapane/DBTableDataPane.java | 68 +++++++++++-------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 8919535f0..af928dee6 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -54,6 +54,7 @@ import java.util.ArrayList; import java.util.List; public class DBTableDataPane extends AbstractTableDataPane { + private static final int BOTTOM = 6; private static final String PREVIEW_BUTTON = Inter.getLocText("FR-Designer_Preview"); private static final String REFRESH_BUTTON = Inter.getLocText("FR-Designer_Refresh"); private ConnectionTableProcedurePane connectionTableProcedurePane; @@ -66,29 +67,9 @@ public class DBTableDataPane extends AbstractTableDataPane { private String pageQuery = null; private DBTableData dbTableData; - - - public DBTableDataPane() { - this.setLayout(new BorderLayout(4, 4)); - - Box box = new Box(BoxLayout.Y_AXIS); - + private void init() { sqlTextPane = new SQLEditPane(); sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); - JPanel northPane = new JPanel(new BorderLayout(4, 4)); - JToolBar editToolBar = createToolBar(); - northPane.add(editToolBar, BorderLayout.CENTER); - northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0)); - - RTextScrollPane sqlTextScrollPane = new RTextScrollPane(sqlTextPane); - sqlTextScrollPane.setLineNumbersEnabled(true); - sqlTextScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - sqlTextScrollPane.setPreferredSize(new Dimension(680, 600)); - - JPanel paraMeanPane = new JPanel(new BorderLayout()); - paraMeanPane.setPreferredSize(new Dimension(680, 90)); - UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES")); - paraMeanPane.add(paraMean, BorderLayout.CENTER); ParameterTableModel model = new ParameterTableModel() { @Override @@ -98,14 +79,6 @@ public class DBTableDataPane extends AbstractTableDataPane { }; editorPane = new UITableEditorPane(model); - box.add(northPane); - box.add(sqlTextScrollPane); - box.add(paraMeanPane); - box.add(editorPane); - - JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4)); - sqlSplitPane.add(box, BorderLayout.CENTER); - // 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table connectionTableProcedurePane = new ConnectionTableProcedurePane() { @Override @@ -131,7 +104,7 @@ public class DBTableDataPane extends AbstractTableDataPane { }); sqlTextPane.addFocusListener(new FocusListener() { public void focusGained(FocusEvent e) { - + // unsupport } public void focusLost(FocusEvent e) { @@ -140,6 +113,40 @@ public class DBTableDataPane extends AbstractTableDataPane { } } }); + } + + public DBTableDataPane() { + init(); + this.setLayout(new BorderLayout(4, 4)); + + Box box = new Box(BoxLayout.Y_AXIS); + + + JPanel northPane = new JPanel(new BorderLayout(4, 4)); + JToolBar editToolBar = createToolBar(); + northPane.add(editToolBar, BorderLayout.CENTER); + northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM, 0)); + + RTextScrollPane sqlTextScrollPane = new RTextScrollPane(sqlTextPane); + sqlTextScrollPane.setLineNumbersEnabled(true); + sqlTextScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); + sqlTextScrollPane.setPreferredSize(new Dimension(680, 600)); + + JPanel paraMeanPane = new JPanel(new BorderLayout()); + paraMeanPane.setPreferredSize(new Dimension(680, 90)); + UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES")); + paraMeanPane.add(paraMean, BorderLayout.CENTER); + + + box.add(northPane); + box.add(sqlTextScrollPane); + box.add(paraMeanPane); + box.add(editorPane); + + JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4)); + sqlSplitPane.add(box, BorderLayout.CENTER); + + box.setMinimumSize(new Dimension(310, 400)); // 使用SplitPane JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane); @@ -297,6 +304,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override public void checkEnabled() { + // unsupport } } From 4e945a165808de1f9ec635a7200530d8e319e311 Mon Sep 17 00:00:00 2001 From: hzzz Date: Wed, 1 Nov 2017 14:15:29 +0800 Subject: [PATCH 5/7] sonarqube --- .../tabledata/tabledatapane/DBTableDataPane.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index af928dee6..85c75e329 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -68,6 +68,8 @@ public class DBTableDataPane extends AbstractTableDataPane { private DBTableData dbTableData; private void init() { + this.setLayout(new BorderLayout(4, 4)); + sqlTextPane = new SQLEditPane(); sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); @@ -115,10 +117,8 @@ public class DBTableDataPane extends AbstractTableDataPane { }); } - public DBTableDataPane() { - init(); - this.setLayout(new BorderLayout(4, 4)); + private void initMainSplitPane() { Box box = new Box(BoxLayout.Y_AXIS); @@ -155,6 +155,12 @@ public class DBTableDataPane extends AbstractTableDataPane { this.add(mainSplitPane, BorderLayout.CENTER); } + public DBTableDataPane() { + init(); + initMainSplitPane(); + } + + private boolean isPreviewOrRefreshButton (FocusEvent e) { if (e.getOppositeComponent() != null) { From 1c33bfe011c4044a6f060bf76300f592b9a6a86a Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 1 Nov 2017 14:43:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?REPORT-5143=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=8B=E6=9C=BA=E9=82=AE=E7=AE=B1=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginWebBridge.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 14b70aa87..438deb914 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -5,6 +5,7 @@ import com.fr.base.FRContext; import com.fr.design.RestartHelper; import com.fr.design.bbs.BBSLoginUtils; import com.fr.design.dialog.UIDialog; +import com.fr.design.extra.exe.PluginLoginExecutor; import com.fr.design.extra.exe.callback.JSCallback; import com.fr.design.gui.ilable.UILabel; import com.fr.general.FRLogger; @@ -17,6 +18,7 @@ import com.fr.plugin.context.PluginMarker; import com.fr.plugin.manage.PluginManager; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; +import javafx.concurrent.Task; import javafx.scene.web.WebEngine; import javafx.stage.FileChooser; import javafx.stage.Stage; @@ -491,6 +493,18 @@ public class PluginWebBridge { this.uiLabel = uiLabel; } + /** + * 设计器端的用户登录 + * + * @param username 用户名 + * @param password 密码 + * @return 登录信息标志 + */ + public void defaultLogin(String username, String password, final JSObject callback) { + Task task = new PluginTask<>(webEngine, callback, new PluginLoginExecutor(username, password)); + new Thread(task).start(); + } + /** * 弹出QQ授权页面 */ From 671e60eda6e125bde6d60e007b77b7a0f2c0d2f5 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 1 Nov 2017 15:04:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?REPORT-5304=20=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8E=EF=BC=8C=E9=A2=84=E8=A7=88=E6=97=A0?= =?UTF-8?q?=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/FileTableDataPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index db98a6928..baeb4798c 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -90,7 +90,6 @@ public class FileTableDataPane extends AbstractTableDataPane { private Parameter[] params; private JPanel filePath; private XMLNodeTreePane nodeTreePane; - private JPanel textSetPanel; private UICheckBox needColumnNameCheckBox;// 第一行是否作为标题 private UIRadioButton tableDismemberRadioButton;// 制表符 @@ -151,8 +150,8 @@ public class FileTableDataPane extends AbstractTableDataPane { southPanel.add(setPanel, BorderLayout.CENTER); setPanel.setPreferredSize(new Dimension(setPanelWidth, 460)); setPanel.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Set"))); - textSetPanel = textSetPanel(width,height); - setPanel.add(textSetPanel, BorderLayout.NORTH); + JPanel controlPane = textSetPanel(width,height); + setPanel.add(controlPane, BorderLayout.NORTH); fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height)); this.add(northPanel, BorderLayout.NORTH); @@ -465,11 +464,12 @@ public class FileTableDataPane extends AbstractTableDataPane { } else if (fileTypeComboBox.getSelectedIndex() == EXCEL) { setPanel.add(excelSetPanel(width,height), BorderLayout.NORTH); } else { - setPanel.add(textSetPanel, BorderLayout.NORTH); + setPanel.add(textSetPanel(width,height), BorderLayout.NORTH); } String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; tips.setText(tipContent); + setPanel.revalidate(); } };