From ae55fda1f9aa206d644f2e3da654201f0831f0be Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 26 Oct 2023 09:32:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=20searchCopyFormProps?= =?UTF-8?q?=20valueResolve=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++++++ docs/zh/api/crud-options/settings.md | 4 ++-- packages/fast-admin/fs-admin-antdv4 | 2 +- packages/fast-crud/src/use/use-columns.tsx | 3 +-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 38cde483..fc2ea228 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,13 @@ QQ群

+## 技术支持 +* 群里问问题免费解答 +* 疑难杂症提供远程控制付费技术支持: + * 半小时内解决,88元 + * 高于半小时,188元 + * 解决不了,不收费 + ## 依赖 ### ui组件库 * [Antdv 3x](https://github.com/vueComponent/ant-design-vue) 、[Element-Plus](https://github.com/element-plus/element-plus) 、[NaiveUI](https://github.com/TuSimple/naive-ui) 三选一 diff --git a/docs/zh/api/crud-options/settings.md b/docs/zh/api/crud-options/settings.md index ff7f3973..c4da3d81 100644 --- a/docs/zh/api/crud-options/settings.md +++ b/docs/zh/api/crud-options/settings.md @@ -8,9 +8,9 @@ ## searchCopyFormProps -* 说明:search字段从form配置中继承哪些属性 +* 说明:search字段从form配置中继承哪些属性,其中`valueResolve`,`valueBuilder`会先从columns中继承 * 类型:`string[]` -* 默认:`["component", "valueChange","title", "key","label", "render","valueResolve"]` +* 默认:`["component", "valueChange","title", "key","label", "render"]` ## onUseCrud * 说明:useCrud结束后触发,最后可以修改一下crudBinding diff --git a/packages/fast-admin/fs-admin-antdv4 b/packages/fast-admin/fs-admin-antdv4 index 6a785782..83bda749 160000 --- a/packages/fast-admin/fs-admin-antdv4 +++ b/packages/fast-admin/fs-admin-antdv4 @@ -1 +1 @@ -Subproject commit 6a78578271800ba124019510131a6ef908c7955a +Subproject commit 83bda749520266799c51f3931ab3f95a30e916ea diff --git a/packages/fast-crud/src/use/use-columns.tsx b/packages/fast-crud/src/use/use-columns.tsx index 80969f26..50e91209 100644 --- a/packages/fast-crud/src/use/use-columns.tsx +++ b/packages/fast-crud/src/use/use-columns.tsx @@ -269,8 +269,7 @@ function buildSearchForm(baseOptions: CrudOptions, formType = "search", columnsM "title", "key", "label", - "render", - "valueResolve" + "render" ]; function copyFromCompositionColumn(target: any, key: string, field: string) {