From dfe0ea9969d615c019edf9b87c3d966d8e725a8d Mon Sep 17 00:00:00 2001
From: "Coral.Chen" <coral.chen@fanruan.com>
Date: Mon, 9 Jan 2023 17:07:34 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-86259=20=E3=80=90=E5=AF=BC=E5=87=BAexcel?=
 =?UTF-8?q?&word=E3=80=91=E4=BB=85=E9=99=90=E9=A2=84=E8=A7=88=E4=B8=8B?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=A4=8D=E5=88=B6=20REPORT-86426-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAexcel/pdf=20=E5=AF=86=E7=A0=81=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/report/ExportUniversalPane.java | 26 ++++++++++++++-----
 .../design/report/ReportExportAttrPane.java   |  5 ++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java b/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java
index 3714d66a27..dce865b402 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java
@@ -1,7 +1,6 @@
 package com.fr.design.report;
 
 import com.fr.base.CustomConfig;
-import com.fr.config.Configuration;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -11,16 +10,20 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.CloudCenter;
+import com.fr.io.attr.ReportExportAttr;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
 
 /**
+ * 通用
+ *
  * @author hades
  * @version 11.0
  * Created by hades on 2022/5/26
@@ -30,13 +33,15 @@ public class ExportUniversalPane extends BasicPane {
     private static final String HELP_URL = CloudCenter.getInstance().acquireUrlByKind("help.alt_font.zh_CN", "https://help.fanruan.com/finereport/doc-view-4707.html");
 
     private UICheckBox specialCharacterExport;
+    // 密码支持公式
+    private UICheckBox passwordSupportFormula;
 
     public ExportUniversalPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        JPanel outerNorthPane =FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Config"));
+        JPanel outerNorthPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Config"));
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
-        JPanel specialCharacterExportPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        JPanel specialCharacterExportPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
         specialCharacterExport = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Special_Character"));
         specialCharacterExport.setSelected(true);
         specialCharacterExportPane.add(specialCharacterExport);
@@ -55,6 +60,11 @@ public class ExportUniversalPane extends BasicPane {
         labelPane.add(centerLabel, BorderLayout.CENTER);
         labelPane.add(rightLabel, BorderLayout.EAST);
         northPane.add(labelPane);
+        JPanel passwordSupportPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        passwordSupportFormula = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Password_Support_Formula"));
+        passwordSupportFormula.setSelected(false);
+        passwordSupportPane.add(passwordSupportFormula);
+        northPane.add(passwordSupportPane);
         outerNorthPane.add(northPane);
         this.add(outerNorthPane);
     }
@@ -64,15 +74,17 @@ public class ExportUniversalPane extends BasicPane {
         return "ExportUniversalPane";
     }
 
-    public void populate() {
+    public void populate(ReportExportAttr reportExportAttr) {
         this.specialCharacterExport.setSelected(CustomConfig.getInstance().isOptimizedSpecialCharacterExport());
+        this.passwordSupportFormula.setSelected(reportExportAttr.isPwdSupportFormula());
     }
 
-    public void update() {
+    public void update(ReportExportAttr reportExportAttr) {
         Configurations.modify(new WorkerFacade(CustomConfig.class) {
             @Override
             public void run() {
                 CustomConfig.getInstance().setOptimizedSpecialCharacterExport(specialCharacterExport.isSelected());
+                reportExportAttr.setPwdSupportFormula(passwordSupportFormula.isSelected());
             }
         });
     }
diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java
index 2de520d273..cd992c3fdf 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java
@@ -61,7 +61,7 @@ public class ReportExportAttrPane extends BasicPane {
         }
 
         if (this.exportUniversalPane != null) {
-            this.exportUniversalPane.populate();
+            this.exportUniversalPane.populate(reportExportAttr);
         }
 
         if (this.excelExportPane != null) {
@@ -84,9 +84,8 @@ public class ReportExportAttrPane extends BasicPane {
     public ReportExportAttr update() {
 
         ReportExportAttr reportExportAttr = new ReportExportAttr();
-
         if (this.exportUniversalPane != null) {
-            this.exportUniversalPane.update();
+            this.exportUniversalPane.update(reportExportAttr);
         }
 
         if (this.excelExportPane != null) {