Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/Table/index.jsx

@@ -611,6 +611,7 @@ export default class ZdyTable extends Component {
                                         }}
                                       >
                                         <TableCom
+                                        isPrint={this.props.isPrint}
                                           formCode={formCode} // 当前表单code
                                           modalInit={modalInit}
                                           taskAssignee={taskAssignee} //提交人

one_stop_public/libs/ChildForm.jsx

@@ -104,7 +104,7 @@ export default class ChildForm extends React.Component {
         const gutter = json.gutter != null ? json.gutter : 0
         const rights = this.props.rights
         const xx =  form.getFieldValue(base52)
-        if(objs!=null){
+        if(objs!=null&&xx!=null){
             for(var x in objs){
                 if(xx[x]!=null)objs[x]=xx[x]
             }

one_stop_public/tableCompon/index.jsx

@@ -1641,7 +1641,7 @@ export default class tableCom extends Component {
             <>
               <ul>
                 {files.map((f, index2) => {
-                  if (f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1) {
+                  if (!this.props.isPrint&&(f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1)){
                     return (
                       <img
                         key={index2}
@@ -2056,7 +2056,7 @@ export default class tableCom extends Component {
                     //     />
                     //   );
                     // }
-                    if (get === 'web') {
+                    if (get === 'web'&&!this.props.isPrint) {
                       return (
                         <li key={index2}>
                           <FilePreview path={queryApiActionPath() + f.path} pathName={f.name} />
@@ -2088,7 +2088,7 @@ export default class tableCom extends Component {
                       //     />
                       //   );
                       // }
-                      if (get === 'web') {
+                      if (get === 'web'||!this.props.isPrint) {
                         return (
                           <li key={index2}>
                             <FilePreview path={queryApiActionPath() + f.path} pathName={f.name} />