From 41f218bea02f51585a0be5a84d71ffebc74c543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Fri, 21 May 2021 20:41:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-52264=20=E6=A8=A1=E7=89=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=BC=96=E8=BE=91=E8=AD=A6=E5=91=8A=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/file/MutilTempalteTabPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index bfe0320c45..b52c641c2b 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -967,7 +967,7 @@ public class MutilTempalteTabPane extends JComponent { //如果在权限编辑情况下，不允许切换到表单类型的工作簿 if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) { DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex)); - FineJOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") + FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE); MutilTempalteTabPane.this.repaint(); return; From 316caa136976b9ab79fb62ac9b79fc13197ba182 Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Mon, 24 May 2021 11:54:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-52539=20=E7=BB=84=E4=BB=B6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=9D=A2=E6=9D=BF=E5=87=BA=E7=8E=B0=E6=A8=AA=E5=90=91?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/share/ui/generate/ShareGeneratePane.java | 2 +- .../java/com/fr/design/share/ui/generate/ShareMainPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java index d52cf1ef6b..82eb60f08a 100644 --- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java +++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java @@ -57,7 +57,7 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE; public class ShareGeneratePane extends BasicPane { private static final Dimension DIALOG_SIZE = new Dimension(670, 740); - private static final Dimension DIALOG_NORMAL_SIZE = new Dimension(660, 610); + private static final Dimension DIALOG_NORMAL_SIZE = new Dimension(670, 610); private static final Border DIALOG_BORDER = BorderFactory.createEmptyBorder(0, 6, 4, 6); private JPanel mainPane = null; diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java index 3cd8653538..e9b5a25e22 100644 --- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java +++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java @@ -85,7 +85,7 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE; public class ShareMainPane extends JPanel { private static final int COLUMN_ITEM_SIZE = 60; - private static final int COLUMN_FIELD_WIDTH = 560; + private static final int COLUMN_FIELD_WIDTH = 555; private static final int TEXT_FIELD_WIDTH = 160; private static final int TEXT_FIELD_HEIGHT = 21; private static final int NAME_MAX_LENGTH = 50; From b087607a94580062c3a2d80eb16d39b3ee7d538c Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Mon, 24 May 2021 17:38:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-52512=20=E5=85=B1=E4=BA=AB=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=90=8E=E5=88=A0=E9=99=A4=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/JForm.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) 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 54db2ec1ab..a78c532704 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 @@ -4,6 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.PaperSize; import com.fr.base.Parameter; import com.fr.base.extension.FileExtension; +import com.fr.base.iofile.attr.ExtendSharableAttrMark; import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignState; @@ -64,6 +65,11 @@ import com.fr.file.filter.ChooseFileFilter; import com.fr.form.FormElementCaseContainerProvider; import com.fr.form.FormElementCaseProvider; import com.fr.form.main.Form; +import com.fr.form.main.WidgetGatherAdapter; +import com.fr.form.share.SharableWidgetProvider; +import com.fr.form.share.editor.SharableEditorProvider; +import com.fr.form.share.utils.ShareUtils; +import com.fr.form.ui.AbstractBorderStyleWidget; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WLayout; @@ -77,6 +83,7 @@ import com.fr.report.worksheet.FormElementCase; import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; import com.fr.stable.ProductConstants; +import com.fr.stable.StringUtils; import com.fr.stable.bridge.StableFactory; import com.fr.web.controller.ViewRequestConstants; @@ -96,6 +103,7 @@ import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import javax.swing.tree.TreePath; @@ -305,6 +313,7 @@ public class JForm extends JTemplate implements BaseJForm implements BaseJForm Date: Mon, 24 May 2021 18:16:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-52629=20=E7=BB=84=E4=BB=B6=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=E7=9A=84=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/share/ui/local/GroupPane.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/GroupPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/GroupPane.java index 94d24a3d5b..bfa6343e06 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/GroupPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/GroupPane.java @@ -9,6 +9,7 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.share.group.ui.GroupFileDialog; +import com.fr.design.mainframe.share.sort.SortType; import com.fr.design.mainframe.share.sort.WidgetSortType; import com.fr.design.mainframe.share.ui.base.PopupMenuItem; import com.fr.design.mainframe.share.ui.widgetfilter.LocalWidgetFilter; @@ -49,6 +50,7 @@ class GroupPane extends JPanel { //是否展开 private boolean expendStatus; private SharableWidgetProvider[] elCaseBindInfoList; + private SortType sortType = WidgetSortType.INSTALL_TIME; private GroupPane(Group group) { this(group, DEFAULT_HEIGHT, group.isDefaultExpend()); @@ -133,11 +135,12 @@ class GroupPane extends JPanel { if (widgetProviders == null) { widgetProviders = new SharableWidgetProvider[0]; } - WidgetSortType.INSTALL_TIME.sort(widgetProviders); + sortType.sort(widgetProviders); return widgetProviders; } public void sortWidget(WidgetSortType sortType) { + this.sortType = sortType; sortType.sort(elCaseBindInfoList); reCreateShowPane(elCaseBindInfoList); } From cb474f5d121a3873c4eedbb09614e18d37e3bf43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 25 May 2021 10:37:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-52264=20=E4=BF=AE=E6=94=B9=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E7=9A=84=E7=88=B6=E7=AA=97=E5=8F=A3=E4=B8=BADesignerC?= =?UTF-8?q?ontext.getDesignerFrame()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/file/MutilTempalteTabPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index b52c641c2b..9fa676f94e 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -967,7 +967,7 @@ public class MutilTempalteTabPane extends JComponent { //如果在权限编辑情况下，不允许切换到表单类型的工作簿 if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) { DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex)); - FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") + FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE); MutilTempalteTabPane.this.repaint(); return; From d5d6925c5c4ffa1cf79fb49729a3f942b17f09c7 Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 25 May 2021 16:36:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?REPORT-52824=2010.0.16=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8F=A6=E5=AD=98=E4=B8=8D=E4=BC=9A=E7=94=9F=E6=88=90=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BFid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 8d526971cb..6c64e1eb60 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -1465,10 +1465,8 @@ public abstract class JTemplate> editingFILE = fileChooser.getSelectedFILE(); } - // 在保存之前，初始化 templateID - if (StringUtils.isEmpty(this.template.getTemplateID())) { - generateTemplateId(); - } + //收集和生成templateID 因为是另存为操作 无论怎么样都需要重新生成templateID + initForCollect(); FILE finalEditingFILE = editingFILE; CallbackSaveWorker worker = new CallbackSaveWorker(new Callable() {