From b854a4ada2932c2f894a72ab8ebb81e06920ccd9 Mon Sep 17 00:00:00 2001
From: "Jimmy.Zheng" <Jimmy.Zheng@fanruan.com>
Date: Fri, 23 Sep 2022 13:50:48 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"REPORT-70593=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8E=A7=E4=BB=B6=E5=90=88=E5=B9=B6=E4=B8=BB=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 911ca18f
---
 .../com/fr/design/gui/core/WidgetOption.java  |   7 +-
 .../HyperlinkGroupPaneActionProvider.java     |   2 +
 .../com/fr/design/report/SelectImagePane.java |  67 ++++++-----
 .../buttonicon/widget/picture_widget_16.png   | Bin 0 -> 1061 bytes
 .../widget/picture_widget_designer_bg.png     | Bin 0 -> 4933 bytes
 .../designer/creator/XCreatorUtils.java       |   2 +
 .../fr/design/designer/creator/XPicture.java  |  74 ++++++++++++
 .../com/fr/design/designer/ui/ImgPanel.java   | 111 ++++++++++++++++++
 .../AccessiblePictureModelEditor.java         |  77 ++++++++++++
 .../AccessibleUrlLinkModelEditor.java         |  57 +++++++++
 .../widget/editors/PictureEditor.java         |  17 +++
 .../widget/editors/UrlLinkEditor.java         |  17 +++
 .../widget/renderer/PictureRenderer.java      |  15 +++
 .../widget/renderer/UrlLinkRenderer.java      |  16 +++
 .../widget/wrappers/PictureModelWrapper.java  |  34 ++++++
 .../widget/wrappers/UrlLinkModelWrapper.java  |  33 ++++++
 .../fr/start/module/DesignerActivator.java    |   6 +-
 .../com/fr/start/preload/ImagePreLoader.java  |   1 +
 18 files changed, 499 insertions(+), 37 deletions(-)
 rename {designer-realize => designer-base}/src/main/java/com/fr/design/report/SelectImagePane.java (96%)
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/picture_widget_16.png
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/form/designer/widget/picture_widget_designer_bg.png
 create mode 100644 designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java
 create mode 100644 designer-form/src/main/java/com/fr/design/designer/ui/ImgPanel.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleUrlLinkModelEditor.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/editors/UrlLinkEditor.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/PictureRenderer.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/UrlLinkRenderer.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/PictureModelWrapper.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/UrlLinkModelWrapper.java

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 258f558a7..4c9db5a6a 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
@@ -1,6 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.CheckBox;
 import com.fr.form.ui.CheckBoxGroup;
@@ -14,6 +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.RadioGroup;
 import com.fr.form.ui.TextArea;
 import com.fr.form.ui.TextEditor;
@@ -142,7 +144,7 @@ public abstract class WidgetOption implements Serializable {
      */
     public static WidgetOption[] getFormWidgetIntance() {
         return new WidgetOption[]{TEXTEDITOR, LABEL, FREEBUTTON, COMBOBOX, COMBOCHECKBOX, DATEEDITOR,
-                NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR};
+                NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR,PICTURE};
     }
 
     public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
@@ -214,4 +216,7 @@ public abstract class WidgetOption implements Serializable {
     public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
             IframeEditor.class);
 
