Browse Source

Pull request #8306: REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认

Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/11.0 to final/11.0

* commit 'a0f83145e890362ffd320dacc16c7466d4bd1a4e':
  REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
new-design
Lucian.Chen 3 years ago
parent
commit
584157b41d
  1. 1
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java

1
designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java

@ -161,6 +161,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
colorButton.setColor(webWrite.getSelectedColor()); colorButton.setColor(webWrite.getSelectedColor());
} else { } else {
colorBox.setSelected(false); colorBox.setSelected(false);
colorButton.setEnabled(false);
} }
if (webWrite.getSheetPosition() == Constants.TOP) { if (webWrite.getSheetPosition() == Constants.TOP) {

2
designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java

@ -109,6 +109,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
protected void setDefault() { protected void setDefault() {
super.setDefault(); super.setDefault();
colorBox.setSelected(false); colorBox.setSelected(false);
colorButton.setEnabled(false);
bottomRadioButton.setSelected(true); bottomRadioButton.setSelected(true);
leftRadioButton.setSelected(true); leftRadioButton.setSelected(true);
unloadCheck.setSelected(true); unloadCheck.setSelected(true);
@ -126,6 +127,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
colorButton.setColor(webWrite.getSelectedColor()); colorButton.setColor(webWrite.getSelectedColor());
} else { } else {
colorBox.setSelected(false); colorBox.setSelected(false);
colorButton.setEnabled(false);
} }
if (webWrite.getSheetPosition() == Constants.TOP) { if (webWrite.getSheetPosition() == Constants.TOP) {

Loading…
Cancel
Save