Browse Source

Merge pull request #2875 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'b41b299eb0f27025711af4d00fd46d14d85daa9c':
  REPORT-43372 修改组件树路径的key的格式
bugfix/10.0
superman 4 years ago
parent
commit
f566ebaffd
  1. 17
      designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
  2. 2
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java

17
designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java

@ -2,13 +2,13 @@ package com.fr.design.mainframe;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.designer.treeview.ComponentTreeCellRenderer; import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
import com.fr.design.designer.treeview.ComponentTreeModel; import com.fr.design.designer.treeview.ComponentTreeModel;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.itree.UITreeUI; import com.fr.design.gui.itree.UITreeUI;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@ -287,22 +287,21 @@ public class ComponentTree extends JTree {
} }
private void saveTreePath() { private void saveTreePath() {
String templateID = designer.getTarget().getTemplateID();
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (templateID != null && jt != null && StringUtils.equals(templateID, jt.getTarget().getTemplateID())) { if (jt instanceof JForm && jt.getTarget() == designer.getTarget()) {
String key = jt.getEditingFILE().getPath() + templateID; String key = jt.getEditingFILE().getPath() + "-" + designer.getTarget().getTemplateID();
treePathCache.put(key, getExpandTreePaths()); treePathCache.put(key, getExpandTreePaths());
} }
} }
private List<TreePath> loadTreePath() { private List<TreePath> loadTreePath() {
List<TreePath> result = null;
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (jt == null) { if (jt instanceof JForm) {
return null; String key = jt.getEditingFILE().getPath() + "-" + designer.getTarget().getTemplateID();
result = treePathCache.get(key);
} }
String key = jt.getEditingFILE().getPath() + designer.getTarget().getTemplateID(); return result == null ? new ArrayList<>() : result;
return treePathCache.get(key);
} }
private TreePath buildTreePath(Component comp) { private TreePath buildTreePath(Component comp) {

2
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -313,7 +313,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
if (jt == null) { if (jt == null) {
return; return;
} }
String key = jt.getEditingFILE().getPath() + jt.getTarget().getTemplateID(); String key = jt.getEditingFILE().getPath() + "-" + jt.getTarget().getTemplateID();
FormHierarchyTreePane.getInstance().removeTreePath(key); FormHierarchyTreePane.getInstance().removeTreePath(key);
} }
}); });

Loading…
Cancel
Save