Merge pull request #4382 in DESIGN/design from feature/10.0 to research/10.0

* commit '198da96ae11d36c6f7b30c2d5c1a3e4fc5d3703b':
  REPORT-51678  交互调整

designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

@@ -89,7 +89,7 @@ public class FormWidgetDetailPane extends FormDockView{
                 cardLayout.show(centerPane, paneList.get(newSelectedIndex).getTitle());
             }
         };
-        headGroup.setSelectedIndex(0);
+        headGroup.setSelectedIndex(ONLINE_TAB);
         this.add(headGroup, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
@@ -107,10 +107,10 @@ public class FormWidgetDetailPane extends FormDockView{
 
     public void enterWidgetLib() {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB);
-        headGroup.setSelectedIndex(ONLINE_TAB);
         ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false);
     }
 
+
     /**
      * 定位
      *

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/AbstractOnlineWidgetShowPane.java

@@ -145,7 +145,7 @@ public abstract class AbstractOnlineWidgetShowPane extends JPanel {
                 centerPane.remove(componentSelectPane);
                 componentSelectPane = createOnlineWidgetSelectPane(() -> {
                     sharableWidgetProviders = new OnlineShareWidget[0];
-                    sharableWidgetProviders = ShareUtils.getFilterWidgets(filterStr);
+                    sharableWidgetProviders = getSharableWidgetArr(filterStr);
                     return sharableWidgetProviders;
                 });
                 centerPane.add(componentSelectPane, BorderLayout.CENTER);
@@ -155,6 +155,10 @@ public abstract class AbstractOnlineWidgetShowPane extends JPanel {
         });
     }
 
+    protected OnlineShareWidget[] getSharableWidgetArr( String filterStr){
+       return ShareUtils.getFilterWidgets(filterStr);
+    }
+
     public void initSearchTextFieldPaneListener(FlexSearchFieldPane searchFieldPane) {
         searchFieldPane.registerChangeListener(event -> {
             Object object = event.getSource();

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetShowPane.java

@@ -2,9 +2,11 @@ package com.fr.design.mainframe.share.ui.online;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
+import com.fr.design.mainframe.share.sort.OnlineWidgetSortType;
 import com.fr.design.mainframe.share.ui.base.FlexSearchFieldPane;
 import com.fr.design.mainframe.share.ui.widgetfilter.FilterPane;
 import com.fr.form.share.bean.OnlineShareWidget;
+import com.fr.form.share.utils.ShareUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.event.ChangeEvent;
@@ -106,6 +108,12 @@ public class OnlineWidgetShowPane extends AbstractOnlineWidgetShowPane {
         });
     }
 
+    protected OnlineShareWidget[] getSharableWidgetArr( String filterStr){
+        OnlineShareWidget[] onlineShareWidgets =  ShareUtils.getFilterWidgets(filterStr);
+        OnlineWidgetSortType.values()[lastSortTabSelectedIndex].sort(onlineShareWidgets);
+        return onlineShareWidgets;
+    }
+
     @Override
     public void initSortTabPane(SortTabPane sortTabPane) {
         super.initSortTabPane(sortTabPane);