From c6060958cf5baed5f4e1890e7b95e3461c70bcbb Mon Sep 17 00:00:00 2001 From: "Yanghai.Lin" Date: Thu, 7 May 2026 18:23:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(other):=20=E4=BF=AE=E5=A4=8D=20oxlint?= =?UTF-8?q?=20ignorePatterns=20=E5=AF=BC=E8=87=B4=20pre-commit=20hook=20?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lefthook.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lefthook.yml b/lefthook.yml index a37ae775b..fec09546b 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -50,10 +50,10 @@ pre-commit: run: pnpm oxfmt {staged_files} glob: '*.md' lint-vue: - run: pnpm oxfmt {staged_files} && pnpm oxlint --fix {staged_files} && pnpm eslint --cache --fix {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files} + run: pnpm oxfmt {staged_files} && pnpm oxlint --fix --no-error-on-unmatched-pattern {staged_files} && pnpm eslint --cache --fix {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files} glob: '*.vue' lint-js: - run: pnpm oxfmt {staged_files} && pnpm oxlint --fix {staged_files} && pnpm eslint --cache --fix {staged_files} + run: pnpm oxfmt {staged_files} && pnpm oxlint --fix --no-error-on-unmatched-pattern {staged_files} && pnpm eslint --cache --fix {staged_files} glob: '*.{js,jsx,ts,tsx}' lint-style: run: pnpm oxfmt {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files} From 150eab79111f7f3e6f0141823e6d8ccc158eea3f Mon Sep 17 00:00:00 2001 From: "Yanghai.Lin" Date: Thu, 7 May 2026 18:24:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(@vben-core/shadcn-ui):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20Input=20=E7=BB=84=E4=BB=B6=20focus=20=E6=97=B6?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E8=A2=AB=E7=88=B6=E5=AE=B9=E5=99=A8=20overfl?= =?UTF-8?q?ow=20hidden=20=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue index c5de6d1eb..9a4c3a072 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue @@ -24,7 +24,7 @@ const modelValue = useVModel(props, 'modelValue', emits, { v-model="modelValue" :class=" cn( - 'border-input bg-background ring-offset-background placeholder:text-muted-foreground/50 focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-1 focus-visible:outline-hidden disabled:cursor-not-allowed disabled:opacity-50', + 'border-input bg-background ring-offset-background placeholder:text-muted-foreground/50 focus-visible:outline-none flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50', props.class, ) " @@ -34,6 +34,10 @@ const modelValue = useVModel(props, 'modelValue', emits, { input { --ring: var(--primary); + &:focus-visible { + box-shadow: inset 0 0 0 1px hsl(var(--ring)); + } + &::-ms-reveal, &::-ms-clear { display: none;