From 295034b3599e02564d77d12be1d6f8c8f028eae2 Mon Sep 17 00:00:00 2001 From: "Jimmy.Zheng" Date: Mon, 5 Sep 2022 16:45:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-70593=20=E5=9B=BE=E7=89=87=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=BB=85=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E6=8C=AA=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/gui/core/WidgetOption.java | 2 +- .../main/java/com/fr/design/designer/creator/XCreatorUtils.java | 2 +- .../src/main/java/com/fr/design/designer/creator/XPicture.java | 2 +- .../widget/accessibles/AccessiblePictureModelEditor.java | 2 +- .../com/fr/design/mainframe/widget/editors/PictureEditor.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index 4c9db5a6a0..21e9836136 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -15,7 +15,7 @@ import com.fr.form.ui.ListEditor; import com.fr.form.ui.MultiFileEditor; import com.fr.form.ui.NumberEditor; import com.fr.form.ui.Password; -import com.fr.form.ui.PictureWidget; +import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.RadioGroup; import com.fr.form.ui.TextArea; import com.fr.form.ui.TextEditor; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index e52233e0ef..208656597d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -46,7 +46,7 @@ import com.fr.form.ui.MultiFileEditor; import com.fr.form.ui.NameWidget; import com.fr.form.ui.NumberEditor; import com.fr.form.ui.Password; -import com.fr.form.ui.PictureWidget; +import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.Radio; import com.fr.form.ui.RadioGroup; import com.fr.form.ui.TextArea; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java index 7dd23bd4ce..9592e436e9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java @@ -7,7 +7,7 @@ import com.fr.design.mainframe.widget.editors.PictureEditor; import com.fr.design.mainframe.widget.editors.UrlLinkEditor; import com.fr.design.mainframe.widget.renderer.PictureRenderer; import com.fr.design.mainframe.widget.renderer.UrlLinkRenderer; -import com.fr.form.ui.PictureWidget; +import com.fr.form.ui.widget.PictureWidget; import com.fr.general.IOUtils; import com.fr.stable.ArrayUtils; import java.awt.Dimension; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java index 9e72b5c2ac..d2c8f7c30a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java @@ -9,7 +9,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.wrappers.PictureModelWrapper; import com.fr.design.report.SelectImagePane; -import com.fr.form.ui.PictureWidget; +import com.fr.form.ui.widget.PictureWidget; import com.fr.general.ComparatorUtils; import com.fr.report.cell.FloatElement; import com.fr.report.cell.cellattr.CellImage; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java index c7bbff80a3..b366b7d75a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.widget.editors; import com.fr.design.mainframe.widget.accessibles.AccessiblePictureModelEditor; import com.fr.design.mainframe.widget.accessibles.AccessiblePropertyEditor; -import com.fr.form.ui.PictureWidget; +import com.fr.form.ui.widget.PictureWidget; /** * *

图片控件的图片选择、编辑器