REPORT-76091 && REPORT-76041

1-新建决策报表
2-fvs npe 处理

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -188,7 +188,7 @@ public abstract class DesignTableDataManager {
     public static void addDsChangeListener(ChangeListener l) {
         JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         String key = StringUtils.EMPTY;
-        if (template != null) {
+        if (JTemplate.isValid(template)) {
             key = template.getPath();
         }
         List<ChangeListener> dsListeners = dsListenersMap.get(key);

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

@@ -26,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 历史模板缓存
@@ -109,8 +108,11 @@ public class HistoryTemplateListCache implements CallbackEvent {
      */
     public void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
         this.editingTemplate = jt;
+    
+        if (!JTemplate.isValid(jt)) {
+            return;
+        }
         //如果当前历史面板中没有
-
         if (contains(jt) == -1) {
             addHistory();
         }

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

@@ -815,6 +815,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         basePane.remove(layout.getLayoutComponent(BorderLayout.EAST));
         basePane.add(designerOpenEmptyPanel, BorderLayout.CENTER);
     
+        resetToolkitByPlus(ToolBarMenuDock.NULLAVOID);
+    
+        // 这里挺恶心的，是为了保证对插件的兼容性适配
+        // 不然的话，插件就会 npe
+        // 见 https://work.fineres.com/browse/REPORT-76091
+        HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(JNullTemplate.NULL);
+    
         layeredPane.repaint();
     }
 

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

@@ -0,0 +1,207 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.gui.frpane.HyperlinkGroupPane;
+import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
+import com.fr.design.menu.ShortCut;
+import com.fr.design.menu.ToolBarDef;
+
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+/**
+ * created by Harrison on 2022/08/09
+ **/
+public class JNullTemplate extends JTemplate {
+    
+    public static final JTemplate NULL = new JNullTemplate();
+    
+    @Override
+    public void copy() {
+    
+    }
+    
+    @Override
+    public boolean paste() {
+        return false;
+    }
+    
+    @Override
+    public boolean cut() {
+        return false;
+    }
+    
+    @Override
+    public AuthorityEditPane createAuthorityEditPane() {
+        return null;
+    }
+    
+    @Override
+    public JPanel getEastUpPane() {
+        return null;
+    }
+    
+    @Override
+    public JPanel getEastDownPane() {
+        return null;
+    }
+    
+    @Override
+    public ToolBarDef[] toolbars4Target() {
+        return new ToolBarDef[0];
+    }
+    
+    @Override
+    public JComponent[] toolBarButton4Form() {
+        return new JComponent[0];
+    }
+    
+    @Override
+    public void refreshEastPropertiesPane() {
+    
+    }
+    
+    @Override
+    public TargetComponent getCurrentElementCasePane() {
+        return null;
+    }
+    
+    @Override
+    public JComponent getCurrentReportComponentPane() {
+        return null;
+    }
+    
+    @Override
+    public TemplateProcessInfo getProcessInfo() {
+        return null;
+    }
+    
+    @Override
+    public void setJTemplateResolution(int resolution) {
+    
+    }
+    
+    @Override
+    public int getJTemplateResolution() {
+        return 0;
+    }
+    
+    @Override
+    protected JComponent createCenterPane() {
+        return null;
+    }
+    
+    @Override
+    public void removeTemplateSelection() {
+    
+    }
+    
+    @Override
+    public void refreshContainer() {
+    
+    }
+    
+    @Override
+    public void removeParameterPaneSelection() {
+    
+    }
+    
+    @Override
+    public void setScale(int resolution) {
+    
+    }
+    
+    @Override
+    public int getScale() {
+        return 0;
+    }
+    
+    @Override
+    public int selfAdaptUpdate() {
+        return 0;
+    }
+    
+    @Override
+    protected DesignModelAdapter createDesignModel() {
+        return null;
+    }
+    
+    @Override
+    public UIMenuItem[] createMenuItem4Preview() {
+        return new UIMenuItem[0];
+    }
+    
+    @Override
+    protected BaseUndoState<?> createUndoState() {
+        return null;
+    }
+    
+    @Override
+    protected void applyUndoState(BaseUndoState baseUndoState) {
+    
+    }
+    
+    @Override
+    public String suffix() {
+        return null;
+    }
+    
+    @Override
+    public ShortCut[] shortcut4TemplateMenu() {
+        return new ShortCut[0];
+    }
+    
+    @Override
+    public ShortCut[] shortCuts4Authority() {
+        return new ShortCut[0];
+    }
+    
+    @Override
+    public boolean isJWorkBook() {
+        return false;
+    }
+    
+    @Override
+    public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        return null;
+    }
+    
+    @Override
+    public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        return null;
+    }
+    
+    @Override
+    public void setAuthorityMode(boolean isUpMode) {
+    
+    }
+    
+    @Override
+    public Icon getIcon() {
+        return null;
+    }
+    
+    @Override
+    public String route() {
+        return null;
+    }
+    
+    @Override
+    public JPanel[] toolbarPanes4Form() {
+        return new JPanel[0];
+    }
+    
+    @Override
+    public JComponent toolBar4Authority() {
+        return null;
+    }
+    
+    @Override
+    public int getToolBarHeight() {
+        return 0;
+    }
+}

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

@@ -1973,5 +1973,14 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public void setDesignerUIMode() {
         DesignerUIModeConfig.getInstance().setAbsoluteMeasureUIMode();
     }
-
+    
+    /**
+     * 判断当前的模板是否是有效的模板
+     *
+     * @param jt 模板
+     * @return 是/否
+     */
+    public static boolean isValid(JTemplate jt) {
+        return jt != null && jt != JNullTemplate.NULL;
+    }
 }