Pull request #1782: REPORT-34385&REPORT-34351 alphafine设置，取消勾选联网搜索。确定再次打开，应用中心没有置灰

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit '4326eb79ade863a8fbee9e5e209de5f2fccaaa7c':
  REPORT-34385 修改联网搜索的enable条件
  REPORT-34351 修正FineJOptionPane组件showInputDialog（）方法点击弹出框的取消键后的行为；在组件重命名后将与自己的原来的名字进行对比的情况去除
  REPORT-34385 enabled4Locale与isSearchOnLine条件合并
  REPORT-34385 在alphafine设置窗口打开的时候，将联网搜索状态与几个相关选项的状态进行关联

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -189,34 +189,34 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     public void populate(AlphaFineConfigManager alphaFineConfigManager) {
-        
+
         this.enabledCheckbox.setSelected(alphaFineConfigManager.isEnabled());
-        
+
-        boolean enabled4Locale = FRContext.isChineseEnv();
+        boolean enabled4Locale = FRContext.isChineseEnv() && alphaFineConfigManager.isSearchOnLine();
-        
+
-        this.searchOnlineCheckbox.setEnabled(enabled4Locale);
+        this.searchOnlineCheckbox.setEnabled(FRContext.isChineseEnv());
-        this.searchOnlineCheckbox.setSelected(alphaFineConfigManager.isSearchOnLine());
+        this.searchOnlineCheckbox.setSelected(enabled4Locale);
-        
+
         this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction());
         this.containTemplateCheckbox.setSelected(alphaFineConfigManager.isContainTemplate());
         this.containFileContentCheckbox.setSelected(alphaFineConfigManager.isContainFileContent());
-        
+
-        this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && alphaFineConfigManager.isSearchOnLine());
+        this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && enabled4Locale);
         this.containDocumentCheckbox.setEnabled(enabled4Locale);
-        
+
-        this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && alphaFineConfigManager.isSearchOnLine());
+        this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && enabled4Locale);
         this.containPluginCheckbox.setEnabled(enabled4Locale);
-        
+
-        this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && alphaFineConfigManager.isSearchOnLine());
+        this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && enabled4Locale);
         this.containRecommendCheckbox.setEnabled(enabled4Locale);
-        
+
         this.shortcutsField.setText(getDisplayShortCut(alphaFineConfigManager.getShortcuts()));
 
         this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox());
-        
+
-        this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && alphaFineConfigManager.isSearchOnLine());
+        this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && enabled4Locale);
         this.needIntelligentCustomerService.setEnabled(enabled4Locale);
-        
+
         shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts());
     }
 

designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.dialog;
 
 import com.fr.invoke.Reflect;
+import com.fr.stable.StringUtils;
 
 import javax.swing.Icon;
 import javax.swing.JDialog;
@@ -279,8 +280,11 @@ public class FineJOptionPane extends JOptionPane {
         dialog.show();
         dialog.dispose();
 
-        Object value = pane.getInputValue();
+        //点击取消按钮，返回null
+        if (StringUtils.equals((String) pane.getValue(), OPTION_OK_CANCEL[1]))
+            return null;
 
+        Object value = pane.getInputValue();
         if (value == UNINITIALIZED_VALUE) {
             return null;
         }

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

@@ -945,7 +945,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
                 // marks：判断是否重名
                 boolean isExisted = false;
                 for (int i = 0; i < reportComposite.getEditingWorkBook().getReportCount(); i++) {
-                    if (newName.equalsIgnoreCase(reportComposite.getEditingWorkBook().getReportName(i))) {
+                    if (newName.equalsIgnoreCase(reportComposite.getEditingWorkBook().getReportName(i)) && i != selectedIndex) {
                         isExisted = true;
                         break;
                     }