From 4f01746dafdd339e8efcabacffebe8894ae32127 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Mon, 6 Jul 2020 17:31:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-34385=20enabled4Locale=E4=B8=8EisSearchO?= =?UTF-8?q?nLine=E6=9D=A1=E4=BB=B6=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../help/alphafine/AlphaFineConfigPane.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index 251e2275a..d478fb347 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -192,31 +192,30 @@ public class AlphaFineConfigPane extends BasicPane { this.enabledCheckbox.setSelected(alphaFineConfigManager.isEnabled()); - boolean enabled4Locale = FRContext.isChineseEnv(); - boolean isSearchOnLine = alphaFineConfigManager.isSearchOnLine(); + boolean enabled4Locale = FRContext.isChineseEnv() && alphaFineConfigManager.isSearchOnLine(); this.searchOnlineCheckbox.setEnabled(enabled4Locale); - this.searchOnlineCheckbox.setSelected(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() && isSearchOnLine); - this.containDocumentCheckbox.setEnabled(enabled4Locale && isSearchOnLine); + this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && enabled4Locale); + this.containDocumentCheckbox.setEnabled(enabled4Locale); - this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && isSearchOnLine); - this.containPluginCheckbox.setEnabled(enabled4Locale && isSearchOnLine); + this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && enabled4Locale); + this.containPluginCheckbox.setEnabled(enabled4Locale); - this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && isSearchOnLine); - this.containRecommendCheckbox.setEnabled(enabled4Locale && 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() && isSearchOnLine); - this.needIntelligentCustomerService.setEnabled(enabled4Locale && isSearchOnLine); + this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && enabled4Locale); + this.needIntelligentCustomerService.setEnabled(enabled4Locale); shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts()); }