Skip to content

W
WebPublic
提交 400b6c77 authored 作者: chlolch's avatar chlolch
浏览文件
操作

修改bug

上级 6a477e1f
隐藏空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 111 行删除
one_stop_public/Table/isNewMobileTable.jsx
浏览文件 @ 400b6c77
...@@ -51,7 +51,7 @@ export default class isNewTable extends Component { ...@@ -51,7 +51,7 @@ export default class isNewTable extends Component {
marginTop: 0, marginTop: 0,
background: '#ffffff', background: '#ffffff',
paddingLeft: 12,
width: '100%', width: '100%',
flexWrap: 'wrap', flexWrap: 'wrap',
...style, ...style,
...@@ -71,8 +71,10 @@ export default class isNewTable extends Component { ...@@ -71,8 +71,10 @@ export default class isNewTable extends Component {
) : ( ) : (
<div <div
style={{ style={{
...styles, ...styles,
display:ary.content.isMobileHidden&&"none" borderBottom: '1px solid white',
display:ary.content&&ary.content.isMobileHidden&&"none"
}} }}
> >
<TableCom <TableCom
...@@ -112,7 +114,7 @@ export default class isNewTable extends Component { ...@@ -112,7 +114,7 @@ export default class isNewTable extends Component {
</> </>
); );
} }
if (isRowCol) { // if (isRowCol) {
return items.map((item, i) => { return items.map((item, i) => {
const allhidden = checkAllHidden(items); const allhidden = checkAllHidden(items);
return ( return (
...@@ -222,7 +224,7 @@ export default class isNewTable extends Component { ...@@ -222,7 +224,7 @@ export default class isNewTable extends Component {
</Row> </Row>
); );
}); });
} /* }
return items.map((item, i) => { return items.map((item, i) => {
const allhidden = checkAllHidden(items); const allhidden = checkAllHidden(items);
return ( return (
...@@ -348,8 +350,8 @@ export default class isNewTable extends Component { ...@@ -348,8 +350,8 @@ export default class isNewTable extends Component {
})} })}
</Card> </Card>
<WhiteSpace /> <WhiteSpace />
</> </>
); );
}); });*/
} }
} }
one_stop_public/tableCompon/MobileItem.jsx
浏览文件 @ 400b6c77
/** /**
* @file 移动端 Row,Col二次封装 * @file 移动端 Row,Col二次封装
*/ */
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Row, Col } from 'antd'; import { Form} from 'antd';
export default class MobileItem extends Component { export default class MobileItem extends Component {
render() { render() {
const { labelCol, wrapperCol, label,paddingTop } = this.props; return (<Form.Item {...this.props} label={this.props.label+"：："}/>)
const x = this.props.children.type=="span" }
return ( }
<Row style={{ \ No newline at end of file
minHeight:35,
fontSize:14
}}>
<Col
style={{
paddingTop:5,
minHeight: 35,
textAlign:"right"
}}
span={labelCol.span ? labelCol.span : labelCol}
>
{label}：
</Col>
<Col
span={wrapperCol.span ? wrapperCol.span : wrapperCol}
style={{
paddingTop:x?5:0,
minHeight: 35,
}}
>
{this.props.children}
</Col>
</Row>
);
}
}
one_stop_public/tableCompon/index.jsx
浏览文件 @ 400b6c77
...@@ -1659,70 +1659,7 @@ export default class tableCom extends Component { ...@@ -1659,70 +1659,7 @@ export default class tableCom extends Component {
(json.isMobileLabel == null && json.isLabel) (json.isMobileLabel == null && json.isLabel)
) { ) {
if (obj && obj.defaultValues && obj.defaultValues[formKey]) { if (obj && obj.defaultValues && obj.defaultValues[formKey]) {
if (!isEdit) {
return (
<Row
style={{
minHeight: 40,
lineHeight: '40px',
}}
>
<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}
<span
style={{
position: 'relative',
top: '-0.5px',
margin: '0 8px 0 2px',
}}
>
:
</span>
</>
) : sqlData[key] ? (
<>
{sqlData[key].title}
<span
style={{
position: 'relative',
top: '-0.5px',
margin: '0 8px 0 2px',
}}
>
:
</span>
</>
) : (
''
)}
</Col>
<Col
span={json.wrapperSpan}
style={{
position: 'relative',
lineHeight: '40px',
zoom: 1,
fontSize: 14,
}}
>
{cm}
</Col>
</Row>
);
} else {
return ( return (
<MobileItem <MobileItem
labelCol={{ span: json.labelSpan }} labelCol={{ span: json.labelSpan }}
...@@ -1732,7 +1669,7 @@ export default class tableCom extends Component { ...@@ -1732,7 +1669,7 @@ export default class tableCom extends Component {
{cm} {cm}
</MobileItem> </MobileItem>
); );
}
} else { } else {
return ( return (
<> <>
......
one_stop_public/tableCompon/style.less
浏览文件 @ 400b6c77
...@@ -13,16 +13,118 @@ ...@@ -13,16 +13,118 @@
//background-color: rgba(238, 238, 238, 0.801); //background-color: rgba(238, 238, 238, 0.801);
border-radius: 4px; border-radius: 4px;
} }
#mobile_table .ant-form-item-label.ant-col-0,#mobile_table .ant-form-item-control-wrapper.ant-col-0{
width: 0%;
}
#mobile_table .ant-form-item-label.ant-col-1,#mobile_table .ant-form-item-control-wrapper.ant-col-1{
width: 4.16666667%;
}
#mobile_table .ant-form-item-label.ant-col-2,#mobile_table .ant-form-item-control-wrapper.ant-col-2{
width: 8.33333333%;
}
#mobile_table .ant-form-item-label.ant-col-3,#mobile_table .ant-form-item-control-wrapper.ant-col-3{
width: 12.5%;
}
#mobile_table .ant-form-item-label.ant-col-4,#mobile_table .ant-form-item-control-wrapper.ant-col-4{
width: 16.66666667%;
}
#mobile_table .ant-form-item-label.ant-col-5,#mobile_table .ant-form-item-control-wrapper.ant-col-5{
width: 20.83333333%;
}
#mobile_table .ant-form-item-label.ant-col-6,#mobile_table .ant-form-item-control-wrapper.ant-col-6{
width: 25%;
}
#mobile_table .ant-form-item-label.ant-col-7,#mobile_table .ant-form-item-control-wrapper.ant-col-7{
width: 29.16666667%;
}
#mobile_table .ant-form-item-label.ant-col-8,#mobile_table .ant-form-item-control-wrapper.ant-col-8{
width: 33.33333333%;
}
#mobile_table .ant-form-item-label.ant-col-9,#mobile_table .ant-form-item-control-wrapper.ant-col-9{
width: 37.5%;
}
#mobile_table .ant-form-item-label.ant-col-10,#mobile_table .ant-form-item-control-wrapper.ant-col-10{
width: 41.66666667%;
}
#mobile_table .ant-form-item-label.ant-col-11,#mobile_table .ant-form-item-control-wrapper.ant-col-11{
width: 45.83333333%;
}
#mobile_table .ant-form-item-label.ant-col-12,#mobile_table .ant-form-item-control-wrapper.ant-col-12{
width: 50%;
}
#mobile_table .ant-form-item-label.ant-col-13,#mobile_table .ant-form-item-control-wrapper.ant-col-13{
width: 54.16666667%;
}
#mobile_table .ant-form-item-label.ant-col-14,#mobile_table .ant-form-item-control-wrapper.ant-col-14{
width: 58.33333333%;
}
#mobile_table .ant-form-item-label.ant-col-15,#mobile_table .ant-form-item-control-wrapper.ant-col-15{
width: 62.5%;
}
#mobile_table .ant-form-item-label.ant-col-16,#mobile_table .ant-form-item-control-wrapper.ant-col-16{
width: 66.66666667%;
}
#mobile_table .ant-form-item-label.ant-col-17,#mobile_table .ant-form-item-control-wrapper.ant-col-17{
width: 70.83333333%;
}
#mobile_table .ant-form-item-label.ant-col-18,#mobile_table .ant-form-item-control-wrapper.ant-col-18{
width: 75%;
}
#mobile_table .ant-form-item-label.ant-col-19,#mobile_table .ant-form-item-control-wrapper.ant-col-19{
width: 79.16666667%;
}
#mobile_table .ant-form-item-label.ant-col-20,#mobile_table .ant-form-item-control-wrapper.ant-col-20{
width: 83.33333333%;
}
#mobile_table .ant-form-item-label.ant-col-21,#mobile_table .ant-form-item-control-wrapper.ant-col-21{
width: 87.5%;
}
#mobile_table .ant-form-item-label.ant-col-22,#mobile_table .ant-form-item-control-wrapper.ant-col-22{
width: 91.66666667%;
}
#mobile_table .ant-form-item-label.ant-col-23,#mobile_table .ant-form-item-control-wrapper.ant-col-23{
width: 95.83333333%;
}
#mobile_table .ant-form-item-label.ant-col-24,#mobile_table .ant-form-item-control-wrapper.ant-col-24{
width:100%;
}
#mobile_table .ant-col-24{
border-bottom: 1px solid white,
}
#mobile_table .am-textarea-control textarea{ #mobile_table .am-textarea-control textarea{
background-color: #f5f5f5d3; background-color: #f5f5f5d3;
} }
#mobile_table>.am-card{ #mobile_table>.am-card{
min-height: 0; min-height: 0;
} }
#mobile_table .ant-form-item{ #mobile_table .ant-form-item{
margin-bottom: 8px; margin-bottom: 0px;
margin-top: 8px; background: white;
padding-bottom: 5px;
overflow: auto; overflow: auto;
scrollbar-width: none; /* Firefox */ scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE 10+ */ -ms-overflow-style: none; /* IE 10+ */
...@@ -32,12 +134,12 @@ ...@@ -32,12 +134,12 @@
left: -30px; left: -30px;
top: 1px; top: 1px;
} }
#mobile_table .ant-form-item-control{
margin-left: 15px;
padding-left: 12px;
}
#mobile_table .ant-form-item-label{ #mobile_table .ant-form-item-label{
padding-left: 10px;
padding-top: 9px;
text-align: right;
font-weight: bold;
} }
#MobileList .am-list-item{ #MobileList .am-list-item{
background-color: #fff; background-color: #fff;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论