liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20230625-动态防护-weboffice文件名处理' into 'release_20230714'

Browse Source 
7.14 动态防护 weboffice文件名处理

See merge request eshop/fe_service_ebtp_frontend!307
This commit is contained in:
jl-zhoujl2
2023-07-14 03:15:06 +00:00
parent 59782ac2ee 13f9564df3
commit 3431213adc
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/Weboffice4Path.html
View File

@ -59,7 +59,7 @@
<!--AfterPublishAsPDFToURL--> <!--AfterPublishAsPDFToURL-->
<body <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)"> <script type="text/javascript" for="TANGER_OCX" event="OnDocumentOpened(File, Document)">

2
public/webofficeComponent.html
View File

@ -79,7 +79,7 @@
savePDF=getQueryString('savePDF'); savePDF=getQueryString('savePDF');
HTMLfileCode=getQueryString('HTMLfileCode'); HTMLfileCode=getQueryString('HTMLfileCode');
saveHTML=getQueryString('saveHTML'); saveHTML=getQueryString('saveHTML');
fileName=getQueryString('fileName'); fileName=decodeURI(getQueryString('fileName'));
init(readonly,DocfileCode);" init(readonly,DocfileCode);"
> >
<script language="JScript" for="TANGER_OCX" event="OnCustomButtonOnMenuCmd(btnPos,btnCaption,btnCmdid)"> <script language="JScript" for="TANGER_OCX" event="OnCustomButtonOnMenuCmd(btnPos,btnCaption,btnCmdid)">

2
public/webofficeIeComponent.html
View File

@ -83,7 +83,7 @@
savePDF=getQueryString('savePDF'); savePDF=getQueryString('savePDF');
HTMLfileCode=getQueryString('HTMLfileCode'); HTMLfileCode=getQueryString('HTMLfileCode');
saveHTML=getQueryString('saveHTML'); saveHTML=getQueryString('saveHTML');
fileName=getQueryString('fileName'); fileName=decodeURI(getQueryString('fileName'));
init(readonly,DocfileCode);" init(readonly,DocfileCode);"
onbeforeunload="closePostMessage()" onbeforeunload="closePostMessage()"
> >

10
src/components/richText/wang/index.tsx
View File

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

2
src/pages/Evaluation/ReportPrint/index.tsx
View File

@ -89,7 +89,7 @@ const ReportPrint: React.FC<{}> = () => {
const onClickLink = (url: string, name: string, type: string, data: any) => { const onClickLink = (url: string, name: string, type: string, data: any) => {
editLoading(); editLoading();
const fileName: string = `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `（第${data.reviewSort}次重新评审）` : ''}`; 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); window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileType=' + type + '&fileName=' + format);
}; };

4
src/pages/webOffice/weboffice0609.tsx
View File

@ -2,7 +2,7 @@
* @Author: zhoujianlong * @Author: zhoujianlong
* @Date: 2021-06-09 15:29:07 * @Date: 2021-06-09 15:29:07
* @Last Modified by: zhoujianlong * @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 { Button, Modal } from 'antd';
import { LoadingOutlined } from '@ant-design/icons'; 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}`; openUrl += `.html?readonly=${readOnly}&DocfileCode=${docFileCode_}&PDFfileCode=${pdfFileCode_}&HTMLfileCode=${htmlFileCode_}&savePDF=${savePDF}&saveHTML=${saveHTML}&varNtkoGUID=${window.ntkoBrowser.thisNTKOGUID}`;
if (fileName != '') { if (fileName != '') {
const format = fileName.replace(/\//g, "-") //格式化文件名称 const format = encodeURI(encodeURI(fileName.replace(/\//g, "-"))) //格式化文件名称
openUrl += `&fileName=${format}` openUrl += `&fileName=${format}`
} }
window.ntkoBrowser.openWindow(openUrl); window.ntkoBrowser.openWindow(openUrl);