Merge pull request #1312 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit 'd510d5e05f9c9147580c8a6f8c02efde76f2b227':
  REPORT-4899 [9.0二轮回归]表单报表块工具栏功能异常

designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java

@@ -2,15 +2,11 @@ package com.fr.design.mainframe.widget.accessibles;
 
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.mainframe.FormWebWidgetConstants;
 import com.fr.design.mainframe.widget.editors.ElementCaseToolBarPane;
-import com.fr.design.mainframe.widget.editors.ITextComponent;
-import com.fr.design.mainframe.widget.editors.TextField;
 import com.fr.design.mainframe.widget.wrappers.ElementCaseToolBarWrapper;
 import com.fr.form.web.FormToolBarManager;
-import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.SwingUtilities;
@@ -59,18 +55,4 @@ public class AccessibleElementCaseToolBarEditor extends UneditableAccessibleEdit
         return options.toArray(new WidgetOption[options.size()]);
     }
 
-    protected ITextComponent createTextField() {
-        TextField textField = new TextField() {
-            public void registerChangeListener(UIObserverListener listener) {
-                return;
-            }
-
-            public boolean shouldResponseChangeListener() {
-                return false;
-            }
-        };
-        textField.setGlobalName(Inter.getLocText("Form-EC_toolbar"));
-        return textField;
-    }
-
 }

designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java

@@ -40,7 +40,7 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
-        CRPropertyDescriptor[] extraTableEditor = ((XElementCase)creator).getExtraTableEditor();
+        CRPropertyDescriptor[] extraTableEditor = ((XElementCase) creator).getExtraTableEditor();
         extraPropertyGroupPane = new PropertyGroupPane(extraTableEditor, creator);
         centerPane.add(panel, BorderLayout.NORTH);
         centerPane.add(extraPropertyGroupPane, BorderLayout.CENTER);
@@ -49,12 +49,10 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
 
     protected ElementCaseEditor updateSubBean() {
         ElementCaseEditor elementCaseEditor = (ElementCaseEditor) creator.toData();
-        if(ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Layout-Padding"))){
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Layout-Padding"))) {
             paddingBoundPane.update(elementCaseEditor);
         }
-        if(ComparatorUtils.equals(getGlobalName(), Inter.getLocText("Form-EC_toolbar"))){
+        elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
-            elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
-        }
 
         return elementCaseEditor;
     }