From dd202b36b9a9eccb19fc2045882f8b967737344b Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 18 Oct 2021 22:14:14 +0800
Subject: [PATCH 01/11] =?UTF-8?q?REPORT-60724=20=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98=20&&=20R?=
 =?UTF-8?q?EPORT-60892=20=E5=85=A8=E5=B1=80=E8=87=AA=E9=80=82=E5=BA=94-?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/data/datapane/TableDataTreePane.java | 6 ++++--
 .../main/java/com/fr/design/report/fit/BaseFitAttrPane.java | 5 +++--
 .../fr/design/report/fit/menupane/ReportFitAttrAction.java  | 5 +++--
 .../resources/com/fr/design/i18n/dimension_en.properties    | 6 +++++-
 .../resources/com/fr/design/i18n/dimension_ja_JP.properties | 6 +++++-
 .../resources/com/fr/design/i18n/dimension_ko_KR.properties | 6 +++++-
 .../resources/com/fr/design/i18n/dimension_zh.properties    | 6 +++++-
 .../resources/com/fr/design/i18n/dimension_zh_TW.properties | 6 +++++-
 .../fr/design/actions/server/ServerConfigManagerAction.java | 3 ++-
 9 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
index 0850cf05a..6a9c2d1ed 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@@ -186,10 +186,12 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         for (int i = 0; i < lineTips.length; i++) {
             String lineTip = lineTips[i];
             List<JLabel> jLabels = new ArrayList<>();
-            jLabels.add(new JLabel(lineTip));
+            JLabel lineJLabel = new JLabel(lineTip);
+            lineJLabel.setForeground(Color.lightGray);
+            jLabels.add(lineJLabel);
             if (i == (lineTips.length - 1)) {
                 JLabel jLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind"));
-                jLabel.setForeground(Color.lightGray);
+                jLabel.setForeground(Color.blue);
                 jLabel.addMouseListener(new MouseAdapter() {
                     @Override
                     public void mouseClicked(MouseEvent e) {
diff --git a/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java
index dbf078b68..2c38d597c 100644
--- a/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java
@@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.report.fit.menupane.FitPreviewPane;
@@ -90,9 +91,9 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         }
         for (int i = 0; i < columnSize.length; i++) {
             if (i == 0) {
-                columnSize[i] = 80;
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth();
             } else {
-                columnSize[i] = 100;
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth();
             }
         }
 
diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
index 36328d9bd..c1dd3afd6 100644
--- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
+++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
@@ -4,6 +4,7 @@ import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -66,13 +67,13 @@ public class ReportFitAttrAction extends JTemplateAction {
 
     private void showReportFitDialog(ReportFitAttr fitAttr, final JTemplate jwb, final FitProvider wbTpl, final BasicBeanPane<ReportFitAttr> attrPane) {
         attrPane.populateBean(fitAttr);
-        UIDialog dialog = attrPane.showMediumWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        UIDialog dialog = attrPane.showWindowWithCustomSize(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
             @Override
             public void doOk() {
                 wbTpl.setReportFitAttr(attrPane.updateBean());
                 jwb.fireTargetModified();
             }
-        });
+        }, DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.templatePane.dialog"));
         dialog.setVisible(true);
     }
 
diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
index b69ede5ea..686c3da8a 100644
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
@@ -8,4 +8,8 @@ com.fr.design.version.check.dialog=490*95
 com.fr.design.version.detail.label=750*30
 com.fr.design.version.detail.dialog=900*500
 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=450*20
\ No newline at end of file
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=800*630
+com.fr.design.report.fit.templatePane.dialog=800*400
+com.fr.design.report.fit.firstColumn=120*20
+com.fr.design.report.fit.column=160*20
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
index 7d09dee4d..5937b272a 100644
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
@@ -7,4 +7,8 @@ com.fr.design.version.check.dialog=430*95
 com.fr.design.version.detail.label=650*30
 com.fr.design.version.detail.dialog=800*500
 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=400*20
\ No newline at end of file
+com.fr.design.web.pane.text.field=400*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=170*20
+com.fr.design.report.fit.column=100*20
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
index 28823bf1a..5615b3555 100644
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
@@ -7,4 +7,8 @@ com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30
 com.fr.design.version.detail.dialog=850*500
 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=450*20
\ No newline at end of file
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=130*20
+com.fr.design.report.fit.column=100*20
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
index 56998f7f7..c507fcc08 100644
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
@@ -8,4 +8,8 @@ com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20
-com.fr.design.web.pane.text.field=450*20
\ No newline at end of file
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=80*20
+com.fr.design.report.fit.column=100*20
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
index 58e6ae121..8a383a438 100644
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
@@ -7,4 +7,8 @@ com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20
-com.fr.design.web.pane.text.field=450*20
\ No newline at end of file
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=80*20
+com.fr.design.report.fit.column=100*20
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java b/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
index daca25ae4..f3b5100a7 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
@@ -8,6 +8,7 @@ import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.webattr.EditReportServerParameterPane;
@@ -54,7 +55,7 @@ public class ServerConfigManagerAction extends UpdateAction {
         };
 
         final BasicDialog editReportServerParameterDialog = editReportServerParameterPane.showWindowWithCustomSize(
-                DesignerContext.getDesignerFrame(), null,  DEFAULT
+                DesignerContext.getDesignerFrame(), null, DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.actions.server.dialog")
         );
 
         editReportServerParameterDialog.addDialogActionListener(new DialogActionAdapter() {

From 3a43ecc44b76a27721b9f02da827bf2369adf5db Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 19 Oct 2021 13:49:36 +0800
Subject: [PATCH 02/11] =?UTF-8?q?REPORT-60674=20FR11=E8=80=81=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94-=E6=8A=A5=E8=A1=A8=E5=9D=97=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E9=80=89=E6=8B=A9=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?pc=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF?=
 =?UTF-8?q?=E9=9A=8F=E7=9D=80=E5=B7=A5=E5=85=B7=E6=A0=8FPC=E7=AB=AF?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=E8=87=AA=E9=80=82=E5=BA=94=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=90=A7=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E5=87=BA=E7=8E=B0=E4=BA=86=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=8E=B0=E8=B1=A1=EF=BC=9B10.0=E6=98=AF=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/designer/layout/ElementEditorDefinePane.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index e32bc9b07..92a12f30e 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -102,8 +102,10 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
             paddingBoundPane.update(elementCaseEditor);
         }
         elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
-        ReportFitAttr fitAttr = pcFitExpandablePane.update();
-        elementCaseEditor.setReportFitAttr(fitAttr);
+        if (DesignerUIModeConfig.getInstance().newUIMode()) {
+            ReportFitAttr fitAttr = pcFitExpandablePane.update();
+            elementCaseEditor.setReportFitAttr(fitAttr);
+        }
         return elementCaseEditor;
     }
 

From 55031a4fd22c3819db5432e2b6150413c4c99fe0 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 19 Oct 2021 13:50:33 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/designer/layout/ElementEditorDefinePane.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index 92a12f30e..9507248df 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -114,6 +114,8 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         paddingBoundPane.populate(ob);
         elementCaseToolBarEditor.setValue(ob.getToolBars());
         extraPropertyGroupPane.populate(ob);
-        pcFitExpandablePane.populate(ob.getReportFitAttr());
+        if (DesignerUIModeConfig.getInstance().newUIMode()) {
+            pcFitExpandablePane.populate(ob.getReportFitAttr());
+        }
     }
 }

From ed6cb8f72b6d65aaacc84a1b3d77d5f5d12df88e Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 18 Oct 2021 18:49:40 +0800
Subject: [PATCH 04/11] =?UTF-8?q?REPORT-61116=20=E3=80=90=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E5=88=87=E6=8D=A2=E3=80=91=E5=A4=9A=E9=80=89=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=EF=BC=8C=E6=A0=BC=E5=AD=90=E4=BB=8E=E8=B7=9F?=
 =?UTF-8?q?=E9=9A=8F=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E5=88=B0=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=86=85=E8=BE=B9=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
设置自定义单元格样式面板后，需要单独处理下边框设置

【改动思路】
同上
---
 .../cell/settingpane/style/CustomStylePane.java  | 16 +++++++++++-----
 .../cell/settingpane/style/StylePane.java        |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index 302cc45b7..cafbf7d54 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -114,11 +114,10 @@ public class CustomStylePane extends MultiTabPane<Style> {
         return tabPane.getSelectedIndex() == ONE_INDEX;
     }
 
-    /**
-     * @param ePane
-     */
-    public void dealWithBorder(ElementCasePane ePane) {
-        this.reportPane = ePane;
+    public void dealWithBorder() {
+        if (reportPane == null) {
+            return;
+        }
         Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane);
 
         if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) {
@@ -130,7 +129,14 @@ public class CustomStylePane extends MultiTabPane<Style> {
                         (Color) fourObjectArray[THREE_INDEX]);
             }
         }
+    }
 
