Merge remote-tracking branch 'yudao/dev' into dev

2025-04-29 15:45:48 +08:00
parent 16140848b1 6794f1a7f7
commit ab60f8eb3a
189 changed files with 2174 additions and 1516 deletions
--- a/packages/effects/common-ui/package.json
+++ b/packages/effects/common-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/common-ui",
-  "version": "5.5.4",
+  "version": "5.5.5",
  "homepage": "https://github.com/vbenjs/vue-vben-admin",
  "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
  "repository": {
--- a/packages/effects/common-ui/src/components/captcha/hooks/useCaptchaPoints.ts
+++ b/packages/effects/common-ui/src/components/captcha/hooks/useCaptchaPoints.ts
@@ -9,7 +9,7 @@ export function useCaptchaPoints() {
  }

  function clearPoints() {
-    points.splice(0, points.length);
+    points.splice(0);
  }
  return {
    addPoint,
--- a/packages/effects/common-ui/src/components/json-viewer/style.scss
+++ b/packages/effects/common-ui/src/components/json-viewer/style.scss
@@ -65,7 +65,7 @@

    &.jv-string {
      color: hsl(var(--primary));
-      word-break: break-word;
+      overflow-wrap: break-word;
      white-space: normal;
    }
  }
--- a/packages/effects/common-ui/src/components/page/page.vue
+++ b/packages/effects/common-ui/src/components/page/page.vue
@@ -61,7 +61,9 @@ onMounted(() => {
      v-if="$slots.doc && isDocAlertEnable()"
      ref="docRef"
      :class="
-        cn('bg-card border-border relative flex items-end border-b px-6 py-4')
+        cn(
+          'bg-card border-border relative flex items-end rounded-md border-b p-4',
+        )
      "
    >
      <div class="flex-auto">
--- a/packages/effects/common-ui/src/ui/authentication/doc-link.vue
+++ b/packages/effects/common-ui/src/ui/authentication/doc-link.vue
@@ -37,7 +37,7 @@ defineOptions({
        ⚡ 面试手册
      </a>
      <a
-        href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg"
+        href="http://static.yudao.iocoder.cn/mp/xinyu370.jpeg"
        target="_blank"
        class="text-primary hover:text-primary/80 text-sm"
      >
--- a/packages/effects/common-ui/src/ui/authentication/login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/login.vue
@@ -18,7 +18,7 @@ import DocLink from './doc-link.vue';
 import ThirdPartyLogin from './third-party-login.vue';

 interface Props extends AuthenticationProps {
-  formSchema: VbenFormSchema[];
+  formSchema?: VbenFormSchema[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/authentication/register.vue
+++ b/packages/effects/common-ui/src/ui/authentication/register.vue
@@ -14,7 +14,7 @@ import { VbenButton } from '@vben-core/shadcn-ui';
 import Title from './auth-title.vue';

 interface Props {
-  formSchema: VbenFormSchema[];
+  formSchema?: VbenFormSchema[];
  /**
   * @zh_CN 是否处于加载处理状态
   */
--- a/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-charts-tabs.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-charts-tabs.vue
@@ -6,7 +6,7 @@ import { computed } from 'vue';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@vben-core/shadcn-ui';

 interface Props {
-  tabs: TabOption[];
+  tabs?: TabOption[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-overview.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-overview.vue
@@ -12,7 +12,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: AnalysisOverviewItem[];
+  items?: AnalysisOverviewItem[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-project.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-project.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchProjectItem[];
+  items?: WorkbenchProjectItem[];
  title: string;
 }

@@ -37,6 +37,8 @@ defineEmits(['click']);
            'border-r-0': index % 3 === 2,
            'border-b-0': index < 3,
            'pb-4': index > 2,
+            'rounded-bl-xl': index === items.length - 3,
+            'rounded-br-xl': index === items.length - 1,
          }"
          class="border-border group w-full cursor-pointer border-r border-t p-4 transition-all hover:shadow-xl md:w-1/2 lg:w-1/3"
        >
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-quick-nav.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-quick-nav.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchQuickNavItem[];
+  items?: WorkbenchQuickNavItem[];
  title: string;
 }

@@ -35,8 +35,10 @@ defineEmits(['click']);
        <div
          :class="{
            'border-r-0': index % 3 === 2,
-            'pb-4': index > 2,
            'border-b-0': index < 3,
+            'pb-4': index > 2,
+            'rounded-bl-xl': index === items.length - 3,
+            'rounded-br-xl': index === items.length - 1,
          }"
          class="flex-col-center border-border group w-1/3 cursor-pointer border-r border-t py-8 hover:shadow-xl"
          @click="$emit('click', item)"
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-todo.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-todo.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchTodoItem[];
+  items?: WorkbenchTodoItem[];
  title: string;
 }

--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchTrendItem[];
+  items?: WorkbenchTrendItem[];
  title: string;
 }