From 31c31b914bab1d26939bac9ac951d590eb7cb680 Mon Sep 17 00:00:00 2001
From: Harold  Zhang <HZhang@datacolor.com>
Date: Tue, 30 Jun 2026 14:23:27 +0800
Subject: [PATCH 1/3] feat: fix check error (#8094)

---
 cspell.json                                                 | 2 ++
 .../src/components/collapsible/collapsible-params.vue       | 6 ++++--
 .../shadcn-ui/src/components/collapsible/collapsible.vue    | 2 +-
 .../src/components/expandable-arrow/expandable-arrow.vue    | 2 +-
 .../src/widgets/preferences/blocks/layout/sidebar.vue       | 4 +++-
 playground/src/views/examples/form/modules/two-fields.vue   | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cspell.json b/cspell.json
index c53d1cc51..982392e14 100644
--- a/cspell.json
+++ b/cspell.json
@@ -27,6 +27,7 @@
     "execa",
     "iconify",
     "iconoir",
+    "indexeddb",
     "intlify",
     "isequal",
     "jspm",
@@ -36,6 +37,7 @@
     "minw",
     "mkdist",
     "mockjs",
+    "myapp",
     "naiveui",
     "napi",
     "nocheck",
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue b/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue
index dd1cce797..a9341c1dd 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible-params.vue
+++ b/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');
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible.vue b/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible.vue
index d6e4e2ccc..d17d6ba7d 100755
--- a/packages/@core/ui-kit/shadcn-ui/src/components/collapsible/collapsible.vue
+++ b/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;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/expandable-arrow/expandable-arrow.vue b/packages/@core/ui-kit/shadcn-ui/src/components/expandable-arrow/expandable-arrow.vue
index 5cdf619a1..cabfa4af3 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/expandable-arrow/expandable-arrow.vue
+++ b/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>
diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue b/packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue
index 913775a97..94d380f88 100644
--- a/packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue
+++ b/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');
 
diff --git a/playground/src/views/examples/form/modules/two-fields.vue b/playground/src/views/examples/form/modules/two-fields.vue
index 867a1ab38..66cb6eede 100644
--- a/playground/src/views/examples/form/modules/two-fields.vue
+++ b/playground/src/views/examples/form/modules/two-fields.vue
@@ -3,7 +3,7 @@ import { Input, Select } from 'antdv-next';
 
 const emit = defineEmits(['blur', 'change']);
 
-const modelValue = defineModel<[string, string]>({
+const modelValue = defineModel<[string | undefined, string | undefined]>({
   default: () => [undefined, undefined],
 });
 

From d7d6d2e33732b306910dc34e5177b09d2a0f8c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E4=BC=AF=E8=A8=80?=
 <104855611+maoxuner@users.noreply.github.com>
Date: Tue, 30 Jun 2026 14:23:52 +0800
Subject: [PATCH 2/3] fix: lint issue from a8c3729 (#8098)

---
 apps/web-antdv-next/src/preferences.ts | 5 ++++-
 apps/web-ele/src/preferences.ts        | 5 ++++-
 apps/web-naive/src/preferences.ts      | 5 ++++-
 apps/web-tdesign/src/preferences.ts    | 5 ++++-
 packages/preferences/src/index.ts      | 6 +++++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/web-antdv-next/src/preferences.ts b/apps/web-antdv-next/src/preferences.ts
index adcccfbf1..303c496e4 100644
--- a/apps/web-antdv-next/src/preferences.ts
+++ b/apps/web-antdv-next/src/preferences.ts
@@ -1,4 +1,7 @@
-import { appCopyrightPreferences, defineOverridesPreferences } from '@vben/preferences';
+import {
+  appCopyrightPreferences,
+  defineOverridesPreferences,
+} from '@vben/preferences';
 
 /**
  * @description 项目配置文件
diff --git a/apps/web-ele/src/preferences.ts b/apps/web-ele/src/preferences.ts
index adcccfbf1..303c496e4 100644
--- a/apps/web-ele/src/preferences.ts
+++ b/apps/web-ele/src/preferences.ts
@@ -1,4 +1,7 @@
-import { appCopyrightPreferences, defineOverridesPreferences } from '@vben/preferences';
+import {
+  appCopyrightPreferences,
+  defineOverridesPreferences,
+} from '@vben/preferences';
 
 /**
  * @description 项目配置文件
diff --git a/apps/web-naive/src/preferences.ts b/apps/web-naive/src/preferences.ts
index adcccfbf1..303c496e4 100644
--- a/apps/web-naive/src/preferences.ts
+++ b/apps/web-naive/src/preferences.ts
@@ -1,4 +1,7 @@
-import { appCopyrightPreferences, defineOverridesPreferences } from '@vben/preferences';
+import {
+  appCopyrightPreferences,
+  defineOverridesPreferences,
+} from '@vben/preferences';
 
 /**
  * @description 项目配置文件
diff --git a/apps/web-tdesign/src/preferences.ts b/apps/web-tdesign/src/preferences.ts
index adcccfbf1..303c496e4 100644
--- a/apps/web-tdesign/src/preferences.ts
+++ b/apps/web-tdesign/src/preferences.ts
@@ -1,4 +1,7 @@
-import { appCopyrightPreferences, defineOverridesPreferences } from '@vben/preferences';
+import {
+  appCopyrightPreferences,
+  defineOverridesPreferences,
+} from '@vben/preferences';
 
 /**
  * @description 项目配置文件
diff --git a/packages/preferences/src/index.ts b/packages/preferences/src/index.ts
index c0ed87df1..d97bca1e6 100644
--- a/packages/preferences/src/index.ts
+++ b/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';

From 7182405d24f5c46d90326d7333530b73f3174a65 Mon Sep 17 00:00:00 2001
From: xueyitt <1455668754@qq.com>
Date: Tue, 30 Jun 2026 14:24:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=BD=E5=BA=A6=20class=20?=
 =?UTF-8?q?=E8=A2=AB=E9=BB=98=E8=AE=A4=20max-w=20=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#8100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 modalClass 参数移至 cn() 末尾，确保用户通过 class 传入的宽度样式
优先于内置默认的 max-w-[calc(100vw-20px)] 生效，使 业务使用Modal 上的自定义的max-w-[50%] 等方式能正确控制弹框宽度。
---
 packages/@core/ui-kit/popup-ui/src/modal/modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
index c2c25ec3a..850c901a0 100644
--- a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
+++ b/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"