@@ -164,8 +159,7 @@ async function onSendCode(api: () => Promise) {
@@ -176,8 +170,7 @@ async function onSendCode(api: () => Promise
+ class="not-prose relative w-full overflow-x-auto rounded-t-lg px-4 py-6">
+ @update:model-value="open = true">
+ class="absolute bottom-0 left-0 h-[2px] w-(--reka-tabs-indicator-size) translate-x-(--reka-tabs-indicator-position) rounded-full transition-[width,transform] duration-300">
{
:key="index"
:value="tab.label"
class="border-box px-4 py-3 text-foreground data-[state=active]:text-(--vp-c-indigo-1)"
- tabindex="-1"
- >
+ tabindex="-1">
{{ tab.label }}
@@ -76,14 +73,12 @@ const toggleOpen = () => {
:class="{
'py-2': !open,
}"
- class="flex items-center"
- >
+ class="flex items-center">
@@ -92,15 +87,13 @@ const toggleOpen = () => {
> {
:immediate="false"
children-field="children"
loading-slot="suffixIcon"
- visible-event="onDropdownVisibleChange"
- />
+ visible-event="onDropdownVisibleChange" />
```
diff --git a/apps/vben5/docs/src/components/common-ui/vben-cropper.md b/apps/vben5/docs/src/components/common-ui/vben-cropper.md
index c25d32573..5fe60ee4c 100644
--- a/apps/vben5/docs/src/components/common-ui/vben-cropper.md
+++ b/apps/vben5/docs/src/components/common-ui/vben-cropper.md
@@ -163,8 +163,7 @@ const handleCropWithSize = async () => {
:img="imageUrl"
:width="500"
:height="400"
- aspect-ratio="1:1"
- />
+ aspect-ratio="1:1" />
![]()
diff --git a/apps/vben5/docs/src/components/common-ui/vben-table-action.md b/apps/vben5/docs/src/components/common-ui/vben-table-action.md
index 6ffe34dc7..b250921eb 100644
--- a/apps/vben5/docs/src/components/common-ui/vben-table-action.md
+++ b/apps/vben5/docs/src/components/common-ui/vben-table-action.md
@@ -92,8 +92,7 @@ import { VbenTableAction } from '#/adapter/vxe-table';
auth: ['AC_100100'],
},
]"
- align="center"
- />
+ align="center" />
@@ -118,8 +117,7 @@ function hasPermission(auth?: string | string[]) {
> {
:immediate="false"
children-field="children"
loading-slot="suffixIcon"
- visible-event="onDropdownVisibleChange"
- />
+ visible-event="onDropdownVisibleChange" />
diff --git a/apps/vben5/docs/src/demos/vben-count-to-animator/custom/index.vue b/apps/vben5/docs/src/demos/vben-count-to-animator/custom/index.vue
index 5a2434058..343da0b9e 100644
--- a/apps/vben5/docs/src/demos/vben-count-to-animator/custom/index.vue
+++ b/apps/vben5/docs/src/demos/vben-count-to-animator/custom/index.vue
@@ -7,6 +7,5 @@ import { VbenCountToAnimator } from '@vben/common-ui';
:end-val="2000000"
:start-val="1"
prefix="$"
- separator="/"
- />
+ separator="/" />
diff --git a/apps/vben5/docs/src/demos/vben-cropper/aspect-ratio/index.vue b/apps/vben5/docs/src/demos/vben-cropper/aspect-ratio/index.vue
index 8c28174ad..3b47c0dab 100644
--- a/apps/vben5/docs/src/demos/vben-cropper/aspect-ratio/index.vue
+++ b/apps/vben5/docs/src/demos/vben-cropper/aspect-ratio/index.vue
@@ -53,8 +53,7 @@ onBeforeUnmount(() => {
@@ -65,20 +64,17 @@ onBeforeUnmount(() => {
:img="imageUrl"
:width="500"
:height="300"
- :aspect-ratio="aspectRatio"
- />
+ :aspect-ratio="aspectRatio" />
diff --git a/apps/vben5/docs/src/demos/vben-cropper/basic/index.vue b/apps/vben5/docs/src/demos/vben-cropper/basic/index.vue
index 332a1c358..c9a65ee48 100644
--- a/apps/vben5/docs/src/demos/vben-cropper/basic/index.vue
+++ b/apps/vben5/docs/src/demos/vben-cropper/basic/index.vue
@@ -43,14 +43,12 @@ onBeforeUnmount(() => {
diff --git a/apps/vben5/docs/src/demos/vben-descriptions/size/index.vue b/apps/vben5/docs/src/demos/vben-descriptions/size/index.vue
index d75a7e6b2..bc0db2e2a 100644
--- a/apps/vben5/docs/src/demos/vben-descriptions/size/index.vue
+++ b/apps/vben5/docs/src/demos/vben-descriptions/size/index.vue
@@ -15,21 +15,18 @@ const items = [
bordered
title="Small"
:column="2"
- :items="items"
- />
+ :items="items" />
diff --git a/apps/vben5/docs/src/demos/vben-drawer/auto-height/drawer.vue b/apps/vben5/docs/src/demos/vben-drawer/auto-height/drawer.vue
index 41cb3c46b..36ab221f1 100644
--- a/apps/vben5/docs/src/demos/vben-drawer/auto-height/drawer.vue
+++ b/apps/vben5/docs/src/demos/vben-drawer/auto-height/drawer.vue
@@ -32,8 +32,7 @@ function handleUpdate(len: number) {
{
'-z',
]);
- let changedList = stdout ? stdout.replace(/\0$/, '').split('\0') : [];
+ const nullSeparator = '\u0000';
+ const normalizedStdout = stdout.endsWith(nullSeparator)
+ ? stdout.slice(0, -1)
+ : stdout;
+ let changedList = normalizedStdout
+ ? normalizedStdout.split(nullSeparator)
+ : [];
changedList = changedList.map((item) => path.resolve(process.cwd(), item));
const changedSet = new Set(changedList);
changedSet.delete('');
diff --git a/apps/vben5/internal/vite-config/src/plugins/importmap.ts b/apps/vben5/internal/vite-config/src/plugins/importmap.ts
index 0ccda99f8..1cf3cb84f 100644
--- a/apps/vben5/internal/vite-config/src/plugins/importmap.ts
+++ b/apps/vben5/internal/vite-config/src/plugins/importmap.ts
@@ -180,7 +180,7 @@ async function viteImportMapPlugin(
},
injectTo: 'head-prepend',
tag: 'script',
- children: `${JSON.stringify(importmapJson)}`,
+ children: JSON.stringify(importmapJson),
},
],
};
diff --git a/apps/vben5/oxfmt.config.ts b/apps/vben5/oxfmt.config.ts
index 9ad7fe1bf..4db35686d 100644
--- a/apps/vben5/oxfmt.config.ts
+++ b/apps/vben5/oxfmt.config.ts
@@ -1,6 +1,7 @@
import { defineConfig } from '@vben/oxfmt-config';
export default defineConfig({
+ bracketSameLine: true,
ignorePatterns: [
'dist',
'dev-dist',
@@ -18,7 +19,7 @@ export default defineConfig({
'.output',
'**/*.svg',
'**/*.sh',
- 'public',
+ 'public/',
'.npmrc',
'*-lock.yaml',
'skills-lock.json',
diff --git a/apps/vben5/oxlint.config.ts b/apps/vben5/oxlint.config.ts
index 230ddd98b..21bf2ac5c 100644
--- a/apps/vben5/oxlint.config.ts
+++ b/apps/vben5/oxlint.config.ts
@@ -2,4 +2,15 @@ import { oxlintConfig } from '@vben/oxlint-config';
import { defineConfig } from 'oxlint';
-export default defineConfig(oxlintConfig);
+export default defineConfig({
+ ...oxlintConfig,
+ rules: {
+ 'no-unused-expressions': 'warn',
+ 'no-unused-vars': 'warn',
+ 'typescript/no-dynamic-delete': 'warn',
+ 'typescript/no-non-null-assertion': 'warn',
+ 'unicorn/no-useless-spread': 'warn',
+ 'vitest/hoisted-apis-on-top': 'warn',
+ 'vitest/require-mock-type-parameters': 'warn',
+ },
+});
diff --git a/apps/vben5/package.json b/apps/vben5/package.json
index dbe278a44..10b2fcdea 100644
--- a/apps/vben5/package.json
+++ b/apps/vben5/package.json
@@ -55,6 +55,7 @@
"dev:play": "pnpm -F @vben/playground run dev",
"format": "vsh lint --format",
"lint": "vsh lint",
+ "lint:check": "oxlint --quiet",
"postinstall": "pnpm -r run --if-present stub",
"preinstall": "npx only-allow pnpm",
"prepare": "is-ci || pnpm exec lefthook install",
diff --git a/apps/vben5/packages/@abp/account/src/components/MyProfile.vue b/apps/vben5/packages/@abp/account/src/components/MyProfile.vue
index a17f9b5eb..e7eda10ed 100644
--- a/apps/vben5/packages/@abp/account/src/components/MyProfile.vue
+++ b/apps/vben5/packages/@abp/account/src/components/MyProfile.vue
@@ -78,63 +78,53 @@ onMounted(onGet);
+ mode="inline" />
+ class="block overflow-y-scroll bg-(--vp-code-block-bg) transition-all duration-300">
+ class="rounded-xl">
+ src="https://opencollective.com/vbenjs/contributors.svg?button=false" />
diff --git a/apps/vben5/docs/src/components/common-ui/vben-api-component.md b/apps/vben5/docs/src/components/common-ui/vben-api-component.md
index b14e07258..d7ef529a4 100644
--- a/apps/vben5/docs/src/components/common-ui/vben-api-component.md
+++ b/apps/vben5/docs/src/components/common-ui/vben-api-component.md
@@ -116,8 +116,7 @@ function fetchApi(): Promise
+ src="https://opencollective.com/vbenjs/contributors.svg?button=false" />
+ class="flex-center h-55 w-full bg-muted even:bg-heavy">
{{ item }}
diff --git a/apps/vben5/docs/src/demos/vben-modal/auto-height/modal.vue b/apps/vben5/docs/src/demos/vben-modal/auto-height/modal.vue
index 6a23fc87a..b3b041164 100644
--- a/apps/vben5/docs/src/demos/vben-modal/auto-height/modal.vue
+++ b/apps/vben5/docs/src/demos/vben-modal/auto-height/modal.vue
@@ -32,8 +32,7 @@ function handleUpdate(len: number) {
+ class="flex-center h-55 w-full bg-muted even:bg-heavy">
{{ item }}
diff --git a/apps/vben5/docs/src/demos/vben-table-action/dropdown/index.vue b/apps/vben5/docs/src/demos/vben-table-action/dropdown/index.vue
index b7664e51e..2d5261e5d 100644
--- a/apps/vben5/docs/src/demos/vben-table-action/dropdown/index.vue
+++ b/apps/vben5/docs/src/demos/vben-table-action/dropdown/index.vue
@@ -35,8 +35,7 @@ const dropdownActions: ActionItem[] = [
:dropdown-actions="dropdownActions"
align="start"
divider
- more-text="更多"
- />
+ more-text="更多" />
最近点击：{{ last }}
diff --git a/apps/vben5/docs/src/demos/vben-table-action/permission/index.vue b/apps/vben5/docs/src/demos/vben-table-action/permission/index.vue index bce245ca8..28dde3963 100644 --- a/apps/vben5/docs/src/demos/vben-table-action/permission/index.vue +++ b/apps/vben5/docs/src/demos/vben-table-action/permission/index.vue @@ -23,6 +23,5 @@ const actions: ActionItem[] = [提示:
-
diff --git a/apps/vben5/docs/src/en/components/common-ui/vben-api-component.md b/apps/vben5/docs/src/en/components/common-ui/vben-api-component.md
index a38a9e189..8df27c386 100644
--- a/apps/vben5/docs/src/en/components/common-ui/vben-api-component.md
+++ b/apps/vben5/docs/src/en/components/common-ui/vben-api-component.md
@@ -40,8 +40,7 @@ function fetchApi() {
:immediate="false"
children-field="children"
loading-slot="suffixIcon"
- visible-event="onDropdownVisibleChange"
- />
+ visible-event="onDropdownVisibleChange" />
```
diff --git a/apps/vben5/docs/src/en/components/common-ui/vben-cropper.md b/apps/vben5/docs/src/en/components/common-ui/vben-cropper.md
index ebddda318..5d1450d70 100644
--- a/apps/vben5/docs/src/en/components/common-ui/vben-cropper.md
+++ b/apps/vben5/docs/src/en/components/common-ui/vben-cropper.md
@@ -150,8 +150,7 @@ const handleCropWithSize = async () => {
:img="imageUrl"
:width="500"
:height="400"
- aspect-ratio="1:1"
- />
+ aspect-ratio="1:1" />
+ class="flex items-center justify-center rounded-lg bg-[#dac6c6]">
+ required>
@@ -175,8 +171,7 @@ async function onValidCode() {
{{ authenticator?.sharedKey }}
@@ -144,8 +141,7 @@ async function onValidCode() {
+ class="flex flex-col items-center justify-center rounded-lg bg-[#dac6c6]">
{{ recoveryCodes.slice(0, 5).join('\r\n') }}
@@ -195,8 +190,7 @@ async function onValidCode() {
v-if="currentStep < 2"
:disabled="currentStep === 1 && !codeValidated"
type="primary"
- @click="onNextStep"
- >
+ @click="onNextStep">
{{ $t('AbpAccount.Steps:NextStep') }}
+ class="text-foreground mb-3 text-3xl font-bold leading-9 tracking-tight lg:text-4xl">
diff --git a/apps/vben5/packages/@abp/account/src/components/components/NoticeSettings.vue b/apps/vben5/packages/@abp/account/src/components/components/NoticeSettings.vue
index 7b67fb6c9..e29c85531 100644
--- a/apps/vben5/packages/@abp/account/src/components/components/NoticeSettings.vue
+++ b/apps/vben5/packages/@abp/account/src/components/components/NoticeSettings.vue
@@ -88,16 +88,14 @@ onMounted(() => {
-
+ :key="notification.name">
@@ -587,8 +584,7 @@ onMounted(onInit);
ref="bubbleRef"
:items="bubbleItems"
:roles="bubbleRoles"
- :style="styles.messages"
- />
+ :style="styles.messages" />
+ @change="(value) => (content = value)">
+ :description="$t('BlobManagement.BlobCanNotPreviewMessage')">
🔍
@@ -276,16 +275,14 @@ watch(blobData, (newVal, oldVal) => {
@@ -297,15 +294,13 @@ watch(blobData, (newVal, oldVal) => {
+ class="whitespace-pre-wrap rounded bg-gray-50 p-4 font-mono text-sm dark:bg-gray-800">
{{ blobText }}
@@ -265,13 +264,11 @@ watch(
+ width="100">
{{ formatSize(row.size) }}
@@ -279,8 +276,7 @@ watch(
+ width="180">
@@ -302,8 +298,7 @@ watch(
fixed="right"
field="action"
:title="$t('AbpUi.Actions')"
- width="100"
- >
+ width="100">
diff --git a/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobFolderTree.vue b/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobFolderTree.vue
index a9e50f87f..9cfc761ed 100644
--- a/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobFolderTree.vue
+++ b/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobFolderTree.vue
@@ -236,16 +236,14 @@ onMounted(onInit);
:field-names="{ label: 'name', value: 'id' }"
:loading="isLoadingContainers"
v-model:value="containerId"
- @change="(e) => onContainerChange(e!.toString())"
- />
+ @change="(e) => onContainerChange(e!.toString())" />
diff --git a/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobViewPage.vue b/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobViewPage.vue
index 1e38e435b..6fdc46cc2 100644
--- a/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobViewPage.vue
+++ b/apps/vben5/packages/@abp/blob-management/src/components/blobs/BlobViewPage.vue
@@ -35,8 +35,7 @@ function onFolderChange(val?: string) {
@@ -311,21 +306,18 @@ watch(
v-if="row.paused || row.error"
:icon="h(CaretRightOutlined)"
@click="onResume(row)"
- type="link"
- />
+ type="link" />
+ type="link" />
+ danger />
@@ -261,8 +259,7 @@ onMounted(onInit);
:tree-data="folders"
:load-data="onLoadChildFolders"
@select="(_, info) => onFolderChange(info.node?.dataRef?.id)"
- @expand="onFolderExpand"
- />
+ @expand="onFolderExpand" />
@@ -265,8 +264,7 @@ onMounted(onSearchClient);
:icon="h(EditOutlined)"
block
type="link"
- @click="onUpdate(row)"
- >
+ @click="onUpdate(row)">
{{ $t('AbpUi.Edit') }}
@@ -277,8 +275,7 @@ onMounted(onSearchClient);
danger
type="link"
v-access:code="[AuthorizationsPermissions.Delete]"
- @click="onDelete(row)"
- >
+ @click="onDelete(row)">
{{ $t('AbpUi.Delete') }}
diff --git a/apps/vben5/packages/@abp/openiddict/src/components/display-names/DisplayNameTable.vue b/apps/vben5/packages/@abp/openiddict/src/components/display-names/DisplayNameTable.vue
index 2ac62bac1..1d7098c9c 100644
--- a/apps/vben5/packages/@abp/openiddict/src/components/display-names/DisplayNameTable.vue
+++ b/apps/vben5/packages/@abp/openiddict/src/components/display-names/DisplayNameTable.vue
@@ -18,8 +18,7 @@ defineOptions({
const props = defineProps
+ :class="cn('flex flex-col gap-2 text-center sm:text-left', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogOverlay.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogOverlay.vue
index 0c721c774..97e0ec27c 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogOverlay.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogOverlay.vue
@@ -26,6 +26,5 @@ useScrollLock();
backdropFilter:
overlayBlur && overlayBlur > 0 ? `blur(${overlayBlur}px)` : 'none',
}"
- :class="cn('z-popup bg-overlay inset-0 fixed', props.class)"
- >
+ :class="cn('z-popup bg-overlay inset-0 fixed', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogTitle.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogTitle.vue
index 7b24f9ea3..7ab0fc255 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogTitle.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogTitle.vue
@@ -19,8 +19,7 @@ const delegatedProps = reactiveOmit(props, 'class');
+ :class="cn('text-muted-foreground text-sm', props.class)">
+ :class="cn('flex items-center px-6 [.border-t]:pt-6', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue
index f3357448d..e9be8a023 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue
@@ -16,8 +16,7 @@ const props = defineProps<{
'@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6',
props.class,
)
- "
- >
+ ">
+ :class="cn('leading-none font-semibold', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
index 87e93702d..a7a9d4ecf 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
@@ -33,13 +33,11 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
indeterminate && 'bg-primary text-primary-foreground border-primary',
props.class,
)
- "
- >
+ ">
+ :class="cn('flex flex-col gap-2 text-center sm:text-left', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
index ac353ac02..7f5458a9f 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
@@ -29,6 +29,5 @@ const dismissableModalId = inject('DISMISSABLE_MODAL_ID', undefined);
backdropFilter:
overlayBlur && overlayBlur > 0 ? `blur(${overlayBlur}px)` : 'none',
}"
- :class="cn('z-popup bg-overlay inset-0 fixed', props.class)"
- >
+ :class="cn('z-popup bg-overlay inset-0 fixed', props.class)">
diff --git a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue
index c480c758b..638a19d30 100644
--- a/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue
+++ b/apps/vben5/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue
@@ -32,8 +32,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
+ :class="cn('text-muted-foreground text-sm', props.class)">