合并

one_stop_public/tableCompon/index.jsx

@@ -73,6 +73,7 @@ function getBase64(value) {
   return value ? base64.encode(new Buffer(value)) : null;
 
 }
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -117,6 +118,7 @@ const errorHandler = error => {
 
 let oldProps = {}
 const normFile = (e) => {
+  console.log(e)
   if (Array.isArray(e)) {
     return e;
   }
@@ -2710,16 +2712,33 @@ export default class tableCom extends Component {
           }
           break;
         case 'ImgUploadCom':
-
           cm = getFieldDecorator("img$" + dataColumn.base52, {
             valuePropName: 'fileList[0]',
             getValueFromEvent: normFile,
-          })(<Upload.Dragger disabled={disabled} accept={"image/*"} url={this.state.url || initValue} showUploadList={false} name="file" action={config.uploadUrl} onChange={info => this.changeUrl(info, dataColumn.base52)} multiple={false} style={{ padding: 0 }}>
-            {this.state.url || initValue ? <img src={config.httpServer + (this.state.url || initValue)} style={{ height: json.height, width: json.width }} /> : <div style={{ height: json.height, width: json.width }}>
-
-            </div>}
-
-          </Upload.Dragger>);
+          })(
+              <Upload.Dragger 
+                    disabled={disabled} 
+                    accept={"image/*"} 
+                    url={this.state.url || initValue} 
+                    showUploadList={false} 
+                    name="file" 
+                    action={config.uploadUrl} 
+                    onChange={info => this.changeUrl(info, dataColumn.base52)} 
+                    multiple={false} 
+                    style={{ padding: 0 }}>
+                    {this.state.url || initValue ? 
+                        <img 
+                        src={config.httpServer + (this.state.url || initValue)} 
+                        style={{ height: json.height, width: json.width }} /> 
+                        : <div 
+                            style={{ 
+                                height: json.height, 
+                                width: json.width }}>
+                    
+                </div>}
+
+            </Upload.Dragger>
+          );
           if (get === 'mobile' && json.isLabel && title) {
             cm = <Form.Item
               labelCol={{ span: json.labelSpan }}