REPORT-3163 合作开发9.0设计器=>入口跳转=>单元格属性调整

designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java

@@ -1,10 +1,9 @@
 package com.fr.design.actions.cell;
 
-import java.awt.event.ActionEvent;
-
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.CellElementPropertyPane;
-import com.fr.design.mainframe.EastRegionContainerPane;
+
+import java.awt.event.ActionEvent;
 
 /**
  * 所有的CellAttributeTableAction都是指向单元格属性表的,点了就自动跳转到单元格属性表
@@ -18,7 +17,6 @@ public abstract class CellAttributeTableAction extends UpdateAction {
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
 		CellElementPropertyPane.getInstance().GoToPane(getID());
 	}
 

designer/src/com/fr/design/actions/cell/GlobalStyleMenuDef.java

@@ -186,6 +186,7 @@ public class GlobalStyleMenuDef extends MenuDef {
             }
 
             stylePane.updateGlobalStyle(getEditingComponent());
+            CellElementPropertyPane.getInstance().GoToPane(Inter.getLocText("FR-Designer-Widget_Style"));
             return true;
         }
 

designer/src/com/fr/design/actions/cell/NewPresentAction.java

@@ -3,7 +3,6 @@ package com.fr.design.actions.cell;
 import com.fr.base.present.Present;
 import com.fr.design.actions.PresentCheckBoxAction;
 import com.fr.design.mainframe.CellElementPropertyPane;
-import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
@@ -26,7 +25,6 @@ public class NewPresentAction extends PresentCheckBoxAction {
 
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
-        EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
         if (!ComparatorUtils.equals(this.itemName, "NOPRESENT")) {
             CellElementPropertyPane.getInstance().GoToPane(Inter.getLocText("FR-Designer_Present"), this.itemName);
         } else {

designer/src/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -176,6 +176,7 @@ public class CellElementPropertyPane extends DockingView {
      */
     public void GoToPane(String... id) {
         cellElementEditPane.setSelectedIndex(id);
+        EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }