From e9383fb4bf276ed8db82fb70b628e2feb681ffca Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 20 Apr 2023 14:55:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20fvs=E5=9B=BE=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E4=BF=9D=E5=AD=98=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=20#REPORT-94359?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/chart/BaseChartPropertyPane.java | 9 +++++++-- .../com/fr/design/mainframe/ChartPropertyPane.java | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java b/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java index d4be14dcdd..9e8c1481a1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java @@ -3,6 +3,7 @@ package com.fr.design.gui.chart; import com.fr.base.chart.BaseChartCollection; import com.fr.design.designer.TargetComponent; import com.fr.design.mainframe.DockingView; +import org.jetbrains.annotations.Nullable; /** * 图表属性界面 抽象, 用于多工程协作.. @@ -14,8 +15,12 @@ public abstract class BaseChartPropertyPane extends DockingView { * 设置是否支持单元格数据. */ public abstract void setSupportCellData(boolean supportCellData); - - public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane); + + public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane) { + populateChartPropertyPane(collection, ePane, null); + } + + public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane, @Nullable Runnable callback); public abstract ChartEditPaneProvider getChartEditPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java index 8e6b80c53a..239eb8b8f3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java @@ -17,6 +17,7 @@ import com.fr.design.gui.chart.ChartEditPaneProvider; import com.fr.design.gui.frpane.UITitlePanel; import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.utils.gui.GUICoreUtils; +import org.jetbrains.annotations.Nullable; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -96,7 +97,7 @@ public class ChartPropertyPane extends BaseChartPropertyPane { * @param collection 收集图表 * @param ePane 面板 */ - public void populateChartPropertyPane(ChartCollection collection, TargetComponent ePane) { + public void populateChartPropertyPane(ChartCollection collection, TargetComponent ePane, @Nullable Runnable callback) { new SwingWorker() { @Override protected Void doInBackground() throws Exception { @@ -114,6 +115,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { } else { GUICoreUtils.setEnabled(chartEditPane, false); } + if (callback != null) { + callback.run(); + } } }.execute(); } @@ -123,9 +127,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { * @param collection 收集图表 * @param ePane 面板 */ - public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane) { + public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane, @Nullable Runnable callback) { if (collection instanceof ChartCollection) { - populateChartPropertyPane((ChartCollection) collection, ePane); + populateChartPropertyPane((ChartCollection) collection, ePane, callback); } } From f7531bd0c70a83f145a5dbdbda920f3c3c7097fd Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 20 Apr 2023 15:18:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"fix:=20fvs=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8D=E4=BF=9D=E5=AD=98=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=20#REPORT-94359"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e9383fb4bf276ed8db82fb70b628e2feb681ffca. --- .../com/fr/design/gui/chart/BaseChartPropertyPane.java | 9 ++------- .../com/fr/design/mainframe/ChartPropertyPane.java | 10 +++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java b/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java index 9e8c1481a1..d4be14dcdd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java @@ -3,7 +3,6 @@ package com.fr.design.gui.chart; import com.fr.base.chart.BaseChartCollection; import com.fr.design.designer.TargetComponent; import com.fr.design.mainframe.DockingView; -import org.jetbrains.annotations.Nullable; /** * 图表属性界面 抽象, 用于多工程协作.. @@ -15,12 +14,8 @@ public abstract class BaseChartPropertyPane extends DockingView { * 设置是否支持单元格数据. */ public abstract void setSupportCellData(boolean supportCellData); - - public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane) { - populateChartPropertyPane(collection, ePane, null); - } - - public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane, @Nullable Runnable callback); + + public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane); public abstract ChartEditPaneProvider getChartEditPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java index 239eb8b8f3..8e6b80c53a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java @@ -17,7 +17,6 @@ import com.fr.design.gui.chart.ChartEditPaneProvider; import com.fr.design.gui.frpane.UITitlePanel; import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.utils.gui.GUICoreUtils; -import org.jetbrains.annotations.Nullable; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -97,7 +96,7 @@ public class ChartPropertyPane extends BaseChartPropertyPane { * @param collection 收集图表 * @param ePane 面板 */ - public void populateChartPropertyPane(ChartCollection collection, TargetComponent ePane, @Nullable Runnable callback) { + public void populateChartPropertyPane(ChartCollection collection, TargetComponent ePane) { new SwingWorker() { @Override protected Void doInBackground() throws Exception { @@ -115,9 +114,6 @@ public class ChartPropertyPane extends BaseChartPropertyPane { } else { GUICoreUtils.setEnabled(chartEditPane, false); } - if (callback != null) { - callback.run(); - } } }.execute(); } @@ -127,9 +123,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { * @param collection 收集图表 * @param ePane 面板 */ - public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane, @Nullable Runnable callback) { + public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent ePane) { if (collection instanceof ChartCollection) { - populateChartPropertyPane((ChartCollection) collection, ePane, callback); + populateChartPropertyPane((ChartCollection) collection, ePane); } } From 206696bd1d0163c1273e9569a5dc4f0b1f529842 Mon Sep 17 00:00:00 2001 From: shine Date: Sun, 25 Jun 2023 10:14:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20fvs=E9=80=82=E9=85=8Djxbrowser7.26?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=20#REPORT-98648?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/fun/DefaultValueAdjustProvider.java | 2 +- .../design/fun/impl/AbstractDefaultValueAdjustProvider.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java index 1e553735dd..f534163b04 100644 --- a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java @@ -14,7 +14,7 @@ import java.awt.Font; */ public interface DefaultValueAdjustProvider extends Selectable { String MARK_STRING = "DefaultValueAdjustProvider"; - int CURRENT_LEVEL = 1; + int CURRENT_LEVEL = 2; /** * 调整单元格对象默认值 diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractDefaultValueAdjustProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractDefaultValueAdjustProvider.java index b2fc58ba8f..cb1357abe3 100644 --- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractDefaultValueAdjustProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractDefaultValueAdjustProvider.java @@ -9,9 +9,13 @@ import com.fr.stable.fun.mark.API; @API(level = DefaultValueAdjustProvider.CURRENT_LEVEL) public abstract class AbstractDefaultValueAdjustProvider extends AbstractProvider implements DefaultValueAdjustProvider { + //1.16及之前发布版本插件里面没有实现currentAPILevel方法，运行时候会走到主jar，拿到-2。 + //1.16.1及之后发布版本插件实现currentAPILevel方法，编译插件的时候，会把DefaultValueAdjustProvider.CURRENT_LEVEL的值编译给插件，比如1.16.1会拿到2。 + private static final int OLD_CURRENT_LEVEL = -2; + @Override public int currentAPILevel() { - return CURRENT_LEVEL; + return OLD_CURRENT_LEVEL; } public String mark4Provider() {