From 9c287606d8fef68fda99e2d1cb6000d32c93ca3d Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 20 Nov 2020 17:02:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?MOBILE-27967=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E3=80=91tab=E6=A0=B7=E5=BC=8F=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=AE=BE=E7=BD=AE=E4=BB=A5=E5=90=8E=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=9B=9E=E6=A0=87=E5=87=86=EF=BC=8C=E5=9C=A8=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B9=8B=E5=89=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=9C=AA=E4=BF=9D=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/MobileTemplateStyleDefinePane.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java index 6dc2da5e92..ae8cbeb3ad 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java @@ -44,6 +44,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane 标准 + if (custom.getSelectedIndex() == 0) { + customTempStyle = getCustomMobileTemplateStyle(); + } + // 标准 -> 自定义 + if (custom.getSelectedIndex() == 1 && customTempStyle != null) { + populateBean(customTempStyle); + } boolean isCustom = custom.getSelectedIndex() == 1; centerPane.setVisible(isCustom); updatePreviewPane(); @@ -182,8 +191,24 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane Date: Mon, 23 Nov 2020 09:55:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-43516=20=E3=80=90=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=8E=E9=87=8D=E5=A4=8D=E4=B8=8E=E5=86=BB=E7=BB=93=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9B=BE=E6=A0=87=E4=BC=98=E5=8C=96=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=92=8C=E9=87=8D=E5=A4=8D=E4=B8=8E=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BA=86=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E3=80=91=E6=9B=B4=E6=8D=A2=E9=87=8D=E5=A4=8D=E4=B8=8E?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/images/m_file/repeatAndFrozen.png | Bin 0 -> 233 bytes .../actions/report/ReportPageAttrAction.java | 4 ++-- .../java/com/fr/start/preload/ImagePreLoader.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png b/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png new file mode 100644 index 0000000000000000000000000000000000000000..adc5428a7dc046443c015e18c5df47ceb2b0dc33 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-FJY5_^ zECkmEIr23q@Gw7SuIcKm`2O-<>yhO@n3qfv+O(tj0bgEn_U^`GC9_!TB4ctMavrq* zp~lq3r+dnD+3W-rY4@amC%reExqsruCU3NAjA3+`clC%?V~A56bEH1Y hrW12kvHW?L-}llnWZHV6$w0R Date: Mon, 23 Nov 2020 14:44:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=20REPORT-43754=20=E3=80=90=E4=BA=8C?= =?UTF-8?q?=E8=BD=AE=E5=86=92=E7=83=9F=E3=80=91=E8=BF=9C=E7=A8=8B=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=9B=AE=E5=BD=95=E9=87=8D=E5=A4=8D=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=B8=8D=E4=BC=9A=E6=8F=90=E9=86=92=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=9C=A8Listener?= =?UTF-8?q?=E4=B8=AD=E5=88=A4=E6=96=AD=E9=87=8D=E5=A4=8D=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=83?= =?UTF-8?q?=E4=BC=9A=E6=8A=8A=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=9F=90=E4=B8=80=E9=A1=B9=E5=90=8D=E5=AD=97=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=9A=84=E5=8F=A6=E4=B8=80=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E7=BD=AE=E4=B8=BA=E7=A9=BA=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E9=81=8D=E5=8E=86allListNames=EF=BC=8C?= =?UTF-8?q?=E7=9C=8B=E6=98=AF=E5=90=A6=E6=9C=89=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=EF=BC=8C=E4=BE=8B=E5=A6=82=EF=BC=8Caa?= =?UTF-8?q?=E3=80=81bb=E3=80=81cc=E7=9A=84=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=B0=86aa=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAbb=EF=BC=8C=E7=84=B6=E5=90=8E=E7=82=B9=E5=87=BBbb?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E6=97=B6=E5=80=99bb=E8=A2=AB=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=86=8D=E5=B0=86aa=E3=80=81""?= =?UTF-8?q?=E3=80=81cc=E4=B8=8Ebb=E6=AF=94=E8=BE=83=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E6=B2=A1=E6=9C=89=E9=87=8D=E5=A4=8D=EF=BC=8C=E5=8D=B3?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=91=BD=E5=90=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=BC=B9=E7=AA=97=20=E3=80=90=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E3=80=91=E6=8A=8A=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8CallListNames=E4=B8=AD=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E5=90=8D=E5=AD=97=E7=BD=AE=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=91=BD=E5=90=8D=E5=90=8E=EF=BC=8CallListNa?= =?UTF-8?q?mes=E4=B8=AD=E9=87=8D=E5=91=BD=E5=90=8D=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E7=BD=AE=E4=B8=BA=E7=A9=BA=E3=80=82=E5=8D=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9aa=E4=B8=BAbb=E5=90=8E=EF=BC=8C=E5=B0=86bb?= =?UTF-8?q?=E4=B8=8E""=E3=80=81bb=E3=80=81cc=E6=AF=94=E8=BE=83=EF=BC=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9C=89=E9=87=8D=E5=A4=8D=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8E=E7=BB=99=E5=87=BA=E5=91=BD=E5=90=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/env/EnvListPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index 2d875cb458..454388e124 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -34,7 +34,7 @@ public class EnvListPane extends JListControlPane { public void propertyChange() { String tempName = getEditingName(); String[] allListNames = nameableList.getAllNames(); - allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; + allListNames[editingIndex] = StringUtils.EMPTY; if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text")); From 23f9133c0b0baf4400749d13095879684d5a1562 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 23 Nov 2020 15:50:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-43905=20=E9=87=8D=E8=AF=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E8=BE=93=E5=87=BA=E6=94=B9=E6=88=90warn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/socketio/DesignerSocketIO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java index 2316a19a38..33b3b80f7d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java @@ -131,7 +131,7 @@ public class DesignerSocketIO { private static final Emitter.Listener failRetry = new Emitter.Listener() { @Override public void call(Object... args) { - FineLoggerFactory.getLogger().error("failed args: {}", Arrays.toString(args)); + FineLoggerFactory.getLogger().warn("failed args: {}", Arrays.toString(args)); status = Status.Disconnecting; socket.close(); count++; From 56ea11266305a9927c386b34d3e273d4096989b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Fri, 20 Nov 2020 15:29:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=09CHART-16939=20=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=A0=87=E7=AD=BE=E5=AE=BD=E9=AB=98=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/designer/component/VanChartTooltipContentPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java index cc04d9c51c..b5f03a728a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java @@ -270,7 +270,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane