打印bug修改

zyd_private/DragAndPrint/DragSetting.js

@@ -120,8 +120,14 @@ export default class Index extends Component {
 	render() {
 		const {
 			backgroundUrl,
-			configAll: { config },
+			configAll: { config, wide, high, },
 		} = this.props;
+
+    const imageStyle = {
+      height: high || '902px',
+      width: wide || 'auto',
+    };
+
 		return (
 			<div className={styles.outSideDiv}>
 				<div
@@ -130,12 +136,17 @@ export default class Index extends Component {
 					}}
 					style={{
 						padding: '12px',
+            ...imageStyle,
 					}}>
 					<img
 						src={backgroundUrl}
 						id={'dropZone'}
 						draggable={false}
 						className={styles.bgimage}
+            style={{
+              width: 'auto',
+              height: '100%',
+            }}
 						alt={'背景图'}
 					/>
 					{config.map((item, index) => {

zyd_private/DragAndPrint/ViewPrint/index.js

@@ -55,6 +55,13 @@ export default class ViewPrint extends Component {
             console.error(`${x.queryUrl}接口报错或者没有返回数据`);
             return false;
           }
+          for (let item of viewData) {
+            for (let x in item) {
+              if (item[x] === null || item[x] === 'null') {
+                item[x] = '';
+              }
+            }
+          }
           this.setState({
             viewData,
           });
@@ -197,7 +204,7 @@ export default class ViewPrint extends Component {
           <div
             ref={(node) => (this.content = node)}
             style={{
-              display: showWindowPrint || true ? 'block' : 'none',
+              display: showWindowPrint ? 'block' : 'none',
             }}>
             {viewData.map((info, index) => {
               return (
@@ -217,7 +224,7 @@ export default class ViewPrint extends Component {
                       style={{
                         width: 'auto',
                         height: '100%',
-                      }}    />
+                      }}/>
                   ) : null}
 
                   {this.detailDom(info)}