Browse Source

REPORT-61116 【主题切换】多选单元格,格子从跟随主题切换到自定义,内边框不可设置

【问题原因】
设置自定义单元格样式面板后,需要单独处理下边框设置

【改动思路】
同上
bugfix/11.0
Starryi 3 years ago
parent
commit
ed6cb8f72b
  1. 16
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
  2. 1
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

16
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java

@ -114,11 +114,10 @@ public class CustomStylePane extends MultiTabPane<Style> {
return tabPane.getSelectedIndex() == ONE_INDEX; return tabPane.getSelectedIndex() == ONE_INDEX;
} }
/** public void dealWithBorder() {
* @param ePane if (reportPane == null) {
*/ return;
public void dealWithBorder(ElementCasePane ePane) { }
this.reportPane = ePane;
Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane); Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane);
if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) { if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) {
@ -130,7 +129,14 @@ public class CustomStylePane extends MultiTabPane<Style> {
(Color) fourObjectArray[THREE_INDEX]); (Color) fourObjectArray[THREE_INDEX]);
} }
} }
}
/**
* @param ePane
*/
public void dealWithBorder(ElementCasePane ePane) {
this.reportPane = ePane;
dealWithBorder();
} }
/** /**

1
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

@ -107,6 +107,7 @@ public class StylePane extends BasicPane implements UIObserver {
lastSelectedRealStyle = (Style) lastSelectedRealStyle.clone(); lastSelectedRealStyle = (Style) lastSelectedRealStyle.clone();
if (lastSelectedRealStyle != null) { if (lastSelectedRealStyle != null) {
customStylePane.populateBean(lastSelectedRealStyle); customStylePane.populateBean(lastSelectedRealStyle);
customStylePane.dealWithBorder();
} }
} catch (CloneNotSupportedException ex) { } catch (CloneNotSupportedException ex) {
FineLoggerFactory.getLogger().error(ex.getMessage(), ex); FineLoggerFactory.getLogger().error(ex.getMessage(), ex);

Loading…
Cancel
Save