test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-05 05:28:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'amis/master'

Browse Source
This commit is contained in:
rickcole 2020-04-08 10:40:12 +08:00
commit cb6b4e4399
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scss/components/_table.scss
View File

@ -5,6 +5,10 @@
border-radius: $Table-borderRadius; border-radius: $Table-borderRadius;
margin-bottom: $gap-md; margin-bottom: $gap-md;
.#{$ns}Form-control > & {
margin-bottom: $gap-sm;
}
&-fixedLeft, &-fixedLeft,
&-fixedRight { &-fixedRight {
position: absolute; position: absolute;
@ -358,7 +362,7 @@
position: relative; position: relative;
&::before { &::before {
content: ""; content: '';
position: absolute; position: absolute;
width: px2rem(1px); width: px2rem(1px);
top: 0; top: 0;
@ -369,7 +373,7 @@
} }
&::after { &::after {
content: ""; content: '';
position: absolute; position: absolute;
height: px2rem(1px); height: px2rem(1px);
top: px2rem(20px); top: px2rem(20px);
@ -442,7 +446,7 @@
// position: relative; // position: relative;
&::before { &::before {
content: ""; content: '';
position: absolute; position: absolute;
width: px2rem(1px); width: px2rem(1px);
top: px2rem(30px); top: px2rem(30px);

5
scss/components/form/_combo.scss
View File

@ -1,6 +1,7 @@
.#{$ns}Combo { .#{$ns}Combo {
&-placeholder { &-placeholder {
color: $text--muted-color; color: $text--muted-color;
padding-top: px2rem(7px);
} }
&-toolbarBtn { &-toolbarBtn {
@ -111,9 +112,7 @@
0 (-$Combo--vertical-item-gap * 2); 0 (-$Combo--vertical-item-gap * 2);
> .#{$ns}Combo-placeholder { > .#{$ns}Combo-placeholder {
padding: ($Combo--vertical-item-gap * 2) ($Combo--vertical-item-gap * 2) margin: $Combo--vertical-item-gap * 2;
0 ($Combo--vertical-item-gap * 2);
margin-bottom: $Combo--vertical-item-gap * 2;
} }
} }

2
src/renderers/Form/Table.tsx
View File

@ -501,7 +501,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
columns.push({ columns.push({
type: 'operation', type: 'operation',
buttons: btns, buttons: btns,
width: 100, width: 150,
label: '操作' label: '操作'
}); });
} }