修复bug

one_stop_public/filePreview/index.jsx

@@ -3,7 +3,7 @@
  */
 import React, { Component } from 'react';
 import { Modal,Icon,Tooltip,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/libs/UploadCom.js

@@ -78,7 +78,7 @@ export default class UploadCom extends React.Component {
           </Upload>
           <ul style={{paddingLeft:8}}>
           {files.map((f)=>{
-            if(f.path.indexOf('.png') !=-1||f.path.indexOf('.jpg') !=-1){
+            if(f.path&&f.path.indexOf('.png') !=-1||f.path.indexOf('.jpg') !=-1){
               return <li key={f.path}><img style={{width:100,height:100}} src={queryApiActionPath() + f.path}/><Icon style={{marginLeft:10}} type="delete"  onClick={this.remove.bind(this,f.path)} /></li>
             }
             return <li key={f.path}><a target="_blank" key={f.path} href={queryApiActionPath()+f.path} >{f.name}</a> <Icon style={{marginLeft:10}} type="delete"  onClick={this.remove.bind(this,f.path)} /></li>

one_stop_public/tableCompon/index.jsx

@@ -65,7 +65,7 @@ const base64 = baseX(Bs64)
 import { Base16Encode } from "../Base16/index"
 import { getToken } from '../utils/token';
 import { formulaList }  from '../excelInitFuc/functionList';
-// import FilePreview from '../filePreview';
+import FilePreview from '../filePreview';
 const Item = MobileList.Item;
 const Brief = Item.Brief;
 function getBase64(value) {
@@ -1665,15 +1665,9 @@ export default class tableCom extends Component {
 
 
       if (json.isLabel) {
-        if (!isEdit && obj.defaultValues && obj.defaultValues[formKey]) {
+        if (obj.defaultValues && obj.defaultValues[formKey]) {
+          if(!isEdit ){
             return (
-            // <Form.Item
-            //   labelCol={{ span: json.labelSpan }}
-            //   wrapperCol={{ span: json.wrapperSpan }}
-            //   label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ""}
-            // >
-            //   {cm}
-            // </Form.Item>
             <Row
             style={{
               minHeight:40,
@@ -1706,7 +1700,18 @@ export default class tableCom extends Component {
                   {cm}
               </Col>
             </Row>
-          );
+            )
+          } else {
+            return (
+            <Form.Item
+              labelCol={{ span: json.labelSpan }}
+              wrapperCol={{ span: json.wrapperSpan }}
+              label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ""}
+            >
+              {cm}
+            </Form.Item>
+            )
+          }
         } else {
           if (get === 'mobile') {
             /**
@@ -1937,12 +1942,12 @@ 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>
-                    // }
+                    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}
 
@@ -2705,14 +2710,8 @@ export default class tableCom extends Component {
         // return <Row><Col span={6}>{title}:</Col><Col span={18}>{cm}</Col></Row>
       }
       if (get === 'web') {
+        if(!isEdit ){
           return (
-          // <Form.Item
-          //   labelCol={{ span: json.labelSpan }}
-          //   wrapperCol={{ span: json.wrapperSpan }}
-          //   label={title}
-          // >
-          //   {cm}
-          // </Form.Item>
             <Row
             style={{
               minHeight:40,
@@ -2745,7 +2744,18 @@ export default class tableCom extends Component {
                 {cm}
             </Col>
           </Row>
-        );
+          )
+        } else {
+          return (
+            <Form.Item
+            labelCol={{ span: json.labelSpan }}
+            wrapperCol={{ span: json.wrapperSpan }}
+            label={title}
+          >
+            {cm}
+          </Form.Item>
+          )
+        }
       } else {
 
         return cm