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

build: publish success
perf: 优化列设置多级表头支持级联勾选
perf: table-select支持destroyOnClose参数,以修复点击取消后,扔保留上一次选中值的bug
pull/91/head
GitHub Actions Bot 2024-10-13 19:27:22 +00:00
parent fe9d443100
commit 49fa01f209
7 changed files with 35 additions and 13 deletions

View File

@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.21.3](https://github.com/fast-crud/fast-crud/compare/v1.21.2...v1.21.3) (2024-09-20)
### Performance Improvements ### Performance Improvements

View File

@ -1,6 +1,6 @@
{ {
"name": "@fast-crud/fs-admin-antdv4", "name": "@fast-crud/fs-admin-antdv4",
"version": "1.21.3", "version": "1.21.4",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@ -26,10 +26,10 @@
"@ant-design/icons-vue": "^7.0.1", "@ant-design/icons-vue": "^7.0.1",
"@aws-sdk/client-s3": "^3.535.0", "@aws-sdk/client-s3": "^3.535.0",
"@aws-sdk/s3-request-presigner": "^3.535.0", "@aws-sdk/s3-request-presigner": "^3.535.0",
"@fast-crud/fast-crud": "^1.21.3", "@fast-crud/fast-crud": "^1.21.4",
"@fast-crud/fast-extends": "^1.21.3", "@fast-crud/fast-extends": "^1.21.4",
"@fast-crud/ui-antdv4": "^1.21.3", "@fast-crud/ui-antdv4": "^1.21.4",
"@fast-crud/ui-interface": "^1.21.3", "@fast-crud/ui-interface": "^1.21.4",
"@iconify/vue": "^4.1.1", "@iconify/vue": "^4.1.1",
"@soerenmartius/vue3-clipboard": "^0.1.2", "@soerenmartius/vue3-clipboard": "^0.1.2",
"ant-design-vue": "^4.1.2", "ant-design-vue": "^4.1.2",

View File

@ -2,7 +2,7 @@
<div class="fs-multiple-page-control-group"> <div class="fs-multiple-page-control-group">
<div class="fs-multiple-page-control-content"> <div class="fs-multiple-page-control-content">
<div class="fs-multiple-page-control-content-inner"> <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-tab-pane v-for="item in page.getOpened" :key="item.fullPath" :tab="item.meta?.title || '未命名'" :name="item.fullPath" :closable="isTabClosable(item)" />
</a-tabs> </a-tabs>
<!-- <fs-contextmenu v-model:visible="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">--> <!-- <fs-contextmenu v-model:visible="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">-->
@ -16,10 +16,10 @@
<div class="fs-multiple-page-control-btn"> <div class="fs-multiple-page-control-btn">
<a-dropdown-button class="control-btn-dropdown" split-button @click="closeAll"> <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 #icon><DownOutlined /></template>
<template #overlay> <template #overlay>
<a-menu @click="(command:any) => handleControlItemClick(command)"> <a-menu @click="(command: any) => handleControlItemClick(command)">
<a-menu-item key="left"> <a-menu-item key="left">
<fs-icon name="arrow-left" class="fs-mr-10" /> <fs-icon name="arrow-left" class="fs-mr-10" />
关闭左侧 关闭左侧

View File

@ -105,6 +105,14 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
} }
} }
}, },
long: {
title: "演示Text很长时如何很好的展示",
type: "text",
column: {
ellipsis: true,
showTitle: true
}
},
search: { search: {
title: "搜索", title: "搜索",
type: "text", type: "text",
@ -169,8 +177,8 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
utils.logger.info("context scope", context); utils.logger.info("context scope", context);
return ( return (
<a-input-group compact> <a-input-group compact>
<a-input placeholder={"render1 input"} style="width: 50%" v-model={[context.form.render, "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 placeholder={"render2 input"} style={{ width: "50%" }} v-model={[context.form.render2, "value"]} />
</a-input-group> </a-input-group>
); );
} }
@ -181,7 +189,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
title: "我的值是由复杂输入列输入的", title: "我的值是由复杂输入列输入的",
type: "text", type: "text",
column: { column: {
width: "300px" width: 300
}, },
form: { form: {
show: false show: false

View File

@ -24,6 +24,7 @@ const list = [
name: "张三", name: "张三",
date: "2016-05-04", date: "2016-05-04",
status: "1", status: "1",
long: "我很长我很长我很长我很长我很长我很长我很长我很长",
province: "2", province: "2",
copy: "测试文本", copy: "测试文本",
classId: 2 classId: 2

View File

@ -49,7 +49,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
afterSubmit(context) { afterSubmit(context) {
// context.res 是add或update请求返回结果 // context.res 是add或update请求返回结果
if (context.form.id === 1) { if (context.form.id === 1) {
message.error("模拟保存失败,阻止弹窗关闭"); message.error("模拟保存失败,阻止弹窗关闭,请选择其他行的数据进行编辑保存");
throw new Error("模拟失败,阻止弹窗关闭"); throw new Error("模拟失败,阻止弹窗关闭");
} }
}, },
@ -102,7 +102,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
}, },
long: { long: {
title: "演示Label很长时如何很好的展示", title: "演示Label很长时如何很好的展示",
type: "text" type: "text",
column: {
ellipsis: true,
showTitle: true
}
}, },
draft: { draft: {
title: "草稿", title: "草稿",

View File

@ -10,12 +10,14 @@ const list = [
age: 15, age: 15,
password: "", password: "",
status: "2", status: "2",
long: "我的label很长",
url: "https://baidu.com", url: "https://baidu.com",
renderLabel: "第一行编辑演示阻止表单提交" renderLabel: "第一行编辑演示阻止表单提交"
}, },
{ {
name: "张三", name: "张三",
age: 18, age: 18,
long: "我的label很长",
password: "", password: "",
url: "https://baidu.com" url: "https://baidu.com"
}, },