Merging in latest from upstream (DESIGN/design:refs/heads/release/11.0)

* commit 'eb2fbc2baa84907e71a1b1e69729d5dcf64b5245':
  无jira任务，补交遗漏代码

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java

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