Browse Source

Pull request #9324: REPORT-73808 海外版alphafine功能问题 && REPORT-72851 TitlePlaceProcessor 11.0.2之后版本不生效了 同步到10.0

Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '3d233422904770b93e77536a358823dcd6970037':
  REPORT-72851 去除无用导入
  REPORT-72851 TitlePlaceProcessor 11.0.2之后版本不生效了
  REPORT-73808 海外版alphafine功能问题
final/10.0
Hades 2 years ago
parent
commit
1d0dfcb8d1
  1. 3
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
  2. 3
      designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java

3
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

@ -1,5 +1,6 @@
package com.fr.design.actions.help.alphafine; package com.fr.design.actions.help.alphafine;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.license.function.VT4FR; import com.fr.license.function.VT4FR;
@ -442,7 +443,7 @@ public class AlphaFineConfigManager implements XMLable {
} }
public boolean isProductDynamics() { public boolean isProductDynamics() {
return productDynamics; return productDynamics && FRContext.isChineseEnv();
} }
public void setProductDynamics(boolean productDynamics) { public void setProductDynamics(boolean productDynamics) {

3
designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java

@ -100,8 +100,7 @@ public class NorthRegionContainerPane extends JPanel {
//优先级为-1,保证最后全面刷新一次 //优先级为-1,保证最后全面刷新一次
GeneralContext.listenPluginRunningChanged(pluginOnRunOrStopListener, pluginFilter); GeneralContext.listenPluginRunningChanged(pluginOnRunOrStopListener, pluginFilter);
// 在设计器启动时仅在最后一个插件启用时候进行刷新一次 如果插件启用过程中存在实现了设计器接口的插件 // 在设计器启动时仅在最后一个插件启用时候进行刷新一次 如果插件启用过程中存在实现了设计器接口的插件
boolean needRefresh = DesignerContext.getDesignerFrame() != null && DesignerContext.getDesignerFrame().isVisible() && existDesignExtraPlugin; if (existDesignExtraPlugin) {
if (needRefresh) {
refreshAll(northEastPane, ad); refreshAll(northEastPane, ad);
} }
} }

Loading…
Cancel
Save