+    /**
+     * @param ePane
+     */
+    public void dealWithBorder(ElementCasePane ePane) {
+        this.reportPane = ePane;
+        dealWithBorder();
     }
 
     /**
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
index bfd335f39..bad6e6b6a 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
@@ -107,6 +107,7 @@ public class StylePane extends BasicPane implements UIObserver {
 					lastSelectedRealStyle = (Style) lastSelectedRealStyle.clone();
 					if (lastSelectedRealStyle != null) {
 						customStylePane.populateBean(lastSelectedRealStyle);
+						customStylePane.dealWithBorder();
 					}
 				} catch (CloneNotSupportedException ex) {
 					FineLoggerFactory.getLogger().error(ex.getMessage(), ex);

From 022b4af184e8d8293551b011a9fff4c3ff904d94 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 18 Oct 2021 18:59:41 +0800
Subject: [PATCH 05/11] =?UTF-8?q?REPORT-61108=20=E3=80=90=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E9=AA=8C=E6=94=B6=E3=80=91--=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
调整共享组件面板的样式

【改动思路】
同上
---
 .../actions/DownloadSuitableThemeAction.java  | 13 ++++++
 .../share/ui/actions/Jump2DetailAction.java   | 14 +++++-
 .../SharedComponentActionMenuItemUI.java      | 44 +++++++++++++++++++
 .../ui/block/AbstractOnlineWidgetBlock.java   |  4 +-
 .../share/ui/block/LocalWidgetBlock.java      | 28 ++++++++++--
 .../share/ui/constants/ColorConstants.java    | 12 +++++
 .../online/OnlineWidgetPopupPreviewPane.java  | 14 ++++--
 .../share/ui/widgetfilter/FilterPane.java     |  2 +-
 .../ui/widgetfilter/FilterPopupPane.java      |  8 ++--
 9 files changed, 126 insertions(+), 13 deletions(-)
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/share/ui/constants/ColorConstants.java

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
index 8eb068fd6..399a644b4 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
@@ -8,11 +8,14 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIMenuItemUI;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.DesignerLoginHelper;
 import com.fr.design.login.DesignerLoginSource;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.design.mainframe.share.util.DownloadUtils;
 import com.fr.design.mainframe.theme.dialog.TemplateThemeUsingDialog;
 import com.fr.stable.StringUtils;
@@ -22,6 +25,7 @@ import com.fr.workspace.WorkContext;
 import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
+import java.awt.Color;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
@@ -44,6 +48,15 @@ public class DownloadSuitableThemeAction extends UpdateAction {
         this.setName(Toolkit.i18nText("Fine-Design_Share_Download_Suitable_Theme"));
     }
 
+    @Override
+    public UIMenuItem createMenuItem() {
+        UIMenuItem menuItem = super.createMenuItem();
+        menuItem.setOpaque(true);
+        menuItem.setBackground(ColorConstants.BACKGROUND);
+        menuItem.setUI(new SharedComponentActionMenuItemUI());
+        return menuItem;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/Jump2DetailAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/Jump2DetailAction.java
index 73a91fc87..698ec7545 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/Jump2DetailAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/Jump2DetailAction.java
@@ -1,11 +1,14 @@
 package com.fr.design.mainframe.share.ui.actions;
 
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIMenuItemUI;
 import com.fr.design.i18n.Toolkit;
-import com.fr.form.share.bean.OnlineShareWidget;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.Action;
+import java.awt.Color;
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -27,6 +30,15 @@ public class Jump2DetailAction extends UpdateAction {
         this.setName(Toolkit.i18nText("Fine-Design_Share_Jump_To_Detail"));
     }
 
+    @Override
+    public UIMenuItem createMenuItem() {
+        UIMenuItem menuItem = super.createMenuItem();
+        menuItem.setOpaque(true);
+        menuItem.setBackground(ColorConstants.BACKGROUND);
+        menuItem.setUI(new SharedComponentActionMenuItemUI());
+        return menuItem;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         if (StringUtils.isNotEmpty(id)) {
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
new file mode 100644
index 000000000..ca4d499b1
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
@@ -0,0 +1,44 @@
+package com.fr.design.mainframe.share.ui.actions;
+
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.imenu.UIMenuItemUI;
+import com.fr.design.utils.gui.GUIPaintUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.ButtonModel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/10/18
+ */
+public class SharedComponentActionMenuItemUI extends UIMenuItemUI {
+
+    @Override
+    protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) {
+        ButtonModel model = menuItem.getModel();
+        Color oldColor = g.getColor();
+        int menuWidth = menuItem.getWidth();
+        int menuHeight = menuItem.getHeight();
+
+        g.setColor(UIConstants.NORMAL_BACKGROUND);
+        g.fillRect(0, 0, menuWidth, menuHeight);
+        if (menuItem.isOpaque()) {
+            if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
+                GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
+            } else {
+                GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, menuItem.getBackground(), 7);
+            }
+            g.setColor(oldColor);
+        } else if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
+            GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
+            g.setColor(oldColor);
+        }
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
index 54a813c43..5ce5b57dd 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
@@ -1,10 +1,10 @@
 package com.fr.design.mainframe.share.ui.block;
 
-import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.share.ui.actions.DownloadSuitableThemeAction;
 import com.fr.design.mainframe.share.ui.actions.Jump2DetailAction;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.design.mainframe.share.ui.online.OnlineResourceManager;
 import com.fr.design.mainframe.share.ui.online.OnlineWidgetSelectPane;
 import com.fr.design.mainframe.share.ui.online.ResourceLoader;
@@ -116,7 +116,7 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
     public JPopupMenu createRightClickPopupMenu() {
         UIPopupMenu popupMenu = new UIPopupMenu();
         popupMenu.setOnlyText(true);
-        popupMenu.setBackground(UIConstants.DEFAULT_BG_RULER);
+        popupMenu.setBackground(ColorConstants.BACKGROUND);
 
         OnlineShareWidget widget = getWidget();
         String suitableThemeFile = widget.getThemePath();
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java
index ee3d2f32f..7975ab39c 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java
@@ -9,13 +9,16 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.WidgetToolBarPane;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.group.ui.GroupMoveDialog;
+import com.fr.design.mainframe.share.ui.actions.SharedComponentActionMenuItemUI;
 import com.fr.design.mainframe.share.ui.base.PopupMenuItem;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.design.mainframe.share.ui.local.LocalWidgetRepoPane;
 import com.fr.design.mainframe.share.ui.local.LocalWidgetSelectPane;
 import com.fr.design.mainframe.share.ui.local.WidgetSelectedManager;
@@ -275,9 +278,10 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
 
         UIPopupMenu popupMenu = new UIPopupMenu();
         popupMenu.setOnlyText(true);
-        popupMenu.setBackground(UIConstants.DEFAULT_BG_RULER);
-        popupMenu.add(new PopupMenuItem(new MoveGroupAction()));
-        popupMenu.add(new PopupMenuItem(new RemoveAction()));
+        popupMenu.setOpaque(true);
+        popupMenu.setBackground(ColorConstants.BACKGROUND);
+        popupMenu.add(new MoveGroupAction().createMenuItem());
+        popupMenu.add(new RemoveAction().createMenuItem());
 
         return popupMenu;
     }
@@ -288,6 +292,15 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
             this.setName(Toolkit.i18nText("Fine-Design_Share_Group_Move"));
         }
 
