Merge pull request #6272 in DESIGN/design from feature/10.0 to feature/x

* commit '236d4210f00638b28007e872f2471c288f0d6c85':
  REPORT-59814 代码优化
  REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
  CHART-21219 特殊形状柱形图触发保存
  REPORT-60752 【10.0】tab组件，移动端属性设置样式模板，从默认切换到自定义后不保存关闭窗口，再次进入后，选项会显示自定义，应该还是默认才对
  REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java

@@ -288,12 +288,17 @@ public class ComponentCollector implements XMLable {
 
     private JSONArray getGroupingDetail() {
         JSONArray ja = JSONFactory.createJSON(JSON.ARRAY);
-        Group[] groups = DefaultShareGroupManager.getInstance().getAllGroup();
+        try {
-        for(Group group : groups) {
+            DefaultShareGroupManager.getInstance().refresh();
-            JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+            Group[] groups = DefaultShareGroupManager.getInstance().getAllGroup();
-            jo.put(GROUP_NAME, group.getGroupName());
+            for(Group group : groups) {
-            jo.put(CONTAIN_AMOUNT, group.getAllBindInfoList().length);
+                JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
-            ja.add(jo);
+                jo.put(GROUP_NAME, group.getGroupName());
+                jo.put(CONTAIN_AMOUNT, group.getAllBindInfoList().length);
+                ja.add(jo);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
         return ja;
     }

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java

@@ -7,4 +7,8 @@ public abstract class AbstractTemplateStylePane<T> extends BasicPane {
     public abstract void populate(T ob);
 
     public abstract T update();
+
+    public AbstractTemplateStylePane<T> generateCleanPane() {
+        return this;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java

@@ -32,6 +32,11 @@ public class AccessibleTemplateStyleEditor extends UneditableAccessibleEditor {
                 setValue(stylePane.update());
                 fireStateChanged();
             }
+
+            @Override
+            public void doCancel() {
+                stylePane = stylePane.generateCleanPane();
+            }
         });
         stylePane.populate(getValue());
         dlg.setVisible(true);

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java

@@ -44,12 +44,14 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
     private JPanel right;
     private CardLayout card;
     private Set<Class<? extends MobileTemplateStyle>> extraStyle = new HashSet<>();
+    private WCardTagLayout tagLayout;
     public MobileTemplateStylePane(WCardTagLayout tagLayout){
         init(tagLayout);
     }
 
     public void init(WCardTagLayout tagLayout){
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.tagLayout = tagLayout;
         listModel = new DefaultListModel();
         card = new CardLayout();
         right = FRGUIPaneFactory.createCardLayout_S_Pane();
@@ -147,4 +149,9 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
         list.addAll(sets);
         return Collections.unmodifiableList(list);
     }
+
+    @Override
+    public AbstractTemplateStylePane<MobileTemplateStyle> generateCleanPane() {
+        return new MobileTemplateStylePane(this.tagLayout);
+    }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java

@@ -5,6 +5,7 @@ import com.fr.design.constants.KeyWords;
 import com.fr.design.gui.autocomplete.AutoCompletion;
 import com.fr.design.gui.autocomplete.BasicCompletion;
 import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -45,7 +46,7 @@ public class VanChartHtmlLabelPane extends JPanel {
     private UICheckBox isCustomHeight;
     private UITextField customHeight;
 
-    private VanChartStylePane parent;
+    private AbstractAttrNoScrollPane parent;
 
     private JPanel widthAndHeightPane;
 
@@ -53,7 +54,7 @@ public class VanChartHtmlLabelPane extends JPanel {
         contentTextArea.setText(text);
     }
 
-    public void setParent(VanChartStylePane parent) {
+    public void setParent(AbstractAttrNoScrollPane parent) {
         this.parent = parent;
     }
 
@@ -126,7 +127,7 @@ public class VanChartHtmlLabelPane extends JPanel {
         };
     }
 
-    private void fireJSChange() {
+    protected void fireJSChange() {
         if (parent != null) {
             parent.attributeChanged();
         }

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

@@ -97,7 +97,8 @@ public class FormWidgetDetailPane extends FormDockView{
         }
          headGroup = new UIHeadGroup(paneNames) {
             protected void tabChanged(int newSelectedIndex) {
-                if (newSelectedIndex == 1) {
+                //初始化还未展示的时候不需要收集其 marketClick
+                if (this.isShowing() && newSelectedIndex == 1) {
                     ComponentCollector.getInstance().collectMarkerClick();
                 }
                 cardLayout.show(centerPane, paneList.get(newSelectedIndex).getTitle());