Browse Source

Pull request #12254: fix: fvs适配jxbrowser7.26兼容问题 #REPORT-98648

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '206696bd1d0163c1273e9569a5dc4f0b1f529842':
  fix: fvs适配jxbrowser7.26兼容问题 #REPORT-98648
  Revert "fix: fvs图表配置不保存不生效 #REPORT-94359"
  fix: fvs图表配置不保存不生效 #REPORT-94359
release/11.0
zheng-郑潇 1 year ago
parent
commit
e46e6bb5a9
  1. 2
      designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
  2. 6
      designer-base/src/main/java/com/fr/design/fun/impl/AbstractDefaultValueAdjustProvider.java

2
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;
/**
* 调整单元格对象默认值

6
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() {

Loading…
Cancel
Save