Commit bdae33e34a17fd547cb16685fad3c6e91c09d31a
1 parent
e9e51b2f
chore: revert scrollbar
Showing
2 changed files
with
2 additions
and
10 deletions
src/components/Scrollbar/src/Scrollbar.vue
@@ -29,7 +29,6 @@ | @@ -29,7 +29,6 @@ | ||
29 | nextTick, | 29 | nextTick, |
30 | provide, | 30 | provide, |
31 | computed, | 31 | computed, |
32 | - watch, | ||
33 | unref, | 32 | unref, |
34 | } from 'vue'; | 33 | } from 'vue'; |
35 | import Bar from './bar'; | 34 | import Bar from './bar'; |
@@ -65,7 +64,7 @@ | @@ -65,7 +64,7 @@ | ||
65 | default: 'div', | 64 | default: 'div', |
66 | }, | 65 | }, |
67 | }, | 66 | }, |
68 | - setup(props, { slots }) { | 67 | + setup(props) { |
69 | const sizeWidth = ref('0'); | 68 | const sizeWidth = ref('0'); |
70 | const sizeHeight = ref('0'); | 69 | const sizeHeight = ref('0'); |
71 | const moveX = ref(0); | 70 | const moveX = ref(0); |
@@ -82,13 +81,6 @@ | @@ -82,13 +81,6 @@ | ||
82 | return props.wrapStyle; | 81 | return props.wrapStyle; |
83 | }); | 82 | }); |
84 | 83 | ||
85 | - watch( | ||
86 | - () => slots.default?.(), | ||
87 | - () => { | ||
88 | - nextTick(update); | ||
89 | - } | ||
90 | - ); | ||
91 | - | ||
92 | const handleScroll = () => { | 84 | const handleScroll = () => { |
93 | if (!props.native) { | 85 | if (!props.native) { |
94 | moveY.value = (unref(wrap).scrollTop * 100) / unref(wrap).clientHeight; | 86 | moveY.value = (unref(wrap).scrollTop * 100) / unref(wrap).clientHeight; |
src/design/ant/btn.less
@@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
59 | } | 59 | } |
60 | 60 | ||
61 | &.ant-btn-link.is-disabled { | 61 | &.ant-btn-link.is-disabled { |
62 | - color: rgba(0, 0, 0, 0.25) !important; | 62 | + color: rgba(0, 0, 0, 0.25); |
63 | text-shadow: none; | 63 | text-shadow: none; |
64 | cursor: not-allowed !important; | 64 | cursor: not-allowed !important; |
65 | background-color: transparent !important; | 65 | background-color: transparent !important; |