Browse Source

Revert "REPORT-70593 图片控件仅决策报表使用,挪个位置"

This reverts commit 295034b3
release/11.0
Jimmy.Zheng 2 years ago
parent
commit
9b047e5159
  1. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
  2. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java
  3. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java
  4. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java

2
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.NameWidget;
import com.fr.form.ui.NumberEditor; import com.fr.form.ui.NumberEditor;
import com.fr.form.ui.Password; import com.fr.form.ui.Password;
import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.PictureWidget;
import com.fr.form.ui.Radio; import com.fr.form.ui.Radio;
import com.fr.form.ui.RadioGroup; import com.fr.form.ui.RadioGroup;
import com.fr.form.ui.TextArea; import com.fr.form.ui.TextArea;

2
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.editors.UrlLinkEditor;
import com.fr.design.mainframe.widget.renderer.PictureRenderer; import com.fr.design.mainframe.widget.renderer.PictureRenderer;
import com.fr.design.mainframe.widget.renderer.UrlLinkRenderer; import com.fr.design.mainframe.widget.renderer.UrlLinkRenderer;
import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.PictureWidget;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import java.awt.Dimension; import java.awt.Dimension;

2
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.WidgetPropertyPane;
import com.fr.design.mainframe.widget.wrappers.PictureModelWrapper; import com.fr.design.mainframe.widget.wrappers.PictureModelWrapper;
import com.fr.design.report.SelectImagePane; import com.fr.design.report.SelectImagePane;
import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.PictureWidget;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.report.cell.FloatElement; import com.fr.report.cell.FloatElement;
import com.fr.report.cell.cellattr.CellImage; import com.fr.report.cell.cellattr.CellImage;

2
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.AccessiblePictureModelEditor;
import com.fr.design.mainframe.widget.accessibles.AccessiblePropertyEditor; import com.fr.design.mainframe.widget.accessibles.AccessiblePropertyEditor;
import com.fr.form.ui.widget.PictureWidget; import com.fr.form.ui.PictureWidget;
/** /**
* *
* <p>图片控件的图片选择编辑器</p> * <p>图片控件的图片选择编辑器</p>

Loading…
Cancel
Save