Pull request #5788: REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0 * commit 'eb2ea8eccf54c9979f0fa01270bcd7b8b55a9849': REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态
3 years ago · f5c607ac95
5 changed files with 59 additions and 26 deletions
--- a/designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java
+++ b/designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java
@ -10,7 +10,15 @@ public class DesignModeContext {
    private static DesignerMode mode = DesignerMode.NORMAL;

    public static void switchTo(DesignerMode mode) {
-        DesignModeContext.mode = mode;
+        changeMode(DesignModeContext.mode, mode);
+    }
+
+    private static void changeMode(DesignerMode oldMode, DesignerMode newMode) {
+        if (oldMode != newMode) {
+            DesignModeContext.mode = newMode;
+            oldMode.closeMode();
+            newMode.openMode();
+        }
    }

    public static DesignerMode getMode() {
--- a/designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java
+++ b/designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java
@ -1,9 +1,25 @@
 package com.fr.design.base.mode;

+
+import com.fr.design.mainframe.DesignerContext;
+
 public enum DesignerMode {
    NORMAL,
    BAN_COPY_AND_CUT,
    VCS,
-    AUTHORITY,
-    DUCHAMP
+    AUTHORITY {
+        @Override
+        public void closeMode() {
+            DesignerContext.getDesignerFrame().closeAuthorityMode();
+        }
+    },
+    DUCHAMP;
+
+    public void openMode() {
+
+    }
+
+    public void closeMode() {
+    }
+
 }
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
@ -4,6 +4,7 @@ import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.io.BaseBook;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.file.filter.ClassFilter;
 import com.fr.design.i18n.Toolkit;
@ -69,7 +70,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
        DesignTableDataManager.closeTemplate(selected);
        //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
        if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
-            DesignerContext.getDesignerFrame().closeAuthorityEditing();
+            DesignModeContext.switchTo(DesignerMode.NORMAL);
        }
        if (contains(selected) == -1) {
            return;
@ -430,13 +431,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
     */
    @Deprecated
    public void reloadCurrentTemplate() {
-       reloadAllEditingTemplate();
+        reloadAllEditingTemplate();
    }

    /**
     * 重绘当前模板
     */
-    public void repaintCurrentEditingTemplate(){
+    public void repaintCurrentEditingTemplate() {
        UIUtil.invokeLaterIfNeeded(new Runnable() {
            @Override
            public void run() {
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@ -9,6 +9,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@ -219,7 +220,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        @Override
        public void mouseReleased(MouseEvent e) {
            if (DesignModeContext.isAuthorityEditing()) {
-                closeAuthorityEditing();
+                DesignModeContext.switchTo(DesignerMode.NORMAL);
            }
        }

@ -299,8 +300,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().doResize();
    }

+    @Deprecated
    public void closeAuthorityEditing() {
-        DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
+    }
+
+    public void closeAuthorityMode() {
        WestRegionContainerPane.getInstance().replaceDownPane(
                TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
@ -312,6 +317,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        EventDispatcher.fire(DesignAuthorityEventType.StopEdit, DesignerFrame.this);
    }

+
    /**
     * 注册app.
     *
@ -796,6 +802,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     * @param jt 添加的模板.
     */
    public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        if (currentEditingTemplate != null) {
            currentEditingTemplate.stopEditing();
@ -1038,7 +1045,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        }

        JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jt != null)  {
+        if (jt != null) {
            DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
        }

--- a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java
@ -18,21 +18,22 @@ import java.util.Map;
 */
 public class RolesEditedSourceOP extends RoleSourceOP {

-	protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map<String, RoleDataWrapper> map) {
-		List<ExpandMutableTreeNode> roleList = new ArrayList<ExpandMutableTreeNode>();
-		Iterator<Map.Entry<String, RoleDataWrapper>> entryIt = map.entrySet().iterator();
-		while (entryIt.hasNext()) {
-			Map.Entry<String, RoleDataWrapper> entry = entryIt.next();
-			RoleDataWrapper t = entry.getValue();
-			
-			JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-			PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget();
-			
-			ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet()));
-			for (ExpandMutableTreeNode expandMutableTreeNode : expand) {
-				roleList.add(expandMutableTreeNode);
-			}
-		}
-		return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]);
-	}
+    protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map<String, RoleDataWrapper> map) {
+        List<ExpandMutableTreeNode> roleList = new ArrayList<ExpandMutableTreeNode>();
+        Iterator<Map.Entry<String, RoleDataWrapper>> entryIt = map.entrySet().iterator();
+        while (entryIt.hasNext()) {
+            Map.Entry<String, RoleDataWrapper> entry = entryIt.next();
+            RoleDataWrapper t = entry.getValue();
+
+            JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (jt.getTarget() instanceof PrivilegeEditedRoleProvider) {
+                PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget();
+                ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet()));
+                for (ExpandMutableTreeNode expandMutableTreeNode : expand) {
+                    roleList.add(expandMutableTreeNode);
+                }
+            }
+        }
+        return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]);
+    }
 }