by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap 2024-11-09 20:10:36 +08:00
commit 4c487fe85f
10 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/base/shared/package.json
View File

@ -84,7 +84,7 @@
"@types/lodash.get": "catalog:", "@types/lodash.get": "catalog:",
"@vue/shared": "catalog:", "@vue/shared": "catalog:",
"clsx": "catalog:", "clsx": "catalog:",
"dayjs": "^1.11.13", "dayjs": "catalog:",
"defu": "catalog:", "defu": "catalog:",
"lodash.clonedeep": "catalog:", "lodash.clonedeep": "catalog:",
"lodash.get": "catalog:", "lodash.get": "catalog:",

6
packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
View File

@ -179,12 +179,6 @@ function handleFocusOutside(e: Event) {
</div> </div>
</SheetHeader> </SheetHeader>
<template v-else>
<VisuallyHidden>
<SheetTitle />
<SheetDescription />
</VisuallyHidden>
</template>
<div <div
ref="wrapperRef" ref="wrapperRef"
:class=" :class="

2
packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue
View File

@ -65,7 +65,7 @@ const tabsView = computed(() => {
:style="style" :style="style"
class="tabs-chrome !flex h-full w-max overflow-y-hidden pr-6" class="tabs-chrome !flex h-full w-max overflow-y-hidden pr-6"
> >
<TransitionGroup name="slide-down"> <TransitionGroup name="slide-left">
<div <div
v-for="(tab, i) in tabsView" v-for="(tab, i) in tabsView"
:key="tab.key" :key="tab.key"

4
packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
View File

@ -67,9 +67,9 @@ const tabsView = computed(() => {
<template> <template>
<div <div
:class="contentClass" :class="contentClass"
class="relative !flex h-full w-max items-center overflow-y-hidden pr-6" class="relative !flex h-full w-max items-center overflow-hidden pr-6"
> >
<TransitionGroup name="slide-down"> <TransitionGroup name="slide-left">
<div <div
v-for="(tab, i) in tabsView" v-for="(tab, i) in tabsView"
:key="tab.key" :key="tab.key"

2
packages/effects/layouts/package.json
View File

@ -37,7 +37,7 @@
"@vben/types": "workspace:*", "@vben/types": "workspace:*",
"@vben/utils": "workspace:*", "@vben/utils": "workspace:*",
"@vueuse/core": "catalog:", "@vueuse/core": "catalog:",
"default-passive-events": "^2.0.0", "default-passive-events": "catalog:",
"vue": "catalog:", "vue": "catalog:",
"vue-router": "catalog:" "vue-router": "catalog:"
} }

2
packages/effects/layouts/src/basic/layout.vue
View File

@ -29,6 +29,8 @@ import {
} from './menu'; } from './menu';
import { LayoutTabbar } from './tabbar'; import { LayoutTabbar } from './tabbar';
import 'default-passive-events';
defineOptions({ name: 'BasicLayout' }); defineOptions({ name: 'BasicLayout' });
const emit = defineEmits<{ clearPreferencesAndLogout: [] }>(); const emit = defineEmits<{ clearPreferencesAndLogout: [] }>();

2
packages/effects/layouts/src/index.ts
View File

@ -1,5 +1,3 @@
import 'default-passive-events';
export * from './authentication'; export * from './authentication';
export * from './basic'; export * from './basic';
export * from './iframe'; export * from './iframe';

7
packages/effects/plugins/src/vxe-table/theme.css
View File

@ -89,7 +89,12 @@
} }
.vxe-toolbar { .vxe-toolbar {
padding-top: 0; padding: 0;
}
.vxe-buttons--wrapper:not(:empty),
.vxe-tools--wrapper:not(:empty) {
padding: 0.6em 0;
} }
.vxe-tools--operate:not(:has(button)) { .vxe-tools--operate:not(:has(button)) {

2
packages/utils/package.json
View File

@ -13,8 +13,6 @@
"sideEffects": [ "sideEffects": [
"**/*.css" "**/*.css"
], ],
"main": "./dist/index.mjs",
"module": "./dist/index.mjs",
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

7
pnpm-workspace.yaml
View File

@ -79,6 +79,7 @@ catalog:
cz-git: ^1.11.0 cz-git: ^1.11.0
czg: ^1.11.0 czg: ^1.11.0
dayjs: ^1.11.13 dayjs: ^1.11.13
default-passive-events: ^2.0.0
defu: ^6.1.4 defu: ^6.1.4
depcheck: ^1.4.7 depcheck: ^1.4.7
dotenv: ^16.4.5 dotenv: ^16.4.5
@ -137,7 +138,7 @@ catalog:
radix-vue: ^1.9.9 radix-vue: ^1.9.9
resolve.exports: ^2.0.2 resolve.exports: ^2.0.2
rimraf: ^6.0.1 rimraf: ^6.0.1
rollup: ^4.24.4 rollup: ^4.25.0
rollup-plugin-visualizer: ^5.12.0 rollup-plugin-visualizer: ^5.12.0
sass: 1.80.6 sass: 1.80.6
sortablejs: ^1.15.3 sortablejs: ^1.15.3
@ -174,8 +175,8 @@ catalog:
vue-i18n: ^10.0.4 vue-i18n: ^10.0.4
vue-router: ^4.4.5 vue-router: ^4.4.5
vue-tsc: ^2.1.10 vue-tsc: ^2.1.10
vxe-pc-ui: ^4.2.46 vxe-pc-ui: ^4.2.49
vxe-table: ^4.8.8 vxe-table: ^4.8.9
watermark-js-plus: ^1.5.7 watermark-js-plus: ^1.5.7
zod: ^3.23.8 zod: ^3.23.8
zod-defaults: ^0.1.3 zod-defaults: ^0.1.3