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

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { ZodType } from 'zod';
 
-import type { FormSchema } from '../types';
+import type { FormSchema, MaybeComponentProps } from '../types';
 
 import { computed } from 'vue';
 
@@ -26,6 +26,7 @@ import { isEventObjectLike } from './helper';
 interface Props extends FormSchema {}
 
 const {
+  commonComponentProps,
   component,
   componentProps,
   dependencies,
@@ -38,7 +39,11 @@ const {
   labelWidth,
   renderComponentContent,
   rules,
-} = defineProps<Props>();
+} = defineProps<
+  {
+    commonComponentProps: MaybeComponentProps;
+  } & Props
+>();
 
 const { componentBindEventMap, componentMap, isVertical } = useFormContext();
 const formRenderProps = injectRenderFormProps();
@@ -133,6 +138,7 @@ const computedProps = computed(() => {
     : componentProps;
 
   return {
+    ...commonComponentProps,
     ...finalComponentProps,
     ...dynamicComponentProps.value,
   };

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

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { GenericObject } from 'vee-validate';
 import type { ZodTypeAny } from 'zod';
 
 import type { FormRenderProps, FormSchema, FormShape } from '../types';
@@ -7,7 +6,9 @@ import type { FormRenderProps, FormSchema, FormShape } from '../types';
 import { computed } from 'vue';
 
 import { Form } from '@vben-core/shadcn-ui';
-import { cn, isString, merge } from '@vben-core/shared/utils';
+import { cn, isString } from '@vben-core/shared/utils';
+
+import { type GenericObject } from 'vee-validate';
 
 import { provideFormRenderProps } from './context';
 import { useExpandable } from './expandable';
@@ -70,51 +71,54 @@ const formCollapsed = computed(() => {
   return props.collapsed && isCalculated.value;
 });
 
-const computedSchema = computed((): FormSchema[] => {
-  const {
-    componentProps = {},
-    controlClass = '',
-    disabled,
-    formFieldProps = {},
-    formItemClass = '',
-    hideLabel = false,
-    hideRequiredMark = false,
-    labelClass = '',
-    labelWidth = 100,
-    wrapperClass = '',
-  } = props.commonConfig;
-  return (props.schema || []).map((schema, index): FormSchema => {
-    const keepIndex = keepFormItemIndex.value;
-
-    const hidden =
-      // 折叠状态 & 显示折叠按钮 & 当前索引大于保留索引
-      props.showCollapseButton && !!formCollapsed.value && keepIndex
-        ? keepIndex <= index
-        : false;
-
-    return {
+const computedSchema = computed(
+  (): ({ commonComponentProps: Record<string, any> } & FormSchema)[] => {
+    const {
+      componentProps = {},
+      controlClass = '',
       disabled,
-      hideLabel,
-      hideRequiredMark,
-      labelWidth,
-      wrapperClass,
-      ...schema,
-      componentProps: merge({}, schema.componentProps, componentProps),
-      controlClass: cn(controlClass, schema.controlClass),
-      formFieldProps: {
-        ...formFieldProps,
-        ...schema.formFieldProps,
-      },
-      formItemClass: cn(
-        'flex-shrink-0',
-        { hidden },
-        formItemClass,
-        schema.formItemClass,
-      ),
-      labelClass: cn(labelClass, schema.labelClass),
-    };
-  });
-});
+      formFieldProps = {},
+      formItemClass = '',
+      hideLabel = false,
+      hideRequiredMark = false,
+      labelClass = '',
+      labelWidth = 100,
+      wrapperClass = '',
+    } = props.commonConfig;
+    return (props.schema || []).map((schema, index) => {
+      const keepIndex = keepFormItemIndex.value;
+
+      const hidden =
+        // 折叠状态 & 显示折叠按钮 & 当前索引大于保留索引
+        props.showCollapseButton && !!formCollapsed.value && keepIndex
+          ? keepIndex <= index
+          : false;
+
+      return {
+        disabled,
+        hideLabel,
+        hideRequiredMark,
+        labelWidth,
+        wrapperClass,
+        ...schema,
+        commonComponentProps: componentProps,
+        componentProps: schema.componentProps,
+        controlClass: cn(controlClass, schema.controlClass),
+        formFieldProps: {
+          ...formFieldProps,
+          ...schema.formFieldProps,
+        },
+        formItemClass: cn(
+          'flex-shrink-0',
+          { hidden },
+          formItemClass,
+          schema.formItemClass,
+        ),
+        labelClass: cn(labelClass, schema.labelClass),
+      };
+    });
+  },
+);
 </script>
 
 <template>

packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue

@@ -209,7 +209,11 @@ function calcMenuWidthStyle(isHiddenDom: boolean): CSSProperties {
   };
 }
 
-function handleMouseenter() {
+function handleMouseenter(e: MouseEvent) {
+  if (e?.offsetX < 10) {
+    return;
+  }
+
   // 未开启和未折叠状态不生效
   if (expandOnHover.value) {
     return;

packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts

@@ -54,10 +54,10 @@ export function useVbenDrawer<
     ...options,
   } as DrawerApiOptions;
 
-  // mergedOptions.onOpenChange = (isOpen: boolean) => {
-  //   options.onOpenChange?.(isOpen);
-  //   injectData.options?.onOpenChange?.(isOpen);
-  // };
+  mergedOptions.onOpenChange = (isOpen: boolean) => {
+    options.onOpenChange?.(isOpen);
+    injectData.options?.onOpenChange?.(isOpen);
+  };
   const api = new DrawerApi(mergedOptions);
 
   const extendedApi: ExtendedDrawerApi = api as never;

packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts

@@ -58,10 +58,10 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
     ...options,
   } as ModalApiOptions;
 
-  // mergedOptions.onOpenChange = (isOpen: boolean) => {
-  //   options.onOpenChange?.(isOpen);
-  //   injectData.options?.onOpenChange?.(isOpen);
-  // };
+  mergedOptions.onOpenChange = (isOpen: boolean) => {
+    options.onOpenChange?.(isOpen);
+    injectData.options?.onOpenChange?.(isOpen);
+  };
   const api = new ModalApi(mergedOptions);
 
   const extendedApi: ExtendedModalApi = api as never;