From 49fa01f209bee61c6520d1747946aab9c574cace Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Sun, 13 Oct 2024 19:27:22 +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

build: publish success
perf: 优化列设置多级表头支持级联勾选
perf: table-select支持destroyOnClose参数，以修复点击取消后，扔保留上一次选中值的bug
---
 packages/ui/certd-client/CHANGELOG.md              |  7 +++++++
 packages/ui/certd-client/package.json              | 10 +++++-----
 .../src/layout/components/tabs/index.vue           |  6 +++---
 .../src/views/crud/component/text/crud.tsx         | 14 +++++++++++---
 .../src/views/crud/component/text/mock.ts          |  1 +
 .../certd-client/src/views/crud/form/base/crud.tsx |  8 ++++++--
 .../certd-client/src/views/crud/form/base/mock.ts  |  2 ++
 7 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index 256e68132..0cc21de0f 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.4](https://github.com/fast-crud/fast-crud/compare/v1.21.3...v1.21.4) (2024-10-13)
+
+### Performance Improvements
+
+* 优化列设置多级表头支持级联勾选 ([a196922](https://github.com/fast-crud/fast-crud/commit/a196922630e9ef627dd548bb8d1c13acbe2eee28))
+* table-select支持destroyOnClose参数，以修复点击取消后，扔保留上一次选中值的bug ([5a70cec](https://github.com/fast-crud/fast-crud/commit/5a70cec7e5f45439a518fc2aadc40b29fad5c6f1))
+
 ## [1.21.3](https://github.com/fast-crud/fast-crud/compare/v1.21.2...v1.21.3) (2024-09-20)
 
 ### Performance Improvements
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index b13a857c6..eb0a5e7a3 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fast-crud/fs-admin-antdv4",
-  "version": "1.21.3",
+  "version": "1.21.4",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -26,10 +26,10 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@aws-sdk/client-s3": "^3.535.0",
     "@aws-sdk/s3-request-presigner": "^3.535.0",
-    "@fast-crud/fast-crud": "^1.21.3",
-    "@fast-crud/fast-extends": "^1.21.3",
-    "@fast-crud/ui-antdv4": "^1.21.3",
-    "@fast-crud/ui-interface": "^1.21.3",
+    "@fast-crud/fast-crud": "^1.21.4",
+    "@fast-crud/fast-extends": "^1.21.4",
+    "@fast-crud/ui-antdv4": "^1.21.4",
+    "@fast-crud/ui-interface": "^1.21.4",
     "@iconify/vue": "^4.1.1",
     "@soerenmartius/vue3-clipboard": "^0.1.2",
     "ant-design-vue": "^4.1.2",
diff --git a/packages/ui/certd-client/src/layout/components/tabs/index.vue b/packages/ui/certd-client/src/layout/components/tabs/index.vue
index 6f289abc0..14d8144ea 100644
--- a/packages/ui/certd-client/src/layout/components/tabs/index.vue
+++ b/packages/ui/certd-client/src/layout/components/tabs/index.vue
@@ -2,7 +2,7 @@
   <div class="fs-multiple-page-control-group">
     <div class="fs-multiple-page-control-content">
       <div class="fs-multiple-page-control-content-inner">
-        <a-tabs class="fs-multiple-page-control fs-multiple-page-sort" :active-key="page.getCurrent" type="editable-card" hide-add @tabClick="handleClick" @edit="handleTabEdit">
+        <a-tabs class="fs-multiple-page-control fs-multiple-page-sort" :active-key="page.getCurrent" type="editable-card" hide-add @tab-click="handleClick" @edit="handleTabEdit">
           <a-tab-pane v-for="item in page.getOpened" :key="item.fullPath" :tab="item.meta?.title || '未命名'" :name="item.fullPath" :closable="isTabClosable(item)" />
         </a-tabs>
         <!--        <fs-contextmenu v-model:visible="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">-->
@@ -16,10 +16,10 @@
 
     <div class="fs-multiple-page-control-btn">
       <a-dropdown-button class="control-btn-dropdown" split-button @click="closeAll">
-        <span class="iconify" data-icon="ion:close-circle" data-inline="false"></span>
+        <fs-icon icon="ion:close-circle"></fs-icon>
         <template #icon><DownOutlined /></template>
         <template #overlay>
-          <a-menu @click="(command:any) => handleControlItemClick(command)">
+          <a-menu @click="(command: any) => handleControlItemClick(command)">
             <a-menu-item key="left">
               <fs-icon name="arrow-left" class="fs-mr-10" />
               关闭左侧
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 477351ec9..eb87f1c8c 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
@@ -105,6 +105,14 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
             }
           }
         },
+        long: {
+          title: "演示Text很长时如何很好的展示",
+          type: "text",
+          column: {
+            ellipsis: true,
+            showTitle: true
+          }
+        },
         search: {
           title: "搜索",
           type: "text",
@@ -169,8 +177,8 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
                 utils.logger.info("context scope", context);
                 return (
                   <a-input-group compact>
-                    <a-input placeholder={"render1 input"} style="width: 50%" v-model={[context.form.render, "value"]} />
-                    <a-input placeholder={"render2 input"} style="width: 50%" v-model={[context.form.render2, "value"]} />
+                    <a-input placeholder={"render1 input"} style={{ width: "50%" }} v-model={[context.form.render, "value"]} />
+                    <a-input placeholder={"render2 input"} style={{ width: "50%" }} v-model={[context.form.render2, "value"]} />
                   </a-input-group>
                 );
               }
@@ -181,7 +189,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           title: "我的值是由复杂输入列输入的",
           type: "text",
           column: {
-            width: "300px"
+            width: 300
           },
           form: {
             show: false
diff --git a/packages/ui/certd-client/src/views/crud/component/text/mock.ts b/packages/ui/certd-client/src/views/crud/component/text/mock.ts
index da1fc7ee3..56136451d 100644
--- a/packages/ui/certd-client/src/views/crud/component/text/mock.ts
+++ b/packages/ui/certd-client/src/views/crud/component/text/mock.ts
@@ -24,6 +24,7 @@ const list = [
     name: "张三",
     date: "2016-05-04",
     status: "1",
+    long: "我很长我很长我很长我很长我很长我很长我很长我很长",
     province: "2",
     copy: "测试文本",
     classId: 2
diff --git a/packages/ui/certd-client/src/views/crud/form/base/crud.tsx b/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
index e50dba17e..e60f99f2a 100644
--- a/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
@@ -49,7 +49,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         afterSubmit(context) {
           // context.res 是add或update请求返回结果
           if (context.form.id === 1) {
-            message.error("模拟保存失败，阻止弹窗关闭");
+            message.error("模拟保存失败，阻止弹窗关闭，请选择其他行的数据进行编辑保存");
             throw new Error("模拟失败，阻止弹窗关闭");
           }
         },
@@ -102,7 +102,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         },
         long: {
           title: "演示Label很长时如何很好的展示",
-          type: "text"
+          type: "text",
+          column: {
+            ellipsis: true,
+            showTitle: true
+          }
         },
         draft: {
           title: "草稿",
diff --git a/packages/ui/certd-client/src/views/crud/form/base/mock.ts b/packages/ui/certd-client/src/views/crud/form/base/mock.ts
index 2caa7c35d..86291d51e 100644
--- a/packages/ui/certd-client/src/views/crud/form/base/mock.ts
+++ b/packages/ui/certd-client/src/views/crud/form/base/mock.ts
@@ -10,12 +10,14 @@ const list = [
     age: 15,
     password: "",
     status: "2",
+    long: "我的label很长",
     url: "https://baidu.com",
     renderLabel: "第一行编辑演示阻止表单提交"
   },
   {
     name: "张三",
     age: 18,
+    long: "我的label很长",
     password: "",
     url: "https://baidu.com"
   },