🔱: [client] sync upgrade with 3 commits [trident-sync]

refactor: 1.11.10
fix: 修复列设置显隐和禁用无效的bug

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.10](https://github.com/fast-crud/fast-crud/compare/v1.11.9...v1.11.10) (2023-03-29)
+
+**Note:** Version bump only for package @fast-crud/fs-admin-antdv
+
 ## [1.11.9](https://github.com/fast-crud/fast-crud/compare/v1.11.8...v1.11.9) (2023-03-28)
 
 **Note:** Version bump only for package @fast-crud/fs-admin-antdv

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fast-crud/fs-admin-antdv",
-  "version": "1.11.9",
+  "version": "1.11.10",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -25,8 +25,8 @@
     "@ant-design/icons-vue": "^6.1.0",
     "@aws-sdk/client-s3": "^3.292.0",
     "@aws-sdk/s3-request-presigner": "^3.292.0",
-    "@fast-crud/fast-crud": "^1.11.9",
+    "@fast-crud/fast-crud": "^1.11.10",
-    "@fast-crud/fast-extends": "^1.11.9",
+    "@fast-crud/fast-extends": "^1.11.10",
     "@fast-crud/ui-antdv": "^1.11.9",
     "@fast-crud/ui-interface": "^1.11.9",
     "@iconify/iconify": "^3.1.0",

packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx

@@ -1,6 +1,8 @@
 import * as api from "./api.js";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { message } from "ant-design-vue";
 export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { crudBinding } = crudExpose;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -28,6 +30,34 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           mode: "default"
         }
       },
+      actionbar: {
+        buttons: {
+          toggleMode: {
+            text: "切换简单模式",
+            click() {
+              crudBinding.value.toolbar.columnsFilter.mode = crudBinding.value.toolbar.columnsFilter.mode === "simple" ? "default" : "simple";
+              message.info("当前列设置组件的模式为：" + crudBinding.value.toolbar.columnsFilter.mode);
+            }
+          },
+          toggleColumnSetShow: {
+            text: "切换列设置项显隐",
+            click() {
+              crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow = !crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow;
+              message.info("切换第4列的列设置显隐");
+            }
+          },
+          toggleColumnSetDisabled: {
+            text: "切换列设置项禁用",
+            click() {
+              crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled = !crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled;
+              message.info("切换第3列的列设置禁用启用");
+            }
+          },
+          desc: {
+            text: "点击左侧按钮后，再点最右侧的列设置按钮查看效果"
+          }
+        }
+      },
       columns: {
         id: {
           title: "ID",

packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue

@@ -1,19 +1,15 @@
 <template>
   <fs-page>
     <template #header>
-      <div class="title">列设置</div>
+      <div class="title">
+        列设置
+        <span class="sub">列设置可以禁用或者隐藏某字段勾选 ，-------> 点击右侧最后一个按钮查看效果</span>
+      </div>
       <div class="more">
         <a target="_blank" href="http://fast-crud.docmirror.cn/api/crud-options/toolbar.html#columnsfilter-mode">文档</a>
       </div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding">
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-      <template #actionbar-right>
-        <a-alert class="ml-1" type="warning" message="列设置可以禁用或者隐藏某字段勾选 ，-------> 点击右侧最后一个按钮查看效果" />
-        <a-button @click="columnsSetToggleMode()"> 切换简单模式 </a-button>
-
-        <a-button @click="columnsSetShowToggle()"> 动态修改列设置显隐 </a-button>
-      </template>
-    </fs-crud>
   </fs-page>
 </template>