From 60372dff4834e5c1d0975b24d6032d52745bf9ae Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 14 Nov 2023 16:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8F=92=E4=BB=B6=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9=E4=B8=8B=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=98=AF=E7=B1=BB=E6=B3=A8=E9=87=8A=E5=92=8C?= =?UTF-8?q?=E5=8C=85import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/panel/WidgetThemeECPreviewPane.java | 11 ++++++---- .../panel/WidgetThemeECReportPreviewPane.java | 12 +++++++---- .../parameter/RootDesignDefinePane.java | 9 ++++++-- .../ui/designer/DateEditorDefinePane.java | 9 ++++++-- .../designer/TextFieldEditorDefinePane.java | 5 +++-- .../design/widgettheme/LabelSettingPane.java | 2 +- .../WidgetThemeCreatorPaneAcceptor.java | 21 +++++++------------ 7 files changed, 40 insertions(+), 29 deletions(-) diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java index d25993a99..774ccf1c1 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java @@ -10,8 +10,11 @@ import com.fr.design.mainframe.theme.preview.ecpreview.AbstractECPreviewPane; import com.fr.design.mainframe.theme.preview.ecpreview.cell.AbstractPreviewCell; import com.fr.design.mainframe.theme.preview.ecpreview.cell.PreviewCell; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; import java.util.ArrayList; import java.util.List; @@ -19,8 +22,8 @@ import java.util.List; * 主题界面frm里的那个表格,做了简单修改,削减了几行重复内容,腾出控件参数面板的空间 * * @author John.Ying - * @version 1.0 - * Created by John.Ying on 2021/3/18 + * @since 11.0 + * Created on 2021/3/18 */ public class WidgetThemeECPreviewPane extends AbstractECPreviewPane { private final List headerCellList = new ArrayList<>(); diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java index ce4879629..e34ca83d8 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java @@ -13,8 +13,12 @@ import com.fr.design.mainframe.theme.preview.ecpreview.cell.AbstractPreviewCell; import com.fr.design.mainframe.theme.preview.ecpreview.cell.CornerPreviewCell; import com.fr.design.mainframe.theme.preview.ecpreview.cell.PreviewCell; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.Point; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; @@ -23,8 +27,8 @@ import java.util.List; * 主题界面report里的那个表格,做了简单修改,削减了几行重复内容,腾出控件参数面板的空间 * * @author John.Ying - * @version 1.0 - * Created by John.Ying on 2021/3/18 + * @since 1.0 + * Created on 2021/3/18 */ public class WidgetThemeECReportPreviewPane extends UINoOpaquePanel implements ThemePreviewed { private final List headerTitleCellList = new ArrayList<>(); // 大标题样式单元格 diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 4a44f36f7..008b855ea 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -40,8 +40,13 @@ import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEventListener; import com.fr.report.stable.FormConstants; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.Icon; +import javax.swing.JCheckBox; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 8eec97ec1..7111db110 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -24,11 +24,16 @@ import com.fr.form.ui.DateEditor; import com.fr.stable.ArrayUtils; import com.fr.stable.collections.CollectionUtils; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingConstants; import javax.swing.border.TitledBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.SimpleDateFormat; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java index 7e5af6253..6d4df614a 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java @@ -19,8 +19,9 @@ import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.stable.collections.CollectionUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.SwingConstants; +import java.awt.Component; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.Set; diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java index db9f80ae1..954e956ca 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java @@ -12,7 +12,7 @@ import java.util.Collections; * 设计器控件属性的“高级”设置增加主题样式设置项，用于标签控件 * * @author obo - * @version 11.0 + * @since 11.0 * Created on 2023/11/13 */ public class LabelSettingPane extends BaseStyleSettingPane { diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java index 0f2af2de3..14892f217 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java @@ -65,14 +65,10 @@ public class WidgetThemeCreatorPaneAcceptor { private void acceptEditor(Class creator, List> extraPaneList) { boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance() - && (creator == TextArea.class - || creator == TextEditor.class - || creator == NumberEditor.class - || creator == Password.class - || creator == ComboBox.class - || creator == ComboCheckBox.class - || creator == DateEditor.class - || creator == TreeComboBoxEditor.class) + && (creator == TextArea.class || creator == TextEditor.class + || creator == NumberEditor.class || creator == Password.class + || creator == ComboBox.class || creator == ComboCheckBox.class + || creator == DateEditor.class || creator == TreeComboBoxEditor.class) || WidgetThemeDesignerUtils.isNewComboBoxTreeEditor(creator); if (accept) { insertShortCut(extraPaneList, new EditorSettingPane<>()); @@ -97,12 +93,9 @@ public class WidgetThemeCreatorPaneAcceptor { private void acceptNormal(Class creator, List> extraPaneList) { boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance() - && (creator == AppendRowButton.class - || creator == FreeButton.class - || creator == DeleteRowButton.class - || creator == FormSubmitButton.class - || creator == TreeNodeToggleButton.class - || creator == Button.class); + && (creator == AppendRowButton.class || creator == FreeButton.class + || creator == DeleteRowButton.class || creator == FormSubmitButton.class + || creator == TreeNodeToggleButton.class || creator == Button.class); if (accept) { insertShortCut(extraPaneList, new NormalButtonSettingPane<>()); }