提交 696aab4d authored 作者: chlolch's avatar chlolch

修改bug

上级 400b6c77
...@@ -113,11 +113,7 @@ export default class ChildForm extends React.Component { ...@@ -113,11 +113,7 @@ export default class ChildForm extends React.Component {
return ( return (
<WingBlank size="lg"> <WingBlank size="lg">
{Object.keys(objs).length > 1 || rights.includes("add") ? <Card style={{ marginLeft: '-27px' }}> {Object.keys(objs).length > 1 || rights.includes("add") ? <Card style={{ marginLeft: '-27px' }}>
{rights.includes("add") ?
!isEdit ? '' : (<Card.Header title={<span style={{ fontSize: 14, color: '#333333', fontWeight: 'bold' }}></span>}
extra={rights.includes("add") ? <Button style={{ margin: "auto" }} onClick={this.add}>{addName || "新增"}</Button> : ""}
/>) : ""
}
<Card.Body style={{ minHeight: 10 }}> <Card.Body style={{ minHeight: 10 }}>
{Object.keys(objs).map((r) => { {Object.keys(objs).map((r) => {
if (r == "") { if (r == "") {
...@@ -127,12 +123,17 @@ export default class ChildForm extends React.Component { ...@@ -127,12 +123,17 @@ export default class ChildForm extends React.Component {
<ZdyTable key={r} modalInit={modalInit} formCode={this.props.formCode} <ZdyTable key={r} modalInit={modalInit} formCode={this.props.formCode}
formId={this.props.formId} formId={this.props.formId}
formConfig={datas} get='mobile' fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} fatherObj={this.props.fatherObj} init={objs} isChild={true} form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} /> formConfig={datas} get='mobile' fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} fatherObj={this.props.fatherObj} init={objs} isChild={true} form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} />
{rights.includes("delete") && isEdit ? <Button type='danger' onClick={this.delete.bind(this, r)}>{deleteName || "删除"} </Button> : ''} {rights.includes("delete") && isEdit ? <Button type='danger' size="small" onClick={this.delete.bind(this, r)}>{deleteName || "删除"} </Button> : ''}
</Col> </Col>
</Row> </Row>
})} })}
{rights.includes("add") ? <Row>
<Col style={{textAlign:"center"}}><Button type="primary" size="small" style={{ margin: "auto"}} onClick={this.add}>{addName || "新增"}</Button> </Col>
</Row>:""}
</Card.Body> </Card.Body>
</Card> : ""} </Card> : ""}
</WingBlank> </WingBlank>
) )
} }
......
...@@ -2271,7 +2271,14 @@ export default class tableCom extends Component { ...@@ -2271,7 +2271,14 @@ export default class tableCom extends Component {
break; break;
case 'TextArea': case 'TextArea':
if (get === 'mobile') { if (get === 'mobile') {
cm = ( cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue,
rules:
json.vlds && json.vlds.length > 0
? json.vlds
: [{ required: required, message: '请输入' + title }],
})(<TextArea disabled={disabled} rows={4} placeholder={json.placeholder} />);
/* cm = (
<MobileTextareaItem <MobileTextareaItem
{...getFieldProps(dataColumn.base52, { {...getFieldProps(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
...@@ -2287,7 +2294,7 @@ export default class tableCom extends Component { ...@@ -2287,7 +2294,7 @@ export default class tableCom extends Component {
// title={<span className={styles.text}>{dataColumn.title}</span>} // title={<span className={styles.text}>{dataColumn.title}</span>}
placeholder={json.placeholder} placeholder={json.placeholder}
/> />
); ); */
if ( if (
((json.isMobileLabel != null && json.isMobileLabel) || ((json.isMobileLabel != null && json.isMobileLabel) ||
(json.isMobileLabel == null && json.isLabel)) && (json.isMobileLabel == null && json.isLabel)) &&
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论