Browse Source

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

* commit '111a6888991c7f758b596ad9d5fd453dfbea3aee':
  REPORT-4796 表单报表块背景无法保存
master
superman 7 years ago
parent
commit
ae30b1bcb2
  1. 7
      designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java
  2. 25
      designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java

7
designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java

@ -12,7 +12,6 @@ import java.util.ArrayList;
import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import javax.swing.JComponent;
import javax.swing.JOptionPane;
@ -85,12 +84,6 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor
if (showButton) {
btPopup = new UIButton(){
public void registerChangeListener(UIObserverListener listener) {
return;
}
public boolean shouldResponseChangeListener() {
return false;
}
@Override
public ButtonUI getUI() {
return new UIButtonUI() {

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

@ -2,6 +2,7 @@ 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;
@ -13,8 +14,6 @@ import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -61,23 +60,13 @@ public class AccessibleElementCaseToolBarEditor extends UneditableAccessibleEdit
}
protected ITextComponent createTextField() {
TextField textField = new TextField(){
protected void initListener() {
if (shouldResponseChangeListener()) {
getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
}
@Override
public void removeUpdate(DocumentEvent e) {
attributeChange();
}
@Override
public void changedUpdate(DocumentEvent e) {
TextField textField = new TextField() {
public void registerChangeListener(UIObserverListener listener) {
return;
}
}
});
}
public boolean shouldResponseChangeListener() {
return false;
}
};
textField.setGlobalName(Inter.getLocText("Form-EC_toolbar"));

Loading…
Cancel
Save