Browse Source

Pull request #7169: REPORT-64267 【主题优化】拖入数据列以后,双击打开点击确定,数据列没了

Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x

* commit '51b9bfb372eb7d97ce633e130ca7ea8e1035403b':
  REPORT-64267 【主题优化】拖入数据列以后,双击打开点击确定,数据列没了
feature/x
starryi 3 years ago
parent
commit
2c182a7052
  1. 18
      designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

18
designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

@ -372,10 +372,20 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
* update
*/
public Style update(Style style) {
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), "textField")
|| ComparatorUtils.equals(globalNameListener.getGlobalName(), "typeComboBox")
|| ComparatorUtils.equals(globalNameListener.getGlobalName(), "roundingBox")) {
return style.deriveFormat(this.update());
return updateByGlobalNamedSetting(style);
}
private Style updateByGlobalNamedSetting(Style style) {
if (globalNameListener != null) {
String[] alterSettingNames = new String[] {"typeComboBox", "textField", "roundingBox"};
String globalSettingName = globalNameListener.getGlobalName();
if (StringUtils.isNotEmpty(globalSettingName)) {
for (String alterSettingName : alterSettingNames) {
if (ComparatorUtils.equals(alterSettingName, globalSettingName)) {
return style.deriveFormat(this.update());
}
}
}
}
return style;
}

Loading…
Cancel
Save