Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-08-28 19:26:05 +08:00
parent eff55a7c74 c439d5601f
commit 79b58d13e0
32 changed files with 897 additions and 85 deletions
--- a/packages/effects/common-ui/src/components/index.ts
+++ b/packages/effects/common-ui/src/components/index.ts
@@ -1,3 +1,5 @@
 export * from './ellipsis-text';
 export * from './page';
 export * from '@vben-core/popup-ui';
+
+export { VbenButton } from '@vben-core/shadcn-ui';
--- a/packages/effects/common-ui/src/ui/authentication/login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/login.vue
@@ -161,7 +161,7 @@ defineExpose({ resetCaptcha });
 </script>

 <template>
-  <div @keypress.enter.prevent="handleSubmit">
+  <div @keydown.enter.prevent="handleSubmit">
    <Title>
      {{ title || `${$t('authentication.welcomeBack')} 👋🏻` }}
      <template #desc>