From 576efd67492386b76443fe8fecbf6473dcf5b422 Mon Sep 17 00:00:00 2001 From: Starryi Date: Wed, 10 Jun 2020 18:01:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?MOBILE-27254=20=E8=81=94=E6=8E=92=E6=8C=89?= =?UTF-8?q?=E9=92=AETab=E6=A0=B7=E5=BC=8F=E6=94=AF=E6=8C=81=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E8=BE=B9=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tab组件联排按钮标题栏样式配置面板添加关于上下边距的配置项 --- .../ui/MobileTemplateStyleDefinePane.java | 2 +- .../mobile/ui/UniteStyleDefinePane.java | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java index 7c07aee6f..6dc2da5e9 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java @@ -109,7 +109,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane Date: Fri, 12 Jun 2020 10:49:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?MOBILE-27254=20=E8=81=94=E6=8E=92=E6=8C=89?= =?UTF-8?q?=E9=92=AETab=E6=A0=B7=E5=BC=8F=E6=94=AF=E6=8C=81=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E8=BE=B9=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补充移动端Tab组件联排按钮标题栏样式配置面板控件单元测试 --- .../mobile/ui/UniteStyleDefinePaneTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java diff --git a/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java b/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java new file mode 100644 index 000000000..857a367d2 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java @@ -0,0 +1,39 @@ +package com.fr.design.mainframe.mobile.ui; + +import com.fr.form.ui.container.cardlayout.WCardTagLayout; +import com.fr.general.cardtag.mobile.UniteStyle; +import com.fr.invoke.Reflect; +import junit.framework.TestCase; +import org.junit.Test; + +import java.awt.*; + +public class UniteStyleDefinePaneTest extends TestCase { + + @Test + public void testDefaultConfig() { + UniteStyleDefinePane definePane = new UniteStyleDefinePane(new WCardTagLayout()); + Reflect.on(definePane).call("initDefaultConfig"); + + double paddingTop = Reflect.on(definePane).field("paddingTopSpinner").call("getValue").get(); + assertEquals((int)paddingTop, UniteStyle.DEFAULT_PADDING_TOP); + double paddingBottom = Reflect.on(definePane).field("paddingBottomSpinner").call("getValue").get(); + assertEquals((int)paddingBottom, UniteStyle.DEFAULT_PADDING_BOTTOM); + double paddingLeft = Reflect.on(definePane).field("paddingLeftSpinner").call("getValue").get(); + assertEquals((int)paddingLeft, UniteStyle.DEFAULT_PADDING_LEFT); + double paddingRight = Reflect.on(definePane).field("paddingRightSpinner").call("getValue").get(); + assertEquals((int)paddingRight, UniteStyle.DEFAULT_PADDING_RIGHT); + + Color initialBackgroundColor = Reflect.on(definePane).field("initialBackgroundColorBox").call("getSelectObject").get(); + assertEquals(initialBackgroundColor, UniteStyle.DEFAULT_INITIAL_BACKGROUND_COLOR); + Color selectedBackgroundColor = Reflect.on(definePane).field("selectedBackgroundColorBox").call("getSelectObject").get(); + assertEquals(selectedBackgroundColor, UniteStyle.DEFAULT_SELECTED_BACKGROUND_COLOR); + + int lineStyle = Reflect.on(definePane).field("borderWidthComboBox").call("getSelectedLineStyle").get(); + assertEquals(lineStyle, UniteStyle.DEFAULT_BORDER_LINE.lineStyle); + Color borderColor = Reflect.on(definePane).field("borderColorBox").call("getSelectObject").get(); + assertEquals(borderColor, UniteStyle.DEFAULT_BORDER_LINE.color); + double borderRadius = Reflect.on(definePane).field("borderRadiusSpinner").call("getValue").get(); + assertEquals((int)borderRadius, UniteStyle.DEFAULT_BORDER_RADIUS); + } +} \ No newline at end of file From 2bf97fe7d93d6bf37f102cc5f0167954ee5f3ff0 Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 15 Jun 2020 14:26:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E6=89=93?= =?UTF-8?q?=E5=8C=85=E8=84=9A=E6=9C=AC=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5439b950b..3118ed8a9 100644 --- a/build.gradle +++ b/build.gradle @@ -57,10 +57,10 @@ allprojects { } dependencies { - implementation 'com.fr.third:jxbrowser:7.5' - implementation 'com.fr.third:jxbrowser-swing:7.5' - implementation 'com.fr.third:jxbrowser-mac:7.5' - implementation 'com.fr.third:jxbrowser-win64:7.5' + implementation 'com.fr.third:jxbrowser:6.23' + implementation 'com.fr.third:jxbrowser-swing:6.23' + implementation 'com.fr.third:jxbrowser-mac:6.23' + implementation 'com.fr.third:jxbrowser-win64:6.23' implementation 'com.fr.third.server:servlet-api:3.0' implementation 'org.swingexplorer:swexpl:2.0.1' implementation 'org.swingexplorer:swag:1.0' From b6a250d6ff6341808dd881e106d992e01fec6a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 15 Jun 2020 15:13:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?CHART-14259=20=20=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/data/report/MeterPlotReportDataContentPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index a73ea2a16..c7edab24d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java @@ -53,7 +53,7 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan Component[][] components = getShowComponents(); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6); - panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 5, 15)); + panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 5, 8)); this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.NORTH); From 254e874dc4a582c3a9eb2d38969d535bb4fe09e3 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 15 Jun 2020 17:19:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-33690=20UIManager=E4=B8=AD=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9B=91=E5=90=AC=20=E6=B2=A1=E6=9C=89=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=85=8D=E5=AF=B9=E7=A7=BB=E9=99=A4=20?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=86=85=E5=AD=98=E6=B3=84=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/javascript/JSContentPane.java | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java index cd6e01df3..da0910126 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java @@ -21,6 +21,8 @@ import com.fr.general.IOUtils; import javax.swing.*; import java.awt.*; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -82,6 +84,28 @@ public class JSContentPane extends BasicPane { UIScrollPane sp = new UIScrollPane(contentTextArea); this.add(sp, BorderLayout.CENTER); + contentTextArea.addFocusListener(new FocusListener() { + @Override + public void focusGained(FocusEvent e) { + if (ac == null) { + CompletionProvider provider = createCompletionProvider(); + ac = new AutoCompletion(provider); + String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); + + ac.setTriggerKey(convert2KeyStroke(shortCuts)); + ac.install(contentTextArea); + } + } + + @Override + public void focusLost(FocusEvent e) { + if (ac != null) { + ac.uninstall(); + ac = null; + } + } + }); + UILabel funNameLabel2 = new UILabel(); funNameLabel2.setText("}"); this.add(funNameLabel2, BorderLayout.SOUTH); @@ -97,24 +121,10 @@ public class JSContentPane extends BasicPane { } public void populate(String js) { - if (ac == null) { - CompletionProvider provider = createCompletionProvider(); - ac = new AutoCompletion(provider); - String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); - - ac.setTriggerKey(convert2KeyStroke(shortCuts)); - ac.install(contentTextArea); - } - this.contentTextArea.setText(js); } public String update() { - if (ac != null) { - this.ac.uninstall(); - ac = null; - } - return this.contentTextArea.getText(); } From f5a89c3de8635d6564d462ab21682c38296bef79 Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 16 Jun 2020 10:26:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?REPORT-33690=20=E6=8A=BD=E5=87=BA=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/javascript/JSContentPane.java | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java index da0910126..2ca2d6e66 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java @@ -87,22 +87,14 @@ public class JSContentPane extends BasicPane { contentTextArea.addFocusListener(new FocusListener() { @Override public void focusGained(FocusEvent e) { - if (ac == null) { - CompletionProvider provider = createCompletionProvider(); - ac = new AutoCompletion(provider); - String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); - - ac.setTriggerKey(convert2KeyStroke(shortCuts)); - ac.install(contentTextArea); - } + // 获得焦点时 安装 + installAutoCompletion(); } @Override public void focusLost(FocusEvent e) { - if (ac != null) { - ac.uninstall(); - ac = null; - } + // 失去焦点时 卸载 + uninstallAutoCompletion(); } }); @@ -115,6 +107,30 @@ public class JSContentPane extends BasicPane { return KeyStroke.getKeyStroke(ks.replace("+", "pressed")); } + /** + * 注册安装 自动补全监听 + */ + private void installAutoCompletion() { + if (ac == null) { + CompletionProvider provider = createCompletionProvider(); + ac = new AutoCompletion(provider); + String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); + + ac.setTriggerKey(convert2KeyStroke(shortCuts)); + ac.install(contentTextArea); + } + } + + /** + * 卸载移除 自动补全监听 + */ + private void uninstallAutoCompletion() { + if (ac != null) { + ac.uninstall(); + ac = null; + } + } + @Override protected String title4PopupWindow() { return "JS";