Merge pull request #994 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit 'f91fbdb59cd74defbefecab7744c86d1f5f5a44e':
  REPORT-17881 文档在线预览控件插件无效-外部开发者插件问题 这里保存的不是实时的信息。

designer-realize/src/main/java/com/fr/design/widget/WidgetDefinePaneFactory.java

@@ -48,6 +48,7 @@ import com.fr.report.web.button.write.AppendRowButton;
 import com.fr.report.web.button.write.DeleteRowButton;
 import com.fr.stable.bridge.BridgeMark;
 import com.fr.stable.bridge.StableFactory;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -60,7 +61,9 @@ import java.util.Map;
  * Time   : 上午11:17
  */
 public class WidgetDefinePaneFactory {
+    
     private static Map<Class<? extends Widget>, Appearance> defineMap = new HashMap<Class<? extends Widget>, Appearance>();
+    private static Map<Class<? extends Widget>, Appearance> pluginDefineMap = ExtraDesignClassManager.getInstance().getCellWidgetOptionsMap();
 
     static {
         defineMap.put(NumberEditor.class, new Appearance(NumberEditorDefinePane.class, WidgetConstants.NUMBER + ""));
@@ -91,15 +94,21 @@ public class WidgetDefinePaneFactory {
         defineMap.put(AppendRowButton.class, new Appearance(ButtonDefinePane.class, WidgetConstants.BUTTON + ""));
         defineMap.put(DeleteRowButton.class, new Appearance(ButtonDefinePane.class, WidgetConstants.BUTTON + ""));
         defineMap.put(TreeNodeToggleButton.class, new Appearance(ButtonDefinePane.class, WidgetConstants.BUTTON + ""));
-        defineMap.putAll(ExtraDesignClassManager.getInstance().getCellWidgetOptionsMap());
     }
 
     private WidgetDefinePaneFactory() {
 
     }
 
+    @Nullable
     public static RN createWidgetDefinePane(Widget widget, Operator operator) {
+    
         Appearance dn = defineMap.get(widget.getClass());
+        // 再走一遍插件。
+        if (dn == null) {
+            dn = pluginDefineMap.get(widget.getClass());
+        }
+        if (dn != null) {
             DataModify<Widget> definePane = null;
             try {
                 definePane = (DataModify) dn.getDefineClass().newInstance();
@@ -110,6 +119,8 @@ public class WidgetDefinePaneFactory {
             }
             return new RN(definePane, dn.getDisplayName());
         }
+        return null;
+    }
 
     public static class RN {
         private DataModify<Widget> definePane;

designer-realize/src/test/java/com/fr/design/widget/WidgetDefinePaneFactoryTest.java

@@ -0,0 +1,66 @@
+package com.fr.design.widget;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.data.DataCreatorUI;
+import com.fr.design.widget.ui.ButtonDefinePane;
+import com.fr.form.ui.Button;
+import com.fr.form.ui.Widget;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.swing.*")
+public class WidgetDefinePaneFactoryTest {
+    
+    @Test
+    @PrepareForTest({ExtraDesignClassManager.class, WidgetDefinePaneFactory.class})
+    public void testCreateWidgetDefinePane() throws Exception {
+        
+        Map<Class<? extends Widget>, Appearance> map = new HashMap<>();
+        ExtraDesignClassManager mockDesignManager = EasyMock.mock(ExtraDesignClassManager.class);
+        EasyMock.expect(mockDesignManager.getCellWidgetOptionsMap()).andReturn(map).anyTimes();
+        EasyMock.replay(mockDesignManager);
+        
+        PowerMock.mockStatic(ExtraDesignClassManager.class);
+        EasyMock.expect(ExtraDesignClassManager.getInstance()).andReturn(mockDesignManager).anyTimes();
+        PowerMock.replayAll(ExtraDesignClassManager.class);
+        
+        Button mockWidget = EasyMock.mock(Button.class);
+        EasyMock.replay(mockWidget);
+        
+        ButtonDefinePane mockPane = EasyMock.mock(ButtonDefinePane.class);
+        mockPane.populateBean(EasyMock.anyObject(Button.class));
+        EasyMock.expectLastCall();
+        EasyMock.replay(mockPane);
+        
+        
+        Operator mockOperator = EasyMock.mock(Operator.class);
+        mockOperator.did(EasyMock.anyObject(DataCreatorUI.class), EasyMock.anyString());
+        EasyMock.replay(mockOperator);
+        
+        WidgetDefinePaneFactory.RN rn1 = WidgetDefinePaneFactory.createWidgetDefinePane(mockWidget, mockOperator);
+        Assert.assertNull(rn1);
+        
+        Appearance appearance = new Appearance(ButtonDefinePane.class, "test");
+        map.put(mockWidget.getClass(), appearance);
+    
+        WidgetDefinePaneFactory.RN rn2 = WidgetDefinePaneFactory.createWidgetDefinePane(mockWidget, mockOperator);
+        Assert.assertNotNull(rn2);
+        
+        map.clear();
+        
+        WidgetDefinePaneFactory.RN rn3 = WidgetDefinePaneFactory.createWidgetDefinePane(mockWidget, mockOperator);
+        Assert.assertNull(rn3);
+    }
+    
+    
+}