Pull request #10189: REPORT-70593 图片控件合并主代码

Merge in DESIGN/design from ~JIMMY.ZHENG/design:feature/x to feature/x

* commit '8cb8c26b26d67e93fdc8543abc156ad50537113a':
  REPORT-70593 图片控件合并主代码
  Revert "Revert "REPORT-70593 图片控件合并主代码""

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);
+
 }

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";
+
     /**
      * 刷新面板展示
      *

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");

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -49,6 +49,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;
@@ -186,6 +187,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() {

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;
+    }
+}

designer-form/src/main/java/com/fr/design/designer/ui/ImgPanel.java

@@ -0,0 +1,113 @@
+package com.fr.design.designer.ui;
+
+import com.fr.general.ImageWithSuffix;
+import com.fr.stable.Constants;
+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 Image getBackgroundImage() {
+        return this.backgroundImage;
+    }
+
+    public void setBackgroundImage(Image image) {
+        this.backgroundImage = image;
+        repaint();
+    }
+
+    public int getImageDisplayMode() {
+        return this.imageDisplayMode;
+    }
+
+    public void setImageDisplayMode(int modeName) {
+        switch (modeName) {
+            case Constants.IMAGE_CENTER:
+                this.modeIndex = 0;
+                break;
+            case Constants.IMAGE_TILED:
+                this.imageDisplayMode = 0;
+                this.modeIndex = 1;
+                break;
+            case Constants.IMAGE_EXTEND:
+                this.imageDisplayMode = 2;
+                this.modeIndex = 2;
+                break;
+            case Constants.IMAGE_ADJUST:
+                this.imageDisplayMode = 4;
+                this.modeIndex = 3;
+                break;
+            default:
+        }
+        repaint();
+    }
+
+    @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);
+                default:
+            }
+        }
+    }
+}

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);
+    }
+}

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();
+    }
+}

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));
+    }
+}

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());
+    }
+}

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());
+    }
+}

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());
+    }
+}

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;
+    }
+}

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;
+    }
+}

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -42,6 +42,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;
@@ -56,6 +57,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;
@@ -144,14 +146,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.
@@ -405,6 +406,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());
     }
 
     /**

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",