Browse Source

Merge pull request #200 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit '36a486428eac7fed438693b57f686066b5444f8c':
  REPORT-9437【10.0一轮回归】设计器菜单栏-服务器-服务器配置中去勾选无效
master
kerry 6 years ago
parent
commit
159714a838
  1. 5
      designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java
  2. 5
      designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java

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

@ -155,7 +155,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
webContent = new WebWrite();
}
WebWrite webWrite = (WebWrite) webContent;
if (webWrite.getSelectedColor() != null) {
if (webWrite.isEditRowColor()) {
colorBox.setSelected(true);
colorButton.setColor(webWrite.getSelectedColor());
} else {
@ -205,9 +205,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
}
if (colorBox.isSelected()) {
webWrite.setEditRowColor(true);
webWrite.setSelectedColor(colorButton.getColor());
} else {
webWrite.setSelectedColor(null);
webWrite.setEditRowColor(false);
}
webWrite.setUnloadCheck(unloadCheck.isSelected());

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

@ -120,7 +120,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
if (webWrite == null) {
webWrite = new WebWrite();
}
if (webWrite.getSelectedColor() != null) {
if (webWrite.isEditRowColor()) {
colorBox.setSelected(true);
colorButton.setColor(webWrite.getSelectedColor());
} else {
@ -148,9 +148,10 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
protected WebWrite updateSubWebSettingBean() {
WebWrite webWrite = new WebWrite();
if (colorBox.isSelected()) {
webWrite.setEditRowColor(true);
webWrite.setSelectedColor(colorButton.getColor());
} else {
webWrite.setSelectedColor(null);
webWrite.setEditRowColor(false);
}
if (topRadioButton.isSelected()) {
webWrite.setSheetPosition(Constants.TOP);

Loading…
Cancel
Save