30332 通知书模板优化

zyd_public/components/DraggableSetting/index3.0.js

@@ -104,8 +104,14 @@ export default class FormatSetting extends Component {
 	};
 
 	render() {
-		const { bgImage, formatSettingObject, saveConfig } = this.props;
-
+		const { bgImage, formatSettingObject, saveConfig, pageConfiguration } = this.props;
+    console.log(formatSettingObject);
+    console.log(pageConfiguration, 'pageConfiguration');
+    let bgImageStyle = {};
+    if(pageConfiguration && pageConfiguration.width){
+      bgImageStyle.width = pageConfiguration.width + 'cm';
+      bgImageStyle.height = pageConfiguration.height + 'cm';
+    }
 		return (
 			<Fragment>
 				<Shell
@@ -128,8 +134,7 @@ export default class FormatSetting extends Component {
 							src={bgImage}
 							id={'dropZone'}
 							draggable={false}
-              style={{maxWidth: '21cm'}}
-              // TODO 2022年10月25日 要从配置项里面来
+              style={bgImageStyle}
               className={styles.bgimage}
 							alt={'背景图'}
 						/>
@@ -139,7 +144,7 @@ export default class FormatSetting extends Component {
 									draggable={true}
 									className={styles.inSideItem}
 									key={index}
-									id={x.name}
+									id={x.name + ''}
 									style={x.style}>
 									{x.name}
 								</div>