Browse Source

Pull request #5825: CHART-20522 切换主题,会导致模板主题-细节定制里,自定义渐变的首个颜色变成白色

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '99d3def5be0c07bb4d8cba03f2c6f25c92ed9c28':
  CHART-20522 切换主题,会导致模板主题-细节定制里,自定义渐变的首个颜色变成白色
bugfix/11.0
kerry 3 years ago
parent
commit
00d52c5ea6
  1. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

4
designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@ -380,8 +380,6 @@ public class XCreatorUtils {
public static void setupTemplateTheme(XCreator container, final FormTheme currentTemplateUsingTheme, TemplateThemeCompatible compatible) { public static void setupTemplateTheme(XCreator container, final FormTheme currentTemplateUsingTheme, TemplateThemeCompatible compatible) {
FineColorGather colorGather = new FineColorManager.FineColorReplaceByTheme(currentTemplateUsingTheme, compatible); FineColorGather colorGather = new FineColorManager.FineColorReplaceByTheme(currentTemplateUsingTheme, compatible);
FineColorFlushUtils.replaceCacheObject(container.toData(), colorGather);
FineColorManager.traverse(container.toData(), colorGather);
Form.traversalWidget(container.toData(), new WidgetGather() { Form.traversalWidget(container.toData(), new WidgetGather() {
@Override @Override
public void dealWith(Widget widget) { public void dealWith(Widget widget) {
@ -394,5 +392,7 @@ public class XCreatorUtils {
return true; return true;
} }
}, TemplateThemeAware.class); }, TemplateThemeAware.class);
FineColorFlushUtils.replaceCacheObject(container.toData(), colorGather);
FineColorManager.traverse(container.toData(), colorGather);
} }
} }
Loading…
Cancel
Save