提交 9e8c0faf authored 作者: 徐立's avatar 徐立

调整表格padding

上级 f8917abb
...@@ -50,7 +50,12 @@ export default class ZdyTable extends Component { ...@@ -50,7 +50,12 @@ export default class ZdyTable extends Component {
formDeafault = '', // 为二维码快捷发起默认值 formDeafault = '', // 为二维码快捷发起默认值
} = this.props; } = this.props;
if (isPreview || isChild) { if (isPreview || isChild) {
this.setState({ ...this.state, ...this.props, isReady: true ,formConfig:{...this.state.formConfig,style:this.props.style }}); this.setState({
...this.state,
...this.props,
isReady: true,
formConfig: { ...this.state.formConfig, style: this.props.style },
});
return; return;
} }
...@@ -233,7 +238,12 @@ export default class ZdyTable extends Component { ...@@ -233,7 +238,12 @@ export default class ZdyTable extends Component {
isChild, // 是否为子表单 isChild, // 是否为子表单
} = nextProps; } = nextProps;
if (isPreview || isChild) { if (isPreview || isChild) {
this.setState({ ...this.state, ...this.props, isReady: true,formConfig:{...this.state.formConfig,style:this.props.style }}); this.setState({
...this.state,
...this.props,
isReady: true,
formConfig: { ...this.state.formConfig, style: this.props.style },
});
return; return;
} }
...@@ -611,7 +621,8 @@ export default class ZdyTable extends Component { ...@@ -611,7 +621,8 @@ export default class ZdyTable extends Component {
...styles, ...styles,
display: display:
cell.content && cell.content &&
cell.content.comName === 'InputHidden' && (cell.content.comName === 'InputHidden' ||
cell.content.comName === 'PartForm') &&
'none', 'none',
}} }}
> >
...@@ -711,7 +722,7 @@ export default class ZdyTable extends Component { ...@@ -711,7 +722,7 @@ export default class ZdyTable extends Component {
}) })
: ''} : ''}
<IsNewTable <IsNewTable
isRowCol={isRowCol} isRowCol={isRowCol}
modalInit={modalInit} modalInit={modalInit}
items={items} items={items}
checkAllHidden={this.checkAllHidden} checkAllHidden={this.checkAllHidden}
......
...@@ -129,7 +129,12 @@ export default class isNewTable extends Component { ...@@ -129,7 +129,12 @@ export default class isNewTable extends Component {
return ( return (
<Col <Col
style={{ style={{
...styles display:
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
...styles,
}} }}
span={ary.content?.labelSpan} span={ary.content?.labelSpan}
> >
...@@ -167,9 +172,17 @@ export default class isNewTable extends Component { ...@@ -167,9 +172,17 @@ export default class isNewTable extends Component {
); );
} }
return ( return (
<Col span={24} style={{ <Col
...styles span={24}
}}> style={{
display:
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
...styles,
}}
>
{!allhidden && ary.hidden ? ( {!allhidden && ary.hidden ? (
'' ''
) : ( ) : (
...@@ -243,6 +256,11 @@ export default class isNewTable extends Component { ...@@ -243,6 +256,11 @@ export default class isNewTable extends Component {
width: '100%', width: '100%',
height: '100%', height: '100%',
...styles, ...styles,
display:
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
}} }}
> >
<TableCom <TableCom
...@@ -280,11 +298,14 @@ export default class isNewTable extends Component { ...@@ -280,11 +298,14 @@ export default class isNewTable extends Component {
'' ''
) : ( ) : (
<Card.Body <Card.Body
style={ style={{
{ // textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right'
// textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right' display:
} ary.content &&
} (ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
}}
> >
{' '} {' '}
<div <div
......
.FormArray { .FormArray {
padding: 18px 12px 0 12px; padding: 18px 12px 0 12px;
...@@ -14,12 +13,10 @@ ...@@ -14,12 +13,10 @@
text-decoration: line-through; text-decoration: line-through;
} }
} }
} }
.colDom { .colDom {
:global { :global {
} }
} }
} }
...@@ -32,7 +29,9 @@ ...@@ -32,7 +29,9 @@
margin-bottom: 6px; margin-bottom: 6px;
} }
.ant-tag, .ant-tag a, .ant-tag a:hover { .ant-tag,
.ant-tag a,
.ant-tag a:hover {
color: #84d945; color: #84d945;
} }
} }
...@@ -63,7 +62,7 @@ ...@@ -63,7 +62,7 @@
.discrib { .discrib {
padding-left: 5px; padding-left: 5px;
font-size: 12px; font-size: 12px;
letter-spacing: .1px; letter-spacing: 0.1px;
color: #3a3a3a; color: #3a3a3a;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -72,7 +71,6 @@ ...@@ -72,7 +71,6 @@
line-height: @height; line-height: @height;
} }
} }
} }
.FieldListWithoutBg { .FieldListWithoutBg {
...@@ -99,7 +97,7 @@ ...@@ -99,7 +97,7 @@
} }
div:after { div:after {
content: " "; content: ' ';
display: inline-block; display: inline-block;
width: 100%; width: 100%;
} }
...@@ -108,7 +106,7 @@ ...@@ -108,7 +106,7 @@
.withoutBgDiscrib { .withoutBgDiscrib {
padding-left: 12px; padding-left: 12px;
font-size: 14px; font-size: 14px;
letter-spacing: .1px; letter-spacing: 0.1px;
color: #555; color: #555;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -124,7 +122,7 @@ ...@@ -124,7 +122,7 @@
// margin-top: 20px; // margin-top: 20px;
.row { .row {
background-color: rgba(255, 255, 255, 1);; background-color: rgba(255, 255, 255, 1);
} }
} }
...@@ -195,14 +193,13 @@ ...@@ -195,14 +193,13 @@
.NormalTable { .NormalTable {
@TableThemeColor: #5e9ede; @TableThemeColor: #5e9ede;
@TableThemeBgColor: #e6f7ff; @TableThemeBgColor: #e6f7ff;
padding: 6px 12px 0 12px; // padding: 6px 12px 0 12px;
:global { :global {
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
padding: 0 12px; padding: 0 12px;
height: 50px; height: 50px;
color: rgba(0, 0, 0, .65); color: rgba(0, 0, 0, 0.65);
background-color: #e9f2fb; background-color: #e9f2fb;
} }
...@@ -218,11 +215,14 @@ ...@@ -218,11 +215,14 @@
color: @TableThemeColor; color: @TableThemeColor;
} }
.ant-table-thead > tr > th, .ant-table-tbody > tr > td { .ant-table-thead > tr > th,
.ant-table-tbody > tr > td {
padding: 10px 16px; padding: 10px 16px;
} }
.ant-pagination-item-active, .ant-pagination-item:focus, .ant-pagination-item:hover { .ant-pagination-item-active,
.ant-pagination-item:focus,
.ant-pagination-item:hover {
border-color: @TableThemeColor; border-color: @TableThemeColor;
} }
...@@ -235,11 +235,13 @@ ...@@ -235,11 +235,13 @@
border-color: @TableThemeColor; border-color: @TableThemeColor;
} }
.ant-pagination-item:focus a, .ant-pagination-item:hover a { .ant-pagination-item:focus a,
.ant-pagination-item:hover a {
color: @TableThemeColor; color: @TableThemeColor;
} }
.ant-pagination-item-active:focus a, .ant-pagination-item-active:hover a { .ant-pagination-item-active:focus a,
.ant-pagination-item-active:hover a {
color: @TableThemeColor; color: @TableThemeColor;
} }
...@@ -248,7 +250,9 @@ ...@@ -248,7 +250,9 @@
border-color: @TableThemeColor; border-color: @TableThemeColor;
} }
.ant-checkbox-wrapper:hover .ant-checkbox-inner, .ant-checkbox:hover .ant-checkbox-inner, .ant-checkbox-input:focus + .ant-checkbox-inner { .ant-checkbox-wrapper:hover .ant-checkbox-inner,
.ant-checkbox:hover .ant-checkbox-inner,
.ant-checkbox-input:focus + .ant-checkbox-inner {
border-color: @TableThemeColor; border-color: @TableThemeColor;
} }
...@@ -260,7 +264,8 @@ ...@@ -260,7 +264,8 @@
background: @TableThemeColor; background: @TableThemeColor;
} }
tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row) > td, .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td { tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row) > td,
.ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
background: @TableThemeBgColor; background: @TableThemeBgColor;
} }
...@@ -272,11 +277,10 @@ ...@@ -272,11 +277,10 @@
} }
} }
.ButtonDiy { .ButtonDiy {
@blue: rgba(25, 152, 240, 1); @blue: rgba(25, 152, 240, 1);
@white: rgba(255, 255, 255, 1); @white: rgba(255, 255, 255, 1);
@red: #F14B5A; @red: #f14b5a;
padding-right: 12px; padding-right: 12px;
button { button {
...@@ -292,7 +296,9 @@ ...@@ -292,7 +296,9 @@
border-radius: 2px; border-radius: 2px;
border-color: @blue; border-color: @blue;
&:hover, &:active, &:focus { &:hover,
&:active,
&:focus {
background: @blue; background: @blue;
color: @white; color: @white;
border-color: @white; border-color: @white;
...@@ -314,7 +320,9 @@ ...@@ -314,7 +320,9 @@
border-radius: 2px; border-radius: 2px;
border-color: @red; border-color: @red;
&:hover, &:active, &:focus { &:hover,
&:active,
&:focus {
background: @red; background: @red;
color: @white; color: @white;
border-color: @white; border-color: @white;
...@@ -330,7 +338,9 @@ ...@@ -330,7 +338,9 @@
border-radius: 2px; border-radius: 2px;
border-color: @blue; border-color: @blue;
&:hover, &:active, &:focus { &:hover,
&:active,
&:focus {
background: @white; background: @white;
color: @blue; color: @blue;
border-color: @blue; border-color: @blue;
...@@ -346,13 +356,14 @@ ...@@ -346,13 +356,14 @@
border-radius: 2px; border-radius: 2px;
border-color: @red; border-color: @red;
&:hover, &:active, &:focus { &:hover,
&:active,
&:focus {
background: @white; background: @white;
color: @red; color: @red;
border-color: @red; border-color: @red;
} }
} }
} }
.collegeTitle { .collegeTitle {
...@@ -361,8 +372,6 @@ ...@@ -361,8 +372,6 @@
text-align: center; text-align: center;
padding-bottom: 74px; padding-bottom: 74px;
font-weight: 600; font-weight: 600;
} }
.collegeStyle { .collegeStyle {
...@@ -370,17 +379,17 @@ ...@@ -370,17 +379,17 @@
:global { :global {
.ant-col-2 { .ant-col-2 {
width: 10%; width: 10%;
text-align: center text-align: center;
} }
} }
} }
.colStyle { .colStyle {
color: #4992DF color: #4992df;
} }
.colStyle:hover { .colStyle:hover {
background: green background: green;
} }
.picName { .picName {
...@@ -398,7 +407,6 @@ ...@@ -398,7 +407,6 @@
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
} }
} }
} }
/*:global{ /*:global{
...@@ -407,7 +415,6 @@ ...@@ -407,7 +415,6 @@
} }
}*/ }*/
.searchChangeMaintain { .searchChangeMaintain {
margin-bottom: 0; margin-bottom: 0;
padding-top: 15px; padding-top: 15px;
...@@ -463,7 +470,7 @@ ...@@ -463,7 +470,7 @@
background-image: none; background-image: none;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-radius: 4px; border-radius: 4px;
transition: all .3s; transition: all 0.3s;
&:hover { &:hover {
border-color: #29a6ff; border-color: #29a6ff;
...@@ -500,7 +507,7 @@ ...@@ -500,7 +507,7 @@
cursor: pointer; cursor: pointer;
.itemInner { .itemInner {
transition: all .3s linear; transition: all 0.3s linear;
background-color: #fff; background-color: #fff;
height: 110px; height: 110px;
padding: 20px; padding: 20px;
...@@ -508,7 +515,8 @@ ...@@ -508,7 +515,8 @@
display: flex; display: flex;
&:hover { &:hover {
box-shadow: 0px 7px 8px -4px rgba(0, 0, 0, 0.2), 0px 12px 17px 2px rgba(0, 0, 0, 0.14), 0px 5px 20px 4px rgba(0, 0, 0, 0.12) !important; box-shadow: 0px 7px 8px -4px rgba(0, 0, 0, 0.2), 0px 12px 17px 2px rgba(0, 0, 0, 0.14),
0px 5px 20px 4px rgba(0, 0, 0, 0.12) !important;
} }
.left { .left {
...@@ -592,7 +600,6 @@ ...@@ -592,7 +600,6 @@
} }
} }
.customMultiple { .customMultiple {
.multipleBox { .multipleBox {
width: 100%; width: 100%;
...@@ -608,16 +615,15 @@ ...@@ -608,16 +615,15 @@
line-height: 1.5; line-height: 1.5;
&:hover { &:hover {
transition: all .3s linear; transition: all 0.3s linear;
background: #E9F2FB; background: #e9f2fb;
} }
&.active { &.active {
background: #008DFF; background: #008dff;
color: white; color: white;
} }
} }
} }
.operationBtnBox { .operationBtnBox {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论