+    public static final WidgetOption PICTURE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Image"), IconUtils.readIcon("/com/fr/web/images/form/resources/picture_widget_16.png"),
+            PictureWidget.class);
+
 }
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPaneActionProvider.java b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPaneActionProvider.java
index 525bb5b79..be0d8e852 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPaneActionProvider.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPaneActionProvider.java
@@ -8,6 +8,8 @@ import com.fr.design.designer.TargetComponent;
  */
 public interface HyperlinkGroupPaneActionProvider {
 
+    String XML_TAG = "HyperlinkGroupPane";
+
     /**
      * 刷新面板展示
      *
diff --git a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java
similarity index 96%
rename from designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java
rename to designer-base/src/main/java/com/fr/design/report/SelectImagePane.java
index bcad15c76..7781233aa 100644
--- a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java
+++ b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java
@@ -13,22 +13,24 @@ import com.fr.report.cell.Elem;
 import com.fr.report.cell.cellattr.CellImage;
 import com.fr.report.cell.painter.CellImagePainter;
 import com.fr.stable.Constants;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 
 /**
- * 这个类主要用于插入图片时的设置
- */
+ * <p>这个类主要用于插入图片时的设置</p>
+ * <p>这个类原本在designer-realize包下面，现在表单也可选择图片，所以应该抽为公用的base包。包名不变，应该不影响插件使用</p>
+ *
+ * @author Jimmy.Zheng created on 2022/8/11 21:22
+ **/
 public class SelectImagePane extends BasicPane {
     private ImagePreviewPane previewPane = null;
 
@@ -39,8 +41,31 @@ public class SelectImagePane extends BasicPane {
     private UIRadioButton adjustRadioButton = null;
 
     private Style imageStyle = null;
+    ActionListener layoutActionListener = new ActionListener() {
 
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            setImageStyle();
+            changeImageStyle();
+        }
+    };
     private File imageFile;
+    /**
+     * Select picture.
+     */
+    ActionListener selectPictureActionListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            int returnVal = imageFileChooser
+                    .showOpenDialog(SelectImagePane.this);
+            if (returnVal != JFileChooser.CANCEL_OPTION) {
+                File selectedFile = imageFileChooser.getSelectedFile();
+                imageFile = selectedFile;
+                ImgChooseWrapper.getInstance(previewPane, imageFileChooser, imageStyle, null).dealWithImageFile(returnVal);
+            }
+        }
+    };
 
     public SelectImagePane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -102,23 +127,6 @@ public class SelectImagePane extends BasicPane {
         imageFileChooser.setMultiSelectionEnabled(false);
     }
 
-    /**
-     * Select picture.
-     */
-    ActionListener selectPictureActionListener = new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            int returnVal = imageFileChooser
-                    .showOpenDialog(SelectImagePane.this);
-            if (returnVal != JFileChooser.CANCEL_OPTION) {
-                File selectedFile = imageFileChooser.getSelectedFile();
-                imageFile = selectedFile;
-                ImgChooseWrapper.getInstance(previewPane, imageFileChooser, imageStyle, null).dealWithImageFile(returnVal);
-            }
-        }
-    };
-
     // 调整图片样式，只有水平和垂直对齐以及拉伸。相对于背景，平铺不予考虑。
     private void changeImageStyle() {
         previewPane.setImageStyle(this.imageStyle);
@@ -137,15 +145,6 @@ public class SelectImagePane extends BasicPane {
         }
     }
 
-    ActionListener layoutActionListener = new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            setImageStyle();
-            changeImageStyle();
-        }
-    };
-
     @Override
     protected String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/picture_widget_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/picture_widget_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf334ad22a2e3a9985830d225959a6ea40379b0
