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

refactor: 1.12.0
refactor: 多行查询优化
perf: 优化多行查询示例
feat(search): search支持自定义布局

search支持自定义布局,search.layout、search.collapse转移到 search.container之下。如果想使用原来的search组件,请配置search.is=fs-search-v1
refactor: 1.11.10
fix: 修复列设置显隐和禁用无效的bug
refactor: 1.11.9
refactor: 1.11.9
perf: 增加表单字段render示例
refactor: 删除无用的index
Merge remote-tracking branch 'origin/main'
refactor: circle check
refactor: circle check
refactor: 1.11.8
refactor: upload demo test
perf: 优化dict性能
refactor: debug
fix: 修复当limit=1时,上传文件删光后,再选择文件上传第一次无效的bug

https://github.com/fast-crud/fast-crud/issues/166
refactor: 1.11.7
refactor: 1.11.6
...
pull/14/head
GitHub Actions Bot 2023-03-31 19:24:21 +00:00
parent aa3207fca5
commit aebce2f241
4 changed files with 42 additions and 16 deletions

View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [1.12.0](https://github.com/fast-crud/fast-crud/compare/v1.11.10...v1.12.0) (2023-03-31)
### Performance Improvements
* 优化多行查询示例 ([95fa427](https://github.com/fast-crud/fast-crud/commit/95fa427043b29ef9590ce75fe91df9d5d686b196))
## [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

View File

@ -1,6 +1,6 @@
{
"name": "@fast-crud/fs-admin-antdv",
"version": "1.11.10",
"version": "1.12.0",
"private": true,
"scripts": {
"dev": "vite",
@ -25,10 +25,10 @@
"@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.10",
"@fast-crud/fast-extends": "^1.11.10",
"@fast-crud/ui-antdv": "^1.11.9",
"@fast-crud/ui-interface": "^1.11.9",
"@fast-crud/fast-crud": "^1.12.0",
"@fast-crud/fast-extends": "^1.12.0",
"@fast-crud/ui-antdv": "^1.12.0",
"@fast-crud/ui-interface": "^1.12.0",
"@iconify/iconify": "^3.1.0",
"@iconify/json": "^2.2.35",
"@purge-icons/generated": "^0.9.0",

View File

@ -27,10 +27,11 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
},
search: {
container: {
layout: "multi-line"
},
col: {
span: 4
layout: "multi-line",
action: {
label: "操作"
//col: { span: 4 }
}
},
options: {
labelCol: {
@ -45,10 +46,10 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
change: {
text: "切换模式",
click() {
if (crudExpose.crudBinding.value.search.layout === "multi-line") {
crudExpose.crudBinding.value.search.layout = "";
if (crudExpose.crudBinding.value.search.container.layout === "multi-line") {
crudExpose.crudBinding.value.search.container.layout = "default";
} else {
crudExpose.crudBinding.value.search.layout = "multi-line";
crudExpose.crudBinding.value.search.container.layout = "multi-line";
}
}
},
@ -99,9 +100,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
}
},
text1: {
type: "text",
title: "text1",
search: { show: true }
type: "datetimerange",
title: "datetimerange",
search: { show: true, col: { span: 8 } }
},
text2: {
type: "text",

View File

@ -1,5 +1,5 @@
<template>
<fs-page>
<fs-page class="PageFeatureSearchMulti">
<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
</fs-page>
</template>
@ -25,3 +25,22 @@ export default defineComponent({
}
});
</script>
<style lang="less">
.PageFeatureSearchMulti {
.fs-search {
.fs-search-multi-line-buttons {
position: absolute;
bottom: -38px;
right: 160px;
}
.ant-form-item-label:before {
border-bottom: 1px solid #eee;
content: "";
position: absolute;
bottom: 1px;
left: 2px;
right: 8px;
}
}
}
</style>