diff --git a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java index 3987844cf8..875ef00833 100644 --- a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java +++ b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java @@ -22,24 +22,7 @@ public class UITitledBorder extends TitledBorder { } private UITitledBorder(String title) { - super( - BorderFactory.createCompoundBorder( - BorderFactory.createEmptyBorder( - 0, - 0, - 5, - 0), - new UIRoundedBorder( - UIConstants.TITLED_BORDER_COLOR, - 1, - 10) - ), - title, - TitledBorder.LEADING, - TitledBorder.TOP, - null, - new Color(1, 159, 222) - ); + this(title, 10); } /** diff --git a/designer-base/src/main/java/com/fr/design/border/UITitledMatteBorder.java b/designer-base/src/main/java/com/fr/design/border/UITitledMatteBorder.java new file mode 100644 index 0000000000..c46143e1e5 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/border/UITitledMatteBorder.java @@ -0,0 +1,32 @@ +package com.fr.design.border; + +import com.fr.design.constants.UIConstants; + +import javax.swing.BorderFactory; +import javax.swing.border.TitledBorder; +import java.awt.Color; + +public class UITitledMatteBorder extends TitledBorder { + public static UITitledMatteBorder createTitledTopBorder(String title, Color color) { + return new UITitledMatteBorder(title, 1, 0, 0, 0, color); + } + + public static UITitledMatteBorder createTitledBorder(String title, Color color) { + return new UITitledMatteBorder(title, 1, 1, 1, 1, color); + } + + public static UITitledMatteBorder createTitledBorder(String title, int top, int left, int bottom, int right, Color color) { + return new UITitledMatteBorder(title, top, left, bottom, right, color); + } + + private UITitledMatteBorder(String title, int top, int left, int bottom, int right, Color color) { + super( + BorderFactory.createMatteBorder(top, left, bottom, right, UIConstants.TITLED_BORDER_COLOR), + title, + TitledBorder.LEADING, + TitledBorder.TOP, + null, + color + ); + } +} diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index 5ea393ba64..c473d068b6 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -66,7 +66,6 @@ import javax.swing.ListModel; import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; diff --git a/designer-form/src/main/java/com/fr/design/actions/NewFormAction.java b/designer-form/src/main/java/com/fr/design/actions/NewFormAction.java index c867be8d24..5ce51b673c 100644 --- a/designer-form/src/main/java/com/fr/design/actions/NewFormAction.java +++ b/designer-form/src/main/java/com/fr/design/actions/NewFormAction.java @@ -1,13 +1,8 @@ package com.fr.design.actions; -import com.fr.base.svg.IconUtils; -import com.fr.design.mainframe.BaseJForm; -import com.fr.design.mainframe.DesignerContext; -import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.MenuKeySet; - -import com.fr.stable.bridge.StableFactory; +import com.fr.design.widget.ui.designer.NewFormPane; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -31,8 +26,7 @@ public class NewFormAction extends UpdateAction { * @param e 事件 */ public void actionPerformed(ActionEvent e) { - BaseJForm jform = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class); - DesignerContext.getDesignerFrame().addAndActivateJTemplate((JTemplate) jform); + new NewFormPane().showWindow(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/PredefinedLayout.java b/designer-form/src/main/java/com/fr/design/designer/beans/PredefinedLayout.java new file mode 100644 index 0000000000..ba184e5702 --- /dev/null +++ b/designer-form/src/main/java/com/fr/design/designer/beans/PredefinedLayout.java @@ -0,0 +1,35 @@ +package com.fr.design.designer.beans; + +import java.io.Serializable; + +public class PredefinedLayout implements Serializable { + private static final String IMAGE_PATH = "/com/fr/design/form/layouts/images/"; + private static final String TEMPLATE_PATH = "/com/fr/design/form/layouts/templates/"; + private String template; + private String realStyle; + private String simpleStyle; + + public String getTemplate() { + return TEMPLATE_PATH + template; + } + + public void setTemplate(String template) { + this.template = template; + } + + public String getRealStyle() { + return IMAGE_PATH + realStyle; + } + + public void setRealStyle(String realStyle) { + this.realStyle = realStyle; + } + + public String getSimpleStyle() { + return IMAGE_PATH + simpleStyle; + } + + public void setSimpleStyle(String simpleStyle) { + this.simpleStyle = simpleStyle; + } +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/NewFormModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/NewFormModel.java new file mode 100644 index 0000000000..4e4b688b9a --- /dev/null +++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/NewFormModel.java @@ -0,0 +1,57 @@ +package com.fr.design.designer.beans.models; + +import com.fr.design.designer.beans.PredefinedLayout; +import com.fr.general.IOUtils; +import com.fr.log.FineLoggerFactory; +import com.fr.stable.StringUtils; +import com.fr.third.fasterxml.jackson.databind.ObjectMapper; + +import java.io.InputStream; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class NewFormModel implements Serializable { + private static final String CONFIG_FILE_PATH = "/com/fr/design/form/layouts/config.json"; + private static NewFormModel holder = null; + private Map> config = new HashMap<>(); + + public static NewFormModel getInstance() { + if (holder == null) { + try { + holder = new ObjectMapper().readValue(readConfigFile(), NewFormModel.class); + } catch (Exception e) { + holder = new NewFormModel(); + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } + return holder; + } + + private NewFormModel() { + + } + + private synchronized static String readConfigFile() { + String result = StringUtils.EMPTY; + InputStream is = null; + try { + is = IOUtils.readResource(CONFIG_FILE_PATH); + result = IOUtils.inputStream2String(is); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } finally { + IOUtils.close(is); + } + return result; + } + + public Map> getConfig() { + return config; + } + + public void setConfig(Map> config) { + this.config = config; + } +} diff --git a/designer-form/src/main/java/com/fr/design/fit/NewJForm.java b/designer-form/src/main/java/com/fr/design/fit/NewJForm.java index fe192b59b9..8f52fbaf00 100644 --- a/designer-form/src/main/java/com/fr/design/fit/NewJForm.java +++ b/designer-form/src/main/java/com/fr/design/fit/NewJForm.java @@ -53,6 +53,12 @@ public class NewJForm extends JForm { changePaneSize(); } + public NewJForm(Form form) { + super(form); + init(); + changePaneSize(); + } + public NewJForm(Form form, FILE file, Parameter[] parameters) { this(form, file); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 581e289994..ecb57eeb2c 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -6,12 +6,13 @@ import com.fr.base.Parameter; import com.fr.base.Releasable; import com.fr.base.extension.FileExtension; import com.fr.base.iofile.attr.ExtendSharableAttrMark; -import com.fr.base.theme.TemplateThemeCompatible; -import com.fr.base.vcs.DesignerMode; +import com.fr.base.iofile.attr.TemplateLayoutIdAttrMark; import com.fr.base.theme.FormTheme; import com.fr.base.theme.FormThemeConfig; import com.fr.base.theme.TemplateTheme; +import com.fr.base.theme.TemplateThemeCompatible; import com.fr.base.theme.TemplateThemeConfig; +import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignState; import com.fr.design.ExtraDesignClassManager; @@ -23,10 +24,6 @@ import com.fr.design.base.mode.DesignModeContext; import com.fr.design.cell.FloatElementsProvider; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.designer.TargetComponent; -import com.fr.design.designer.beans.actions.CopyAction; -import com.fr.design.designer.beans.actions.CutAction; -import com.fr.design.designer.beans.actions.FormDeleteAction; -import com.fr.design.designer.beans.actions.PasteAction; import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XComponent; @@ -120,6 +117,7 @@ import java.util.List; public class JForm extends JTemplate implements BaseJForm
, Releasable { private static final String FORM_CARD = "FORM"; private static final String ELEMENTCASE_CARD = "ELEMENTCASE"; + private static final String EMPTY_FORM_LAYOUTID = "9ebf6aff-ad53-45a9-a175-9633f4162a3a"; private static final String[] CARDNAME = new String[]{FORM_CARD, ELEMENTCASE_CARD}; private static final int TOOLBARPANEDIMHEIGHT_FORM = 60; @@ -141,6 +139,11 @@ public class JForm extends JTemplate implements BaseJForm implements BaseJForm layoutPaneMap = new HashMap<>(); + private List layoutCards = new ArrayList<>(); + + public NewFormPane() { + newFormModel = NewFormModel.getInstance(); + this.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0)); + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.add(createModuleListPane(), BorderLayout.WEST); + this.add(createTemplateManagePane(), BorderLayout.CENTER); + } + + @Override + protected String title4PopupWindow() { + return Toolkit.i18nText("Fine-Design_New_Template"); + } + + public void showWindow() { + dialog = new UIDialog(DesignerContext.getDesignerFrame(), this) { + @Override + public void checkValid() throws Exception { + + } + }; + dialog.setButtonEnabled(false); + dialog.addDialogActionListener(new DialogActionListener() { + @Override + public void doOk() { + if (selectedLayoutPane != null) { + NewFormPane.this.newForm(selectedLayoutPane.getTemplatePath()); + } + } + + @Override + public void doCancel() { + + } + }); + dialog.setSize(new Dimension(900, 600)); + GUICoreUtils.centerWindow(dialog); + dialog.setResizable(false); + dialog.setVisible(true); + } + + private JPanel createModuleListPane() { + JList list = new JList(); + list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + list.setModel(initListModel()); + list.setSelectedIndex(0); + list.setCellRenderer(new DefaultListCellRenderer()); + list.addListSelectionListener(new ListSelectionListener() { + @Override + public void valueChanged(ListSelectionEvent e) { + String value = list.getSelectedValue(); + int selectedIndex = list.getSelectedIndex(); + for (Map.Entry entry : layoutPaneMap.entrySet()) { + String moduleName = entry.getKey(); + JPanel module = entry.getValue(); + module.setVisible(selectedIndex == 0 || ComparatorUtils.equals(moduleName, value)); + } + } + }); + + JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jPanel.setBackground(new Color(255, 255, 255)); + jPanel.setPreferredSize(new Dimension(138, 1)); + jPanel.add(new UIScrollPane(list), BorderLayout.CENTER); + return jPanel; + } + + private DefaultListModel initListModel() { + DefaultListModel model = new DefaultListModel<>(); + model.addElement(Toolkit.i18nText("Fine-Design_All_Template_Layout")); + Map> map = newFormModel.getConfig(); + for (String key : map.keySet()) { + model.addElement(key); + } + return model; + } + + private JPanel createTemplateManagePane() { + JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jPanel.add(createTemplateManageNorthPane(), BorderLayout.NORTH); + jPanel.add(createTemplateManageSouthPane(), BorderLayout.CENTER); + return jPanel; + } + + private JPanel createTemplateManageNorthPane() { + JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); + jPanel.setPreferredSize(new Dimension(1, 129)); + jPanel.add(createNewTemplatePane(), BorderLayout.WEST); + jPanel.add(createSwitchButtonPane(), BorderLayout.EAST); + return jPanel; + } + + private JPanel createNewTemplatePane() { + EmptyLayoutPane jPanel = new EmptyLayoutPane(); + jPanel.addClickListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + setSelectedLayoutPane(jPanel); + dialog.setButtonEnabled(true); + } + }); + return jPanel; + } + + private JPanel createSwitchButtonPane() { + UIButtonGroup buttonGroup = new UIButtonGroup(new String[] { + Toolkit.i18nText("Fine-Design_Simple_Style_Template"), + Toolkit.i18nText("Fine-Design_Real_Style_Template") + }); + buttonGroup.setPreferredSize(new Dimension(140, 20)); + buttonGroup.setSelectedIndex(1); + buttonGroup.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + int selectedIndex = buttonGroup.getSelectedIndex(); + for (PredefinedLayoutPane layoutCard : layoutCards) { + if (selectedIndex == 1) { + layoutCard.showRealStyle(); + } else { + layoutCard.showSimpleStyle(); + } + } + } + }); + + JPanel switchButtonPane = new JPanel(new BorderLayout()); + switchButtonPane.add(buttonGroup, BorderLayout.CENTER); + + JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); + jPanel.add(switchButtonPane, BorderLayout.NORTH); + return jPanel; + } + + private JPanel createTemplateManageSouthPane() { + List predefinedLayoutPanes = createPredefinedLayoutPanes(); + JPanel selectionsPane = createSelectionsPane(predefinedLayoutPanes); + + UIScrollPane selectionsScrollPane = new UIScrollPane(selectionsPane); + selectionsScrollPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); + + JPanel titlePane = new JPanel(new BorderLayout()); + titlePane.setBorder(UITitledMatteBorder.createTitledBorder(Toolkit.i18nText("Fine-Design_Select_Template"), new Color(1, 159, 222))); + titlePane.add(selectionsScrollPane, BorderLayout.CENTER); + + JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jPanel.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); + jPanel.add(titlePane, BorderLayout.CENTER); + + return jPanel; + } + + private JPanel createSelectionsPane(List components) { + JPanel selectionsPane = new JPanel(); + JPanel container = new JPanel(new BorderLayout()); + for (int i = 0; i < components.size(); i++) { + JPanel component = components.get(i); + if (component != null) { + container.add(component, BorderLayout.NORTH); + JPanel nextContainer = new JPanel(new BorderLayout()); + container.add(nextContainer, BorderLayout.CENTER); + if (i == 0) { + selectionsPane = container; + } + container = nextContainer; + } + } + return selectionsPane; + } + + private List createPredefinedLayoutPanes() { + List jPanels = new ArrayList<>(); + Map> map = newFormModel.getConfig(); + for (Map.Entry> entry : map.entrySet()) { + String moduleName = entry.getKey(); + List layouts = entry.getValue(); + + JPanel module = createPredefinedLayoutPane(moduleName); + layoutPaneMap.put(moduleName, module); + for (PredefinedLayout layout : layouts) { + PredefinedLayoutPane predefinedLayoutPane = new PredefinedLayoutPane(layout); + predefinedLayoutPane.addClickListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + setSelectedLayoutPane(predefinedLayoutPane); + dialog.setButtonEnabled(true); + } + }); + module.add(predefinedLayoutPane); + layoutCards.add(predefinedLayoutPane); + } + jPanels.add(module); + } + return jPanels; + } + + private JPanel createPredefinedLayoutPane(String title) { + JPanel jp = new JPanel(); + UITitledMatteBorder explainBorder = UITitledMatteBorder.createTitledTopBorder(title, Color.BLACK); + jp.setBorder(explainBorder); + jp.setLayout(new GridLayout(0, 3, 5, 5)); + return jp; + } + + private void newForm(String path) { + BaseJForm jForm; + try { + if (StringUtils.isNotEmpty(path)) { + Form form = new Form(); + form.readStream(NewFormPane.class.getResourceAsStream(path)); + jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, new Object[]{form}, BaseJForm.class); + } else { + jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class); + } + DesignerContext.getDesignerFrame().addAndActivateJTemplate((JTemplate) jForm); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } + + private void setSelectedLayoutPane(PredefinedLayoutPane layoutPane) { + if (selectedLayoutPane != layoutPane) { + if (selectedLayoutPane != null) { + selectedLayoutPane.setSelected(false); + } + selectedLayoutPane = layoutPane; + if (selectedLayoutPane != null) { + selectedLayoutPane.setSelected(true); + } + } + } +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/PredefinedLayoutPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/PredefinedLayoutPane.java new file mode 100644 index 0000000000..56048a1421 --- /dev/null +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/PredefinedLayoutPane.java @@ -0,0 +1,117 @@ +package com.fr.design.widget.ui.designer; + +import com.fr.base.GraphHelper; +import com.fr.base.svg.IconUtils; +import com.fr.design.designer.beans.PredefinedLayout; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.share.ui.base.MouseClickListener; +import com.fr.stable.Constants; +import com.fr.stable.StringUtils; + +import javax.swing.JPanel; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Rectangle; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +public class PredefinedLayoutPane extends JPanel { + private static final Color HOVERING_BORDER_COLOR = new Color(65, 155, 249); + private static final Color HOVERING_SHADOW_COLOR = new Color(65, 155, 249, 51); + private CardLayout cardLayout = new CardLayout(); + protected boolean hovering = false; + protected boolean selected = false; + protected MouseAdapter clickListener; + protected String templatePath = StringUtils.EMPTY; + + public PredefinedLayoutPane() { + + } + + public PredefinedLayoutPane(PredefinedLayout predefinedLayout) { + this.templatePath = predefinedLayout.getTemplate(); + UILabel simpleStyle = new UILabel(IconUtils.readIcon(predefinedLayout.getSimpleStyle())); + UILabel realStyle = new UILabel(IconUtils.readIcon(predefinedLayout.getRealStyle())); + + this.setLayout(cardLayout); + this.add(realStyle, 0); + this.add(simpleStyle, 1); + this.initListener(); + } + + protected void initListener() { + this.addMouseListener(new MouseClickListener() { + @Override + public void mouseClicked(MouseEvent e) { + if (clickListener != null) { + clickListener.mouseClicked(e); + } + } + + @Override + public void mouseEntered(MouseEvent e) { + hovering = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hovering = false; + repaint(); + } + }); + } + + @Override + public void paint(Graphics g) { + super.paint(g); + if (hovering) { + g.setColor(HOVERING_SHADOW_COLOR); + GraphHelper.fillRect(g, 1, 1, this.getWidth() - 2, this.getHeight() - 2); + } + + if (selected || hovering) { + g.setColor(HOVERING_BORDER_COLOR); + Rectangle rectangle = new Rectangle(1, 1, this.getWidth() - 2, this.getHeight() - 2); + GraphHelper.draw(g, rectangle, Constants.LINE_MEDIUM); + } + } + + public void addClickListener(MouseAdapter clickListener) { + this.clickListener = clickListener; + } + + public void showSimpleStyle() { + cardLayout.last(this); + } + + public void showRealStyle() { + cardLayout.first(this); + } + + public boolean isHovering() { + return hovering; + } + + public void setHovering(boolean hovering) { + this.hovering = hovering; + } + + public boolean isSelected() { + return selected; + } + + public void setSelected(boolean selected) { + this.selected = selected; + repaint(); + } + + public String getTemplatePath() { + return templatePath; + } + + public void setTemplatePath(String templatePath) { + this.templatePath = templatePath; + } +} diff --git a/designer-form/src/main/resources/com/fr/design/form/images/new_form.png b/designer-form/src/main/resources/com/fr/design/form/images/new_form.png new file mode 100644 index 0000000000..f48dc7f590 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/images/new_form.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/config.json b/designer-form/src/main/resources/com/fr/design/form/layouts/config.json new file mode 100644 index 0000000000..5237356d51 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/config.json @@ -0,0 +1,100 @@ +{ + "config":{ + "2-4模块":[ + { + "template":"2-4/1.frm", + "realStyle":"real_style_1", + "simpleStyle":"simple_style_1" + }, + { + "template":"2-4/2.frm", + "realStyle":"real_style_2", + "simpleStyle":"simple_style_2" + }, + { + "template":"2-4/3.frm", + "realStyle":"real_style_3", + "simpleStyle":"simple_style_3" + }, + { + "template":"2-4/4.frm", + "realStyle":"real_style_4", + "simpleStyle":"simple_style_4" + }, + { + "template":"2-4/5.frm", + "realStyle":"real_style_5", + "simpleStyle":"simple_style_5" + }, + { + "template":"2-4/6.frm", + "realStyle":"real_style_6", + "simpleStyle":"simple_style_6" + } + ], + "5-7模块":[ + { + "template":"5-7/1.frm", + "realStyle":"real_style_7", + "simpleStyle":"simple_style_7" + }, + { + "template":"5-7/2.frm", + "realStyle":"real_style_8", + "simpleStyle":"simple_style_8" + }, + { + "template":"5-7/3.frm", + "realStyle":"real_style_9", + "simpleStyle":"simple_style_9" + }, + { + "template":"5-7/4.frm", + "realStyle":"real_style_10", + "simpleStyle":"simple_style_10" + }, + { + "template":"5-7/5.frm", + "realStyle":"real_style_11", + "simpleStyle":"simple_style_11" + }, + { + "template":"5-7/6.frm", + "realStyle":"real_style_12", + "simpleStyle":"simple_style_12" + } + ], + "多模块":[ + { + "template":"multi/1.frm", + "realStyle":"real_style_13", + "simpleStyle":"simple_style_13" + }, + { + "template":"multi/2.frm", + "realStyle":"real_style_14", + "simpleStyle":"simple_style_14" + }, + { + "template":"multi/3.frm", + "realStyle":"real_style_15", + "simpleStyle":"simple_style_15" + }, + { + "template":"multi/4.frm", + "realStyle":"real_style_16", + "simpleStyle":"simple_style_16" + }, + { + "template":"multi/5.frm", + "realStyle":"real_style_17", + "simpleStyle":"simple_style_17" + }, + { + "template":"multi/6.frm", + "realStyle":"real_style_18", + "simpleStyle":"simple_style_18" + } + ] + } +} \ No newline at end of file diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_1.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_1.png new file mode 100755 index 0000000000..a16bcaaf46 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_1.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_10.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_10.png new file mode 100755 index 0000000000..b42ed791f3 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_10.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_11.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_11.png new file mode 100755 index 0000000000..952167a2f3 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_11.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_12.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_12.png new file mode 100755 index 0000000000..409ca492c6 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_12.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_13.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_13.png new file mode 100755 index 0000000000..4f036d9188 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_13.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_14.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_14.png new file mode 100755 index 0000000000..71a861fd17 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_14.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_15.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_15.png new file mode 100755 index 0000000000..c82b9ff874 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_15.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_16.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_16.png new file mode 100755 index 0000000000..e17f585be8 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_16.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_17.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_17.png new file mode 100755 index 0000000000..9a0e78fd16 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_17.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_18.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_18.png new file mode 100644 index 0000000000..b7f3c2375a Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_18.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_2.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_2.png new file mode 100644 index 0000000000..ee0ac88f7c Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_2.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_3.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_3.png new file mode 100755 index 0000000000..94eef9e73a Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_3.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_4.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_4.png new file mode 100755 index 0000000000..d3e03a59b6 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_4.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_5.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_5.png new file mode 100755 index 0000000000..070671f6a7 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_5.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_6.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_6.png new file mode 100755 index 0000000000..578b92b7fd Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_6.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_7.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_7.png new file mode 100755 index 0000000000..c2b8ee9949 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_7.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_8.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_8.png new file mode 100755 index 0000000000..bc81f209fb Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_8.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_9.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_9.png new file mode 100755 index 0000000000..c3178ecd26 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_9.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_1.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_1.png new file mode 100755 index 0000000000..131480f047 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_1.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_10.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_10.png new file mode 100755 index 0000000000..126c29071e Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_10.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_11.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_11.png new file mode 100755 index 0000000000..b2ccadb621 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_11.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_12.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_12.png new file mode 100755 index 0000000000..3f82f5c3bf Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_12.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_13.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_13.png new file mode 100755 index 0000000000..fd162c19db Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_13.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_14.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_14.png new file mode 100755 index 0000000000..9e12642375 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_14.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_15.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_15.png new file mode 100755 index 0000000000..362a57cf5e Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_15.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_16.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_16.png new file mode 100755 index 0000000000..508660a2e4 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_16.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_17.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_17.png new file mode 100755 index 0000000000..d634df98f7 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_17.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png new file mode 100755 index 0000000000..656494c55a Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_2.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_2.png new file mode 100755 index 0000000000..38bec5695d Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_2.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_3.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_3.png new file mode 100755 index 0000000000..5c2253075a Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_3.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_4.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_4.png new file mode 100755 index 0000000000..4f1ed2feda Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_4.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_5.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_5.png new file mode 100755 index 0000000000..c5aae00b4e Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_5.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_6.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_6.png new file mode 100755 index 0000000000..59a869feba Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_6.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_7.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_7.png new file mode 100755 index 0000000000..84b09320d8 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_7.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_8.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_8.png new file mode 100755 index 0000000000..ec3a80bdfd Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_8.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_9.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_9.png new file mode 100755 index 0000000000..d7bb743043 Binary files /dev/null and b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_9.png differ diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm new file mode 100644 index 0000000000..941abbbb17 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm new file mode 100644 index 0000000000..0b04d5e7d4 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm @@ -0,0 +1,128 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm new file mode 100644 index 0000000000..43cc0b93b5 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm @@ -0,0 +1,137 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm new file mode 100644 index 0000000000..d6b0ba42b1 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm @@ -0,0 +1,137 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm new file mode 100644 index 0000000000..167db8fd20 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm @@ -0,0 +1,137 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm new file mode 100644 index 0000000000..504bfbd124 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm @@ -0,0 +1,137 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm new file mode 100644 index 0000000000..24df43d5c7 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm @@ -0,0 +1,146 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm new file mode 100644 index 0000000000..e7f9d76d02 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm @@ -0,0 +1,146 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm new file mode 100644 index 0000000000..1b1f1e1a4a --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm @@ -0,0 +1,155 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm new file mode 100644 index 0000000000..dcd003aa1c --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm @@ -0,0 +1,155 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm new file mode 100644 index 0000000000..98a3ac6f9a --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm @@ -0,0 +1,164 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm new file mode 100644 index 0000000000..34d579ed58 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm @@ -0,0 +1,164 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm new file mode 100644 index 0000000000..710ccc3bda --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm @@ -0,0 +1,173 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm new file mode 100644 index 0000000000..2bfe6c1987 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm @@ -0,0 +1,182 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm new file mode 100644 index 0000000000..e80cd4303f --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm @@ -0,0 +1,182 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm new file mode 100644 index 0000000000..21eac8ae6d --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm @@ -0,0 +1,182 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm new file mode 100644 index 0000000000..5dde2178ec --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm @@ -0,0 +1,182 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm new file mode 100644 index 0000000000..3644ecff85 --- /dev/null +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm @@ -0,0 +1,191 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + +