Merge remote-tracking branch 'origin/release/11.0' into release/11.0

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

@@ -10,6 +10,7 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.Nameable;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@@ -128,7 +129,9 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
 
     public void populate(Nameable[] nameableArray) {
         //特殊处理，使用instanceof判断，弹出不同的面板
-        if (SwingUtilities.getWindowAncestor(this) instanceof PopupEditDialog) {
+        //悬浮窗图表弹框 || 场景地图编辑弹框 都是真正的弹框 从if走
+        //fvs.chart走super
+        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog && !ChartEditContext.duchampMode()) {
             popupEditDialog = new HyperDialog(cardPane);
         }
         super.populate(nameableArray);
@@ -136,7 +139,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
 
     protected void popupEditDialog(Point mousePos) {
         //特殊处理，处理连续弹窗情况，弹出面板定为方式不同
-        if (SwingUtilities.getWindowAncestor(this) instanceof PopupEditDialog) {
+        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog && !ChartEditContext.duchampMode()) {
             GUICoreUtils.centerWindow(popupEditDialog);
             popupEditDialog.setVisible(true);
             return;

designer-realize/src/main/java/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java

@@ -89,7 +89,7 @@ public class HyperlinkGroupPaneActionImpl implements HyperlinkGroupPaneActionPro
                     }
 
                     // 首次添加超链接，将文字样式默认改为蓝色下划线
-                    if (editCellElement.getNameHyperlinkGroup() == null && hyperlinkGroupPane.getCurrentEvent() != null && hyperlinkGroupPane.getCurrentEvent().getType() == ListDataEvent.INTERVAL_ADDED) {
+                    if ((editCellElement.getNameHyperlinkGroup() == null || editCellElement.getNameHyperlinkGroup().size() == 0) && hyperlinkGroupPane.getCurrentEvent() != null && hyperlinkGroupPane.getCurrentEvent().getType() == ListDataEvent.INTERVAL_ADDED) {
                         editCellElement.setStyle(elementStyle.deriveFRFont(frFont));
                     }
 

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineFrame.java

@@ -282,6 +282,7 @@ public class AlphaFineFrame extends JFrame {
             @Override
             public void mousePressed(MouseEvent e) {
                 searchTextField.setText(StringUtils.EMPTY);
+                beforeSearchStr = StringUtils.EMPTY;
                 clearLabel.setVisible(false);
             }
         });
@@ -543,6 +544,8 @@ public class AlphaFineFrame extends JFrame {
                 if (StringUtils.isNotEmpty(searchTextField.getText())) {
                     clearLabel.setVisible(true);
                     SearchTooltipPopup.getInstance().show(searchTextFieldWrapperPane);
+                } else {
+                    beforeSearchStr = StringUtils.EMPTY;
                 }
                 AlphaFineToolTipList alphaFineToolTipList = SearchTooltipPopup.getInstance().getAlphaFineToolTipList();
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
@@ -590,6 +593,7 @@ public class AlphaFineFrame extends JFrame {
                 SearchTooltipPopup.getInstance().hide();
                 clearLabel.setVisible(false);
                 switchType(selectedType);
+                beforeSearchStr = StringUtils.EMPTY;
             } else if (searchTextField.hasFocus()) {
                 clearLabel.setVisible(true);
                 SearchTooltipPopup.getInstance().show(searchTextFieldWrapperPane);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineList.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.alphafine.component;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
+import com.fr.design.mainframe.alphafine.cell.model.DocumentModel;
 import com.fr.design.mainframe.alphafine.preview.ResultShowPane;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -26,7 +27,10 @@ public class AlphaFineList extends JList<AlphaCellModel> {
                 AlphaCellModel selectedValue = getSelectedValue();
                 if (e.getClickCount() == AlphaFineConstants.DEFAULT_CLICK_COUNT && selectedValue.hasAction()) {
                     // 点击搜索结果 主页面移动到后面
-                    AlphaFineHelper.getAlphaFineDialog().toBack();
+                    if (!(selectedValue instanceof DocumentModel)) {
+                        // 帮助文档不跳转
+                        AlphaFineHelper.getAlphaFineDialog().toBack();
+                    }
                     dealWithSearchResult();
                 }
             }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

@@ -11,6 +11,7 @@ import com.fr.design.mainframe.alphafine.search.SearchTextBean;
 import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONArray;
+import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
@@ -82,6 +83,8 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
                             }
                         }
                     }
+                }  catch (JSONException jsonException) {
+                    FineLoggerFactory.getLogger().warn(jsonException, jsonException.getMessage());
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error("document search error: " + e.getMessage());
                 }