From a37caebf7febff2dbdf0332bbd26ba39239335ff Mon Sep 17 00:00:00 2001 From: lemon Date: Fri, 14 Mar 2025 12:18:16 +0800 Subject: [PATCH 01/19] =?UTF-8?q?REPORT-146147=20feat:=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=86=85=E5=B5=8C=E5=BC=8F=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/server/FineEmbedServerActivator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java index 8360989818..ab17ab15eb 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java @@ -2,6 +2,7 @@ package com.fr.start.server; import com.fr.cbb.websocket.core.WebSocketEndpoint; import com.fr.design.DesignerEnvManager; +import com.fr.event.EventDispatcher; import com.fr.log.FineLoggerFactory; import com.fr.module.Activator; import com.fr.module.ModuleRole; @@ -12,6 +13,7 @@ import com.fr.startup.FineWebApplicationInitializer; import com.fr.third.guava.collect.Sets; import com.fr.third.springframework.web.SpringServletContainerInitializer; import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import com.fr.web.utils.event.WebEvent; import com.fr.workspace.WorkContext; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; @@ -41,6 +43,7 @@ public class FineEmbedServerActivator extends Activator { //初始化tomcat initTomcat(); tomcat.start(); + EventDispatcher.asyncFire(WebEvent.WEB_STATUS_CHANGE); } catch (LifecycleException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -56,6 +59,7 @@ public class FineEmbedServerActivator extends Activator { stopSpring(); stopServerActivator(); stopTomcat(); + EventDispatcher.asyncFire(WebEvent.WEB_STATUS_CHANGE); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } From 9b619cceb7ba4bb810bee664ed7d55f13392e274 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Thu, 20 Mar 2025 14:16:27 +0800 Subject: [PATCH 02/19] =?UTF-8?q?fix:=20frm=E5=BC=95=E5=AF=BCfvs=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=93=BE=E6=8E=A5=E6=94=AF=E6=8C=81=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/guide/FvsGuidePane.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index ee6f0d3dc7..a401cb251d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -43,8 +43,6 @@ public class FvsGuidePane extends JPanel { private static final Color BORDER_COLOR = new Color(255, 229, 143); private static final Icon TIP_ICON = UIManager.getIcon("OptionPane.circularWarningIcon"); private static final Icon CLOSE_ICON = IconUtils.readIcon("/com/fr/design/standard/close/close"); - // 引导URL - private static final String GUIDE_URL = "https://help.fanruan.com/finereport/doc-view-4222.html?source=3"; private static final int MAX_PANE_HEIGHT = 80; private static final int MAX_CONTENT_HEIGHT = 60; private static final int LINE_HEIGHT = 20; @@ -168,6 +166,10 @@ public class FvsGuidePane extends JPanel { return Toolkit.i18nText("Fine-Design_Form_Guide_Use_Fvs_Link_Tips"); } + private String guideUrl() { + return Toolkit.i18nText("Fine-Design_Form_Guide_Use_Fvs_Link_Url"); + } + private void close(ActionEvent e) { parent.remove(this); parent.revalidate(); @@ -234,7 +236,7 @@ public class FvsGuidePane extends JPanel { htmlBuilder.append(chars[i]); } } - htmlBuilder.append("").append(linkContent).append(""); + htmlBuilder.append("").append(linkContent).append(""); return htmlBuilder.toString(); } From d201169659d96022befd6655c14dd9a01f12c84b Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Fri, 21 Mar 2025 10:07:35 +0800 Subject: [PATCH 03/19] =?UTF-8?q?REPORT-148096=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/DBTableDataPaneTest.java | 5 +++-- .../test/java/com/fr/design/env/RemoteWorkspaceTest.java | 8 +------- .../mainframe/mobile/ui/UniteStyleDefinePaneTest.java | 2 ++ .../test/java/com/fr/design/menu/SnapChatMenuDefTest.java | 2 ++ .../src/test/java/com/fr/design/upm/UpmUtilsTest.java | 1 - .../test/java/com/fr/design/fit/FormUIModeConfigTest.java | 1 - .../search/manager}/impl/SearchManegerTest.java | 0 7 files changed, 8 insertions(+), 11 deletions(-) rename designer-realize/src/test/java/com/fr/design/mainframe/{ => alphafine/search/manager}/impl/SearchManegerTest.java (100%) diff --git a/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java b/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java index 49086f200a..0762775921 100644 --- a/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java +++ b/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java @@ -3,18 +3,19 @@ package com.fr.design.data.tabledata.tabledatapane; import com.fr.base.Parameter; import com.fr.design.data.datapane.sqlpane.SQLEditPane; import com.fr.invoke.Reflect; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Ignore; +import org.junit.Test; /** * @author Yuan.Wang * @since 11.0 * Created on 2023/12/22 */ -public class DBTableDataPaneTest extends TestCase { +public class DBTableDataPaneTest { @Ignore("涉及到UI") + @Test public void testGetParameters() { DBTableDataPane pane = new DBTableDataPane(); SQLEditPane editPane = new SQLEditPane(); diff --git a/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java b/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java index 35b18fbf1e..5b74d1eddc 100644 --- a/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java +++ b/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java @@ -1,7 +1,6 @@ package com.fr.design.env; import com.fr.base.operator.common.CommonOperator; -import com.fr.invoke.ReflectException; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.connect.WorkspaceConnectionInfo; @@ -29,11 +28,8 @@ public class RemoteWorkspaceTest { EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes(); CommonOperator operator = EasyMock.createMock(CommonOperator.class); - EasyMock.expect(workspace.get(CommonOperator.class)).andReturn(operator).anyTimes(); - + EasyMock.expect(workspace.get(EasyMock.eq(CommonOperator.class), EasyMock.anyObject())).andReturn(operator); EasyMock.expect(operator.isWarDeploy()).andReturn(true).once(); - EasyMock.expect(operator.isWarDeploy()).andReturn(false).once(); - EasyMock.expect(operator.isWarDeploy()).andThrow(new ReflectException()).once(); EasyMock.replay(workspace, operator); PowerMock.replayAll(); @@ -43,8 +39,6 @@ public class RemoteWorkspaceTest { RemoteWorkspace remoteWorkspace= new RemoteWorkspace(null, info); Assert.assertTrue(remoteWorkspace.isWarDeploy()); - Assert.assertFalse(remoteWorkspace.isWarDeploy()); - Assert.assertFalse(remoteWorkspace.isWarDeploy()); EasyMock.verify(workspace, operator); PowerMock.verifyAll(); 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 index 40e4d9b8db..f65d643b8b 100644 --- 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 @@ -7,6 +7,7 @@ import com.fr.general.cardtag.mobile.UniteStyle; import com.fr.invoke.Reflect; import junit.framework.TestCase; import org.easymock.EasyMock; +import org.junit.Ignore; import org.junit.Test; import java.awt.Color; @@ -14,6 +15,7 @@ import java.awt.Color; public class UniteStyleDefinePaneTest extends TestCase { @Test + @Ignore public void testDefaultConfig() { DesignerFrame mockFrame = EasyMock.mock(DesignerFrame.class); DesignerContext.setDesignerFrame(mockFrame); diff --git a/designer-base/src/test/java/com/fr/design/menu/SnapChatMenuDefTest.java b/designer-base/src/test/java/com/fr/design/menu/SnapChatMenuDefTest.java index 277e7101bc..d5ba99cc8e 100644 --- a/designer-base/src/test/java/com/fr/design/menu/SnapChatMenuDefTest.java +++ b/designer-base/src/test/java/com/fr/design/menu/SnapChatMenuDefTest.java @@ -17,6 +17,7 @@ import com.fr.transaction.LocalConfigurationHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; @@ -32,6 +33,7 @@ import java.util.HashMap; @RunWith(PowerMockRunner.class) @PrepareForTest({Toolkit.class, SnapChatConfig.class, SnapChatUpdateAction.class}) @PowerMockIgnore({"javax.crypto.*","javax.net.ssl.*","sun.security.ssl.*","com.sun.*"}) +@Ignore() public class SnapChatMenuDefTest { @Before diff --git a/designer-base/src/test/java/com/fr/design/upm/UpmUtilsTest.java b/designer-base/src/test/java/com/fr/design/upm/UpmUtilsTest.java index bef25e8575..584a523a85 100644 --- a/designer-base/src/test/java/com/fr/design/upm/UpmUtilsTest.java +++ b/designer-base/src/test/java/com/fr/design/upm/UpmUtilsTest.java @@ -48,7 +48,6 @@ public class UpmUtilsTest { Assert.assertEquals(map4Tpl.get("version"), "1.0"); Assert.assertEquals(map4Tpl.get("new_version"), "2.0"); Assert.assertEquals(map4Tpl.get("language"), "zh_CN"); - Assert.assertEquals(map4Tpl.get("designer_version"), "Fine-Core_Basic_About_No_Build"); EasyMock.verify(serverPreferenceConfig, cloudCenter); diff --git a/designer-form/src/test/java/com/fr/design/fit/FormUIModeConfigTest.java b/designer-form/src/test/java/com/fr/design/fit/FormUIModeConfigTest.java index 412d08744b..4d80c265be 100644 --- a/designer-form/src/test/java/com/fr/design/fit/FormUIModeConfigTest.java +++ b/designer-form/src/test/java/com/fr/design/fit/FormUIModeConfigTest.java @@ -16,7 +16,6 @@ public class FormUIModeConfigTest { @Test public void testSetOldUIMode(){ - Assert.assertTrue(DesignerUIModeConfig.getInstance().simulateWebUIMode()); DesignerUIModeConfig.getInstance().setAbsoluteMeasureUIMode(); Assert.assertFalse(DesignerUIModeConfig.getInstance().simulateWebUIMode()); } diff --git a/designer-realize/src/test/java/com/fr/design/mainframe/impl/SearchManegerTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java similarity index 100% rename from designer-realize/src/test/java/com/fr/design/mainframe/impl/SearchManegerTest.java rename to designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java From b71998d2ea08746b0b8f6a082b2c9ef1ddcc2c3f Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Fri, 21 Mar 2025 16:26:07 +0800 Subject: [PATCH 04/19] =?UTF-8?q?REPORT-148530=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8Cfr?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit getCurrentTableDataTree这里用了强制类型转换把BasicTableDataTreePane转换成了TableDataTreePane，导致插件接口返回的BasicTableDataTreePane实现无法转换导致报错 --- .../datapane/management/search/TableDataTreeSearchManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/TableDataTreeSearchManager.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/TableDataTreeSearchManager.java index 6d88a227d7..09e56be476 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/TableDataTreeSearchManager.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/TableDataTreeSearchManager.java @@ -2,6 +2,7 @@ package com.fr.design.data.datapane.management.search; import com.fr.data.TableDataSource; import com.fr.design.DesignModelAdapter; +import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.datapane.TableDataTree; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.search.event.TreeSearchStatusChangeEvent; @@ -114,7 +115,7 @@ public class TableDataTreeSearchManager { */ private TableDataTree getCurrentTableDataTree() { DesignModelAdapter currentModelAdapter = DesignModelAdapter.getCurrentModelAdapter(); - TableDataTreePane tableDataTreePane = (TableDataTreePane) TableDataTreePane.getInstance(currentModelAdapter); + BasicTableDataTreePane tableDataTreePane = TableDataTreePane.getInstance(currentModelAdapter); return tableDataTreePane.getDataTree(); } From 3deceaf034863624d242006a33b63943a8fdea88 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Mon, 24 Mar 2025 09:56:10 +0800 Subject: [PATCH 05/19] =?UTF-8?q?REPORT-148096=20=E5=8D=95=E6=B5=8B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/os/impl/SupportOSImplTest.java | 11 ++++---- .../toolbar/TemplateTransformerDebugTest.java | 4 ++- .../manager/impl/SearchManegerTest.java | 4 ++- .../mainframe/app/DesignerAppUtilsTest.java | 26 +++++++++++-------- .../module/DesignerWorkspaceProviderTest.java | 2 ++ 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java b/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java index d49ab5e073..30057bb681 100644 --- a/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java +++ b/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java @@ -1,26 +1,25 @@ package com.fr.design.os.impl; import com.fr.general.GeneralContext; -import com.fr.third.org.apache.commons.math3.analysis.function.Pow; -import junit.framework.TestCase; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; - -import java.util.Locale; - import org.junit.runner.RunWith; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import java.util.Locale; + /** * @author hades * @version 10.0 * Created by hades on 2020/1/16 */ @RunWith(PowerMockRunner.class) -public class SupportOSImplTest extends TestCase { +public class SupportOSImplTest { @Test + @Ignore("与实际的系统耦合严重") public void testAutoPush() { Assert.assertTrue(SupportOSImpl.AUTOPUSHUPDATE.support()); GeneralContext.setLocale(Locale.TAIWAN); diff --git a/designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java b/designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java index 6a8f8247bd..7d85975600 100644 --- a/designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java +++ b/designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java @@ -60,7 +60,6 @@ import com.fr.page.stable.PaperSetting; import com.fr.page.stable.ReportPageAttr; import com.fr.plugin.attr.CalculatorAttrMark; import com.fr.runtime.FineRuntime; -import com.fr.stable.EssentialUtils; import com.fr.stable.bridge.BridgeMark; import com.fr.stable.bridge.StableFactory; import com.fr.stable.fun.WidgetSwitcher; @@ -74,6 +73,7 @@ import org.easymock.IArgumentMatcher; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; @@ -136,6 +136,7 @@ public class TemplateTransformerDebugTest { } @Test + @Ignore public void testUnsupportedCompile() { WorkBook workbook = readCpt("read-write-expand-order.cpt"); @@ -156,6 +157,7 @@ public class TemplateTransformerDebugTest { } @Test + @Ignore public void testImageRefCompile() { WorkBook workbook = readCpt("read-write-image-ref.cpt"); diff --git a/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java index b0fff198f6..0c82af7316 100644 --- a/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java +++ b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java @@ -8,6 +8,7 @@ import com.fr.design.mainframe.toolbar.UpdateActionManager; import com.fr.json.JSONObject; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -20,7 +21,7 @@ import java.util.ArrayList; @RunWith(PowerMockRunner.class) @PrepareForTest(Toolkit.class) -@PowerMockIgnore("javax.swing.*") +@PowerMockIgnore({"javax.swing.*", "javax.net.*", "javax.management.*"}) public class SearchManegerTest { SimilarSearchManager similarSearchManager; ComplementAdviceManager complementAdviceManager; @@ -51,6 +52,7 @@ public class SearchManegerTest { } @Test + @Ignore public void getSearchResultTest() { //检测网络情况 diff --git a/designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java index f47d18d34a..28dda54c2e 100644 --- a/designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java +++ b/designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java @@ -5,9 +5,12 @@ import com.fr.plugin.context.PluginMarker; import com.fr.plugin.context.PluginMarkerAdapter; import com.fr.stable.TemplateIOErrorContextHolder; import com.fr.third.guava.collect.Multimap; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.Collection; @@ -20,6 +23,7 @@ import java.util.HashSet; * Created by vito on 2021/5/31 */ @RunWith(PowerMockRunner.class) +@PrepareForTest(PluginRemote.class) public class DesignerAppUtilsTest { @Test public void testDealWithErrorDetailMultiLineAndCache() { @@ -57,17 +61,17 @@ public class DesignerAppUtilsTest { @Test public void testRearrange() { // 远程插件模拟注册 -// PluginRemoteSync pluginRemoteSync = EasyMock.createMock(PluginRemoteSync.class); -// EasyMock.expect(pluginRemoteSync.getPluginRemoteStatusByIdIndex()).andReturn(new HashMap(){{ -// put("com.fr.plugin1", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin1","1",true).get()); -// put("com.fr.plugin2", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin2","1",true).get()); -// put("com.fr.plugin3", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin3","1",false).get()); -// put("com.fr.plugin4", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin4","1",false).get()); -// }}).anyTimes(); -// EasyMock.replay(pluginRemoteSync); -// PowerMock.mockStaticPartial(PluginRemoteSync.class, "getInstance"); -// EasyMock.expect(PluginRemoteSync.getInstance()).andReturn(pluginRemoteSync).anyTimes(); -// PowerMock.replay(PluginRemoteSync.class); + PluginRemote pluginRemote = EasyMock.createMock(PluginRemote.class); + EasyMock.expect(pluginRemote.getPluginRemoteStatus()).andReturn(new HashMap() {{ + put("com.fr.plugin1", Reflect.on(PluginRemote.PluginStatus.class).call("create", "com.fr.plugin1", "1", true).get()); + put("com.fr.plugin2", Reflect.on(PluginRemote.PluginStatus.class).call("create", "com.fr.plugin2", "1", true).get()); + put("com.fr.plugin3", Reflect.on(PluginRemote.PluginStatus.class).call("create", "com.fr.plugin3", "1", false).get()); + put("com.fr.plugin4", Reflect.on(PluginRemote.PluginStatus.class).call("create", "com.fr.plugin4", "1", false).get()); + }}).anyTimes(); + EasyMock.replay(pluginRemote); + PowerMock.mockStatic(PluginRemote.class); + EasyMock.expect(PluginRemote.getInstance()).andReturn(pluginRemote).anyTimes(); + PowerMock.replay(PluginRemote.class); // 本地插件模拟检查 TemplateIOErrorContextHolder.registerPluginNameMap(new HashMap() {{ diff --git a/designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java b/designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java index d058ee8de9..60c715b9f1 100644 --- a/designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java +++ b/designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java @@ -7,6 +7,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import org.easymock.EasyMock; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; @@ -23,6 +24,7 @@ import org.powermock.modules.junit4.PowerMockRunner; public class DesignerWorkspaceProviderTest { @Test + @Ignore public void testPluginErrorRemind() { try { From c2007412445fef7a105139207d7388d9aae4379c Mon Sep 17 00:00:00 2001 From: lemon Date: Mon, 31 Mar 2025 15:13:04 +0800 Subject: [PATCH 06/19] =?UTF-8?q?REPORT-150879=20fix:=20=E6=96=B0=E8=80=81?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/server/FineEmbedServerActivator.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java index ab17ab15eb..8360989818 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java @@ -2,7 +2,6 @@ package com.fr.start.server; import com.fr.cbb.websocket.core.WebSocketEndpoint; import com.fr.design.DesignerEnvManager; -import com.fr.event.EventDispatcher; import com.fr.log.FineLoggerFactory; import com.fr.module.Activator; import com.fr.module.ModuleRole; @@ -13,7 +12,6 @@ import com.fr.startup.FineWebApplicationInitializer; import com.fr.third.guava.collect.Sets; import com.fr.third.springframework.web.SpringServletContainerInitializer; import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import com.fr.web.utils.event.WebEvent; import com.fr.workspace.WorkContext; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; @@ -43,7 +41,6 @@ public class FineEmbedServerActivator extends Activator { //初始化tomcat initTomcat(); tomcat.start(); - EventDispatcher.asyncFire(WebEvent.WEB_STATUS_CHANGE); } catch (LifecycleException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -59,7 +56,6 @@ public class FineEmbedServerActivator extends Activator { stopSpring(); stopServerActivator(); stopTomcat(); - EventDispatcher.asyncFire(WebEvent.WEB_STATUS_CHANGE); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } From 4dc18f5d488457ca55de7bf3e25eb2a49aa4ef89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 3 Apr 2025 15:27:55 +0800 Subject: [PATCH 07/19] =?UTF-8?q?REPORT-149471=20feat:FR11=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8F=96=E6=95=B0=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/jxbrowser/JxEngine.java | 60 +++++ .../com/fr/design/jxbrowser/JxUIPane.java | 216 +++++++++++++----- 2 files changed, 222 insertions(+), 54 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java index 7738082a4c..78c5e7a832 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java @@ -11,15 +11,21 @@ import com.teamdev.jxbrowser.engine.Engine; import com.teamdev.jxbrowser.engine.EngineOptions; import com.teamdev.jxbrowser.engine.RenderingMode; import com.teamdev.jxbrowser.engine.event.EngineCrashed; +import com.teamdev.jxbrowser.net.HttpHeader; import com.teamdev.jxbrowser.net.Network; +import com.teamdev.jxbrowser.net.ResourceType; import com.teamdev.jxbrowser.net.Scheme; +import com.teamdev.jxbrowser.net.UrlRequest; +import com.teamdev.jxbrowser.net.callback.BeforeStartTransactionCallback; import com.teamdev.jxbrowser.net.callback.VerifyCertificateCallback; import com.teamdev.jxbrowser.os.Environment; import org.jetbrains.annotations.NotNull; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Map; /** @@ -38,6 +44,7 @@ public class JxEngine { private AssembleComponent component; private Map parameterMap = Collections.emptyMap(); + private boolean disableWebSecurity = false; private final ClearableLazyValue ENGINE = ClearableLazyValue.create(() -> { @@ -46,6 +53,9 @@ public class JxEngine { .addSwitch("--disable-google-traffic") .addScheme(Scheme.of(ModernUIConstants.EMB_TAG), new NxInterceptRequestCallback(this::getComponent, this::getParameterMap)); + if (disableWebSecurity) { + builder.addSwitch("--disable-web-security"); + } Engine engine; try { engine = Engine.newInstance(builder.build()); @@ -70,6 +80,14 @@ public class JxEngine { return engine; }); + public JxEngine() { + } + + public JxEngine(boolean disableWebSecurity) { + this.disableWebSecurity = disableWebSecurity; + } + + public Map getParameterMap() { return Collections.unmodifiableMap(parameterMap); } @@ -125,6 +143,38 @@ public class JxEngine { return ENGINE.getValue(); } + /** + * 是否禁用安全属性 + * 注：对客户端来说，安全属性可以忽略 + * + * @return 是否禁用 + */ + public boolean isDisableWebSecurity() { + return disableWebSecurity; + } + + /** + * 添加XHR请求头 + * + * @param headers 请求头 + */ + public void addXHRHeaders(Map headers) { + Network network = ENGINE.getValue().network(); + network.set(BeforeStartTransactionCallback.class, (params) -> { + UrlRequest urlRequest = params.urlRequest(); + ResourceType resourceType = urlRequest.resourceType(); + if (resourceType == ResourceType.XHR) { + List httpHeaders = new ArrayList<>(params.httpHeaders()); + for (Map.Entry header : headers.entrySet()) { + httpHeaders.add(HttpHeader.of(header.getKey(), header.getValue())); + } + return BeforeStartTransactionCallback.Response.override(httpHeaders); + } else { + return BeforeStartTransactionCallback.Response.proceed(); + } + }); + } + /** * 关闭引擎 */ @@ -153,4 +203,14 @@ public class JxEngine { public static JxEngine newInstance() { return new JxEngine(); } + + /** + * 创建一个新的引擎，创建引擎使用后需负责关闭引擎 + * 但可以独立使用 map 和 component + * + * @return 引擎 + */ + public static JxEngine newInstance(boolean disableWebSecurity) { + return new JxEngine(disableWebSecurity); + } } diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java index b2a0673ed6..1733502a9a 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java @@ -1,5 +1,6 @@ package com.fr.design.jxbrowser; +import com.fr.concurrent.NamedThreadFactory; import com.fr.design.DesignerEnvManager; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itoolbar.UIToolbar; @@ -11,24 +12,34 @@ import com.fr.stable.collections.combination.Pair; import com.fr.stable.os.OperatingSystem; import com.fr.web.struct.AssembleComponent; import com.teamdev.jxbrowser.browser.Browser; +import com.teamdev.jxbrowser.browser.callback.CertificateErrorCallback; import com.teamdev.jxbrowser.browser.callback.InjectJsCallback; -import com.teamdev.jxbrowser.chromium.events.LoadListener; -import com.teamdev.jxbrowser.chromium.events.ScriptContextListener; import com.teamdev.jxbrowser.event.Observer; import com.teamdev.jxbrowser.frame.Frame; import com.teamdev.jxbrowser.js.JsObject; +import com.teamdev.jxbrowser.net.callback.BeforeStartTransactionCallback; import com.teamdev.jxbrowser.view.swing.BrowserView; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.JProgressBar; import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; import java.awt.BorderLayout; import java.awt.Desktop; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Optional; - +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.function.Consumer; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; import static com.fr.design.ui.ModernUIConstants.COMPONENT_TAG; import static com.fr.design.ui.ModernUIConstants.DEFAULT_EXPRESSION; import static com.fr.design.ui.ModernUIConstants.DEFAULT_NAMESPACE; @@ -49,31 +60,70 @@ import static com.fr.design.ui.ModernUIConstants.WINDOW; */ public class JxUIPane extends ModernUIPane { + public static final ExecutorService DEFAULT_EXECUTOR = + Executors.newSingleThreadExecutor(new NamedThreadFactory("jx-simple", true)); + /** * 冒号 */ public static final String COLON = ":"; private static final String COLON_ESCAPE = "\\:"; - private Browser browser; private String namespace = "Pool"; private String variable = "data"; private String expression = "update()"; + private final JxEngine jxEngine; + private Consumer initCallback = null; - private JxUIPane() { - super(); + private JxUIPane(JxEngine jxEngine) { + this.jxEngine = jxEngine; } - private void initialize() { + private void initialize(Consumer consumer) { setLayout(new BorderLayout()); if (browser != null) { return; } hackInITInnovationLinuxDesktop(); + initCallback = consumer; initDebugIfNeeded(); - // 使用公共引擎创建浏览器 - browser = JxEngine.getPublicEngineInstance().newBrowser(); - add(BrowserView.newInstance(browser), BorderLayout.CENTER); + asyncInitBrowser(); + } + + /** + * 启动 jxbrowser 引擎，过程包含解压文件等过程，异步操作。 + */ + private void asyncInitBrowser() { + JProgressBar jProgressBar = showProgressBar(); + new SwingWorker() { + + @Override + protected Browser doInBackground() { + browser = jxEngine.getEngine().newBrowser(); + if (jxEngine.isDisableWebSecurity()) { + // 忽略证书验证，兼容有些情况下自定义证书与实际域名不匹配的情况。 + // 虽然不是个正确的方式，但真有这么用的还是兼容一下 + browser.set(CertificateErrorCallback.class, (params, action) -> action.allow()); + } + return browser; + } + + @Override + protected void done() { + jProgressBar.setVisible(false); + try { + Browser mBrowser = get(); + add(BrowserView.newInstance(mBrowser), BorderLayout.CENTER); + if (initCallback != null) { + initCallback.accept(mBrowser); + } + initCallback = null; + revalidate(); + } catch (InterruptedException | ExecutionException e) { + throw new RuntimeException(e); + } + } + }.execute(); } /** @@ -85,6 +135,47 @@ public class JxUIPane extends ModernUIPane { } } + /** + * 加载组件时显示一个进度条 + */ + private @NotNull JProgressBar showProgressBar() { + JProgressBar jProgressBar = new JProgressBar(); + jProgressBar.setIndeterminate(true); + add(row( + flex(), + column(flex(), cell(jProgressBar), flex()), + flex() + ).getComponent(), BorderLayout.CENTER); + return jProgressBar; + } + + /** + * 添加自定义XHR请求头，只在自定义引擎下生效， + * 公共引擎暂不支持 + * + * @param headers 自定义头 + */ + public void addXHRHeaders(Map headers) { + warpCallback(browser -> { + if (JxEngine.getInstance() != jxEngine) { + jxEngine.addXHRHeaders(headers); + } + }); + } + + /** + * 异步链式调用 + * + * @param then 后续任务 + */ + private void warpCallback(Consumer then) { + if (initCallback != null) { + initCallback = initCallback.andThen(then); + } else { + then.accept(browser); + } + } + /** * 按需初始化debug界面UI */ @@ -124,7 +215,7 @@ public class JxUIPane extends ModernUIPane { * * @param injectJsCallback 回调 */ - private void setInjectJsCallback(InjectJsCallback injectJsCallback) { + private synchronized void setInjectJsCallback(InjectJsCallback injectJsCallback) { Optional callback = browser.get(InjectJsCallback.class); if (callback.isPresent()) { browser.set(InjectJsCallback.class, params -> { @@ -142,9 +233,8 @@ public class JxUIPane extends ModernUIPane { * * @param url 新的地址 */ - @Override public void redirect(String url) { - browser.navigation().loadUrl(encodeWindowsPath(url)); + warpCallback(browser -> browser.navigation().loadUrl(encodeWindowsPath(url))); } /** @@ -153,18 +243,17 @@ public class JxUIPane extends ModernUIPane { * @param url 新的地址 * @param map 初始化参数 */ - @Override public void redirect(String url, Map map) { setMap(map); - browser.navigation().loadUrl(encodeWindowsPath(url)); + warpCallback(browser -> browser.navigation().loadUrl(encodeWindowsPath(url))); } private void setMap(Map map) { - JxEngine.getInstance().setMap(map); + jxEngine.setMap(map); } private void setComponent(AssembleComponent component) { - JxEngine.getInstance().setComponent(component); + jxEngine.setComponent(component); } @Override @@ -173,20 +262,23 @@ public class JxUIPane extends ModernUIPane { } - @Override + /** + * 更新数据到界面 + * + * @param t 数据类 + */ public void populate(final T t) { - setInjectJsCallback(params -> { + warpCallback(browser -> setInjectJsCallback(params -> { executeJsObject(params.frame(), WINDOW + DOT + namespace) .ifPresent(ns -> ns.putProperty(variable, t)); return InjectJsCallback.Response.proceed(); - }); + })); } - @Override @Nullable public T update() { if (browser.mainFrame().isPresent()) { - return browser.mainFrame().get().executeJavaScript("window." + namespace + "." + expression); + return browser.mainFrame().get().executeJavaScript(WINDOW + DOT + namespace + DOT + expression); } return null; } @@ -198,10 +290,10 @@ public class JxUIPane extends ModernUIPane { if (browser != null) { browser.close(); browser = null; - JxEngine.getInstance().clearMap(); - JxEngine.getInstance().clearComponent(); + jxEngine.clearMap(); + jxEngine.clearComponent(); + jxEngine.getEngine().network().remove(BeforeStartTransactionCallback.class); } - } /** @@ -225,6 +317,18 @@ public class JxUIPane extends ModernUIPane { } } + /** + * 执行一段js + * + * @param javaScript 待执行的js脚本 + * @see JxUIPane#executeJS(String) + */ + public void executeJavaScript(String javaScript, Consumer consumer) { + if (browser != null) { + browser.mainFrame().ifPresent(frame -> frame.executeJavaScript(javaScript, consumer)); + } + } + /** * 获取js对象 * 注意：类内部使用，用于简化编码，提供 Optional 包装 @@ -271,6 +375,7 @@ public class JxUIPane extends ModernUIPane { * @param 参数 */ public static class Builder extends ModernUIPane.Builder { + private JxEngine jxEngine; private String namespace; private String variable; private String expression; @@ -290,6 +395,7 @@ public class JxUIPane extends ModernUIPane { public Builder() { // 为了兼容继承关系，但又不允许创建，用这个方式先处理一下 super((ModernUIPane) null); + this.jxEngine = JxEngine.getInstance(); this.namespace = DEFAULT_NAMESPACE; this.variable = DEFAULT_VARIABLE; this.expression = DEFAULT_EXPRESSION; @@ -305,6 +411,17 @@ public class JxUIPane extends ModernUIPane { this.html = StringUtils.EMPTY; } + /** + * 自定义引擎 + * + * @param jxEngine 引擎 + * @return builder + */ + public Builder engine(JxEngine jxEngine) { + this.jxEngine = jxEngine; + return this; + } + /** * 注入一个回调，回调的js会在初始化进行执行 * @@ -316,24 +433,14 @@ public class JxUIPane extends ModernUIPane { return this; } - @Override - public Builder prepareForV6(ScriptContextListener contextListener) { - return this; - } - - @Override - public Builder prepareForV6(LoadListener loadListener) { - return this; - } - - @Override - public JxUIPane.Builder prepareForV7(InjectJsCallback callback) { - prepare(callback); - return this; - } - - @Override - public JxUIPane.Builder prepareForV7(Class event, Observer listener) { + /** + * 注册一个监听器 + * + * @param event 事件 + * @param listener 监听器 + * @return builder + */ + public JxUIPane.Builder prepare(Class event, Observer listener) { listenerPair = new Pair<>(event, listener); return this; } @@ -527,22 +634,23 @@ public class JxUIPane extends ModernUIPane { * 构建 */ public JxUIPane build() { - JxUIPane pane = new JxUIPane<>(); + JxUIPane pane = new JxUIPane<>(jxEngine); pane.namespace = namespace; pane.variable = variable; pane.expression = expression; pane.setMap(parameterMap); pane.setComponent(component); - pane.initialize(); - injectJs(pane); - if (!Objects.isNull(listenerPair)) { - pane.browser.navigation().on(listenerPair.getFirst(), listenerPair.getSecond()); - } - if (StringUtils.isNotEmpty(this.url)) { - pane.browser.navigation().loadUrl(encodeWindowsPath(this.url)); - } else if (StringUtils.isNotEmpty(this.html)) { - pane.browser.mainFrame().ifPresent(f -> f.loadHtml(html)); - } + pane.initialize(browser -> { + injectJs(pane); + if (!Objects.isNull(listenerPair)) { + browser.navigation().on(listenerPair.getFirst(), listenerPair.getSecond()); + } + if (StringUtils.isNotEmpty(url)) { + browser.navigation().loadUrl(encodeWindowsPath(url)); + } else if (StringUtils.isNotEmpty(html)) { + browser.mainFrame().ifPresent(f -> f.loadHtml(html)); + } + }); return pane; } From 560f6cfe380a1fc29dbb9365a1e04a47dfd2dcb3 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 17:26:03 +0800 Subject: [PATCH 08/19] =?UTF-8?q?feat:=20FRM=E6=94=AF=E6=8C=81=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E5=9C=A8=E7=BA=BF=E8=B5=84=E6=BA=90=20REPORT-151746?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/share/ComponentShareConfig.java | 37 +++++++++++++++++++ .../mainframe/share/ComponentShareUtil.java | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java new file mode 100644 index 0000000000..6ed1b3b1e6 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java @@ -0,0 +1,37 @@ +package com.fr.design.mainframe.share; + +import com.fr.config.ConfigContext; +import com.fr.config.DefaultConfiguration; +import com.fr.config.Identifier; +import com.fr.config.holder.Conf; +import com.fr.config.holder.factory.Holders; + +/** + * @author Zhanying + * @since 11.0 + * Created on 2025/4/7 + */ +public class ComponentShareConfig extends DefaultConfiguration { + private static ComponentShareConfig config = null; + + public static ComponentShareConfig getInstance() { + if (config == null) { + config = ConfigContext.getConfigInstance(ComponentShareConfig.class); + } + return config; + } + + /** + * 是否显示在线组件 + */ + @Identifier("showOnlineWidget") + private Conf showOnlineWidget = Holders.simple(true); + + public boolean isShowOnlineWidget() { + return showOnlineWidget.get(); + } + + public void setShowOnlineWidget(boolean showOnlineWidget) { + this.showOnlineWidget.set(showOnlineWidget); + } +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java index 2445826128..e7ea320c23 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java @@ -30,6 +30,10 @@ public class ComponentShareUtil { } public static boolean isShowOnlineWidgetRepoPane() { + // 先读一下全局配置 + if (!ComponentShareConfig.getInstance().isShowOnlineWidget()) { + return false; + } LocaleMark localeMark = LocaleCenter.getMark(ShowOnlineWidgetMark.class); return localeMark.getValue(); } From e0b5f092fb397effbc8bf479091e4f7f7d43489c Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 18:17:20 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/share/ComponentShareConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java index 6ed1b3b1e6..0776a101d3 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java @@ -7,6 +7,8 @@ import com.fr.config.holder.Conf; import com.fr.config.holder.factory.Holders; /** + * ComponentShare 全局配置 + * * @author Zhanying * @since 11.0 * Created on 2025/4/7 From 4cb8fb6b1d317125ced0c1aedb26c9647fadb9d9 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 18:47:17 +0800 Subject: [PATCH 10/19] =?UTF-8?q?feat:=20frm=E4=B8=ADfvs=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E5=B1=8F=E8=94=BD=E8=B6=85?= =?UTF-8?q?=E9=93=BE=E8=B7=B3=E8=BD=AC=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/guide/FvsGuideConfig.java | 39 +++++++++++++++++++ .../design/mainframe/guide/FvsGuidePane.java | 10 +++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java new file mode 100644 index 0000000000..9fc3bb2bb9 --- /dev/null +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java @@ -0,0 +1,39 @@ +package com.fr.design.mainframe.guide; + +import com.fr.config.ConfigContext; +import com.fr.config.DefaultConfiguration; +import com.fr.config.Identifier; +import com.fr.config.holder.Conf; +import com.fr.config.holder.factory.Holders; + +/** + * FvsGuide 全局配置 + * + * @author Zhanying + * @since 11.0 + * Created on 2025/4/7 + */ +public class FvsGuideConfig extends DefaultConfiguration { + private static FvsGuideConfig config = null; + + public static FvsGuideConfig getInstance() { + if (config == null) { + config = ConfigContext.getConfigInstance(FvsGuideConfig.class); + } + return config; + } + + /** + * 是否显示超链跳转 + */ + @Identifier("showGuideLink") + private Conf showGuideLink = Holders.simple(true); + + public boolean isShowGuideLink() { + return showGuideLink.get(); + } + + public void setShowGuideLink(boolean showGuideLink) { + this.showGuideLink.set(showGuideLink); + } +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index a401cb251d..21be225d08 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -196,9 +196,11 @@ public class FvsGuidePane extends JPanel { // 计算省略号的长度 int omitLength = getStringWidth(OMIT_TEXT, fontMetrics); - String linkContent = linkContent(); + boolean showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); + + String linkContent = showGuideLink ? linkContent() : StringUtils.EMPTY; // 计算超链的长度 - int linkLength = getStringWidth(linkContent, fontMetrics); + int linkLength = showGuideLink ? getStringWidth(linkContent, fontMetrics) : 0; String tipContent = tipContent(); @@ -236,7 +238,9 @@ public class FvsGuidePane extends JPanel { htmlBuilder.append(chars[i]); } } - htmlBuilder.append("").append(linkContent).append(""); + if (showGuideLink) { + htmlBuilder.append("").append(linkContent).append(""); + } return htmlBuilder.toString(); } From 6b69c62f85304c914c130afb085e4ee990ecc2be Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Tue, 8 Apr 2025 09:38:18 +0800 Subject: [PATCH 11/19] =?UTF-8?q?feat:=20=E5=A7=8B=E7=BB=88=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E6=9C=80=E5=90=8E=E6=8B=BC=E6=8E=A5=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/guide/FvsGuidePane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index 21be225d08..aefd96187b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -239,8 +239,9 @@ public class FvsGuidePane extends JPanel { } } if (showGuideLink) { - htmlBuilder.append("").append(linkContent).append(""); + htmlBuilder.append("").append(linkContent).append(""); } + htmlBuilder.append(""); return htmlBuilder.toString(); } From 3aa10edb79c73881fed87c75cf840403d1b6325e Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Tue, 8 Apr 2025 09:44:36 +0800 Subject: [PATCH 12/19] =?UTF-8?q?feat:=20showGuideLink=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E6=97=B6=E5=80=99=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/guide/FvsGuidePane.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index aefd96187b..7ab1fd3212 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -51,10 +51,13 @@ public class FvsGuidePane extends JPanel { private static final String CONTENT_FORMAT = "\n\n %s\n\n"; private final JComponent parent; private JTextPane textPane; + // 是否显示超链跳转 + private final boolean showGuideLink; public FvsGuidePane(JComponent parent) { super(); this.parent = parent; + showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); initUI(); } @@ -196,8 +199,6 @@ public class FvsGuidePane extends JPanel { // 计算省略号的长度 int omitLength = getStringWidth(OMIT_TEXT, fontMetrics); - boolean showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); - String linkContent = showGuideLink ? linkContent() : StringUtils.EMPTY; // 计算超链的长度 int linkLength = showGuideLink ? getStringWidth(linkContent, fontMetrics) : 0; From 282f51dff6d1cbbdc17a942c5c8960e5f3b6dd9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brian=2ELuo-=E7=BD=97=E6=97=AD?= Date: Tue, 8 Apr 2025 10:02:46 +0800 Subject: [PATCH 13/19] =?UTF-8?q?REPORT-148261=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E8=BF=9E=E6=8E=A5=E6=96=AD?= =?UTF-8?q?=E5=BC=80=E5=90=8E=E8=87=AA=E5=8A=A8=E5=81=9C=E6=AD=A2=E5=BF=83?= =?UTF-8?q?=E8=B7=B3=E4=B8=8E=E9=94=81=E7=8A=B6=E6=80=81=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E5=90=8E=E4=BA=A7=E7=94=9F=E5=A4=A7=E9=87=8F=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=8A=A5=E9=94=99=E3=80=82=E8=BF=9E=E6=8E=A5=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E7=9B=B8=E5=85=B3=E4=BB=BB=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editlock/EditLockChangeChecker.java | 70 ++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java index cb4d5550f7..1d41f9d88e 100644 --- a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java +++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java @@ -6,6 +6,11 @@ import com.fr.log.FineLoggerFactory; import com.fr.workspace.WorkContext; import com.fr.workspace.server.lock.editlock.EditLockOperator; import com.fr.report.LockItem; +import com.fr.event.Event; +import com.fr.event.EventDispatcher; +import com.fr.event.Listener; +import com.fr.workspace.Workspace; +import com.fr.workspace.WorkspaceEvent; import java.util.ArrayList; import java.util.List; @@ -26,11 +31,63 @@ public abstract class EditLockChangeChecker { protected LockItem lockItem; private boolean isLocked = false; private List listeners = new ArrayList<>(); + private boolean running = false; + + // 监听连接断开事件 + private Listener disconnectListener = new Listener() { + @Override + public void on(Event event, Workspace workspace) { + if (scheduler != null && !scheduler.isShutdown()) { + scheduler.shutdown(); + scheduler = null; + FineLoggerFactory.getLogger().info("Connection lost, edit lock checker stopped"); + } + } + }; + + // 监听连接恢复事件 + private Listener connectListener = new Listener() { + @Override + public void on(Event event, Workspace workspace) { + if (running && scheduler == null) { + FineLoggerFactory.getLogger().info("Connection restored, restarting edit lock checker"); + startScheduler(); + } + } + }; /** * 轮询任务，如果是远程设计状态，每隔30s查询一次相应lockItem的锁状态是否改变 */ public void start() { + running = true; + startListeners(); + startScheduler(); + } + + /** + * 启动事件监听器 + */ + private void startListeners() { + if (!WorkContext.getCurrent().isLocal()) { + // 确保不会重复注册 + EventDispatcher.stopListen(disconnectListener); + EventDispatcher.stopListen(connectListener); + + EventDispatcher.listen(WorkspaceEvent.LostConnect, disconnectListener); + EventDispatcher.listen(WorkspaceEvent.ConnectSuccess, connectListener); + } + } + + /** + * 启动调度器 + */ + private void startScheduler() { + // 已经有调度器运行中，不需要重新创建 + if (scheduler != null && !scheduler.isShutdown()) { + return; + } + this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("EditLockChangeChecker")); this.scheduler.scheduleWithFixedDelay(new Runnable() { @Override @@ -45,7 +102,7 @@ public abstract class EditLockChangeChecker { fireChange(); } } catch (Exception e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + FineLoggerFactory.getLogger().error("Edit lock check error: " + e.getMessage(), e); } } else if (isLocked()){ // 如果不是远程环境，且此前的远程状态下为锁定的话，切换回来后需要将其修改为不锁定 @@ -57,7 +114,16 @@ public abstract class EditLockChangeChecker { } public void stop() { - this.scheduler.shutdown(); + running = false; + // 移除事件监听 + EventDispatcher.stopListen(disconnectListener); + EventDispatcher.stopListen(connectListener); + + // 关闭调度器 + if (this.scheduler != null && !this.scheduler.isShutdown()) { + this.scheduler.shutdown(); + this.scheduler = null; + } } public void addEditLockChangeListener(EditLockChangeListener listener) { From 747aa5c3b1355ac8f68815dae5cb2bc2c3692637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zheng-=E9=83=91=E6=BD=87?= Date: Thu, 10 Apr 2025 19:36:47 +0800 Subject: [PATCH 14/19] =?UTF-8?q?fix:=20=E6=89=A9=E5=B1=95=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=8F=92=E4=BB=B6=E5=9C=BA=E6=99=AF=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E8=87=AA=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E8=BF=9C=E7=A8=8Bhttps=E7=8E=AF=E5=A2=83=20#?= =?UTF-8?q?REPORT-151829?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/JxEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java index 78c5e7a832..dbe6c6fb2d 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java @@ -72,7 +72,8 @@ public class JxEngine { FineLoggerFactory.getLogger().error("jxBrowser engine crashed with exitCode: {}", event.exitCode()); event.engine().close(); }); - if (DesignerEnvManager.getEnvManager().isOpenDebug()) { + if (DesignerEnvManager.getEnvManager().isOpenDebug() + || Boolean.parseBoolean(System.getProperty("jxbrowser.verify.vertificate.prohibit"))) { // 调试模式下，禁止HTTPS证书验证，使得可以正常访问商城测试服务器等 Network network = engine.network(); network.set(VerifyCertificateCallback.class, params -> VerifyCertificateCallback.Response.valid()); From a6e0c4c16fab8708f41eb6859c439f19813f633f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zheng-=E9=83=91=E6=BD=87?= Date: Thu, 10 Apr 2025 19:45:41 +0800 Subject: [PATCH 15/19] =?UTF-8?q?fix:=20=E6=8F=90=E4=BE=9B=E5=86=85?= =?UTF-8?q?=E5=B5=8C=E6=B5=8F=E8=A7=88=E5=99=A8=E5=90=AF=E5=8A=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE=E6=96=B9=E6=A1=88=20#REPORT-125730?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/JxEngine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java index dbe6c6fb2d..1732b6989c 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java @@ -53,6 +53,10 @@ public class JxEngine { .addSwitch("--disable-google-traffic") .addScheme(Scheme.of(ModernUIConstants.EMB_TAG), new NxInterceptRequestCallback(this::getComponent, this::getParameterMap)); + String options = System.getProperty("jxbrowser.chrome.setup.options"); + for (String s : options.split(";")) { + builder.addSwitch(s); + } if (disableWebSecurity) { builder.addSwitch("--disable-web-security"); } From 0ac9502022733947a82b723345a7a55fe8f51ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zheng-=E9=83=91=E6=BD=87?= Date: Thu, 10 Apr 2025 19:52:50 +0800 Subject: [PATCH 16/19] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=20#none?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/JxEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java index 1732b6989c..55ee81cc8f 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java @@ -39,6 +39,7 @@ import java.util.Map; * Created on 2023/6/8 */ public class JxEngine { + private static final String SPLIT = ";"; private static final JxEngine INSTANCE = new JxEngine(); @@ -54,7 +55,7 @@ public class JxEngine { .addScheme(Scheme.of(ModernUIConstants.EMB_TAG), new NxInterceptRequestCallback(this::getComponent, this::getParameterMap)); String options = System.getProperty("jxbrowser.chrome.setup.options"); - for (String s : options.split(";")) { + for (String s : options.split(SPLIT)) { builder.addSwitch(s); } if (disableWebSecurity) { From fa7a5139d8abee61c27d46e4b1db412a36a03b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zheng-=E9=83=91=E6=BD=87?= Date: Fri, 11 Apr 2025 14:32:52 +0800 Subject: [PATCH 17/19] fix: npe #REPORT-125730 --- .../src/main/java/com/fr/design/jxbrowser/JxEngine.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java index 55ee81cc8f..ecf1432cb7 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java @@ -4,6 +4,7 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.ui.ModernUIConstants; import com.fr.log.FineLoggerFactory; import com.fr.stable.CommonUtils; +import com.fr.stable.StringUtils; import com.fr.value.ClearableLazyValue; import com.fr.web.struct.AssembleComponent; import com.teamdev.jxbrowser.engine.ChromiumBinariesExtractionException; @@ -55,8 +56,10 @@ public class JxEngine { .addScheme(Scheme.of(ModernUIConstants.EMB_TAG), new NxInterceptRequestCallback(this::getComponent, this::getParameterMap)); String options = System.getProperty("jxbrowser.chrome.setup.options"); - for (String s : options.split(SPLIT)) { - builder.addSwitch(s); + if (StringUtils.isNotEmpty(options)) { + for (String s : options.split(";")) { + builder.addSwitch(s); + } } if (disableWebSecurity) { builder.addSwitch("--disable-web-security"); From 809df003d0763d6ceddf93ef3feef09945ee7c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zheng-=E9=83=91=E6=BD=87?= Date: Mon, 14 Apr 2025 16:42:12 +0800 Subject: [PATCH 18/19] =?UTF-8?q?fix:=20=E5=9C=BA=E6=99=AF=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=8A=A5=E9=94=99npe=20#REPORT-152115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/jxbrowser/JxUIPane.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java index 1733502a9a..ad0ed2c830 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java @@ -14,6 +14,8 @@ import com.fr.web.struct.AssembleComponent; import com.teamdev.jxbrowser.browser.Browser; import com.teamdev.jxbrowser.browser.callback.CertificateErrorCallback; import com.teamdev.jxbrowser.browser.callback.InjectJsCallback; +import com.teamdev.jxbrowser.chromium.events.LoadListener; +import com.teamdev.jxbrowser.chromium.events.ScriptContextListener; import com.teamdev.jxbrowser.event.Observer; import com.teamdev.jxbrowser.frame.Frame; import com.teamdev.jxbrowser.js.JsObject; @@ -445,6 +447,34 @@ public class JxUIPane extends ModernUIPane { return this; } + + /** + * 下面XXXV6/XXXV7相关的四个方法不要删 兼容扩展图表插件用 + * + * @param contextListener 上下文监听器 + * @return builder + */ + @Override + public Builder prepareForV6(ScriptContextListener contextListener) { + return this; + } + + @Override + public Builder prepareForV6(LoadListener loadListener) { + return this; + } + + @Override + public JxUIPane.Builder prepareForV7(InjectJsCallback callback) { + prepare(callback); + return this; + } + + @Override + public JxUIPane.Builder prepareForV7(Class event, Observer listener) { + return prepare(event, listener); + } + /** * 加载jar包中的资源 * From fa9b09d3d077e9b451021093c475e241cdb0a726 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Wed, 16 Apr 2025 16:40:38 +0800 Subject: [PATCH 19/19] =?UTF-8?q?REPORT-151361=20AlphaFine=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=9A=84=E6=A8=A1=E6=9D=BF=E6=84=8F=E4=B8=BA=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E5=92=A8=E8=AF=A2=E9=94=80=E5=94=AE=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E5=AE=9E=E9=99=85=E4=BB=B7=E6=A0=BC=E4=B8=BA=E8=B4=9F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 价格为-1时显示咨询销售 --- .../alphafine/preview/TemplateResourceDetailPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java index a4b47dd8ee..d36b6091b6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java @@ -59,6 +59,7 @@ public class TemplateResourceDetailPane extends JPanel { private static final String PARENT_PACKAGE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Parent_Package"); private static final String DETAIL_INFO = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Info"); private static final String FREE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Price_Free"); + private static final String SALES_CONSULTATION = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Sales_Consultation"); private static final String SPACE = " "; private static final String LF = "
"; private static final String RMB = "￥"; @@ -75,7 +76,6 @@ public class TemplateResourceDetailPane extends JPanel { private static final String HTML_P_TAG_FORMAT = "

%s

"; - public TemplateResourceDetailPane(TemplateResourceDetail detail) { this.data = detail; initComponent(); @@ -125,6 +125,8 @@ public class TemplateResourceDetailPane extends JPanel { priceLabel.setForeground(Color.RED); if (data.getPrice() == 0) { priceLabel.setText(FREE); + } else if (data.getPrice() == -1) { + priceLabel.setText(SALES_CONSULTATION); } else { priceLabel.setText(RMB + SPACE + data.getPrice()); }