From 4f6cd94afbf0416b28460e2d353a4af88fc4f962 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Mon, 6 Jul 2020 16:52:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-34385=20=E5=9C=A8alphafine=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=AA=97=E5=8F=A3=E6=89=93=E5=BC=80=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=B0=86=E8=81=94=E7=BD=91=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8E=E5=87=A0=E4=B8=AA=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E7=9A=84=E7=8A=B6=E6=80=81=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../help/alphafine/AlphaFineConfigPane.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 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 d261de57c3..251e2275ab 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 @@ -189,34 +189,35 @@ public class AlphaFineConfigPane extends BasicPane { } public void populate(AlphaFineConfigManager alphaFineConfigManager) { - + this.enabledCheckbox.setSelected(alphaFineConfigManager.isEnabled()); - + boolean enabled4Locale = FRContext.isChineseEnv(); - + boolean isSearchOnLine = alphaFineConfigManager.isSearchOnLine(); + this.searchOnlineCheckbox.setEnabled(enabled4Locale); - this.searchOnlineCheckbox.setSelected(alphaFineConfigManager.isSearchOnLine()); - + this.searchOnlineCheckbox.setSelected(isSearchOnLine); + this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction()); this.containTemplateCheckbox.setSelected(alphaFineConfigManager.isContainTemplate()); this.containFileContentCheckbox.setSelected(alphaFineConfigManager.isContainFileContent()); - - this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && alphaFineConfigManager.isSearchOnLine()); - this.containDocumentCheckbox.setEnabled(enabled4Locale); - - this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && alphaFineConfigManager.isSearchOnLine()); - this.containPluginCheckbox.setEnabled(enabled4Locale); - - this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && alphaFineConfigManager.isSearchOnLine()); - this.containRecommendCheckbox.setEnabled(enabled4Locale); - + + this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && isSearchOnLine); + this.containDocumentCheckbox.setEnabled(enabled4Locale && isSearchOnLine); + + this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && isSearchOnLine); + this.containPluginCheckbox.setEnabled(enabled4Locale && isSearchOnLine); + + this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && isSearchOnLine); + this.containRecommendCheckbox.setEnabled(enabled4Locale && isSearchOnLine); + this.shortcutsField.setText(getDisplayShortCut(alphaFineConfigManager.getShortcuts())); this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox()); - - this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && alphaFineConfigManager.isSearchOnLine()); - this.needIntelligentCustomerService.setEnabled(enabled4Locale); - + + this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && isSearchOnLine); + this.needIntelligentCustomerService.setEnabled(enabled4Locale && isSearchOnLine); + shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts()); } 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 2/4] =?UTF-8?q?REPORT-34385=20enabled4Locale=E4=B8=8EisSea?= =?UTF-8?q?rchOnLine=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 251e2275ab..d478fb3476 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()); } From e5b618372952499bcc39ded59afacef2b019dd50 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Mon, 6 Jul 2020 17:39:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-34351=20=E4=BF=AE=E6=AD=A3FineJOptio?= =?UTF-8?q?nPane=E7=BB=84=E4=BB=B6showInputDialog=EF=BC=88=EF=BC=89?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=82=B9=E5=87=BB=E5=BC=B9=E5=87=BA=E6=A1=86?= =?UTF-8?q?=E7=9A=84=E5=8F=96=E6=B6=88=E9=94=AE=E5=90=8E=E7=9A=84=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=EF=BC=9B=E5=9C=A8=E7=BB=84=E4=BB=B6=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E5=B0=86=E4=B8=8E=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=90=8D=E5=AD=97=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E7=9A=84=E6=83=85=E5=86=B5=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/dialog/FineJOptionPane.java | 6 +++++- .../main/java/com/fr/design/mainframe/SheetNameTabPane.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java index 4a4424d9f5..c644550795 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java +++ b/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; } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index 74443e831c..52f1fe1f0c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/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; } From 4326eb79ade863a8fbee9e5e209de5f2fccaaa7c Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Tue, 7 Jul 2020 13:52:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-34385=20=E4=BF=AE=E6=94=B9=E8=81=94?= =?UTF-8?q?=E7=BD=91=E6=90=9C=E7=B4=A2=E7=9A=84enable=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/help/alphafine/AlphaFineConfigPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d478fb3476..5bf0214e02 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 @@ -194,7 +194,7 @@ public class AlphaFineConfigPane extends BasicPane { boolean enabled4Locale = FRContext.isChineseEnv() && alphaFineConfigManager.isSearchOnLine(); - this.searchOnlineCheckbox.setEnabled(enabled4Locale); + this.searchOnlineCheckbox.setEnabled(FRContext.isChineseEnv()); this.searchOnlineCheckbox.setSelected(enabled4Locale); this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction());