提交 62304db8 authored 作者: 徐立's avatar 徐立

修复bug

上级 7a8d505a
......@@ -1667,13 +1667,45 @@ export default class tableCom extends Component {
if (json.isLabel) {
if (!isEdit && obj.defaultValues && obj.defaultValues[formKey]) {
return (
<Form.Item
labelCol={{ span: json.labelSpan }}
wrapperCol={{ span: json.wrapperSpan }}
label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ""}
// <Form.Item
// labelCol={{ span: json.labelSpan }}
// wrapperCol={{ span: json.wrapperSpan }}
// label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ""}
// >
// {cm}
// </Form.Item>
<Row
style={{
minHeight:40,
lineHeight:'40px'
}}
>
{cm}
</Form.Item>
<Col
className={json.label ? json.label : sqlData[key] ?styles.row_col_div:''}
span={json.labelSpan}
style={{
textAlign:json.labelSpan === 24? 'left':'right',
lineHeight:'40px',
whiteSpace: 'nowrap',
overflow:'hidden',
fontSize:14,
color:'rgba(0,0,0,0.85)'
}}
>
{json.label ? json.label : sqlData[key] ? sqlData[key].title : ""}
</Col>
<Col
span={json.wrapperSpan}
style={{
position:'relative',
lineHeight:'40px',
zoom:1,
fontSize:14,
}}
>
{cm}
</Col>
</Row>
);
} else {
if (get === 'mobile') {
......@@ -1794,7 +1826,8 @@ export default class tableCom extends Component {
break;
case 'Input':
cm = <span>{obj[dataColumn.base52]}</span>;
cm = <span
>{obj[dataColumn.base52]}</span>;
break;
case 'InputHidden':
......@@ -2673,13 +2706,45 @@ export default class tableCom extends Component {
}
if (get === 'web') {
return (
<Form.Item
labelCol={{ span: json.labelSpan }}
wrapperCol={{ span: json.wrapperSpan }}
label={title}
>
{cm}
</Form.Item>
// <Form.Item
// labelCol={{ span: json.labelSpan }}
// wrapperCol={{ span: json.wrapperSpan }}
// label={title}
// >
// {cm}
// </Form.Item>
<Row
style={{
minHeight:40,
lineHeight:'40px'
}}
>
<Col
className={title?styles.row_col_div:''}
span={json.labelSpan}
style={{
textAlign:json.labelSpan === 24? 'left':'right',
lineHeight:'40px',
whiteSpace: 'nowrap',
overflow:'hidden',
fontSize:14,
color:'rgba(0,0,0,0.85)'
}}
>
{title}
</Col>
<Col
span={json.wrapperSpan}
style={{
position:'relative',
lineHeight:'40px',
zoom:1,
fontSize:14,
}}
>
{cm}
</Col>
</Row>
);
} else {
......
......@@ -81,4 +81,10 @@ line-height: 28px;
text-align: left;
font-weight: bold;
font-family: PingFang-SC-Regular;
}
.row_col_div::after{
content: ":";
position: relative;
top: -0.5px;
margin: 0 8px 0 2px;
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论