From 6cb0e6a1d86d64da9d380b4bdf60595120a54ced Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Fri, 29 May 2020 15:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B0=83=E7=94=A8=E5=BB=B6?= =?UTF-8?q?=E6=97=B6=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/components/form/_checks.scss | 30 +++++++++++-------------- src/components/AssociatedCheckboxes.tsx | 17 ++++++++++++++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/scss/components/form/_checks.scss b/scss/components/form/_checks.scss index e6a82e30..23607515 100644 --- a/scss/components/form/_checks.scss +++ b/scss/components/form/_checks.scss @@ -340,6 +340,11 @@ cursor: pointer; user-select: none; + &.is-active { + color: $Form-select-menu-onActive-color; + background-color: $Form-select-menu-onActive-bg; + } + &:hover { background-color: $Tree-item-onHover-bg; } @@ -363,15 +368,6 @@ } } -.#{$ns}ListRadios { - &-item { - &.is-active { - color: $Form-select-menu-onActive-color; - background-color: $Form-select-menu-onActive-bg; - } - } -} - .#{$ns}TableCheckboxes { .#{$ns}Table-content { border-top: $Table-borderWidth solid $Table-borderColor; @@ -469,15 +465,15 @@ cursor: pointer; user-select: none; - &:hover { - background-color: $Tree-item-onHover-bg; - } - &.is-active { color: $Form-select-menu-onActive-color; background-color: $Form-select-menu-onActive-bg; } + &:hover { + background-color: $Tree-item-onHover-bg; + } + &.is-disabled { pointer-events: none; color: $text--muted-color; @@ -528,15 +524,15 @@ cursor: pointer; user-select: none; - &:hover { - background-color: $Tree-item-onHover-bg; - } - &.is-active { color: $Form-select-menu-onActive-color; background-color: $Form-select-menu-onActive-bg; } + &:hover { + background-color: $Tree-item-onHover-bg; + } + &.is-disabled { pointer-events: none; color: $text--muted-color; diff --git a/src/components/AssociatedCheckboxes.tsx b/src/components/AssociatedCheckboxes.tsx index 2f0b4a5a..97d050ba 100644 --- a/src/components/AssociatedCheckboxes.tsx +++ b/src/components/AssociatedCheckboxes.tsx @@ -49,6 +49,23 @@ export class AssociatedCheckboxes extends Checkboxes< leftValue: this.props.leftDefaultValue }; + componentDidMount() { + const leftValue = this.state.leftValue; + const {options, onDeferLoad} = this.props; + + if (leftValue) { + const selectdOption = ListRadios.resolveSelected( + leftValue, + options, + option => option.ref + ); + + if (selectdOption && onDeferLoad && selectdOption.defer) { + onDeferLoad(selectdOption); + } + } + } + @autobind leftOption2Value(option: Option) { return option.value;