From aebce2f24104dc9f4daf3f78d5bcfd7d23250586 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Fri, 31 Mar 2023 19:24:21 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?=
=?UTF-8?q?h=2021=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
...
---
packages/ui/certd-client/CHANGELOG.md | 6 ++++++
packages/ui/certd-client/package.json | 10 ++++-----
.../views/crud/feature/search-multi/crud.tsx | 21 ++++++++++---------
.../views/crud/feature/search-multi/index.vue | 21 ++++++++++++++++++-
4 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index ff64139b..3ddb6b9f 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -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
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 72754a13..96bf30d8 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -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",
diff --git a/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx
index a0a78e5b..dfef9462 100644
--- a/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx
@@ -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",
diff --git a/packages/ui/certd-client/src/views/crud/feature/search-multi/index.vue b/packages/ui/certd-client/src/views/crud/feature/search-multi/index.vue
index b4e3a79d..96be6ab5 100644
--- a/packages/ui/certd-client/src/views/crud/feature/search-multi/index.vue
+++ b/packages/ui/certd-client/src/views/crud/feature/search-multi/index.vue
@@ -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>