Merge remote-tracking branch 'origin/master'

one_stop_public/filePreview/index.jsx

@@ -3,7 +3,7 @@
  */
 import React, { Component } from 'react';
 import { Modal,Popconfirm } from 'antd';
-import FileViewer from 'react-file-viewer';
+// import FileViewer from 'react-file-viewer';
 export default class index extends Component {
     constructor(props){
         super(props)
@@ -123,13 +123,13 @@ export default class index extends Component {
                                     height:600,
                                 }}
                                 >
-                                <FileViewer
+                                {/* <FileViewer
                                     fileType={type}
                                     filePath={path}
                                     // onError={this.onError}
                                     // errorComponent={Error}
                                     // unsupportedComponent={Error}
-                                />
+                                /> */}
                             </div>
                     }
 

one_stop_public/tableCompon/index.jsx

@@ -67,7 +67,6 @@ const base64 = baseX(Bs64)
 import { Base16Encode } from "../Base16/index"
 import { getToken } from '../utils/token';
 import { formulaList }  from '../excelInitFuc/functionList';
-import FilePreview from '../filePreview';
 const Item = MobileList.Item;
 const Brief = Item.Brief;
 function getBase64(value) {
@@ -1967,12 +1966,6 @@ export default class tableCom extends Component {
                     if (f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1) {
                       return <img key={index2} style={{ width: 100, height: 100 }} src={queryApiActionPath() + f.path} />
                     }
-                    if(get === 'web'){
-                      return <li key={index2}><FilePreview
-                                    path={queryApiActionPath() + f.path}
-                                    pathName={f.name}
-                                    /></li>
-                    }
                     return <li key={index2}><a target="_blank" key={f.path} href={queryApiActionPath() + f.path}>
                       {f.name}
 
@@ -1988,12 +1981,6 @@ export default class tableCom extends Component {
                     if (f.filePath.indexOf('.png') != -1 || f.filePath.indexOf('.jpg') != -1) {
                       return <img key={index2} style={{ width: 100, height: 100 }} src={queryApiActionPath() + f.filePath} />
                     }
-                    // if(get === 'web'){
-                    //   return <li key={index2}><FilePreview
-                    //                 path={queryApiActionPath() + f.path}
-                    //                 pathName={f.name}
-                    //                 /></li>
-                    // }
                     return <li key={index2}><a target="_blank" key={f.filePath} href={queryApiActionPath() + f.filePath}>
                       {f.fileName}
                     </a></li>