diff --git a/src/components/Scrollbar/src/Scrollbar.vue b/src/components/Scrollbar/src/Scrollbar.vue index e9138557cb7886be44402dabaa1bef954d34e194..ec5678054a2c008a5349b0f5f4b3fa1fffbcafff 100644 --- a/src/components/Scrollbar/src/Scrollbar.vue +++ b/src/components/Scrollbar/src/Scrollbar.vue @@ -29,7 +29,6 @@ nextTick, provide, computed, - watch, unref, } from 'vue'; import Bar from './bar'; @@ -65,7 +64,7 @@ default: 'div', }, }, - setup(props, { slots }) { + setup(props) { const sizeWidth = ref('0'); const sizeHeight = ref('0'); const moveX = ref(0); @@ -82,13 +81,6 @@ return props.wrapStyle; }); - watch( - () => slots.default?.(), - () => { - nextTick(update); - } - ); - const handleScroll = () => { if (!props.native) { moveY.value = (unref(wrap).scrollTop * 100) / unref(wrap).clientHeight; diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index 3f6bae811d4e9990bf9117fb61c814504f91b893..68778b0e021554aa727af3cfdf414b17d37a8b72 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -59,7 +59,7 @@ } &.ant-btn-link.is-disabled { - color: rgba(0, 0, 0, 0.25) !important; + color: rgba(0, 0, 0, 0.25); text-shadow: none; cursor: not-allowed !important; background-color: transparent !important;