From a1e5351b99677c121864e097617bd86bc284870d Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Wed, 8 Apr 2020 10:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/components/_table.scss | 10 +++++++--- scss/components/form/_combo.scss | 5 ++--- src/renderers/Form/Table.tsx | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scss/components/_table.scss b/scss/components/_table.scss index 9589929b..60baa1b2 100644 --- a/scss/components/_table.scss +++ b/scss/components/_table.scss @@ -5,6 +5,10 @@ border-radius: $Table-borderRadius; margin-bottom: $gap-md; + .#{$ns}Form-control > & { + margin-bottom: $gap-sm; + } + &-fixedLeft, &-fixedRight { position: absolute; @@ -358,7 +362,7 @@ position: relative; &::before { - content: ""; + content: ''; position: absolute; width: px2rem(1px); top: 0; @@ -369,7 +373,7 @@ } &::after { - content: ""; + content: ''; position: absolute; height: px2rem(1px); top: px2rem(20px); @@ -442,7 +446,7 @@ // position: relative; &::before { - content: ""; + content: ''; position: absolute; width: px2rem(1px); top: px2rem(30px); diff --git a/scss/components/form/_combo.scss b/scss/components/form/_combo.scss index 8b37af07..43df4f03 100644 --- a/scss/components/form/_combo.scss +++ b/scss/components/form/_combo.scss @@ -1,6 +1,7 @@ .#{$ns}Combo { &-placeholder { color: $text--muted-color; + padding-top: px2rem(7px); } &-toolbarBtn { @@ -111,9 +112,7 @@ 0 (-$Combo--vertical-item-gap * 2); > .#{$ns}Combo-placeholder { - padding: ($Combo--vertical-item-gap * 2) ($Combo--vertical-item-gap * 2) - 0 ($Combo--vertical-item-gap * 2); - margin-bottom: $Combo--vertical-item-gap * 2; + margin: $Combo--vertical-item-gap * 2; } } diff --git a/src/renderers/Form/Table.tsx b/src/renderers/Form/Table.tsx index d4b91087..e10ab24e 100644 --- a/src/renderers/Form/Table.tsx +++ b/src/renderers/Form/Table.tsx @@ -501,7 +501,7 @@ export default class FormTable extends React.Component { columns.push({ type: 'operation', buttons: btns, - width: 100, + width: 150, label: '操作' }); }