GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(projects): layout和tab组件依赖名称变更、样式修复

Browse Source
This commit is contained in:
Soybean 2022-04-27 22:51:28 +08:00
parent c275f2632c
commit de5fb84215
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -28,7 +28,7 @@
"dependencies": { "dependencies": {
"@antv/g2plot": "^2.4.16", "@antv/g2plot": "^2.4.16",
"@better-scroll/core": "^2.4.2", "@better-scroll/core": "^2.4.2",
"@soybeanjs/vue-admin-layout": "^1.0.2", "@soybeanjs/vue-admin-layout": "^1.0.3",
"@soybeanjs/vue-admin-tab": "^1.0.1", "@soybeanjs/vue-admin-tab": "^1.0.1",
"@vueuse/core": "^8.3.1", "@vueuse/core": "^8.3.1",
"axios": "^0.27.2", "axios": "^0.27.2",

8
pnpm-lock.yaml
View File

@ -8,7 +8,7 @@ specifiers:
'@commitlint/config-conventional': ^16.2.1 '@commitlint/config-conventional': ^16.2.1
'@iconify/json': ^2.1.33 '@iconify/json': ^2.1.33
'@iconify/vue': ^3.2.1 '@iconify/vue': ^3.2.1
'@soybeanjs/vue-admin-layout': ^1.0.2 '@soybeanjs/vue-admin-layout': ^1.0.3
'@soybeanjs/vue-admin-tab': ^1.0.1 '@soybeanjs/vue-admin-tab': ^1.0.1
'@types/bmapgl': ^0.0.5 '@types/bmapgl': ^0.0.5
'@types/crypto-js': ^4.1.1 '@types/crypto-js': ^4.1.1
@ -75,7 +75,7 @@ specifiers:
dependencies: dependencies:
'@antv/g2plot': 2.4.16 '@antv/g2plot': 2.4.16
'@better-scroll/core': registry.nlark.com/@better-scroll/core/2.4.2 '@better-scroll/core': registry.nlark.com/@better-scroll/core/2.4.2
'@soybeanjs/vue-admin-layout': 1.0.2_vue@3.2.33 '@soybeanjs/vue-admin-layout': 1.0.3_vue@3.2.33
'@soybeanjs/vue-admin-tab': 1.0.1_vue@3.2.33 '@soybeanjs/vue-admin-tab': 1.0.1_vue@3.2.33
'@vueuse/core': 8.3.1_vue@3.2.33 '@vueuse/core': 8.3.1_vue@3.2.33
axios: 0.27.2 axios: 0.27.2
@ -1029,8 +1029,8 @@ packages:
picomatch: 2.3.1 picomatch: 2.3.1
dev: true dev: true
/@soybeanjs/vue-admin-layout/1.0.2_vue@3.2.33: /@soybeanjs/vue-admin-layout/1.0.3_vue@3.2.33:
resolution: {integrity: sha512-6OnBEpabV121ChT1SHiSXhyv1QN+rkkdZt4pflrg8vOAmy2hbx935KtCsgXjw5ObGO/tYPkfQSs4gi0ZVgmpUw==} resolution: {integrity: sha512-ech9q8XOkQ2rIxF5D2p4ikzV/S5yk08N2sWuQWC6QSzF3c8seG89i+Pl+k0NZRkKlnD3ntz9Ai0VqxET/jhMdw==}
peerDependencies: peerDependencies:
'@vue/composition-api': ^1.4.6 '@vue/composition-api': ^1.4.6
vue: ^2.0.0 || >=3.0.0 vue: ^2.0.0 || >=3.0.0

6
src/layouts/common/GlobalSider/components/VerticalMixSider/components/MixMenuDetail.vue
View File

@ -2,12 +2,12 @@
<div class="mb-6px px-4px cursor-pointer" @mouseenter="setTrue" @mouseleave="setFalse"> <div class="mb-6px px-4px cursor-pointer" @mouseenter="setTrue" @mouseleave="setFalse">
<div <div
class="flex-center flex-col py-12px rounded-2px bg-transparent transition-colors duration-300 ease-in-out" class="flex-center flex-col py-12px rounded-2px bg-transparent transition-colors duration-300 ease-in-out"
:class="{ 'text-primary !bg-primary-active': isActive, 'text-primary': isHover }" :class="{ 'text-primary !bg-primary_active': isActive, 'text-primary': isHover }"
> >
<component :is="icon" :class="[isMini ? 'text-16px' : 'text-20px']" /> <component :is="icon" :class="[isMini ? 'text-16px' : 'text-20px']" />
<p <p
class="pt-8px text-12px overflow-hidden transition-height duration-300 ease-in-out" class="text-12px overflow-hidden transition-height duration-300 ease-in-out"
:class="[isMini ? 'h-0 pt-0' : 'h-20px pt-8px']" :class="[isMini ? 'h-0 pt-0' : 'h-24px pt-4px']"
> >
{{ label }} {{ label }}
</p> </p>

30
uno.config.ts
View File

@ -41,25 +41,25 @@ export default defineConfig({
theme: { theme: {
colors: { colors: {
primary: 'var(--primary-color)', primary: 'var(--primary-color)',
'primary-hover': 'var(--primary-color-hover)', primary_hover: 'var(--primary-color-hover)',
'primary-pressed': 'var(--primary-color-pressed)', primary_pressed: 'var(--primary-color-pressed)',
'primary-active': 'var(--primary-color-active)', primary_active: 'var(--primary-color-active)',
info: 'var(--info-color)', info: 'var(--info-color)',
'info-hover': 'var(--info-color-hover)', info_hover: 'var(--info-color-hover)',
'info-pressed': 'var(--info-color-pressed)', info_pressed: 'var(--info-color-pressed)',
'info-active': 'var(--info-color-active)', info_active: 'var(--info-color-active)',
success: 'var(--success-color)', success: 'var(--success-color)',
'success-hover': 'var(--success-color-hover)', success_hover: 'var(--success-color-hover)',
'success-pressed': 'var(--success-color-pressed)', success_pressed: 'var(--success-color-pressed)',
'success-active': 'var(--success-color-active)', success_active: 'var(--success-color-active)',
warning: 'var(--warning-color)', warning: 'var(--warning-color)',
'warning-hover': 'var(--warning-color-hover)', warning_hover: 'var(--warning-color-hover)',
'warning-pressed': 'var(--warning-color-pressed)', warning_pressed: 'var(--warning-color-pressed)',
'warning-active': 'var(--warning-color-active)', warning_active: 'var(--warning-color-active)',
error: 'var(--error-color)', error: 'var(--error-color)',
'error-hover': 'var(--error-color-hover)', error_hover: 'var(--error-color-hover)',
'error-pressed': 'var(--error-color-pressed)', error_pressed: 'var(--error-color-pressed)',
'error-active': 'var(--error-color-active)' error_active: 'var(--error-color-active)'
}, },
backgroundColor: { backgroundColor: {
dark: '#18181c' dark: '#18181c'