Merge branch 'main' into refactor/router-redirect

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

@@ -243,7 +243,6 @@ function handleClosed() {
         cn(
           'inset-x-0 top-[10vh] mx-auto flex w-130 flex-col p-0',
           shouldFullscreen ? 'rounded-none' : 'rounded-(--radius)',
-          modalClass,
           {
             'border border-border': bordered,
             'shadow-3xl': !bordered,
@@ -255,6 +254,7 @@ function handleClosed() {
             'duration-300': !dragging,
             hidden: isClosed,
           },
+          modalClass,
         )
       "
       :force-mount="getForceMount"

packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue

@@ -31,8 +31,10 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emits = defineEmits<{ 'update:value': [any, string] }>();
 
-const modelValue = defineModel('value', {
-  default: {} as Recordable<CollapsibleParamSchema['defaultValue']>,
+const modelValue = defineModel<
+  Recordable<CollapsibleParamSchema['defaultValue']>
+>('value', {
+  default: () => ({}),
 });
 
 const visibleRefs = useTemplateRef('visibleRefs');

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

@@ -30,7 +30,7 @@ const delegatedProps = computed(() => {
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 
-const open = defineModel('open', { default: true });
+const open = defineModel<boolean>('open', { default: true });
 
 function toggle() {
   open.value = !open.value;

packages/@core/ui-kit/shadcn-ui/src/components/expandable-arrow/expandable-arrow.vue

@@ -7,7 +7,7 @@ const props = defineProps<{
 }>();
 
 // 控制箭头展开/收起状态
-const collapsed = defineModel({ default: false });
+const collapsed = defineModel<boolean>({ default: false });
 </script>
 
 <template>

packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue

@@ -23,7 +23,9 @@ const sidebarDraggable = defineModel<boolean>('sidebarDraggable');
 const sidebarCollapsed = defineModel<boolean>('sidebarCollapsed');
 const sidebarExpandOnHover = defineModel<boolean>('sidebarExpandOnHover');
 
-const sidebarButtons = defineModel<string[]>('sidebarButtons', { default: [] });
+const sidebarButtons = defineModel<string[]>('sidebarButtons', {
+  default: () => [],
+});
 const sidebarCollapsedButton = defineModel<boolean>('sidebarCollapsedButton');
 const sidebarFixedButton = defineModel<boolean>('sidebarFixedButton');
 

packages/preferences/src/index.ts

@@ -28,6 +28,10 @@ const appCopyrightPreferences = {
   icpLink: 'https://beian.miit.gov.cn/',
 } satisfies DeepPartial<Preferences>['copyright'];
 
-export { appCopyrightPreferences, defineOverridesPreferences, definePreferencesExtension };
+export {
+  appCopyrightPreferences,
+  defineOverridesPreferences,
+  definePreferencesExtension,
+};
 
 export * from '@vben-core/preferences';