From 70f73614747baf2e0f3d117ecd81511cecc5afff Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Sun, 25 Jun 2023 14:37:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?6.25=20=E5=8A=A8=E6=80=81=E9=98=B2=E6=8A=A4?=
 =?UTF-8?q?-weboffice=E6=96=87=E4=BB=B6=E5=90=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/webofficeComponent.html        | 2 +-
 public/webofficeIeComponent.html      | 2 +-
 src/pages/webOffice/weboffice0609.tsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/webofficeComponent.html b/public/webofficeComponent.html
index 1a1d680..846f62f 100644
--- a/public/webofficeComponent.html
+++ b/public/webofficeComponent.html
@@ -79,7 +79,7 @@
             savePDF=getQueryString('savePDF');
             HTMLfileCode=getQueryString('HTMLfileCode');
             saveHTML=getQueryString('saveHTML');
-            fileName=getQueryString('fileName');
+            fileName=decodeURI(getQueryString('fileName'));
             init(readonly,DocfileCode);"
             >
 <script language="JScript" for="TANGER_OCX" event="OnCustomButtonOnMenuCmd(btnPos,btnCaption,btnCmdid)">
diff --git a/public/webofficeIeComponent.html b/public/webofficeIeComponent.html
index 05b5a8e..1e9a381 100644
--- a/public/webofficeIeComponent.html
+++ b/public/webofficeIeComponent.html
@@ -83,7 +83,7 @@
             savePDF=getQueryString('savePDF');
             HTMLfileCode=getQueryString('HTMLfileCode');
             saveHTML=getQueryString('saveHTML');
-            fileName=getQueryString('fileName');
+            fileName=decodeURI(getQueryString('fileName'));
             init(readonly,DocfileCode);"
             onbeforeunload="closePostMessage()"
             >
diff --git a/src/pages/webOffice/weboffice0609.tsx b/src/pages/webOffice/weboffice0609.tsx
index e613f7b..2a29c07 100644
--- a/src/pages/webOffice/weboffice0609.tsx
+++ b/src/pages/webOffice/weboffice0609.tsx
@@ -2,7 +2,7 @@
  * @Author: zhoujianlong
  * @Date: 2021-06-09 15:29:07
  * @Last Modified by: zhoujianlong
- * @Last Modified time: 2022-06-24 23:26:28
+ * @Last Modified time: 2023-06-21 16:36:57
  */
 import { Button, Modal } from 'antd';
 import { LoadingOutlined } from '@ant-design/icons';
@@ -259,7 +259,7 @@ const WebOffice0609: React.FC<WebOfficeProps> = (props) => {
               }
               openUrl += `.html?readonly=${readOnly}&DocfileCode=${docFileCode_}&PDFfileCode=${pdfFileCode_}&HTMLfileCode=${htmlFileCode_}&savePDF=${savePDF}&saveHTML=${saveHTML}&varNtkoGUID=${window.ntkoBrowser.thisNTKOGUID}`;
               if (fileName != '') {
-                const format = fileName.replace(/\//g, "-") //格式化文件名称
+                const format = encodeURI(encodeURI(fileName.replace(/\//g, "-"))) //格式化文件名称
                 openUrl += `&fileName=${format}`
               }
               window.ntkoBrowser.openWindow(openUrl);

From 67069c02303d7734d77514d923662ba32f14b66e Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 27 Jun 2023 15:49:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?6.27=20=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/Weboffice4Path.html                 | 2 +-
 src/pages/Evaluation/ReportPrint/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/Weboffice4Path.html b/public/Weboffice4Path.html
index 94164a5..b7319f6 100644
--- a/public/Weboffice4Path.html
+++ b/public/Weboffice4Path.html
@@ -59,7 +59,7 @@
 <!--AfterPublishAsPDFToURL-->
 
 <body
-  onload="path=getQueryString('path');fileName=getQueryString('fileName');fileType=getQueryString('fileType');init(path);">
+  onload="path=getQueryString('path');fileName=decodeURI(getQueryString('fileName'));fileType=getQueryString('fileType');init(path);">
 
   <script type="text/javascript" for="TANGER_OCX" event="OnDocumentOpened(File, Document)">
 
diff --git a/src/pages/Evaluation/ReportPrint/index.tsx b/src/pages/Evaluation/ReportPrint/index.tsx
index b55f1d9..3f78bfc 100644
--- a/src/pages/Evaluation/ReportPrint/index.tsx
+++ b/src/pages/Evaluation/ReportPrint/index.tsx
@@ -89,7 +89,7 @@ const ReportPrint: React.FC<{}> = () => {
   const onClickLink = (url: string, name: string, type: string, data: any) => {
     editLoading();
     const fileName: string = `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `（第${data.reviewSort}次重新评审）` : ''}`;
-    const format = fileName.replace(/\//g, "-") //格式化文件名称
+    const format = encodeURI(encodeURI(fileName.replace(/\//g, "-"))) //格式化文件名称
     window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileType=' + type + '&fileName=' + format);
   };
 

From 13f9564df34cda65f2827de1ab7659b18128db03 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 3 Jul 2023 16:04:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?7.3=20=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8F=AA=E8=AF=BB=E7=8A=B6=E6=80=81=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/richText/wang/index.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/richText/wang/index.tsx b/src/components/richText/wang/index.tsx
index 4b4b928..ec07770 100644
--- a/src/components/richText/wang/index.tsx
+++ b/src/components/richText/wang/index.tsx
@@ -188,9 +188,6 @@ const BraftText: React.FC<WangType> = (props) => {
       /**一定要创建 */
       editor.create();
 
-      //控制是否可编辑
-      disabled && makeDis();
-
       willCreate = false;
     }
 
@@ -202,6 +199,11 @@ const BraftText: React.FC<WangType> = (props) => {
     }
   }, []);
 
+  useEffect(() => {
+    //控制是否可编辑
+    disabled && makeDis();
+  }, [disabled])
+
   useEffect(() => {
     // 重新设置编辑器内容
     echo && editor.txt.html(echo);
@@ -240,7 +242,7 @@ const BraftText: React.FC<WangType> = (props) => {
 
   //不可编辑
   function makeDis() {
-    editor.disable();
+    editor && editor.disable();
   }
 
   //form取值
