Browse Source

Pull request #3975: KERNEL-7376 优化设计器上一些性能问题 && CHART-18881 单元格图表有时候无法点出图表属性面板

Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0

* commit '3e53124e9a7055bfa388cca4d84ce6ceb5d6fbf6':
  KERNEL-7376 优化设计器上一些性能问题
feature/10.0
Henry.Wang 4 years ago
parent
commit
81d2064def
  1. 2
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
  2. 8
      designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

2
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@ -64,7 +64,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
* @param selected 选择的 * @param selected 选择的
*/ */
public void closeSelectedReport(JTemplate<?, ?> selected) { public void closeSelectedReport(JTemplate<?, ?> selected) {
DesignModuleFactory.clearChartPropertyPane();
DesignTableDataManager.closeTemplate(selected); DesignTableDataManager.closeTemplate(selected);
//直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑 //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) { if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
@ -92,7 +91,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
* @param selected 选择的 * @param selected 选择的
*/ */
public void closeVirtualSelectedReport(JTemplate<?, ?> selected) { public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
DesignModuleFactory.clearChartPropertyPane();
DesignTableDataManager.closeTemplate(selected); DesignTableDataManager.closeTemplate(selected);
if (contains(selected) == -1) { if (contains(selected) == -1) {
return; return;

8
designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@ -243,14 +243,6 @@ public class DesignModuleFactory {
return bp; return bp;
} }
public static void clearChartPropertyPane() {
if (instance.chartPropertyPaneClass != null) {
StableUtils.clearInstance(instance.chartPropertyPaneClass);
}
}
public static void registerButtonDetailPaneClass(Class clazz) { public static void registerButtonDetailPaneClass(Class clazz) {
instance.buttonDetailPaneClass = clazz; instance.buttonDetailPaneClass = clazz;
} }

Loading…
Cancel
Save