diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java index 9f77d7d2b4..ab2a71ba97 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java @@ -16,6 +16,8 @@ import java.util.Arrays; import java.util.List; /** + * 单元格-格式 + * * @author Destiny.Lin * @version 11.0 * created by Destiny.Lin on 2022-10-25 diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellGroupType.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellGroupType.java index 8e769b4715..a9b20b6627 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellGroupType.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellGroupType.java @@ -207,10 +207,9 @@ public enum CellGroupType { return new MinFunction(); case COUNT_FUNCTION: return new CountFunction(); - case NONE_FUNCTION: + default: return new NoneFunction(); } - return new NoneFunction(); } /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/SettingContent.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/SettingContent.java index 67211b77e9..a72ddd3a74 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/SettingContent.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/SettingContent.java @@ -4,6 +4,8 @@ import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.i18n.Toolkit; /** + * 设置项的一些常用常量 + * * @author Destiny.Lin * @version 11.0 * created by Destiny.Lin on 2022-10-24 diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java index f80609e39d..8497dcff01 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java @@ -527,6 +527,10 @@ public class ITReplaceMainDialog extends UIDialog { public void checkValid() throws Exception { } + /** + * 获取模板内容数据 + * @return 存储数据的list + */ public static List getSearchContentResultList() { return searchContentResultList; } @@ -535,6 +539,10 @@ public class ITReplaceMainDialog extends UIDialog { this.searchContentResultList = searchContentResultList; } + /** + * 获取设置项数据 + * @return 存储数据的list + */ public static List getSearchSettingResultList() { return searchSettingResultList; } diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java index 60300de2a9..cf358ad384 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java @@ -88,7 +88,7 @@ public class ITReplaceNorthPanel { private static final int FIRST_X = 20, SECOND_X = 80; private static final int LABEL_WIDTH = 60; private static final Icon CHANGE_ICON = IconUtils.readIcon("/com/fr/design/images/replace/change_normal.svg"); - private static final String[] rangeItems = new String[]{Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Current")}; + private static final String[] RANGE_ITEMS = new String[]{Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Current")}; public static final String CARD_CONTENT = "Content"; public static final String CARD_SETTING = "setting"; @@ -186,7 +186,7 @@ public class ITReplaceNorthPanel { resultLabel = new UILabel(); String[] replaceInputItems = new String[]{StringUtils.EMPTY}; findCombobox = new UIComboBox(findItems.toArray()); - rangeCombobox = new UIComboBox(rangeItems); + rangeCombobox = new UIComboBox(RANGE_ITEMS); findInputCombobox = new UIComboBox(findInputItems.toArray()) { @Override public void setEditor(ComboBoxEditor comboBoxEditor) { @@ -233,7 +233,7 @@ public class ITReplaceNorthPanel { rangeSettingLabel = new UILabel(Toolkit.i18nText("Fine-Design_Replace_Search_Range")); settingResultLabel = new UILabel(); findSettingComboBox = new UIComboBox(findSettingItems.toArray()); - rangeSettingComboBox = new UIComboBox(rangeItems); + rangeSettingComboBox = new UIComboBox(RANGE_ITEMS); findSettingInputComboBox = new UIComboBox(formatItems.toArray()) { @Override public void setEditor(ComboBoxEditor anEditor) { @@ -703,10 +703,19 @@ public class ITReplaceNorthPanel { this.searchButton = searchButton; } + /** + * 获取CardLayout + * @return CardLayout + */ public static CardLayout getCardLayout() { return cardLayout; } + /** + * 获取表格主界面 + * + * @return cardPanel + */ public static JPanel getCardPanel() { return cardPanel; } diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceSouthPanel.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceSouthPanel.java index 24c441b9a3..cd086d903c 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceSouthPanel.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceSouthPanel.java @@ -47,6 +47,11 @@ public class ITReplaceSouthPanel { this.tableEditorPane = tableEditorPane; } + /** + * 获取表格的editor + * + * @return 表格的editor + */ public static ITTableEditor getItTableEditor() { return itTableEditor; }