Browse Source

Merge pull request #8318 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '1f4c9dbba43a07e39d798f3aedf56cff6d633921':
  REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
  REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
  REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
feature/10.0
superman 3 years ago
parent
commit
b7114f492b
  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

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

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

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

Loading…
Cancel
Save