diff --git a/package.json b/package.json index 01764cdf..8f0afed0 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "*.{vue,js,jsx,ts,tsx}": "eslint --fix" }, "dependencies": { + "@better-scroll/core": "^2.4.2", "@vueuse/core": "^6.7.4", "axios": "^0.24.0", "chroma-js": "^2.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e4c2ef9a..8021f74b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.3 specifiers: + '@better-scroll/core': ^2.4.2 '@commitlint/cli': ^13.2.1 '@commitlint/config-conventional': ^13.2.0 '@iconify/json': ^1.1.417 @@ -61,6 +62,7 @@ specifiers: windicss: ^3.2.0 dependencies: + '@better-scroll/core': registry.npmmirror.com/@better-scroll/core/2.4.2 '@vueuse/core': registry.npmmirror.com/@vueuse/core/6.7.4_vue@3.2.20 axios: registry.npmmirror.com/axios/0.24.0 chroma-js: registry.nlark.com/chroma-js/2.1.2 @@ -4576,6 +4578,20 @@ packages: engines: {node: '>=6.0.0'} hasBin: true + registry.npmmirror.com/@better-scroll/core/2.4.2: + resolution: {integrity: sha1-5pRwAS15kjoYA0w+STFyD7sG6uU=, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@better-scroll/core/download/@better-scroll/core-2.4.2.tgz} + name: '@better-scroll/core' + version: 2.4.2 + dependencies: + '@better-scroll/shared-utils': registry.npmmirror.com/@better-scroll/shared-utils/2.4.2 + dev: false + + registry.npmmirror.com/@better-scroll/shared-utils/2.4.2: + resolution: {integrity: sha1-GsXJdJVycJOiKoAJVgeV3V48GNo=, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@better-scroll/shared-utils/download/@better-scroll/shared-utils-2.4.2.tgz} + name: '@better-scroll/shared-utils' + version: 2.4.2 + dev: false + registry.npmmirror.com/@commitlint/cli/13.2.1: resolution: {integrity: sha1-gOvUa+72zu07sMCEK82o0Co8kd4=, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@commitlint/cli/download/@commitlint/cli-13.2.1.tgz} name: '@commitlint/cli' diff --git a/src/components/custom/BetterScroll/index.vue b/src/components/custom/BetterScroll/index.vue new file mode 100644 index 00000000..ec97c32e --- /dev/null +++ b/src/components/custom/BetterScroll/index.vue @@ -0,0 +1,43 @@ + + + + diff --git a/src/components/custom/ButtonTab/index.vue b/src/components/custom/ButtonTab/index.vue index 91ab4625..926d153a 100644 --- a/src/components/custom/ButtonTab/index.vue +++ b/src/components/custom/ButtonTab/index.vue @@ -16,7 +16,7 @@ @mouseenter="setTrue" @mouseleave="setFalse" > - +
diff --git a/src/components/custom/ChromeTab/index.vue b/src/components/custom/ChromeTab/index.vue index 7ae91b58..1436c187 100644 --- a/src/components/custom/ChromeTab/index.vue +++ b/src/components/custom/ChromeTab/index.vue @@ -14,7 +14,7 @@ :primary-color="primaryColor" />
- +
diff --git a/src/components/custom/index.ts b/src/components/custom/index.ts index 7cd335f7..19a6c71b 100644 --- a/src/components/custom/index.ts +++ b/src/components/custom/index.ts @@ -3,5 +3,6 @@ import IconClose from './IconClose/index.vue'; import ButtonTab from './ButtonTab/index.vue'; import ChromeTab from './ChromeTab/index.vue'; import ShadowCard from './ShadowCard/index.vue'; +import BetterScroll from './BetterScroll/index.vue'; -export { CountTo, IconClose, ButtonTab, ChromeTab, ShadowCard }; +export { CountTo, IconClose, ButtonTab, ChromeTab, ShadowCard, BetterScroll }; diff --git a/src/components/index.ts b/src/components/index.ts index e8293fd4..c45cf80e 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,2 +1,2 @@ export { AppProviderContent, SystemLogo, ExceptionSvg, LoginBg, BannerSvg, HoverContainer } from './common'; -export { CountTo, IconClose, ButtonTab, ChromeTab, ShadowCard } from './custom'; +export { CountTo, IconClose, ButtonTab, ChromeTab, ShadowCard, BetterScroll } from './custom'; diff --git a/src/layouts/BasicLayout/components/GlobalTab/index.vue b/src/layouts/BasicLayout/components/GlobalTab/index.vue index 428b79bb..287cfb3e 100644 --- a/src/layouts/BasicLayout/components/GlobalTab/index.vue +++ b/src/layouts/BasicLayout/components/GlobalTab/index.vue @@ -8,7 +8,11 @@ justify="space-between" :item-style="{ paddingTop: '0px', paddingBottom: '0px' }" > - +
+ + + +
@@ -17,6 +21,7 @@ import { computed, watch } from 'vue'; import { useRoute } from 'vue-router'; import { useThemeStore, useAppStore } from '@/store'; +import { BetterScroll } from '@/components'; import { MultiTab, ReloadButton } from './components'; defineProps({