Browse Source

Merge pull request #9319 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'cdb6009572e32a38495eb035275134b609225ece':
  REPORT-67316 决策报表-客户模板是绝对布局固定大小的,复制客户模板里的tab到一个新建的绝对布局固定大小frm,保存关闭再打开新建模板,tab下的报表块尺寸变了
  REPORT-71824 frm打开报表块编辑页面,切换工作目录无法打开当前frm
  REPORT-73808 海外版alphafine功能问题
feature/x
superman 3 years ago
parent
commit
3989d968ce
  1. 3
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
  2. 6
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.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;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
import com.fr.general.ComparatorUtils;
import com.fr.license.function.VT4FR;
@ -442,7 +443,7 @@ public class AlphaFineConfigManager implements XMLable {
}
public boolean isProductDynamics() {
return productDynamics;
return productDynamics && FRContext.isChineseEnv();
}
public void setProductDynamics(boolean productDynamics) {

6
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@ -473,4 +473,10 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
}
}
}
@Override
public void recalculateChildrenSize() {
}
}

Loading…
Cancel
Save