From f0b5489e3e2d9dce06666a487284ae893c7dd7e8 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Mon, 28 Apr 2025 19:25:14 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?=
 =?UTF-8?q?h=204=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

perf: 单元格支持tooltip
Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/plugin/antdv-async/index.ts
fix: 修复naive-ui下 form-item 的label设置为render会报警告的问题
---
 .../certd-client/src/plugin/antdv-async/index.ts  |  5 +++++
 .../src/views/crud/basis/first/crud.ts            |  3 ++-
 .../src/views/crud/basis/helloworld/index.vue     | 15 +++++++++++++--
 .../src/views/crud/component/text/crud.tsx        |  2 +-
 .../src/views/crud/form/base/index.vue            |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/ui/certd-client/src/plugin/antdv-async/index.ts b/packages/ui/certd-client/src/plugin/antdv-async/index.ts
index 0be9e78f..473e0359 100644
--- a/packages/ui/certd-client/src/plugin/antdv-async/index.ts
+++ b/packages/ui/certd-client/src/plugin/antdv-async/index.ts
@@ -234,5 +234,10 @@ export default {
       "ATableSummary",
       defineAsyncComponent(() => import("ant-design-vue/es/vc-table/Footer/Summary"))
     );
+
+    app.component(
+      "ASlider",
+      defineAsyncComponent(() => import("ant-design-vue/es/slider/index"))
+    );
   }
 };
diff --git a/packages/ui/certd-client/src/views/crud/basis/first/crud.ts b/packages/ui/certd-client/src/views/crud/basis/first/crud.ts
index b9823f64..83a2ed01 100644
--- a/packages/ui/certd-client/src/views/crud/basis/first/crud.ts
+++ b/packages/ui/certd-client/src/views/crud/basis/first/crud.ts
@@ -38,7 +38,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps<FirstRo
           search: { show: true },
           column: {
             resizable: true,
-            width: 200
+            width: 200,
+            tooltip: true
           }
         },
         type: {
diff --git a/packages/ui/certd-client/src/views/crud/basis/helloworld/index.vue b/packages/ui/certd-client/src/views/crud/basis/helloworld/index.vue
index d10faf92..fece9814 100644
--- a/packages/ui/certd-client/src/views/crud/basis/helloworld/index.vue
+++ b/packages/ui/certd-client/src/views/crud/basis/helloworld/index.vue
@@ -51,7 +51,6 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
 
   return {
     //自定义变量返回
-    customExport: {},
     crudOptions: {
       request: {
         pageRequest,
@@ -59,6 +58,15 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
         editRequest,
         delRequest
       },
+      actionbar: {
+        buttons: {
+          add: {
+            tooltip: {
+              title: "tooltip演示"
+            }
+          }
+        }
+      },
       columns: {
         name: {
           title: "姓名",
@@ -66,7 +74,10 @@ const createCrudOptions = async function ({}: CreateCrudOptionsProps): Promise<C
           search: { show: true },
           column: {
             resizable: true,
-            width: 200
+            width: 200,
+            tooltip: {
+              title: "tooltip演示"
+            }
           }
         },
         type: {
diff --git a/packages/ui/certd-client/src/views/crud/component/text/crud.tsx b/packages/ui/certd-client/src/views/crud/component/text/crud.tsx
index eb87f1c8..f9cbf4e7 100644
--- a/packages/ui/certd-client/src/views/crud/component/text/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/component/text/crud.tsx
@@ -110,7 +110,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           type: "text",
           column: {
             ellipsis: true,
-            showTitle: true
+            tooltip: true
           }
         },
         search: {
diff --git a/packages/ui/certd-client/src/views/crud/form/base/index.vue b/packages/ui/certd-client/src/views/crud/form/base/index.vue
index dac4fbb3..2c8b5799 100644
--- a/packages/ui/certd-client/src/views/crud/form/base/index.vue
+++ b/packages/ui/certd-client/src/views/crud/form/base/index.vue
@@ -20,7 +20,7 @@
                   label: '上置'
                 },
                 {
-                  value: '',
+                  value: 'horizontal',
                   label: '左置'
                 }
               ]"
@@ -41,7 +41,7 @@ export default defineComponent({
   name: "FormBase",
   setup() {
     const labelWidthRef = ref(100);
-    const labelLayoutRef = ref();
+    const labelLayoutRef = ref("horizontal");
     const context = {
       labelWidthRef,
       labelLayoutRef