REPORT-39884 换一个改动方案

designer-realize/src/main/java/com/fr/design/mainframe/JPolyWorkBook.java

@@ -1,6 +1,4 @@
-/**
+
- *
- */
 package com.fr.design.mainframe;
 
 import com.fr.design.mainframe.template.info.JPolyWorkBookProcessInfo;
@@ -13,7 +11,6 @@ import com.fr.report.poly.PolyWorkSheet;
  * 聚合报表Book, 跟WorkBook区别在于不能放入WorkSheet.
  *
  * @author neil
- *
  * @date: 2015-2-5-上午8:58:39
  */
 public class JPolyWorkBook extends JWorkBook {
@@ -32,15 +29,12 @@ public class JPolyWorkBook extends JWorkBook {
      * 创建sheet名称tab面板
      *
      * @param reportCompositeX 当前组件对象
-     *
      * @return sheet名称tab面板
-     *
      * @date 2015-2-5-上午11:42:12
-     *
      */
     @Override
-    public SheetNameTabPane createSheetNameTabPane(ReportComponentComposite reportCompositeX){
+    public SheetNameTabPane createSheetNameTabPane(ReportComponentComposite reportCompositeX) {
-        return new PolySheetNameTabPane(reportCompositeX);
+        return new SheetNameTabPane(reportCompositeX);
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/mainframe/PolySheetNameTabPane.java

@@ -1,24 +1,38 @@
 package com.fr.design.mainframe;
 
-import java.awt.Graphics2D;
 
 import com.fr.design.menu.MenuDef;
 
+import java.awt.Graphics2D;
+
 
 /**
  * 获取
- * 
+ *
  * @date 2015-2-5-上午10:19:17
- * 
+ * @deprecated 让聚合报表也可以新建普通报表sheet, 逻辑和普通报表保持一致, 弃用此个性化设置
  */
 @Deprecated
-public class PolySheetNameTabPane extends SheetNameTabPane{
+public class PolySheetNameTabPane extends SheetNameTabPane {
-
+
-	/**
+    /**
-	 * 构造函数
+     * 构造函数
-	 */
+     */
-	public PolySheetNameTabPane(ReportComponentComposite reportCompositeX) {
+    public PolySheetNameTabPane(ReportComponentComposite reportCompositeX) {
-		super(reportCompositeX);
+        super(reportCompositeX);
-	}
+    }
+
+    protected void paintAddButton(Graphics2D g2d) {
+        ADD_POLY_SHEET.paintIcon(this, g2d, iconLocation, 3);
+    }
+
+
+    protected void firstInsertActionPerformed() {
+        new PolyReportInsertAction().actionPerformed(null);
+    }
+
+
+    protected void addInsertGridShortCut(MenuDef def) {
+    }
 
 }