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

packages/@core/ui-kit/form-ui/__tests__/form-api.test.ts

@@ -1,24 +1,7 @@
-// 假设这个文件为 FormApi.ts
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { FormApi } from '../src/form-api';
 
-vi.mock('@vben-core/shared/utils', () => ({
-  bindMethods: vi.fn(),
-  createMerge: vi.fn((mergeFn) => {
-    return (stateOrFn: any, prev: any) => {
-      mergeFn(prev, 'key', stateOrFn);
-      return { ...prev, ...stateOrFn };
-    };
-  }),
-  isFunction: (fn: any) => typeof fn === 'function',
-  StateHandler: vi.fn().mockImplementation(() => ({
-    reset: vi.fn(),
-    setConditionTrue: vi.fn(),
-    waitForCondition: vi.fn().mockResolvedValue(true),
-  })),
-}));
-
 describe('formApi', () => {
   let formApi: FormApi;
 
@@ -128,7 +111,6 @@ describe('formApi', () => {
   it('should unmount form and reset state', () => {
     formApi.unmounted();
     expect(formApi.isMounted).toBe(false);
-    expect(formApi.stateHandler.reset).toHaveBeenCalled();
   });
 
   it('should validate form', async () => {

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

@@ -12,20 +12,13 @@ import { toRaw } from 'vue';
 import { Store } from '@vben-core/shared/store';
 import {
   bindMethods,
-  createMerge,
   isFunction,
+  mergeWithArrayOverride,
   StateHandler,
 } from '@vben-core/shared/utils';
 
 import { objectPick } from '@vueuse/core';
 
-const merge = createMerge((originObj, key, updates) => {
-  if (Array.isArray(originObj[key]) && Array.isArray(updates)) {
-    originObj[key] = updates;
-    return true;
-  }
-});
-
 function getDefaultState(): VbenFormProps {
   return {
     actionWrapperClass: '',
@@ -218,10 +211,10 @@ export class FormApi {
   ) {
     if (isFunction(stateOrFn)) {
       this.store.setState((prev) => {
-        return merge(stateOrFn(prev), prev);
+        return mergeWithArrayOverride(stateOrFn(prev), prev);
       });
     } else {
-      this.store.setState((prev) => merge(stateOrFn, prev));
+      this.store.setState((prev) => mergeWithArrayOverride(stateOrFn, prev));
     }
   }
 
@@ -287,7 +280,10 @@ export class FormApi {
     currentSchema.forEach((schema, index) => {
       const updatedData = updatedMap[schema.fieldName];
       if (updatedData) {
-        currentSchema[index] = merge(updatedData, schema) as FormSchema;
+        currentSchema[index] = mergeWithArrayOverride(
+          updatedData,
+          schema,
+        ) as FormSchema;
       }
     });
     this.setState({ schema: currentSchema });

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

@@ -1,6 +1,6 @@
 {
   "name": "@vben-core/layout-ui",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@vben-core/menu-ui",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {

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

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { DrawerProps, ExtendedDrawerApi } from './drawer';
 
-import { ref, watch } from 'vue';
+import { provide, ref, useId, watch } from 'vue';
 
 import {
   useIsMobile,
@@ -33,9 +33,13 @@ const props = withDefaults(defineProps<Props>(), {
   drawerApi: undefined,
 });
 
+const id = useId();
+provide('DISMISSABLE_DRAWER_ID', id);
+
 const wrapperRef = ref<HTMLElement>();
 const { $t } = useSimpleLocale();
 const { isMobile } = useIsMobile();
+
 const state = props.drawerApi?.useStore?.();
 
 const {
@@ -83,8 +87,8 @@ function escapeKeyDown(e: KeyboardEvent) {
 // pointer-down-outside
 function pointerDownOutside(e: Event) {
   const target = e.target as HTMLElement;
-  const dismissableDrawer = !!target?.dataset.dismissableDrawer;
-  if (!closeOnClickModal.value || !dismissableDrawer) {
+  const dismissableDrawer = target?.dataset.dismissableDrawer;
+  if (!closeOnClickModal.value || dismissableDrawer !== id) {
     e.preventDefault();
   }
 }

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

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ExtendedModalApi, ModalProps } from './modal';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, nextTick, provide, ref, useId, watch } from 'vue';
 
 import {
   useIsMobile,
@@ -40,6 +40,10 @@ const dialogRef = ref();
 const headerRef = ref();
 const footerRef = ref();
 
+const id = useId();
+
+provide('DISMISSABLE_MODAL_ID', id);
+
 const { $t } = useSimpleLocale();
 const { isMobile } = useIsMobile();
 const state = props.modalApi?.useStore?.();
@@ -141,8 +145,8 @@ function handerOpenAutoFocus(e: Event) {
 // pointer-down-outside
 function pointerDownOutside(e: Event) {
   const target = e.target as HTMLElement;
-  const isDismissableModal = !!target?.dataset.dismissableModal;
-  if (!closeOnClickModal.value || !isDismissableModal) {
+  const isDismissableModal = target?.dataset.dismissableModal;
+  if (!closeOnClickModal.value || isDismissableModal !== id) {
     e.preventDefault();
     e.stopPropagation();
   }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vben-core/shadcn-ui",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "#main": "./dist/index.mjs",
   "#module": "./dist/index.mjs",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",

packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogOverlay.vue

@@ -1,11 +1,14 @@
 <script setup lang="ts">
+import { inject } from 'vue';
+
 import { useScrollLock } from '@vben-core/composables';
 
 useScrollLock();
+const id = inject('DISMISSABLE_MODAL_ID');
 </script>
 <template>
   <div
+    :data-dismissable-modal="id"
     class="bg-overlay fixed inset-0 z-[1000]"
-    data-dismissable-modal="true"
   ></div>
 </template>

packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetOverlay.vue

@@ -1,11 +1,14 @@
 <script setup lang="ts">
+import { inject } from 'vue';
+
 import { useScrollLock } from '@vben-core/composables';
 
 useScrollLock();
+const id = inject('DISMISSABLE_DRAWER_ID');
 </script>
 <template>
   <div
+    :data-dismissable-drawer="id"
     class="bg-overlay fixed inset-0 z-[1000]"
-    data-dismissable-drawer="true"
   ></div>
 </template>

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

@@ -1,6 +1,6 @@
 {
   "name": "@vben-core/tabs-ui",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {