Merge remote-tracking branch 'origin/master'

one_stop_public/libs/ChildForm.jsx

 import React from 'react'
-import {  Button,  Row, Col, message } from 'antd';
+import { Button, Row, Col, message } from 'antd';
 import ZdyTable from '../Table'
 import UUID from 'react-native-uuid';
 
-import { Card, WingBlank} from 'antd-mobile';
+import { Card, WingBlank } from 'antd-mobile';
 
 
 export default class ChildForm extends React.Component {
@@ -142,11 +142,37 @@ export default class ChildForm extends React.Component {
                             span={span}
                         >
 
-                            <ZdyTable formConfig={datas} key={r} fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} fatherObj={this.props.fatherObj} init={objs} isChild={true} get="web" form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} />
+                            <ZdyTable
+                                formConfig={datas}
+                                key={r}
+                                fatherCode={base52}
+                                isEdit={isEdit}
+                                index={r}
+                                obj={objs[r]}
+                                fatherObj={this.props.fatherObj}
+                                init={objs} isChild={true}
+                                get="web"
+                                form={form}
+                                mapData={mapData}
+                                sqlData={sqlData}
+                                {...datas}
+                                defaultValues={defaultValues} />
 
                             {rights.includes("delete") && isEdit ? <Button size="small"
-                                style={{ position: "absolute", right: 10, top: '50%',transform:'translateY(-50%)' }}
-                                type='danger' onClick={this.delete.bind(this, r)}>{deleteName || "删除"}</Button> : ""}
+                                style={{
+                                    position: "absolute",
+                                    left: ' 95%',
+                                    top: '10px',
+                                    transform: 'translateY(-50%)',
+                                    borderRadius: '50%',
+                                    height: '13px',
+                                    width: '13px',
+                                    padding: 0,
+                                    lineHeight: '10px'
+                                }}
+                                type='danger'
+                                onClick={this.delete.bind(this, r)}>{deleteName || "-"}
+                            </Button> : ""}
 
                         </Col>