fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #12130: 无jira任务，补交遗漏代码 

Merge in DESIGN/design from ~CORAL.CHEN/design:release/11.0 to release/11.0

* commit 'bb5781511f606e72c6fc07513ec848692b1c756f':
  无jira任务，补交遗漏代码
release/11.0
Coral.Chen-张晨 2 years ago committed by Yvan-欧阳帆
parent
fb5e0fadb8 bb5781511f
commit
eb2fbc2baa
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java

10
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
Unescape View File

@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.MobileWidgetStyleProvider; import com.fr.design.fun.MobileWidgetStyleProvider;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.mobile.processor.MobileStyleDefinePaneProcessor; import com.fr.design.mainframe.mobile.processor.MobileStyleDefinePaneCreator;
import com.fr.event.Event; import com.fr.event.Event;
import com.fr.event.EventDispatcher; import com.fr.event.EventDispatcher;
import com.fr.event.Listener; import com.fr.event.Listener;
@ -129,13 +129,13 @@ public class MobileStylePane extends BasicPane {
listModel.addElement(displayName); listModel.addElement(displayName);
try { try {
MobileStyleDefinePaneProcessor processor = ExtraDesignClassManager.getInstance().getSingle(MobileStyleDefinePaneProcessor.XML_TAG); MobileStyleDefinePaneCreator processor = ExtraDesignClassManager.getInstance().getSingle(MobileStyleDefinePaneCreator.XML_TAG);
BasicBeanPane<MobileStyle> mobileStyleBasicBeanPane = new MobileStyleDefinePane(widget, appearanceClazz, mobileStyleClazz); BasicBeanPane<MobileStyle> mobileStyleBasicBeanPane = new MobileStyleDefinePane(widget, appearanceClazz, mobileStyleClazz);
if (checkFlag && processor != null && processor.createBaseBeanPane(widget, appearanceClazz, mobileStyleClazz) != null) { if (checkFlag && processor != null && processor.createBaseBeanPane(widget, appearanceClazz, mobileStyleClazz) != null) {
mobileStyleBasicBeanPane = processor.createBaseBeanPane(widget, appearanceClazz, mobileStyleClazz); mobileStyleBasicBeanPane = processor.createBaseBeanPane(widget, appearanceClazz, mobileStyleClazz);
Class<? extends MobileCommonExtraStyle> extraStyle = processor.classForCommonExtraStyle(widget); Class<? extends MobileCommonExtraStyle> extraStyle = processor.classForCommonExtraStyle(widget);
if (extraStyle != null) { if (extraStyle != null) {
StyleClassMap.getCommonStyleMap().put(extraStyle.getName(), extraStyle.getName()); StyleClassMap.putCommonStyle(extraStyle.getName(), extraStyle.getName());
} }
} }
right.add(displayName, mobileStyleBasicBeanPane); right.add(displayName, mobileStyleBasicBeanPane);
@ -168,7 +168,7 @@ public class MobileStylePane extends BasicPane {
EventDispatcher.listen(PluginEventType.AfterRun, new Listener<PluginContext>() { EventDispatcher.listen(PluginEventType.AfterRun, new Listener<PluginContext>() {
@Override @Override
public void on(Event event, PluginContext pluginContext) { public void on(Event event, PluginContext pluginContext) {
if (pluginContext.getRuntime().contain(MobileStyleDefinePaneProcessor.XML_TAG)) { if (pluginContext.getRuntime().contain(MobileStyleDefinePaneCreator.XML_TAG)) {
checkFlag = true; checkFlag = true;
refreshDockingView(); refreshDockingView();
} }
@ -177,7 +177,7 @@ public class MobileStylePane extends BasicPane {
EventDispatcher.listen(PluginEventType.BeforeStop, new Listener<PluginContext>() { EventDispatcher.listen(PluginEventType.BeforeStop, new Listener<PluginContext>() {
@Override @Override
public void on(Event event, PluginContext pluginContext) { public void on(Event event, PluginContext pluginContext) {
if (pluginContext.getRuntime().contain(MobileStyleDefinePaneProcessor.XML_TAG)) { if (pluginContext.getRuntime().contain(MobileStyleDefinePaneCreator.XML_TAG)) {
checkFlag = false; checkFlag = false;
refreshDockingView(); refreshDockingView();
} }

Write Preview
Loading…
Cancel
Save