GIT binary patch
literal 1061
zcmXw%drVUY6vj_`Z{LOD#Mvv1!WaS)2ZL>*!Ic`+!Nd_BgDhZeM<sD=s5EPJyc`=-
z+=N8LG+D%DW@BLklVy`^q!n=+%MeD#6a*tJr5%0WzDv3Hu15FAIbXg%&hO;QIp@m`
zAB^E{;{rfT@#{t9QH^_CY-Y5Jyp${|XoI9w0x&YUi_yIn^_X&hjk2QYm{KJ>r2t8N
zlU$Kp{GO~qQLd2HpFa7Aq5uH7SzIKkR6me!P?Q)+gJb{+Xem_xmmUP01i<7nfg%Y&
z5EQtq7&h*A#jS4yMZvH?#lP-Owgs1WVzDXHn>g6#1Q`LHwG}9y8|Y6kfnWd_Y_!1S
zGVL+j4JkH{IR*DSMQZ^wW^tH!Zif|(FmW)2jGz!VX1={k-8=30nlSk9!1Mf<|HoJ?
z7BE_kwVl^H8$zTLn7lANCnCUUMqwRcz($Y&7ubPL0W7X8zTnMqZT`nIWTk*)15i&f
zh{0%p%#2LY%!0lI;ou+?asW56AmCwvFF=AbU<V>ZKsXFQk|ZlNlRr1_zmdqGXt8XR
z;eHYdF_}zsyVbEZYj;wOFJhoMOenb4=&()(!EUz!n@0eR4&V&{Y)eNWHqrMiK<Imd
zbl>H%_#yf^hOl=^;M}Vop`<Ie3kRvwH5!eu(BN665}2Ha?R@5gDZbI($hRk2`Bz3-
z<)P+zqvqy^VGT<pc&R1Q-cNgar|1^g@cVtffSt6^0?{~rFZeiiKzSsX7XW@9B0ztS
z4k9K6=@A<&FD~Wr8A+V&ylU7%se#U}zeQzBbuFaVasN`bh{_#Phx;X!xTv!?13}US
z$VBxqX4gBvx8)qtoEbP<{h4Nb+Il{5LKi$<yClUzyXP^WpTqi->2+HQmg=fr(Ke6C
zj&6zEhC{LZ0WG~X!p{hY#5uKXxnJZHo#U0kt(UqdCo05Zsn%`zvzXZd^0QXT7oM=G
zO0l>2S1lpotI~q06Jc9vSM~^s)u+V^m3OPKxxP6p-gFs@Uu9rq+hBLZkL%^k0|7D6
z(7a{Wmz&=lmhN$P8-kx^@ssvZ!p4vLgdXL0*!8M6g!$;4Fn{6J?4%p_Hg#E47pBOz
z9c8TT4~HHPcNlK}cqRQRaUybDwtR;O;>xapo+CMf&F{;X&oo~&;FcG=zUrx=9*us0
zJHD-GI8yt|Nm<pk9`u{hK}aox@t9E1HM7d<NfQ60D*1afRPLGigtd3%;=ma7@4bn4
zRk3vfZOiKHqXb<$p{7@^_f_|<EY4<i{if62$fcoisi&s(dOg=-Hk);=7U$(2k?u8;
za#<3txmCWzjI^Co?iE`Tvy6+dlMj^qkXP721N<4y{o!AS{m}=2;{At<hW8!)=s(*Q
B@QMHc

literal 0
HcmV?d00001

diff --git a/designer-base/src/main/resources/com/fr/design/images/form/designer/widget/picture_widget_designer_bg.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/widget/picture_widget_designer_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e731c557b747f06c132c3ef09a47c722d9ca182
GIT binary patch
literal 4933
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
NL`TL%oDNfH{|_#<q}>1j

literal 0
HcmV?d00001

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 5e7807698..10a8fbfb1 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
@@ -47,6 +47,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.Radio;
 import com.fr.form.ui.RadioGroup;
 import com.fr.form.ui.TextArea;
@@ -183,6 +184,7 @@ public class XCreatorUtils {
         objectMap.put(CardSwitchButton.class, XCardSwitchButton.class);
         objectMap.put(CardAddButton.class, XCardAddButton.class);
         objectMap.put(WidgetErrorMarker.class, ErrorCreator.class);
+        objectMap.put(PictureWidget.class, XPicture.class);
     }
 
     private static void reInitExtra() {
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
new file mode 100644
index 000000000..7dd23bd4c
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPicture.java
@@ -0,0 +1,74 @@
+package com.fr.design.designer.creator;
+
+import com.fr.design.designer.ui.ImgPanel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+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.general.IOUtils;
+import com.fr.stable.ArrayUtils;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.beans.IntrospectionException;
+import javax.swing.JComponent;
+
+/**
+*
+* <p>图片控件的creator</p>
+*
+* @author Jimmy.Zheng created on 2022/8/11 21:16
+**/
+public class XPicture extends XWidgetCreator {
+
+    public XPicture(PictureWidget widget, Dimension dimension) {
+        super(widget, dimension);
+    }
+
+    @Override
+    protected String getIconName() {
+        return "picture_widget_16.png";
+    }
+
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[]{
+                new CRPropertyDescriptor("picUrl", toData().getClass())
+                        .setI18NName(Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Image"))
+                        .setEditorClass(PictureEditor.class)
+                        .setRendererClass(PictureRenderer.class)
+                        .putKeyValue("category", "Fine-Design_Basic_Advanced"),
+                new CRPropertyDescriptor("urlLink", toData().getClass())
+                        .setI18NName(Toolkit.i18nText("Fine-Design_Basic_Hyperlink"))
+                        .setEditorClass(UrlLinkEditor.class)
+                        .setRendererClass(UrlLinkRenderer.class)
+                        .putKeyValue(
+                        "category", "Fine-Design_Basic_Advanced")});
+    }
+
+    @Override
+    protected JComponent initEditor() {
+        PictureWidget pictureWidget = (PictureWidget) this.data;
+        if (this.editor == null) {
+            this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            Object value = pictureWidget.getPicUrl().getValue();
+            ImgPanel imgPanel = new ImgPanel();
+            if (value instanceof Image) {
+                imgPanel.setBackgroundImage((Image) value);
+                imgPanel.setImageDisplayMode(pictureWidget.getShowType());
+            } else {
+                imgPanel.setBackgroundImage(IOUtils.readImage("com/fr/design/images/form/designer/widget/picture_widget_designer_bg.png"));
+                imgPanel.setImageDisplayMode(0);
+            }
+            this.editor.add(imgPanel, "Center");
+        }
+        return this.editor;
+    }
+
+    @Override
+    public boolean canEnterIntoParaPane() {
+        return false;
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/designer/ui/ImgPanel.java b/designer-form/src/main/java/com/fr/design/designer/ui/ImgPanel.java
new file mode 100644
index 000000000..05aa8ba46
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/designer/ui/ImgPanel.java
@@ -0,0 +1,111 @@
+package com.fr.design.designer.ui;
+
+import com.fr.general.ImageWithSuffix;
+import java.awt.Graphics;
+import java.awt.Image;
+import javax.swing.JComponent;
+
+
+/**
+*
+* <p>图片控件中的已选图片展示面板</p>
+*
+* @author Jimmy.Zheng created on 2022/8/11 21:17
+**/
+public class ImgPanel extends JComponent {
+    private static final long serialVersionUID = 1L;
+    private Image backgroundImage;
+    private int imageDisplayMode;
+    private int modeIndex;
+
+    public ImgPanel() {
+        this(null, 0);
+    }
+
+    public ImgPanel(Image image, int modeName) {
+        setBackgroundImage(image);
+        setImageDisplayMode(modeName);
+    }
+
+    public void setBackgroundImage(Image image) {
+        this.backgroundImage = image;
+        repaint();
+    }
+
+    public Image getBackgroundImage() {
+        return this.backgroundImage;
+    }
+
+    public void setImageDisplayMode(int modeName) {
+        if (modeName == 1) {
+            this.modeIndex = 0;
+        }
+
+        if (modeName == 0) {
+            this.imageDisplayMode = 0;
+            this.modeIndex = 1;
+        }
+
+        if (modeName == 2) {
+            this.imageDisplayMode = 2;
+            this.modeIndex = 2;
+        }
+        if (modeName == 4) {
+            this.imageDisplayMode = 4;
+            this.modeIndex = 3;
+        }
+        repaint();
+    }
+
+    public int getImageDisplayMode() {
+        return this.imageDisplayMode;
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+
+        if (this.backgroundImage != null) {
+            if (this.backgroundImage instanceof ImageWithSuffix) {
+                this.backgroundImage = ((ImageWithSuffix) backgroundImage).getImage();
+            }
+            int width = getWidth();
+            int height = getHeight();
+            int imageWidth = this.backgroundImage.getWidth(this);
+            int imageHeight = this.backgroundImage.getHeight(this);
+
+            switch (this.modeIndex) {
+                case 0:
+                    int x = (width - imageWidth) / 2;
+                    int y = (height - imageHeight) / 2;
+                    g.drawImage(this.backgroundImage, x, y, this);
+                    break;
+                case 1:
+                    for (int ix = 0; ix < width; ix += imageWidth) {
+                        for (int iy = 0; iy < height; iy += imageHeight) {
+                            g.drawImage(this.backgroundImage, ix, iy, this);
+                        }
+                    }
+
+                    break;
+                case 2:
+                    g.drawImage(this.backgroundImage, 0, 0, width, height, this);
+                    break;
+                case 3:
+                    double sx = 1.0 * width / imageWidth;
+                    double sy = 1.0 * height / imageHeight;
+
+                    if (sx > sy) {
+                        sx = sy;
+                        width = (int) (sx * imageWidth);
+                    } else {
+                        sy = sx;
+                        height = (int) (sy * imageHeight);
+                    }
+                    int xx = (getWidth() - width) / 2;
+                    int yy = (getHeight() - height) / 2;
+                    g.drawImage(this.backgroundImage, xx, yy, width, height, this);
+            }
+        }
+    }
+}
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
new file mode 100644
index 000000000..9e72b5c2a
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessiblePictureModelEditor.java
@@ -0,0 +1,77 @@
+package com.fr.design.mainframe.widget.accessibles;
+
+import com.fr.base.Style;
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.designer.creator.XPicture;
+import com.fr.design.designer.ui.ImgPanel;
+import com.fr.design.dialog.DialogActionAdapter;
+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.general.ComparatorUtils;
+import com.fr.report.cell.FloatElement;
+import com.fr.report.cell.cellattr.CellImage;
+import javax.swing.JComponent;
+
+
+/**
+*
+* <p>图片控件的图片选择、编辑器</p>
+*
+* @author Jimmy.Zheng created on 2022/8/11 21:13
+**/
+public class AccessiblePictureModelEditor extends UneditableAccessibleEditor {
+    protected FloatElement element = new FloatElement();
+    private PictureWidget pic;
+
+    public AccessiblePictureModelEditor(PictureWidget pic) {
+        super(new PictureModelWrapper());
+        this.pic = pic;
+    }
+
+    @Override
+    public FloatElement getValue() {
+        return (FloatElement) super.getValue();
+    }
+
+    @Override
+    protected void showEditorPane() {
+        final SelectImagePane imageEditorPane = new SelectImagePane();
+        if (super.getValue() != null) {
+            this.element = ((FloatElement) super.getValue());
+        }
+        this.element.setStyle(Style.getInstance().deriveImageLayout(this.pic.getShowType()));
+        imageEditorPane.populate(this.element);
+        final Object oldValue = this.element.getValue();
+        final Style oldStyle = this.element.getStyle();
+        final String oldname = this.element.getName();
+        imageEditorPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+            @Override
+            public void doOk() {
+                CellImage cellImage = imageEditorPane.update();
+                if ((!ComparatorUtils.equals(cellImage.getImage(), oldValue)) || (!ComparatorUtils.equals(cellImage.getStyle(), oldStyle))) {
+                    AccessiblePictureModelEditor.this.element.setValue(cellImage.getImage());
+                    AccessiblePictureModelEditor.this.element.setStyle(cellImage.getStyle());
+                    AccessiblePictureModelEditor.this.element.setName(imageEditorPane.getSelectedImage() == null ? oldname : imageEditorPane.getSelectedImage().toString());
+                    AccessiblePictureModelEditor.this.setValue(AccessiblePictureModelEditor.this.element);
+                    AccessiblePictureModelEditor.this.pic.setShowType(cellImage.getStyle().getImageLayout());
+                    AccessiblePictureModelEditor.this.pic.setPicUrl(element);
+                    ImgPanel p = AccessiblePictureModelEditor.this.getCurrentImgPanel();
+                    p.setBackgroundImage(cellImage.getBufferImage());
+                    p.setImageDisplayMode(cellImage.getStyle().getImageLayout());
+                    AccessiblePictureModelEditor.this.fireStateChanged();
+                    DesignModelAdapter d = DesignModelAdapter.getCurrentModelAdapter();
+                    d.fireTargetModified();
+                }
+            }
+        }).setVisible(true);
+    }
+
+    private ImgPanel getCurrentImgPanel() {
+        XPicture xPicture = (XPicture) WidgetPropertyPane.getInstance().getEditingFormDesigner().getSelectionModel().getSelection().getSelectedCreator();
+        JComponent editor = (JComponent) xPicture.getComponent(0);
+        return (ImgPanel) editor.getComponent(0);
+    }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleUrlLinkModelEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleUrlLinkModelEditor.java
new file mode 100644
index 000000000..2dd4b5499
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleUrlLinkModelEditor.java
@@ -0,0 +1,57 @@
+package com.fr.design.mainframe.widget.accessibles;
+
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
+import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.widget.wrappers.UrlLinkModelWrapper;
+import com.fr.js.NameJavaScriptGroup;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * <p>表单图片控件的链接编辑器</p>
+ * @author Jimmy
+ */
+public class AccessibleUrlLinkModelEditor extends UneditableAccessibleEditor {
+    private FormHyperlinkGroupPane hyperlinkPane;
+
+    public AccessibleUrlLinkModelEditor() {
+        super(new UrlLinkModelWrapper());
+    }
+    /**
+     * 原插件使用
+     * <p>DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(
+     * HyperlinkGroupPaneActionImpl.getInstance()));</p>获取{@see this.hyperlinkPane}
+     * 合并插件依赖不到，换种方式 用{@see DesignerActivator将实例注册了}
+     */
+    @Override
+    protected void showEditorPane() {
+        if (this.hyperlinkPane == null) {
+            HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider = StableFactory.getMarkedInstanceObjectFromClass(HyperlinkGroupPaneActionProvider.XML_TAG,HyperlinkGroupPaneActionProvider.class);
+            this.hyperlinkPane = (FormHyperlinkGroupPane) DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(
+                    hyperlinkGroupPaneActionProvider);
+        }
+        BasicDialog dialog = this.hyperlinkPane.showWindow(DesignerContext.getDesignerFrame());
+        dialog.addDialogActionListener(new DialogActionAdapter() {
+            @Override
+            public void doOk() {
+                super.doOk();
+                NameJavaScriptGroup hyperlinks = AccessibleUrlLinkModelEditor.this.hyperlinkPane.updateJSGroup();
+                AccessibleUrlLinkModelEditor.this.setValue(hyperlinks);
+                AccessibleUrlLinkModelEditor.this.fireStateChanged();
+                DesignModelAdapter d = DesignModelAdapter.getCurrentModelAdapter();
+                d.fireTargetModified();
+            }
+        });
+        this.hyperlinkPane.populate(getValue());
+
+        dialog.setVisible(true);
+    }
+
+    @Override
+    public NameJavaScriptGroup getValue() {
+        return (NameJavaScriptGroup) super.getValue();
+    }
+}
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
new file mode 100644
index 000000000..c7bbff80a
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PictureEditor.java
@@ -0,0 +1,17 @@
+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;
+/**
+*
+* <p>图片控件的图片选择、编辑器</p>
+*
+* @author Jimmy.Zheng created on 2022/8/11 21:15
+**/
+public class PictureEditor extends AccessiblePropertyEditor {
+
+    public PictureEditor(Object o) {
+        super(new AccessiblePictureModelEditor((PictureWidget) o));
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/UrlLinkEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/UrlLinkEditor.java
new file mode 100644
index 000000000..195e8f525
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/UrlLinkEditor.java
@@ -0,0 +1,17 @@
+package com.fr.design.mainframe.widget.editors;
+
+import com.fr.design.mainframe.widget.accessibles.AccessiblePropertyEditor;
+import com.fr.design.mainframe.widget.accessibles.AccessibleUrlLinkModelEditor;
+
+/**
+*
+* <p><p>图片控件的链接编辑器</p></p>
+*
+* @author Jimmy.Zheng created on 2022/8/11 21:19
+**/
+public class UrlLinkEditor extends AccessiblePropertyEditor {
+
+    public UrlLinkEditor() {
+        super(new AccessibleUrlLinkModelEditor());
+    }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/PictureRenderer.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/PictureRenderer.java
new file mode 100644
index 000000000..82fcc85b4
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/PictureRenderer.java
@@ -0,0 +1,15 @@
+package com.fr.design.mainframe.widget.renderer;
+
+import com.fr.design.mainframe.widget.wrappers.PictureModelWrapper;
+
+/**
+ * <p>图片控件的图片编辑器的EncoderCellRenderer</p>
+ *
+ * @author Jimmy.Zheng created on 2022/8/11 21:29
+ **/
+public class PictureRenderer extends EncoderCellRenderer {
+
+    public PictureRenderer() {
+        super(new PictureModelWrapper());
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/UrlLinkRenderer.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/UrlLinkRenderer.java
new file mode 100644
index 000000000..a81187d2d
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/renderer/UrlLinkRenderer.java
@@ -0,0 +1,16 @@
+package com.fr.design.mainframe.widget.renderer;
+
+
+import com.fr.design.mainframe.widget.wrappers.UrlLinkModelWrapper;
+
+/**
+ * <p>图片控件的链接编辑器的EncoderCellRenderer</p>
+ *
+ * @author Jimmy.Zheng created on 2022/8/11 21:29
+ **/
+public class UrlLinkRenderer extends EncoderCellRenderer {
+
+    public UrlLinkRenderer() {
+        super(new UrlLinkModelWrapper());
+    }
+}
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/PictureModelWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/PictureModelWrapper.java
new file mode 100644
index 000000000..ed9fd0a4a
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/PictureModelWrapper.java
@@ -0,0 +1,34 @@
+package com.fr.design.mainframe.widget.wrappers;
+
+import com.fr.design.Exception.ValidationException;
+import com.fr.design.designer.properties.Decoder;
+import com.fr.design.designer.properties.Encoder;
+import com.fr.report.cell.FloatElement;
+import com.fr.stable.StringUtils;
+
+/**
+ * <p>图片选择器 {@link com.fr.design.mainframe.widget.accessibles.AccessiblePictureModelEditor}的 Wrapper</p>
+ * <p>插件中直接移入，未作改动</p>
+ *
+ * @author Jimmy.Zheng created on 2022/8/11 21:25
+ **/
+public class PictureModelWrapper implements Encoder<FloatElement>, Decoder<FloatElement> {
+
+    @Override
+    public FloatElement decode(String txt) {
+        return null;
+    }
+
+    @Override
+    public void validate(String txt) throws ValidationException {
+        // do nothing
+    }
+
+    @Override
+    public String encode(FloatElement v) {
+        if (v != null) {
+            return v.getName();
+        }
+        return StringUtils.EMPTY;
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/UrlLinkModelWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/UrlLinkModelWrapper.java
new file mode 100644
index 000000000..a892065ad
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/UrlLinkModelWrapper.java
@@ -0,0 +1,33 @@
+package com.fr.design.mainframe.widget.wrappers;
+
+import com.fr.design.Exception.ValidationException;
+import com.fr.design.designer.properties.Decoder;
+import com.fr.design.designer.properties.Encoder;
+import com.fr.js.NameJavaScriptGroup;
+
+/**
+ * <p>链接选择器 {@link com.fr.design.mainframe.widget.accessibles.AccessibleUrlLinkModelEditor}的 Wrapper</p>
+ * <p>插件中直接移入，未作改动</p>
+ *
+ * @author Jimmy.Zheng created on 2022/8/11 21:28
+ **/
+public class UrlLinkModelWrapper implements Encoder<NameJavaScriptGroup>, Decoder<NameJavaScriptGroup> {
+
+    @Override
+    public NameJavaScriptGroup decode(String txt) {
+        return null;
+    }
+
+    @Override
+    public void validate(String txt) throws ValidationException {
+        // do nothing
+    }
+
+    @Override
+    public String encode(NameJavaScriptGroup v) {
+        if (v.size() > 0) {
+            return v.getNameHyperlink(0).getName();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
index af32f596c..92d1fc6a4 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
@@ -41,6 +41,7 @@ import com.fr.design.form.parameter.FormParaDesigner;
 import com.fr.design.fun.ElementUIProvider;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 import com.fr.design.hyperlink.ReportletHyperlinkPane;
 import com.fr.design.hyperlink.WebHyperlinkPane;
 import com.fr.design.hyperlink.popup.MobilePopupPane;
@@ -55,6 +56,7 @@ import com.fr.design.login.message.DesignerMessageHelper;
 import com.fr.design.login.socketio.LoginAuthServer;
 import com.fr.design.mainframe.BaseJForm;
 import com.fr.design.mainframe.FormHierarchyTreePane;
+import com.fr.design.mainframe.HyperlinkGroupPaneActionImpl;
 import com.fr.design.mainframe.InformationCollector;
 import com.fr.design.mainframe.JTemplateEvent;
 import com.fr.design.mainframe.WidgetPropertyPane;
@@ -143,14 +145,13 @@ import com.fr.start.common.DesignerStartupPool;
 import com.fr.task.Once;
 import com.fr.workspace.WorkContext;
 import com.fr.xml.ReportXMLUtils;
-
-import javax.swing.SwingWorker;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import javax.swing.SwingWorker;
 
 /**
  * Created by juhaoyu on 2018/1/31.
@@ -404,6 +405,7 @@ public class DesignerActivator extends Activator implements Prepare {
 
     private static void registerOtherPane() {
         StableFactory.registerMarkedClass(BBSGuestPaneProvider.XML_TAG, BBSGuestPane.class);
+        StableFactory.registerMarkedObject(HyperlinkGroupPaneActionProvider.XML_TAG, HyperlinkGroupPaneActionImpl.getInstance());
     }
 
     /**
diff --git a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
index 24d23565c..aad478348 100644
--- a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
+++ b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
@@ -242,6 +242,7 @@ public class ImagePreLoader {
             "com/fr/design/images/buttonicon/widget/label_16_normal.svg",
             "com/fr/web/images/form/resources/button_16.png",
             "com/fr/design/images/buttonicon/widget/button_16.png",
+            "com/fr/web/images/form/resources/picture_widget_16.png",
             "com/fr/design/images/buttonicon/widget/button_16_normal.svg",
             "com/fr/design/images/buttonicon/widget/files_up.png",
             "com/fr/design/images/buttonicon/widget/files_up_normal.svg",