diff --git a/packages/@core/base/design/src/css/global.css b/packages/@core/base/design/src/css/global.css index dc154fc72..cd78a23ff 100644 --- a/packages/@core/base/design/src/css/global.css +++ b/packages/@core/base/design/src/css/global.css @@ -18,9 +18,9 @@ font-size: var(--font-size-base, 16px); font-variation-settings: normal; + font-synthesis-weight: none; line-height: 1.15; text-size-adjust: 100%; - font-synthesis-weight: none; scroll-behavior: smooth; text-rendering: optimizelegibility; -webkit-tap-highlight-color: transparent; diff --git a/packages/@core/composables/src/__tests__/use-sortable.test.ts b/packages/@core/composables/src/__tests__/use-sortable.test.ts index e7ba1f134..bc7e90fd5 100644 --- a/packages/@core/composables/src/__tests__/use-sortable.test.ts +++ b/packages/@core/composables/src/__tests__/use-sortable.test.ts @@ -30,6 +30,7 @@ describe('useSortable', () => { // Import sortablejs to access the mocked create function const Sortable = await import( + // @ts-expect-error - no types 'sortablejs/modular/sortable.complete.esm.js' ); diff --git a/packages/@core/ui-kit/form-ui/src/types.ts b/packages/@core/ui-kit/form-ui/src/types.ts index 6d704145e..b5c5a4fbc 100644 --- a/packages/@core/ui-kit/form-ui/src/types.ts +++ b/packages/@core/ui-kit/form-ui/src/types.ts @@ -350,9 +350,9 @@ export interface ActionButtonOptions extends VbenButtonProps { export interface VbenFormProps< T extends BaseFormComponentType = BaseFormComponentType, > extends Omit< - FormRenderProps, - 'componentBindEventMap' | 'componentMap' | 'form' - > { + FormRenderProps, + 'componentBindEventMap' | 'componentMap' | 'form' +> { /** * 操作按钮是否反转(提交按钮前置) */ diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts index e12729a4e..a55a4d238 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts @@ -27,8 +27,10 @@ export type CustomRenderType = (() => Component | string) | string; export type ValueType = boolean | number | string; -export interface VbenButtonGroupProps - extends Pick { +export interface VbenButtonGroupProps extends Pick< + VbenButtonProps, + 'disabled' +> { /** 单选模式下允许清除选中 */ allowClear?: boolean; /** 值改变前的回调 */ diff --git a/packages/effects/common-ui/src/components/captcha/types.ts b/packages/effects/common-ui/src/components/captcha/types.ts index cd1efdf48..f73877eef 100644 --- a/packages/effects/common-ui/src/components/captcha/types.ts +++ b/packages/effects/common-ui/src/components/captcha/types.ts @@ -54,8 +54,7 @@ export interface PointSelectionCaptchaCardProps { width?: number | string; } -export interface PointSelectionCaptchaProps - extends PointSelectionCaptchaCardProps { +export interface PointSelectionCaptchaProps extends PointSelectionCaptchaCardProps { /** * 是否展示确定按钮 * @default false diff --git a/playground/src/router/routes/modules/demos.ts b/playground/src/router/routes/modules/demos.ts index 3df4f0ad6..b8d27ef5a 100644 --- a/playground/src/router/routes/modules/demos.ts +++ b/playground/src/router/routes/modules/demos.ts @@ -157,9 +157,7 @@ const routes: RouteRecordRaw[] = [ name: 'HideChildrenInMenuDemo', path: '', component: () => - import( - '#/views/demos/features/hide-menu-children/parent.vue' - ), + import('#/views/demos/features/hide-menu-children/parent.vue'), meta: { // hideInMenu: true, title: $t('demos.features.hideChildrenInMenu'), @@ -169,9 +167,7 @@ const routes: RouteRecordRaw[] = [ name: 'HideChildrenInMenuChildrenDemo', path: '/demos/features/hide-menu-children/children', component: () => - import( - '#/views/demos/features/hide-menu-children/children.vue' - ), + import('#/views/demos/features/hide-menu-children/children.vue'), meta: { activePath: '/demos/features/hide-menu-children', title: $t('demos.features.hideChildrenInMenu'), @@ -247,9 +243,7 @@ const routes: RouteRecordRaw[] = [ name: 'RequestParamsSerializerDemo', path: '/demos/features/request-params-serializer', component: () => - import( - '#/views/demos/features/request-params-serializer/index.vue' - ), + import('#/views/demos/features/request-params-serializer/index.vue'), meta: { icon: 'lucide:git-pull-request-arrow', title: $t('demos.features.requestParamsSerializer'),