+        @Override
+        public UIMenuItem createMenuItem() {
+            UIMenuItem menuItem = super.createMenuItem();
+            menuItem.setOpaque(true);
+            menuItem.setBackground(ColorConstants.BACKGROUND);
+            menuItem.setUI(new SharedComponentActionMenuItemUI());
+            return menuItem;
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
             new GroupMoveDialog(DesignerContext.getDesignerFrame()) {
@@ -314,6 +327,15 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
             this.setName(Toolkit.i18nText("Fine-Design_Share_Remove"));
         }
 
+        @Override
+        public UIMenuItem createMenuItem() {
+            UIMenuItem menuItem = super.createMenuItem();
+            menuItem.setOpaque(true);
+            menuItem.setBackground(ColorConstants.BACKGROUND);
+            menuItem.setUI(new SharedComponentActionMenuItemUI());
+            return menuItem;
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
             int rv = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/constants/ColorConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/constants/ColorConstants.java
new file mode 100644
index 000000000..6bd815142
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/constants/ColorConstants.java
@@ -0,0 +1,12 @@
+package com.fr.design.mainframe.share.ui.constants;
+
+import java.awt.Color;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/10/19
+ */
+public class ColorConstants {
+    public static final Color BACKGROUND = new Color(0xF0F0F1);
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java
index 84083b404..3113fd06f 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java
@@ -5,6 +5,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.share.ui.base.AbstractWidgetPopupPreviewPane;
 import com.fr.design.mainframe.share.ui.block.PreviewWidgetBlock;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.form.share.bean.OnlineShareWidget;
 import com.fr.general.FRFont;
 import com.fr.general.IOUtils;
@@ -15,6 +16,7 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
+import javax.swing.plaf.basic.BasicLabelUI;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,10 +45,13 @@ public class OnlineWidgetPopupPreviewPane extends AbstractWidgetPopupPreviewPane
     private UILabel suitableThemeNameLabel;
 
     public OnlineWidgetPopupPreviewPane() {
+        super();
         setPreferredSize(new Dimension(POPUP_WIDTH, getPreferredSize().height));
         setLayout(new BorderLayout(0, 0));
-        setOpaque(true);
-        setBackground(new Color(0xF0F0F1));
+        setBorder(BorderFactory.createLineBorder(new Color(0xDADADD)));
+        setBorderPainted(true);
+        setOpaque(false);
+        setBackground(ColorConstants.BACKGROUND);
 
         suitableThemeNamePane = createSuitableThemeNamePane();
         JPanel previewImagePane = createPreviewImagePane();
@@ -57,8 +62,9 @@ public class OnlineWidgetPopupPreviewPane extends AbstractWidgetPopupPreviewPane
 
     private JPanel createSuitableThemeNamePane() {
         suitableThemeNameLabel = new UILabel();
+        suitableThemeNameLabel.setUI(new BasicLabelUI());
         suitableThemeNameLabel.setOpaque(false);
-        suitableThemeNameLabel.setBackground(new Color(0xF5F5F7));
+        suitableThemeNameLabel.setBackground(null);
         suitableThemeNameLabel.setIcon(IOUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png"));
         suitableThemeNameLabel.setIconTextGap(IntervalConstants.INTERVAL_L6);
 
@@ -92,10 +98,12 @@ public class OnlineWidgetPopupPreviewPane extends AbstractWidgetPopupPreviewPane
         versionLabel = new UILabel();
         versionLabel.setVerticalAlignment(SwingConstants.CENTER);
         versionLabel.setFont(FRFont.getInstance(versionLabel.getFont()).deriveFont(12.0F));
+        versionLabel.setForeground(new Color(0x333334));
 
         downloadsLabel = new UILabel();
         downloadsLabel.setVerticalAlignment(SwingConstants.TOP);
         downloadsLabel.setFont(FRFont.getInstance(downloadsLabel.getFont()).deriveFont(12.0F));
+        downloadsLabel.setForeground(new Color(0x333334));
 
         priceLabel = new UILabel();
         priceLabel.setVerticalAlignment(SwingConstants.CENTER);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPane.java
index 4e8f9ffc5..7623c2e0a 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPane.java
@@ -151,7 +151,7 @@ public class FilterPane extends JPanel {
         Point p = FilterPane.this.getLocationOnScreen();
         popup = pf.getPopup(FilterPane.this, filterPopupPane, p.x, p.y + FilterPane.this.getHeight());
         popup.show();
-        filterPopupPane.setPreferredSize(new Dimension(228, filterPopupPane.getHeight()));
+        filterPopupPane.setPreferredSize(new Dimension(filterPopupPane.getWidth(), filterPopupPane.getHeight()));
         showPopup = true;
         arrowButton.setIcon(FILTER_COMBO_UP);
         firePopupStateChange(true);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPopupPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPopupPane.java
index e2bcd5344..f0d3714c7 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPopupPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPopupPane.java
@@ -31,6 +31,8 @@ public abstract class FilterPopupPane extends JPanel {
     private static final Color BORDER_COLOR = Color.decode("#D9DADD");
     private static final String FILTER_ALL_ID = "0";
 
+    public static final int CONTENT_WIDTH = 225;
+
     FilterPane filterPane;
     private List<WidgetFilterInfo> filterList = new ArrayList<>();
     private final List<UICheckBox> checkBoxList = new ArrayList<>();
@@ -101,7 +103,7 @@ public abstract class FilterPopupPane extends JPanel {
         jPanel.setBackground(Color.WHITE);
         UILabel titleLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Type"));
         titleLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
-        titleLabel.setPreferredSize(new Dimension(226, 20));
+        titleLabel.setPreferredSize(new Dimension(CONTENT_WIDTH - 2, 20));
         titleLabel.setOpaque(true);
         titleLabel.setBackground(Color.decode("#EDEDEE"));
         jPanel.add(titleLabel, BorderLayout.NORTH);
@@ -131,7 +133,7 @@ public abstract class FilterPopupPane extends JPanel {
         jPanel.setBackground(Color.WHITE);
         UILabel titleLabel = new UILabel(filterTypeInfo.getTitle());
         titleLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
-        titleLabel.setPreferredSize(new Dimension(226, 20));
+        titleLabel.setPreferredSize(new Dimension(CONTENT_WIDTH - 2, 20));
         titleLabel.setOpaque(true);
         titleLabel.setBackground(Color.decode("#EDEDEE"));
         jPanel.add(titleLabel, BorderLayout.NORTH);
@@ -150,7 +152,7 @@ public abstract class FilterPopupPane extends JPanel {
             }
         }
         int contentPaneHeight = ((displayCount + 1) / 2) * 27;
-        contentPane.setPreferredSize(new Dimension(228, contentPaneHeight));
+        contentPane.setPreferredSize(new Dimension(CONTENT_WIDTH, contentPaneHeight));
         for (final WidgetFilterInfo filterInfo : filterTypeInfo.getFilterItems()) {
             if (ComparatorUtils.equals(FILTER_ALL_ID, filterInfo.getId())) {
                 continue;

From b51266bafae505fb3143f12a6bca45c500dae652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 19 Oct 2021 14:43:20 +0800
Subject: [PATCH 06/11] =?UTF-8?q?REPORT-60900=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8D=E7=AC=A6=E5=90=88=E8=A7=86=E8=A7=89?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/layouts/images/simple_style_18.png   | Bin 9640 -> 10358 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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
index 362a57cf5ebc72a58cdc6b4c664ad6416fa2f13c..b4623943b918bd68a977d890e6a8992796ad19bf 100755
GIT binary patch
literal 10358
zcmZvCWmFtNw=GF<4epkN!5xA-!6jI5_YfcicXwxipo0w-+}$<Uz(BCz?lQQ)$#<Wu
z_3r)Ar`lGpuBy{rd+)O&KdZ=Mp_8E_ARu7L%So%l+kN;Jf{F}}u7;S_@aC1Xx~wEZ
z<pc%%3Jrq1w1lRI(XsEHJLQn;&fHTqE&>`J4O$R6LM2VlCoscEKGD|(i|8oI1(l5$
zd&{KXADjVy1@0uowz3}4oOdje1U7;5q(at5AB?tjlIRqZSrqf>PK0`pJ|G44OD51n
zQdYI?`e;?1|0-*vz849?saCsEq)hm8<>2q?xLm34ULy>-Fv*bUrs2@QJ!5$f=61Em
zG(>(C7=WwZhl(6X8W(^ICG8Xs6Al)yPiRfo__g_(k$i2nk#JdmW(Z+M6kXdl=H7i~
z>Dh7Bp8AtF!MLbMUEp<d!&cWS>q?7<71Q^wpY2KP#~Qzxx2BVkbPyTmdnHGDemXQa
zb6c&)*4g^F`J$g1|8QDWCzq{6eyE!>WT~q8zMaZ9#a`LS!9~^h2`lE6;x5t<Y@x2h
z$mRq^dvV^or-$24<MyuQTURk%sJ4oL$;&kN!gG_p#_jL@vs-%Y;<G7w(?z}+{bnC-
z#kv>li;=!+{CfTOs2$duuQ7_-`sz==*1q9+IDISo;CvW-x)<-?%t_e$FsVh%8r@6c
zhU1Z@fmhU#KO+edzZKCZTHv1{9i)r9hLmG$jJw})&Y4R6SX8}gw$XcA)Zssmk1p<b
z!PINczI<8j<dlXZcJTeY|A6B}OkjI$V0Np%%eiMDm^tZOz|+%&XKc66Hn&qy$y>iF
z+#Z+fa#Rr;<S4(sMo4VDWDpdUl#nZfVf%nZTxp%hvYpq6mm8p!`dVtU$L|AHa$x``
z3PW8WCo#jgjS-~_y4Xv+IRGU8DoZM-?H55aH}Yp2hj@ewCJSQ?)AiX1;)7jCP4~d{
zP^2G0nm#h-SDp(>)R0`=f@~pOP3QKb2W1&=*Yw9@aQz`q^sdaSiGocL9%RkrFk5Q(
z?VoWgw~miu{`NkLch7k(L)(sk!Vcr|;9AjVp`l4pF6`vH<_8~>H~k-fIk6&El?Ve<
zPphUy`H{!Q*NQeK#$EjoA^lT+)&wO{-A_j60(X7^K6(!88_GDvZH7L!if9T)2=7d3
zDcu8JF4V|!{@O%S(n>yMXaxOB#!%EVJeQeQ_hG_36HQlGe3HP{?!YqaS=Rc`x?}}<
zMG4~EDe(IcoLKHo)QJ7BzN0B<0BxZ47>^e{JlFN}C1pI4UrB~(K4T(=4T)qOzG-Av
z&Xu=aUz}Udb*%~g#q}OMphI&(jvROxOy&2zcOXYJO%q5ZXAVIoZ%9dP*5e$fF?rkU
zjymZkqwJN3)BC!d^wmK6%(#IwI#Y@Ks^F=KYj!A|GplLhc26oY__G+H%g|W%p~J^H
zk(_4(f@6)w3xagF&cB)@uzp|5L|bC24fnRqRr3tr6~>P_8ZjP#r;@(D=uGui*SW%k
zI0S|Z+7Eg59hDrh7odISzv><p<2`+`A4Qvwknhb6slNQtv*}9Qe-LIVtKlGUQuVSU
zvDugx#VI?eg-~=5WdXa+FEa@Ie4stVe8p!^n+u@&#|sG*<K@)eE{ch3|4VW7RZ$YE
zm%G{I`R^`^r^Z&BM^`N4K_F2a45q#|Y`&0A3AqfyMOz)AdD5b%7FUUkC-;bgr&0Za
zA+a{Lm>YKX7PDflbAVxc@y?&X6`R|`cEbKl$jY2ap!0rn|J1X$ey|6=zdz;7)%hxK
z)U{ML)hsJI4Bd9unu^luve85(P1~cm(>I-Pqpu0lwx)Mj?{k<CEVh`K<px{Qu!Dab
zr#_CKmVhw9h?^7n+pOEJm7NVSdqvYzB%HP{i#C-Fn#v;;_Q{fhm;rOQW;vT|KfGt~
zCB16@4y4j0<&p2|H!o2iwIK_$lpr|7iC_1@RDg5*UYmx~k7H>_&b1I1EE*oZ2L96+
zy+iw~Bd4iWo$DK3Y2#jvJ#6FAIQ-2v!*3-`PI>G~4^U4YcWYasOUyUU3Vkjb&gXtm
z>dk2*Z8U=p$|B!mNeue7r0Gu2NLbvnkb9d>+a&h7Z|SO(l<QkZXkVN1O5j247s(a&
zG7skpvK_r#^MKAGyF-@1%s3%Wad(S#<bkU+og8_aF0a3DI5j*&U9jS1{VC7be%j?j
zCwL3+11G|X9h&E><tkegggniLYPafhPF!nRKgM_y<Un%X#1!?VT|8&IHwYf9`KUbZ
zzpZcR8Ki%D8^^R5_KB7f4Q*f3rzb-I^EGlHqeM6AesZ@BfD?5|2r(vMMd;i3*#Cbz
zKQuY){ry|$#op5>HkG5wx_EJPY&2`ufhj@I5g$wA_x-T&`xc_sQ;UaICT5tp2>(tX
zF4uvMDD!*rt*m+jx64tZrrSg+DDR2a?OAPjvG(8jzb6~NwLY%!@1jPZJ^Z8)hJJVm
z&s4u9d~ZS)<Z{t8apT#GkT)$knzdqcY@}|V=Z`qANqucerRd#DBDqMSTW8)Pa{fTg
zaLMs*cXyYrLv;Dbop1D<Y1t=kkb}?>>YJ~x2i9s8a`4pY8Xmk4B_a{XZ_MLVMP!=n
z^|t0|lgZiy*QSa-|NXhJ=7=wpa=koWiZJdIo|EI=?H*Oo;f-KpWP(=3`?MG#fydKI
z(XwM^T1Y2Jc{PZNpWT!?tJC|o<l^0&$11%;#7Xfi_-v<zWoIjW(~ycv$Fv}83NR9%
zbn1wy*!j{NJeb9@Y7n#L4CA7Fy84(@6v)DtQ+9dU)r$&Bjwms^{CQ$PZOi{o19aeK
z`nNlhjkrx)KKkpZ8M(DrkVtxMC)rxiFi4GiN>U*VS5mOsdVbWJ0sOqAPxg)C1o7Zk
zK=x>G(8%b@v<TIR0&RJ*YGvbjbac{h+aQ0R6jq{xyp#oyiK7GRwDJW%Ydh02IC4tV
zYjcCOy!QJq@^>>|r;~DN64sj|%qzn?C0cs+T+SS!`xu3)d=Ii@1w-6CpNBGu95eQ`
zS|LU#U;Zr4xAynuAJEwMw;smPS6o$g$*6mf2o_b@QXI$gSk_$Iu6j#!YRt6#05LaN
zT+X~1EzJED>wy*L-Rv?=m}({Fr%TzVYzUK2HEymk+QXPu?p)U^vr}yy#&@*d`>-6(
z_jleON%E~5FS5vi+?(@jmbGtHn41^p@f#PPw5B9S#>2lH8TeFgs4RGuFAU03c0c}D
z%Ns;km9<kp`LHUqv(}T6iokJzeQ0Fs{(3-hS&@(S<ZNcOQ{X7FO=G3U>3szHc&oNc
zVozyJiS6%zuMgnWH||ngh*BLzy$dusH*49KLzGk=Rkz(R8vCKjmLLao-I*(O(JmlF
z=f`aGWbzD*Xn6AL<}z=CD6hiIA2rdg6o`&Pvq9gR>~>)NXG2h7w9iWcJ~oM6``5tG
zqzL8;A3x@tnk{dK>tgQ!*-Sk2eO1*9;1Hfu=77W8i3h*ic%StwiU>Q&o7+KMlpI~h
zf_(6;%Q<(M`*5GRa?hX5r`0JoV%2i=7H2{%!LPXYx`*Vb4Rm}RhOxLSuW!->xmMba
zVW4cX&-SN=E+K0$(f0Y+oB}bS!;NV>jd!y%js(!TzZBnW6GlqsV<i=2K_aYy9#9YE
zuOU3`(lT-v=KAl!ck3xl30#D~3#P&Ho?#p7AhxduyKLO-k4NRfkVd6=K%o$&;k?b7
znm#@6KCh<?+YWuR!kg*vNu-29K*Q9VV(UqK*>E#HbVf*E=3!sPB{8XTs}&i~zRhAE
z`L2O*9f0sw9Srcjig}M2i<Pm%j_gLD4l2koHqM9n)&sWh>>S&Ij}=)HXY=M`t=oNb
zJaSdbzV7F{COsD|36B)7JKtC|q4-5{?*bQXXmYDACJ3kL!Nsj2PCMWfZTsB^15?*o
zvEb;MA_Azk%I_=*p61e6Yme54iY#NF=loYmJ%5ZBv(QQEhi{gI^Cu<;x(^2v!sj5Z
zw+D?OIc+aq$?_d6rZEg|1&tfU+m(a4fNjM`IsWBoRCS-$z5a<T0jIEnUHu|expeVp
zYjv`SnL*|_yC#u!9-|`}+QRK5(c#whz45xZi0ZGp29K^=DGQz0I5-v6Qep1}_om4@
z%*Z~*2Xfj*d)6~{-^c)W`kLV(I92K8E067uv62v*$@`J2Xh31zD-FG0*6IcFo5YWE
z%0Q@sD#n4*G<a3$#H4r%3_NAoQ4$o8xkq&dD90@*i2`>D<-0s-Vu?R0slMaVYauEA
z&9C@JZ=~+PJx=g;(al@0mgE{+!8*(pBY0Ox&sVJdXd^oF+j=1{<#DmK0dAk%oZPZ_
zUmXu*bil!d!h`}AMTRjJUH%b(Z}KBxJmcmIrwxU>aMr;qy~E%I4%_9YYuZ+8Jz6Pk
z&ON++4F~c5JtiM&Ux2HjiGT5%jG?m8s7&{tM2(GyR4aDw=c}TGO2g88oXF=6rI1@g
zqN$y3B;oI&G9+v6O~^=rIqS!K`+r$PK1Io;u2Gt~DO*(I823*9-P@^-Zg4d<-t+$L
z5mYxAcuJ9&j(r&$t3ovPL87V4%t+s9Gk159@4D@FGn;X}=ztF<qOtHpBd@1E&E@=2
zr8tc`$K`yt?X?fJBfr-+Ph_ELNob|er6JON_$!%$GLgD4?pn}}zgQVRH-~f!9!xOQ
zJiXzsf0(bUr`rVRRr>Z)*rkkGV15`pVO=hb1*n_d!by=WRK*Ogqssz761kn|dsK)-
zTCe!RdR;UQ6O2+Eo-4M62oHxWEq2~OjkU-cA8`#<9PKNcK6A@j`JDN$7Ke-M>!;>T
z7iWsRzjkfCd%Qwz^|bF{IRtyZzTsSRshZKb<kKP#U0-rlwPCRmJj+?9xYvW7@-OZ)
zmqW8KobSzzsgt`4DLu#Yjklj*`OL5BNWc=ta}3%FJF_s)k>bohsLgJI>_1{7Y3GEA
zce0ykDGrAy6d7pEHuxOesv28Lviqv&(sg@=7@{EZ8p($=+@}v(q#L&eg*mmKTIHg5
zbxo||<#|ixekCEV*t%C&PW0;U8m=Ez7IB_Wr}NA$_6BC|xODAWm)^rfQQP0GW#<c~
zLMBzAIS(H3E<sjtl785wk|Ty^6KV8p!+dPDXFHzS(!K4jJp;~mq$%qgH30Hc!;$Ou
zelZ^{#WLu7-qDo5rh0qcWqeTapVBKgDa9<f>3JXhiG`Op(PbZ>T+$pcp%SetU)|4-
z$mFZwYm)n7pNq5b`*@$MCqMk@o+VVM2>(IksC(R$SkrG07SbPAap8DEZ89$E#lXPM
zq98XcspqGO0h)0ilo!MNL1!w5q6TM{JXYq0nd*1YttgCCd|G=o>dnitKb~b5sRlyX
z4t}PbVhOF+;Ar9VrB<39NM%DP$63awD{{ap_to$4pOm;){g)gqw^{8<_g6A2yU3Z*
z5Uu-tM`aKI$2-AAnF)-4kdwZUPyu$Usy+E+S&2`^veA|(jxI>h3K(VL*K&E-l7?<u
zGLI_Ds6t;L^iuC_qn(d-h4VgFduO>qikEi_85X5?`jkF(`iOQE+|n@?J@dcdGalG*
zN&F0&(#$f=-@A5F--lLnNvz&+gp=C6O+$vGH<dSgJM>tu?`TXyc&O{gbb`BiXx`?C
zhVrsf{@n47xCdYA7OI6NUVl|RB&@LH;kgrG1*;`q^O)_K-|?|}+%I(^sX~bL`G$J0
zXwyMKahrY+0t(;0b&Br#iMs|-twqnZVkDJf`U$4-y1u2T@4vA+=}(t!zS9uZzvdc8
zXAR*C3l!8-;`Xho7S~(zW%kv5GHO?~%6g&jHk-J!iPZAm&;lhD!X81$2_=F#?O)bj
zO3m+L9O?e-#ua3Ty-l%_@NQ80Mwy@e$i-p{FrLgX*25c&Ye}b6T@jHrbf3(qgb~h-
zG-Vw4FqHqn709-&DB@JzCWOVrw}9THovOA1&jcK4ho`;XtD=taK1Xdh!$juN(<yE<
zdFtr|fiT%LMjwXb_0{;_Ea&CF#v`0aLz9k4J-b?G@rY!*jE&wGtX|2Or8P=Xj#}>_
zRzjZkc^Mzqz`?7_NxfZ^qu1>As_Wz^P!C&gv`$xszb|vybhkT!XSeM2MQ1yA9LGv&
zV-GsnZVu>P`kIy)J>FKz{HUNr0i_BFjO}wJ1>*a%1Jdien>jI+O$Zee?o-au*fm(_
zt1xp$ofog+^CQST?xD(~R|!%^*tMIYNw8z!VH8+meuo*{pJRldmDz<W`@n~TY)f<s
zW9*bdJpQZUvHjtKnzK}}ikrphPrfYMRNWDvua2!PpQL7GxLUBPTJJh;o9m%-gnP{V
zGE`Z@i1u`nF}ytwhVHqWb6tFna`O|>BYM;Sdv8zi9AFcUQ7fLk%-^|MRjc;y`k)Br
zCseJrZLNo<epX()^@h5$k07dHFmHEQvK^*7<`s~NeAbjH0Cg3`oht@M_&4=-^%zEF
zC?B`9L4By_4ma=IKOCc12pS6RJ&JG*eJ1np^F6B#$Ov&yv?E$9VZ@m(gZ6oP+z@~A
zCs<ZHJ?)B*Z&{S}jVdK6Gmn%P?UL7n^(+-<lcOL-%)O7*YhKJNqZ*Xn_tG`gckB(S
zx`;t>8VAFX=a*0@<p8%}4iG;duVet`iM{yyrQJdB`=7qK6UEY-DmZL}B)puD@`%oT
z#gJfy|KV+KPat=|#~Dj1+R@sOzJSHO>+5Sz6!v9mrdsZ4BXhky+PaJBBt12Dxu=&n
z{tfIDiP^gBA%<gNv)V??(?I$Tdb(<Acm54^SHT}>${2jgumTq}u=X(Z32G}M%z0N~
zC&+h}TMsd8#=`hT4iNvhT4$7OYBP!*L!(6R^^k$4@Z!@re&MfO{dT}p8xGXNbn}vb
z9wJS<y#Tb~Wk=;AgLs`b3f&%DYpVH*Sih4=%=t^TOk0?z#4b19|9S?j^k|uJ>6RZD
zExINHB<jY62L!#ryHy*g#XPBU24?ZR8vGP84dg-w2<T&TRQ9T#?y2>h2A(l5FcZ2H
zRI#KbX0I!M1=dtm4%0YJfY*7~(=Vy7e;fQRC;#<v_O+#`06>sW*{a>zW_49m>zCm3
zP>%eIpRpbydZtu|1vPp>AICdZB)aK#j=rT+N30?*P9=KWT!5t#GX&(-Ocwj$@n#?O
z5fpjIz2lMZg9?mP^#W|4+>~L<Y6gPh%6+(T#jQHb8&QoKN@8F2Q$DfHvSxHD1#;uE
z=Kx?(zH1>5uZmbA*5$o(2V%>{OH?kb-Z#e&Llo_g9+HQZQ(%ck&Ww5vPOc0d0S9;=
zhnRj?uqofmcQGfa6LT*Q8g{BoQ56H8il4^TDe~mo44kgHGBnx3C&5FM?d^YUpg|-&
zKLM8Kv{rxFt*%;vjLgWW{yl3?X>t6LJrV+@HgJ>nd+!WLp`mU$h@$vpyg;NP>DFQl
zpyi%j=8#ecKCcF2gY@j9o!b_5#KIF<z1$wQzCC5~Ci$(23GQ!HQ7b1z#QZLJJ{Kp0
zl-Cp&j`b^rfDm9*(Y7*w2F;q4B(L91dy+lK+U%FeLoU7E;mNY=!ZtPH&akXQVr(&8
zFTa;k=RbzRv{IST2XSd-S~V`eApuQo#w>1y^n)^zdq-VB`aemO$p*+{tSu`ozSJ6N
z5HGEz?M2JCrB#pe?Bm@ok`li>(H6*KY@onHkn$3c44xZ81@gdk0-+HbXfFcKzv1(=
zRUZUCZ~A!xc-i#vEC!|Vh<7@){wgtWCT3wpiE(L{qNUbsrMsAS+%0X7#DGN%PEe=}
zKxaxLQHz<W!(8}9zg0h`0zFLo#+Ye@fphfQcT!|aX)h6_GD^U0_B5tlu~lO(Pb=i2
zo7<m#*i?4t#Ea<_Cbh}^-^tzqyB5=m!?nta>jKV{jDQBAA;xyjAp<{=6{gb)M)0>K
zK}Olt5!L_GgoCHRp|5P<0D36|aC|O(HzIulmITh~n@mwmkEPdtrs9D2?uVzH`VO_F
zF3giqMh@+wFq0}Rd;MHXq7QePqgIj#@=MA0>*NSmVR;ZryLS&E;eOh@ioK)p_s<#*
zc`dWKG6uuOO4Ap2vv`T3ywmw2aW?$->u4xA<<%Sz8}&fK&}5Zs)k<u1#?!_$vBuUh
z{5iCr59vvq`XlESRnfDbKF&K<G&$X7gjXoCP#lk3m)i+)R?_P`#8V0KC`}bkoC^5&
z87S(!wskpw`1{@{Hzud6w;a%o`3zT3q}ZteS6_B_9Q&s_J!>d)(@(p91Yg#Vd=lcW
zt26k3q=|FC;@yM$Xc?keNi>&0_uiOCGUM?=ijtHbJVV4sa_c)vh)EyH)0)amn$e)%
z^l?7dxn*^ln*Y}|Gg8<E=dE9U7b6l2Gnhb}F+wT6lrJnuo;C&GXRO1x_w%yFd2&Lp
zh-n<W?EllCzN$P?7LXb+$vsa_i&dG53+=UV-YDg#?HIMSzS@+Li%n1|MIfQgR_7nE
zkdZr8my2CzKsCu)w>i*tzaF!}l<jGl82#QaZs?4JkH|5RZh9RtGt*V-gn?<6aYGmb
zZ(oz_j&(1B%VXs?r>-P&P1!=|+~6uIhHnovilt%Li^1B<Fi`+<3NduAqa%6RJ+PTd
zx!`=?FD-_%;jYt_f=t_GovnzBuos)^^@T-a2u3<fZukq59eiEqYZPDw?R3H&mE9@I
z*5(-9{hgHPwS&G%L}F0Un?)KE{Dc_glyNy*9j?(a_H(3HxqQ<!P=3^nck%Y@N40;G
zhz5TB@&JC>w|3zEY8#2j^O+WU16}*)N6<ynbg#aBo*m8f>Unjw0@3^*@|Rd`sdh-A
z*1Uh%lu*T0Ps<&-Q+*v(i2}E+wE{sW@VOF)Z*fB}>f+p8chz+_>bt#mfqX0=8+uyD
zue>+~*_y93k^6$f=NVU9eL>_Wj74#JeP&Zf$wY3;V;chC#l8+5wa)?+%9!~=WiyoG
z3K(4WiR6ylDyu&&;5Cpcdl6^MAo_+cu(IuC4n$xZIEB0kp2{~}VgOfVJ5^gtDQp40
zWTM?;Z=|?S-n0=bzvCk8ZN6kIN0L(HhgbvjO?2e;69*2<>_@+;-F&hK;Of4uYKIo5
zC4+D?cmRcP0pJ<i!A1r+=zG$+vSXsE$dv3p2foC7m+JnG3ouj!VJPE<TtoOB^e**}
z$zON+7*F=B*g%(d9}O~+)3_GRol=m5dQY3bWAs+70)>et@t*5G!bN(ypk$DX)!Q}$
z!pZt>$s5XmDa<CBfQ%>;W5Wq>XLpvmi3LRo1Cq?NIMciPk`F1An__(+cc1$uzVP$~
ziapY;cUBK<E2I;f7@Wp-jn)I)D|82&-YA96EuvzlADKsc>osVuKJsI8WLWqKOlp#E
z0Se@uF%Z+)Re-e?TazS{?cJ}3_G8`Kx9D@KhMC7A`x~b3svDCUG=thDjc8O8_%w}h
zg{4<WQRC?$%OnbeyI@5$#!Q-=SAUaVK}AV(fb56A0_>W$Jtl^}q5@MzKNx9t2-{83
zzy<|~bM#Du3lB)J@~+G5D%LC?3_KSmV6VIi#2*k!i7(*=n#|o4*$n%~{N(|MYhufn
z9RY0u@Y5YUzJfi>EgA^7eH2oOF}B=%ie@`8CMtS5a@GFOjn0ogmV%kfH+S`YRbBss
zrQIY;vUL@AUQMv|TspUHa<e+nsADs7?8Qp}O)$vk`vPJ7IrAsSH|D0+aofBIoO5>x
zc8||=Ejvt*1o~lerm6&M(CFDDqN63KAO+O^GX$cmn4B55!tkxreAL26rSoM*f!rI?
z=8-obBR_%{<)lu#9gk-)6ilKtJ_2ep)P&SLegN&6f7E80o17o3Q*+iJ2ZnuiRLp2L
zN4iftkF>d7r44hNkhs56^%vyiuqd<b6d;n87`n<MylLVq3<;Yge=$DO2Zz}Cqy%f<
zwv179MS2eGQpQ?8dM3e?G?V>Td@9d4O(!uErX*Hd#7xFsexcT1d3jvLu<$vSx0$Z2
z6^$vFRz$OEY*cehaZ2iuI4l%{0j`rgt2*u&Q(*V#7Z#5d)cs|)+9_}gZgR$q)S($1
z4fLk5>dB!UHIH6^Q1o<d1qukGzUWZx`~l4}lSSH$!@Tt*3(8%E{o!2c=JQ~0*~GY9
z?DM+PVmz*i1k!h4YPCQr!`)|X+eju&KUI2|Xc5Zq82l#=4l$sfbaA#{ql@U=ek2p3
zQZzYd`luW>mJK}joQ*2E8Abk5K>F5n_9y@Vx)Ua2r;27Pp4mMgxnOFI`tRePex+eT
zCTRu~HvY{GA`au`<L<p|K+E>;+pNglNA8BG*Pc1Hb}owrw@Y0MYsYA-rEV(2jkv7f
z$Ha>{5zH9x+u1yx=g~O4$1`v+z4iiJdPly0qb*WiR@eO*u+U~xUek|rP~jhvr{73Y
zR~gsgvm<W(UFCW3;!xxEq=u)nu>x^bH0$`q!W!+_)R^q3>)EOCCEAegc9lAG$lp^D
z&Bz{O`gu}ehj0YSvhOqi$Zfj+s&CQZ?bpFtnK9#5G}Nc6BIIEjEC7^Q^b=;}I3(5$
zdi7_pgf{H<oGDEA&6SKP)HC!hS*J^5SE};-XA`n#XuA~Xb~GIR*{$3ecPVVDx`z$<
z-`MD#8R3c2v)|x^D;vErA5%<;fiP+$vqCRb+QL`6*y(z42;W%x_^JzvaR<({|FG(<
z<H$%|*wc~IJ}z}CC@)u=6-4*9DaSf<P|wMfFWVc{;hY*ZOimdJ9~99{)ge(}_ARBW
zjMX_!+N_0qnpUxgc=Kn27&hZK_1-;+t@^4ePD(CtudNUBqA=TyrSmArwd}x!xiyST
zb(=p?hLoqUer*C?>N?hg*cdX)0qb7gY#doi*KuE}gq!5@8uB$l*hDk^=`~UnqGypX
zV~%xawM*;WpHIv+D)7<`@Klzoo;&|wm>0+YyZ={MGUyTWE{7WY(^M`P0Ri>HKQBP2
z+nV*(w;TR<drOpPh*f$sgWUW6SxzCTytB*IX?Q}&Y23;28EW>cA_u6B1r=CfL;bkZ
z>)PR%l{uH7<hIoz%DCYag;)zRY3Rnp-|l~G1qqG_GlhQGs{6I7GavK{>EFe+Upfv^
zJi_ToZy)P)zL-1Xl)tQU>(oaCs|2$ohWtP6G`B5wJhl#rBZcxWS0(S?nK$x~d=e+P
zLsNaD{jN#;#1BP?5*J)X&jYGxTN<Kdt6X~h>|y;Gc#ZABzqoC3C+rM}6#}Z0bkz%l
zDk}z&FYOx<KYr#8{YCeqo$+=87sdZUvs5pZ#t8WQ)LCEBVk`RTLjVisx<@KQUv7?k
z?2y{yZ1y22Imc}VoC!z3OuUTFmap_vKkx&gOjl*tq`zeBe%Zc7Yb8-Whd!+<tPXB6
zfTVsb1EDSLW2rZ3MVwJXeK+v}9(U&<|FqWNZ{|F<re+rZkYo&8Sk>AZUdot}?&<Hz
z)Bw7*Y#dqgluE1GKsT|CR_u9fB{txqtwc4N`$#hbi8BDpOfdBt@e7<XDCN}tn$42;
zC5bn1{S<Jk-545;N`3I*%U~<H^|J4FaxlbRDe~y)tNA^_{pLZ>TBtor*R!f2_2pRs
zknQ<?3UOaU>0Rwv5We_|IVYTz!q@ht-bCi1M0shVezsF-3qYau+wSIM5MW5nfp$D)
za~QttnpvxRt!&RF{9i2mUp<h61O7LYHqfo+?Lv9w^vDSA{RH}af{(WAUv?`;%cE4Q
zIMq1Rj^vcRT8ypqXSnAxx$q_WVQk#AQK*^FaD0YA!f$44uufHq#MeI>!!HMP-F2zX
z(;FDerwo{sdx~hxiXy(ls^W$doeFW3wHkh7$vSEMQQGgLam$aWX7tr*29qi4k+=!}
zH_9=ll`~@lMO9whT!#xRiL><68_pDw+_oKbFp6{l#`+2g?5sB|cPLQ+sPf#x%v&1E
z>nb7p))~+-%Ds=H!av`#)Z32!9vqUy`!W4LP@cBKN5iVk+oYxDWRNs&ul`KO8J)S|
z@w20Gg6``~JFIwIAsF%WrB7#r1x(svEdQntADc?2=UX7MxUt;6#mm+~bwa26@18hI
z8M)1n<QQ36dxN)Ig&o8cJ;pL}bU&J8g^x~M&hz1*S9GORJ~m+|o)Q9<kpr$<h47H7
z)D*-d5FzK{!pEAF_FwkMz5mBcLjEx;j8aYtq#oX|f~~Qlxa4$tI4VZ-@+6H*gY_Ep
zAe!=ObI8xL2m=nsOe#$PQj`4LN@0^9UL3PX(ci!iJ`5>0BkdfInNS?jzx@a&Gj;np
zZG)^Fq;CIMJ)>Ll|C{t+-yh}gWd99$z+jK)e>fffB_(odN}lqh`;V{-*^J!Nt+Z{*
zOMART_zUf8Bynf@0em~gdqAlK@LIg!e5SO8gwlmVj+wfbjEy=FT1Ugk8#$cRXN8wY
z2WQv+MYjI!kHfP{=TjUHqsafsunKv&r=>byCN(|n7_E_{)xCL|&{fcAkqT4G9L+UV
z)IiO=Z0hp2_70!N2MzR?;=r6Nw=*+4bn<$oX!=%5T+`X^hTx$;t0tQH#<7{C_!V70
zMg~UPfXV6K;o`r%`Ld)w>OnRq&L7L}Gk%U@p82{|lnPK`={MD)IJ~1|LaI?~fpF2A
zHGYn!n851pCD=EAJH(RG>hEw5Kuv@ngrhbi>g-m?Ts%dFd)4#<mfDnJ@iMKot-T4s
znvj#<tdAObaOXeQ#-<sD^9USx$^<_ybBQ09jlP;Fyt(IpIUV8phdyaK(n0(Krc?vF
z1}M<VO1NGn%J%~JC~v#Fn82Pt2y}yvKq<~FJmZj3dOV<f6EHDabZ&jz{x)2f3lW)V
zQ_*r3B;-N(x^|ydAMhU;F05zgNNWYQYRy2KgFjR<9$JML?wO3~)ZvJIL5k71o!1~L
zforO8wbqQXldIb`IcR6k2B#(Ps^LItm`Rsa9+J@|d-l&`-TclVeempX))MPXjZdmA
z?`4Z6W`1l3v4L=l;NR)u+q+Z(zuBF&maBzlF%_ZPqkB!8M{i=oBONMGSH;{w)Sc<#
zX-r7yjFZSx*BDW$g<RX>-mcQ_Lwpr~nz6&WW>q-6Jm+&88E(kD&^F%yC3-p;dk|jv
zwz(Y5_V_#nxO@4L^^z5CkCi%1)nuyHDE4PFlEyaG!J10HYuB?V|AUgZC;A?_j0sDQ
ztr6T6QtEusv|;04&nd@k>)&SBDaE$P$J&TEF*cH0ykRP$0w+mHojn}Kn%II><>fWf
zOyt=()H<e{#K-?sOdq!nELhkG^H#P9xw=OOtFYe<6ZwNs(z)lHJ&u;8spxLe2v-=~
zC*q^J;C0v@z52CA?aRC1wd14uDS<dtVx$zk(BR(@N4AI&2Lh?$s+XM9%#X|e8?s&`
z{Rgt9l`~Eb#i&Zd4Pu=2&e%}utI##`ftUC`xyLrF&q5*h6!S9U^fqhIQr}7(Y2R<y
zW9D;rY&P^APV-Jrh+UtisxGwHTDdRjb_jFac|hqpnGw8^8;0j*dZU>TLeU+~sDS&)
z7#+~Ant!ros_$$z$`}SYq7}#Mr7jsp@DfCctAMm!J*-|gHb9X!_Hi-oPj%W)KGZP^
yL}9oQ&zcjH4mogmx&`jUBS8*Kj}5qadF50oW0mTKYzj9LBFKMIk*<_93Ho1rvByUM

literal 9640
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
WLuIq7D%|K59#~yhtzOkW>i+;ptqi>Y


From d2a8ed8e0e1fc7b37fa7c60ce8bc45d7f93bef8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 19 Oct 2021 15:30:35 +0800
Subject: [PATCH 07/11] =?UTF-8?q?REPORT-58796=20=E3=80=90=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B6=E3=80=91=E7=BB=84=E4=BB=B6=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E5=B0=BA=E5=AF=B8=E8=B6=85500*300=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=A9=E5=B0=8F=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/ui/generate/ShareGeneratePane.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 99d6c556b..b3a751b5f 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
@@ -19,24 +19,22 @@ import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.exception.LackOfValueException;
 import com.fr.design.mainframe.share.generate.ComponentGeneratorCenter;
 import com.fr.design.mainframe.share.select.ComponentTransformerFactory;
-import com.fr.design.mod.ContentObjectManager;
-import com.fr.form.share.exception.NetWorkFailedException;
-import com.fr.form.share.group.DefaultShareGroup;
 import com.fr.design.mainframe.share.util.ShareUIUtils;
+import com.fr.design.mod.ContentObjectManager;
 import com.fr.design.share.effect.EffectItemGroup;
 import com.fr.design.share.utils.EffectItemUtils;
 import com.fr.design.share.utils.ShareDialogUtils;
 import com.fr.form.share.DefaultSharableWidget;
+import com.fr.form.share.Group;
 import com.fr.form.share.config.ComponentReuseConfigManager;
+import com.fr.form.share.exception.NetWorkFailedException;
+import com.fr.form.share.group.DefaultShareGroup;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.Group;
 import com.fr.form.share.record.ShareWidgetInfoManager;
 import com.fr.form.ui.Widget;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import java.util.HashSet;
-import java.util.Set;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingWorker;
@@ -51,7 +49,9 @@ import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.event.ItemEvent;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -65,8 +65,8 @@ public class ShareGeneratePane extends BasicPane {
     private static final Dimension DIALOG_SIZE = new Dimension(670, 760);
     private static final Dimension DIALOG_NORMAL_SIZE = new Dimension(670, 610);
     private static final Border DIALOG_BORDER = BorderFactory.createEmptyBorder(0, 6, 4, 6);
-    private static final double MAX_WIDTH = 500.0;
-    private static final double MAX_HEIGHT = 260.0;
+    private static final double MAX_WIDTH = 960.0;
+    private static final double MAX_HEIGHT = 540.0;
 
     private JPanel mainPane = null;
     private ShareMainPane uploadPane = null;

From fbffe1bb5c469e3fab42410a8324d3ec382d963d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 19 Oct 2021 16:38:20 +0800
Subject: [PATCH 08/11] REPORT-58796

---
 .../share/action/CreateComponentAction.java   | 27 ++++++++++++-
 .../share/ui/generate/ShareGeneratePane.java  | 39 +------------------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
index 476afe8b6..a86f5043a 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
@@ -81,6 +81,9 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE;
  * 创建组件事件
  */
 public class CreateComponentAction extends UpdateAction {
+    private static final double MAX_WIDTH = 10.0;
+    private static final double MAX_HEIGHT = 540.0;
+
     ShareUIAspect aspect;
     /**
      * 等待时间 500 ms.
@@ -114,8 +117,12 @@ public class CreateComponentAction extends UpdateAction {
         // 获取选中的组件
         Triple<Widget, XCreator, Rectangle> sharedTriple = ComponentTransformerFactory.getInstance().transform(selection);
         if (sharedTriple == null) {
-            FineJOptionPane.showMessageDialog(designerFrame, Toolkit.i18nText("Fine-Design_Share_Select_Error_Tip"),
-                    Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), ERROR_MESSAGE, IOUtils.readIcon("/com/fr/base/images/share/Information_Icon_warning_normal_32x32.png"));
+            showErrMsgDialog(Toolkit.i18nText("Fine-Design_Share_Select_Error_Tip"));
+            return;
+        }
+
+        if (isBeyondMaxSize(sharedTriple.getRight())) {
+            showErrMsgDialog(Toolkit.i18nText("Fine-Design_Share_Widget_Size_Error_Tip"));
             return;
         }
 
@@ -398,4 +405,20 @@ public class CreateComponentAction extends UpdateAction {
         }
         return paras;
     }
+
+    private boolean isBeyondMaxSize(Rectangle rec) {
+        double width = rec.getWidth();
+        double height = rec.getHeight();
+        return width > 0 && height > 0 && (width > MAX_WIDTH || height > MAX_HEIGHT);
+    }
+
+    private void showErrMsgDialog(String err) {
+        FineJOptionPane.showMessageDialog(
+                DesignerContext.getDesignerFrame(),
+                err,
+                Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                ERROR_MESSAGE,
+                IOUtils.readIcon("/com/fr/base/images/share/Information_Icon_warning_normal_32x32.png")
+        );
+    }
 }
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 b3a751b5f..2d027db89 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
@@ -65,8 +65,6 @@ public class ShareGeneratePane extends BasicPane {
     private static final Dimension DIALOG_SIZE = new Dimension(670, 760);
     private static final Dimension DIALOG_NORMAL_SIZE = new Dimension(670, 610);
     private static final Border DIALOG_BORDER = BorderFactory.createEmptyBorder(0, 6, 4, 6);
-    private static final double MAX_WIDTH = 960.0;
-    private static final double MAX_HEIGHT = 540.0;
 
     private JPanel mainPane = null;
     private ShareMainPane uploadPane = null;
@@ -213,7 +211,6 @@ public class ShareGeneratePane extends BasicPane {
         dialog.setButtonEnabled(false);
         ShareDialogUtils.getInstance().setShareDialog(dialog);
         dialog.addDialogActionListener(new DialogActionAdapter() {
-
             @Override
             public void doOk() {
                 ShareMainPane mainPane = getSelectMainPane();
@@ -297,29 +294,11 @@ public class ShareGeneratePane extends BasicPane {
     }
 
     private boolean generateModule(DefaultSharableWidget info) throws Exception {
-
-        DefaultSharableWidget transformInfo = transform(info);
-        ComponentGenerateInfo generateInfo = new ComponentGenerateInfo(uploadCheckbox.isSelected(), jt, paraMap, shareWidget, transformInfo);
+        ComponentGenerateInfo generateInfo = new ComponentGenerateInfo(uploadCheckbox.isSelected(), jt, paraMap, shareWidget, info);
         ComponentGeneratorCenter center = new ComponentGeneratorCenter(generateInfo);
         return center.generate();
     }
 
-    private DefaultSharableWidget transform(DefaultSharableWidget info) {
-        confineSize(info);
-
-        //先屏蔽
-        //if (shareWidget instanceof AbstractBorderStyleWidget) {
-        //    AbstractBorderStyleWidget styleWidget = (AbstractBorderStyleWidget) shareWidget;
-        //    ExtendSharableAttrMark attrMark = styleWidget.getWidgetAttrMark(ExtendSharableAttrMark.XML_TAG);
-        //    if (attrMark != null) {
-        //        String shareId = attrMark.getShareId();
-        //        info.setId(shareId);
-        //    }
-        //}
-        return info;
-    }
-
-
     @Override
     protected String title4PopupWindow() {
         return Toolkit.i18nText("Fine-Design_Share_Module_Msg");
@@ -328,20 +307,4 @@ public class ShareGeneratePane extends BasicPane {
     private Dimension getDialogSize() {
         return effectItemGroups.size() > 0 ? DIALOG_SIZE : DIALOG_NORMAL_SIZE;
     }
-
-
-    private void confineSize(DefaultSharableWidget info) {
-        double width = info.getWidth();
-        double height = info.getHeight();
-        if (width > 0 && height > 0 && (width > MAX_WIDTH || height > MAX_HEIGHT)) {
-            double aspectRatio = width / height;
-            if (width / height > MAX_WIDTH / MAX_HEIGHT) {
-                info.setWidth((int) MAX_WIDTH);
-                info.setHeight((int) (MAX_WIDTH / aspectRatio));
-            } else {
-                info.setHeight((int) MAX_HEIGHT);
-                info.setWidth((int) (MAX_HEIGHT * aspectRatio));
-            }
-        }
-    }
 }

From 18c92584eeaa93079f28a8b2b00b73de4a11b641 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 19 Oct 2021 15:28:44 +0800
Subject: [PATCH 09/11] =?UTF-8?q?REPORT-60982=20=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96-=E7=82=B9=E5=87=BB=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=90=8E=E7=BD=91=E7=BB=9C=E8=BE=83=E6=85=A2?=
 =?UTF-8?q?=E6=97=B6=E8=BF=87=E6=B8=A1=E4=B8=8D=E5=90=88=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
修改主题下载交互
1. 添加加载动画
2. 下载是弹窗菜单不消失

【改动思路】
同上
---
 .../actions/DownloadSuitableThemeAction.java  |  31 ++++++++---
 .../share/ui/actions/LoadingMenuItem.java     |  50 ++++++++++++++++++
 .../SharedComponentActionMenuItemUI.java      |  37 ++++++++-----
 .../ui/block/AbstractOnlineWidgetBlock.java   |   3 +-
 .../com/fr/design/form/images/loading.gif     | Bin 0 -> 3430 bytes
 5 files changed, 101 insertions(+), 20 deletions(-)
 create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/LoadingMenuItem.java
 create mode 100644 designer-form/src/main/resources/com/fr/design/form/images/loading.gif

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
index 399a644b4..f8f4cc1a7 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
@@ -10,6 +10,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIMenuItemUI;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.DesignerLoginHelper;
 import com.fr.design.login.DesignerLoginSource;
@@ -39,22 +40,35 @@ import java.util.concurrent.ExecutionException;
  */
 public class DownloadSuitableThemeAction extends UpdateAction {
     private final String themePath;
+    private final UIPopupMenu popupMenu;
     private boolean downloading = false;
     private JTemplate<?, ?> currentTemplate;
 
-    public DownloadSuitableThemeAction(String themePath) {
+    public DownloadSuitableThemeAction(String themePath, UIPopupMenu popupMenu) {
         this.themePath = themePath;
+        this.popupMenu = popupMenu;
         this.putValue(Action.SMALL_ICON, null);
         this.setName(Toolkit.i18nText("Fine-Design_Share_Download_Suitable_Theme"));
     }
 
     @Override
     public UIMenuItem createMenuItem() {
-        UIMenuItem menuItem = super.createMenuItem();
-        menuItem.setOpaque(true);
-        menuItem.setBackground(ColorConstants.BACKGROUND);
-        menuItem.setUI(new SharedComponentActionMenuItemUI());
-        return menuItem;
+        return getLoadingMenuItem();
+    }
+
+    public LoadingMenuItem getLoadingMenuItem() {
+        Object object = this.getValue(LoadingMenuItem.class.getName());
+        if (object == null) {
+            UIMenuItem menuItem = new LoadingMenuItem(this);
+            // 设置名字用作单元测
+            menuItem.setName(getName());
+            setPressedIcon4Button(menuItem);
+            setDisabledIcon4Button(menuItem);
+            object = menuItem;
+
+            this.putValue(LoadingMenuItem.class.getName(), object);
+        }
+        return (LoadingMenuItem) object;
     }
 
     @Override
@@ -91,6 +105,8 @@ public class DownloadSuitableThemeAction extends UpdateAction {
         }
         downloading = true;
 
+        LoadingMenuItem menuItem = getLoadingMenuItem();
+        menuItem.startLoading();
         new SwingWorker<FormTheme, Void>() {
 
             @Override
@@ -109,11 +125,14 @@ public class DownloadSuitableThemeAction extends UpdateAction {
 
                 onThemeFetched(theme);
                 downloading = false;
+                LoadingMenuItem menuItem = getLoadingMenuItem();
+                menuItem.stopLoading();
             }
         }.execute();
     }
 
     public void onThemeFetched(FormTheme theme) {
+        popupMenu.menuSelectionChanged(false);
         if (theme == null) {
             return;
         }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/LoadingMenuItem.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/LoadingMenuItem.java
new file mode 100644
index 000000000..6262c34a3
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/LoadingMenuItem.java
@@ -0,0 +1,50 @@
+package com.fr.design.mainframe.share.ui.actions;
+
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.mainframe.share.ui.constants.ColorConstants;
+import com.fr.general.IOUtils;
+
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import java.awt.Graphics;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/10/19
+ */
+public class LoadingMenuItem extends UIMenuItem {
+    private boolean loading = false;
+
+    private final Icon profileIcon = IOUtils.readIcon("/com/fr/design/form/images/loading.gif");
+
+    public LoadingMenuItem(Action action) {
+        super(action);
+        setOpaque(true);
+        setBackground(ColorConstants.BACKGROUND);
+        setUI(new SharedComponentActionMenuItemUI(false));
+    }
+
+    public void startLoading() {
+        loading = true;
+        setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
+        revalidate();
+        repaint();
+    }
+
+    public void stopLoading() {
+        loading = false;
+        setBorder(BorderFactory.createEmptyBorder());
+        revalidate();
+        repaint();
+    }
+
+    @Override
+    protected void paintBorder(Graphics g) {
+        super.paintBorder(g);
+        if (loading) {
+            profileIcon.paintIcon(this, g, getWidth() - 20, 0);
+        }
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
index ca4d499b1..8a3fe5e1c 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/SharedComponentActionMenuItemUI.java
@@ -8,7 +8,7 @@ import com.fr.stable.Constants;
 import javax.swing.ButtonModel;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
+import javax.swing.MenuSelectionManager;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -20,6 +20,16 @@ import java.awt.Graphics2D;
  */
 public class SharedComponentActionMenuItemUI extends UIMenuItemUI {
 
+    private final boolean autoClosePopup;
+
+    public SharedComponentActionMenuItemUI(boolean autoClosePopup) {
+        this.autoClosePopup = autoClosePopup;
+    }
+
+    public SharedComponentActionMenuItemUI() {
+        this(true);
+    }
+
     @Override
     protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) {
         ButtonModel model = menuItem.getModel();
@@ -27,18 +37,19 @@ public class SharedComponentActionMenuItemUI extends UIMenuItemUI {
         int menuWidth = menuItem.getWidth();
         int menuHeight = menuItem.getHeight();
 
-        g.setColor(UIConstants.NORMAL_BACKGROUND);
-        g.fillRect(0, 0, menuWidth, menuHeight);
-        if (menuItem.isOpaque()) {
-            if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
-                GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
-            } else {
-                GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, menuItem.getBackground(), 7);
-            }
-            g.setColor(oldColor);
-        } else if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
-            GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
-            g.setColor(oldColor);
+        if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
+            GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 0);
+        }
+
+        g.setColor(oldColor);
+    }
+
+    @Override
+    protected void doClick(MenuSelectionManager msm) {
+        if (autoClosePopup) {
+            super.doClick(msm);
+        } else {
+            menuItem.doClick(0);
         }
     }
 }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
index 5ce5b57dd..3be4f96b9 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
@@ -116,12 +116,13 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
     public JPopupMenu createRightClickPopupMenu() {
         UIPopupMenu popupMenu = new UIPopupMenu();
         popupMenu.setOnlyText(true);
+        popupMenu.setOpaque(true);
         popupMenu.setBackground(ColorConstants.BACKGROUND);
 
         OnlineShareWidget widget = getWidget();
         String suitableThemeFile = widget.getThemePath();
         if (StringUtils.isNotEmpty(suitableThemeFile)) {
-            popupMenu.add(new DownloadSuitableThemeAction(suitableThemeFile).createMenuItem());
+            popupMenu.add(new DownloadSuitableThemeAction(suitableThemeFile, popupMenu).createMenuItem());
         }
 
         popupMenu.add(new Jump2DetailAction(getWidget().getId()).createMenuItem());
diff --git a/designer-form/src/main/resources/com/fr/design/form/images/loading.gif b/designer-form/src/main/resources/com/fr/design/form/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a3c061b0f190ad1bd5199898f5e61fb55e7966e1
GIT binary patch
literal 3430
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
Jg#b9oe*nk_H`xFH

literal 0
HcmV?d00001


From 0c4766d46652ac6366cdef30986e0523914b560e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 19 Oct 2021 17:06:17 +0800
Subject: [PATCH 10/11] REPORT-58796

---
 .../fr/design/mainframe/share/action/CreateComponentAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
index a86f5043a..364588813 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java
@@ -81,7 +81,7 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE;
  * 创建组件事件
  */
 public class CreateComponentAction extends UpdateAction {
-    private static final double MAX_WIDTH = 10.0;
+    private static final double MAX_WIDTH = 960.0;
     private static final double MAX_HEIGHT = 540.0;
 
     ShareUIAspect aspect;

From 0b5bc65816a9aa509ce54be81de8fbacedf1172c Mon Sep 17 00:00:00 2001
From: zack <zack@fanruan.com>
Date: Tue, 19 Oct 2021 17:06:42 +0800
Subject: [PATCH 11/11] =?UTF-8?q?REPORT-60993=20=E5=AF=BC=E5=87=BA-?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BA=8B=E4=BB=B6-=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/javascript/ExportJavaScriptPane.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
index b559c22e6..b57531ef7 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
@@ -218,6 +218,10 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.add(editorPane, BorderLayout.CENTER);
         }
 
+        public void reset() {
+            editorPane.populate(new SingleJavaScript[0]);
+        }
+
         @Override
         protected String title4PopupWindow() {
             return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting");
@@ -758,6 +762,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
     public void populateBean(ExportJavaScript ob) {
         if (ob == null) {
             ob = new ExportJavaScript();
+            otherTemplatePane.reset();
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {