Skip to content

Commit e042f9f

Browse files
suyuan32suyuan32
committed
chore: merge latest codes
2 parents 7c38a98 + a832edc commit e042f9f

File tree

53 files changed

+2458
-1863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2458
-1863
lines changed

‎apps/backend-mock/utils/mock-data.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const dashboardMenus = [
5858
title: 'page.dashboard.title',
5959
},
6060
name: 'Dashboard',
61-
path: '/',
61+
path: '/dashboard',
6262
redirect: '/analytics',
6363
children: [
6464
{

‎internal/lint-configs/commitlint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/commitlint-config",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/lint-configs/stylelint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/stylelint-config",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/node-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/node-utils",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/tailwind-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tailwind-config",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/tsconfig/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tsconfig",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/vite-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/vite-config",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"node": ">=20.10.0",
9393
"pnpm": ">=9.12.0"
9494
},
95-
"packageManager": "[email protected].4",
95+
"packageManager": "[email protected].5",
9696
"pnpm": {
9797
"peerDependencyRules": {
9898
"allowedVersions": {

‎packages/@core/base/design/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/design",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/icons/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/icons",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/shared",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/typings/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/typings",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/composables/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/composables",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/preferences/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/preferences",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/form-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/form-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/form-ui/src/form-api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { Store } from '@vben-core/shared/store';
1212
import {
1313
bindMethods,
1414
createMerge,
15-
formatDate,
1615
isDate,
1716
isDayjsObject,
1817
isFunction,
@@ -93,6 +92,7 @@ export class FormApi {
9392
);
9493
return values;
9594
};
95+
9696
// 最后一次点击提交时的表单值
9797
private latestSubmissionValues: null | Recordable<any> = null;
9898

‎packages/@core/ui-kit/form-ui/src/form-render/form-field.vue

+6-2
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,14 @@ function autofocus() {
327327
v-bind="createComponentProps(slotProps)"
328328
:disabled="shouldDisabled"
329329
>
330-
<template v-for="name in renderContentKey" :key="name" #[name]>
330+
<template
331+
v-for="name in renderContentKey"
332+
:key="name"
333+
#[name]="renderSlotProps"
334+
>
331335
<VbenRenderContent
332336
:content="customContentRender[name]"
333-
v-bind="slotProps"
337+
v-bind="{ ...renderSlotProps, $formContext: slotProps }"
334338
/>
335339
</template>
336340
<!-- <slot></slot> -->

‎packages/@core/ui-kit/layout-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/layout-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/menu-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/menu-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/popup-ui/src/modal/modal.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ const getAppendTo = computed(() => {
251251
ref="wrapperRef"
252252
:class="
253253
cn('relative min-h-40 flex-1 overflow-y-auto p-3', contentClass, {
254-
'pointer-events-none overflow-hidden': showLoading || submitting,
254+
'overflow-hidden': showLoading || submitting,
255255
})
256256
"
257257
>

‎packages/@core/ui-kit/shadcn-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/shadcn-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"#main": "./dist/index.mjs",
55
"#module": "./dist/index.mjs",
66
"homepage": "https://github.com/vbenjs/vue-vben-admin",

‎packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ defineExpose({
9191
</Transition>
9292
<DialogContent
9393
ref="contentRef"
94+
:style="{ ...(zIndex ? { zIndex } : {}), position }"
95+
v-bind="forwarded"
96+
@animationend="onAnimationEnd"
9497
:class="
9598
cn(
9699
'z-popup bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-top-[48%] w-full p-6 shadow-lg outline-none sm:rounded-xl',
97100
props.class,
98101
)
99102
"
100-
@animationend="onAnimationEnd"
101-
v-bind="forwarded"
102-
:style="{ ...(zIndex ? { zIndex } : {}), position }"
103103
>
104104
<slot></slot>
105105

‎packages/@core/ui-kit/tabs-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/tabs-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/constants/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/constants",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/access/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/access",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/common-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/common-ui",
3-
"version": "5.5.2",
3+
"version": "5.5.3",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/common-ui/src/components/api-component/api-component.vue

+13-15
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const bindProps = computed(() => {
117117
[`onUpdate:${props.modelPropName}`]: (val: string) => {
118118
modelValue.value = val;
119119
},
120-
...objectOmit(attrs, ['onUpdate:value']),
120+
...objectOmit(attrs, [`onUpdate:${props.modelPropName}`]),
121121
...(props.visibleEvent
122122
? {
123123
[props.visibleEvent]: handleFetchForVisible,
@@ -187,18 +187,16 @@ function emitChange() {
187187
}
188188
</script>
189189
<template>
190-
<div v-bind="{ ...$attrs }">
191-
<component
192-
:is="component"
193-
v-bind="bindProps"
194-
:placeholder="$attrs.placeholder"
195-
>
196-
<template v-for="item in Object.keys($slots)" #[item]="data">
197-
<slot :name="item" v-bind="data || {}"></slot>
198-
</template>
199-
<template v-if="loadingSlot && loading" #[loadingSlot]>
200-
<LoaderCircle class="animate-spin" />
201-
</template>
202-
</component>
203-
</div>
190+
<component
191+
:is="component"
192+
:placeholder="$attrs.placeholder"
193+
v-bind="bindProps"
194+
>
195+
<template v-for="item in Object.keys($slots)" #[item]="data">
196+
<slot :name="item" v-bind="data || {}"></slot>
197+
</template>
198+
<template v-if="loadingSlot && loading" #[loadingSlot]>
199+
<LoaderCircle class="animate-spin" />
200+
</template>
201+
</component>
204202
</template>

0 commit comments

Comments
 (0)