diff --git a/components/cascader/cascaderNode.tsx b/components/cascader/cascaderNode.tsx index e8c97eb7d..07146fe8a 100644 --- a/components/cascader/cascaderNode.tsx +++ b/components/cascader/cascaderNode.tsx @@ -88,7 +88,7 @@ export default defineComponent({ disabled.value && 'is-disabled', isExpanded.value && 'is-expanded', isSelected.value && 'is-selected', - isChecked.value && 'is-checked', + (isChecked.value || isIndeterminate.value) && 'is-checked', isActive.value && 'is-active', ].filter(Boolean), ); @@ -191,7 +191,7 @@ export default defineComponent({ {!checkable.value && isSelected.value ? ( - + ) : null} @@ -205,10 +205,10 @@ export default defineComponent({ > {isInitLoading.value || isLoading.value ? ( - + ) : ( - + )} ); @@ -219,24 +219,24 @@ export default defineComponent({ {isCheckLoaded.value ? ( - - ) - : ( - - + ) + : ( + + + )} ); diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less index 1deecc131..3fa0ec0c0 100644 --- a/components/cascader/style/index.less +++ b/components/cascader/style/index.less @@ -83,13 +83,13 @@ &-node-switcher { width: @data-input-height-base; height: @data-input-height-base; - color: var(--f-cascader-node-content-wrapper-color); - font-size: @font-size-head; + color: var(--f-text-color); + font-size: @font-size-caption; &.is-disabled { - cursor: pointer; + cursor: not-allowed; } - &:hover { - --f-cascader-node-content-wrapper-color: var(--f-primary-color); + .is-checked { + color: var(--f-primary-color); } } &-node-content {