diff --git a/CHANGELOG.md b/CHANGELOG.md index 243b2edf..2e528d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - 登录页 租户选择框浮层固定高度[256px] 超过高度自动滚动 - 表单的Label默认方向改为`top` 支持\n换行 +- 所有表格的搜索加上allowClear属性 支持清除 # 1.0.0-beta (2024-10-8) diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue index 9fe1ee87..37c9282b 100644 --- a/apps/web-antd/src/views/monitor/logininfor/index.vue +++ b/apps/web-antd/src/views/monitor/logininfor/index.vue @@ -31,6 +31,9 @@ import loginInfoModal from './login-info-modal.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/monitor/online/index.vue b/apps/web-antd/src/views/monitor/online/index.vue index 5f147f71..2a94bd82 100644 --- a/apps/web-antd/src/views/monitor/online/index.vue +++ b/apps/web-antd/src/views/monitor/online/index.vue @@ -14,6 +14,9 @@ import { columns, querySchema } from './data'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/monitor/operlog/index.vue b/apps/web-antd/src/views/monitor/operlog/index.vue index 753eaf02..6d884eb7 100644 --- a/apps/web-antd/src/views/monitor/operlog/index.vue +++ b/apps/web-antd/src/views/monitor/operlog/index.vue @@ -32,6 +32,9 @@ import operationPreviewDrawer from './operation-preview-drawer.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue index 2bdbec9e..5b48f776 100644 --- a/apps/web-antd/src/views/system/client/index.vue +++ b/apps/web-antd/src/views/system/client/index.vue @@ -29,6 +29,9 @@ import { columns, querySchema } from './data'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/config/index.vue b/apps/web-antd/src/views/system/config/index.vue index ab9ed6d7..a6e2cc0f 100644 --- a/apps/web-antd/src/views/system/config/index.vue +++ b/apps/web-antd/src/views/system/config/index.vue @@ -28,6 +28,9 @@ import { columns, querySchema } from './data'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index e54f492e..2114f4b5 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -23,6 +23,9 @@ import deptDrawer from './dept-drawer.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/dict/data/index.vue b/apps/web-antd/src/views/system/dict/data/index.vue index fda0a67e..271a011b 100644 --- a/apps/web-antd/src/views/system/dict/data/index.vue +++ b/apps/web-antd/src/views/system/dict/data/index.vue @@ -30,6 +30,9 @@ const dictType = ref(''); const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3', diff --git a/apps/web-antd/src/views/system/dict/type/index.vue b/apps/web-antd/src/views/system/dict/type/index.vue index 9ffcafdf..f4e85f13 100644 --- a/apps/web-antd/src/views/system/dict/type/index.vue +++ b/apps/web-antd/src/views/system/dict/type/index.vue @@ -40,6 +40,9 @@ import dictTypeModal from './dict-type-modal.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 70, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3', diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue index 0fcce25d..6bf0e27f 100644 --- a/apps/web-antd/src/views/system/menu/index.vue +++ b/apps/web-antd/src/views/system/menu/index.vue @@ -29,6 +29,9 @@ import { QuestionCircleOutlined } from '@ant-design/icons-vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/notice/index.vue b/apps/web-antd/src/views/system/notice/index.vue index 23181082..5ca74f0b 100644 --- a/apps/web-antd/src/views/system/notice/index.vue +++ b/apps/web-antd/src/views/system/notice/index.vue @@ -22,6 +22,9 @@ import noticeModal from './notice-modal.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/oss-config/index.vue b/apps/web-antd/src/views/system/oss-config/index.vue index b8b4fc35..83a87fa5 100644 --- a/apps/web-antd/src/views/system/oss-config/index.vue +++ b/apps/web-antd/src/views/system/oss-config/index.vue @@ -27,6 +27,12 @@ import ossConfigDrawer from './oss-config-drawer.vue'; const formOptions: VbenFormProps = { schema: querySchema(), + commonConfig: { + labelWidth: 80, + componentProps: { + allowClear: true, + }, + }, wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', }; diff --git a/apps/web-antd/src/views/system/oss/index.vue b/apps/web-antd/src/views/system/oss/index.vue index d9251e73..26072d36 100644 --- a/apps/web-antd/src/views/system/oss/index.vue +++ b/apps/web-antd/src/views/system/oss/index.vue @@ -36,6 +36,9 @@ import imageUploadModal from './image-upload-modal.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/post/index.vue b/apps/web-antd/src/views/system/post/index.vue index 5122c789..4b5bba26 100644 --- a/apps/web-antd/src/views/system/post/index.vue +++ b/apps/web-antd/src/views/system/post/index.vue @@ -26,6 +26,9 @@ const selectDeptId = ref([]); const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/role-assign/index.vue b/apps/web-antd/src/views/system/role-assign/index.vue index 7a8c61f1..88f23b67 100644 --- a/apps/web-antd/src/views/system/role-assign/index.vue +++ b/apps/web-antd/src/views/system/role-assign/index.vue @@ -29,6 +29,9 @@ const roleId = route.params.roleId as string; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue index 6f7658d9..63b0afa8 100644 --- a/apps/web-antd/src/views/system/role/index.vue +++ b/apps/web-antd/src/views/system/role/index.vue @@ -44,6 +44,9 @@ import roleDrawer from './role-drawer.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue index 157e6216..88e288b4 100644 --- a/apps/web-antd/src/views/system/tenant/index.vue +++ b/apps/web-antd/src/views/system/tenant/index.vue @@ -33,6 +33,9 @@ import tenantDrawer from './tenant-drawer.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/tenantPackage/index.vue b/apps/web-antd/src/views/system/tenantPackage/index.vue index ed3e7b53..56cfe9fd 100644 --- a/apps/web-antd/src/views/system/tenantPackage/index.vue +++ b/apps/web-antd/src/views/system/tenantPackage/index.vue @@ -31,6 +31,9 @@ import tenantPackageDrawer from './tenant-package-drawer.vue'; const formOptions: VbenFormProps = { commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 0a35ab25..22b24569 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -63,6 +63,9 @@ const formOptions: VbenFormProps = { schema: querySchema(), commonConfig: { labelWidth: 80, + componentProps: { + allowClear: true, + }, }, wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', handleReset: async () => { diff --git a/apps/web-antd/src/views/tool/gen/data.tsx b/apps/web-antd/src/views/tool/gen/data.tsx index 3a05380a..ecb25e26 100644 --- a/apps/web-antd/src/views/tool/gen/data.tsx +++ b/apps/web-antd/src/views/tool/gen/data.tsx @@ -8,6 +8,9 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'dataName', label: '数据源', defaultValue: '', + componentProps: { + allowClear: false, + }, }, { component: 'Input', diff --git a/apps/web-antd/src/views/tool/gen/index.vue b/apps/web-antd/src/views/tool/gen/index.vue index 420c4e8e..449377a1 100644 --- a/apps/web-antd/src/views/tool/gen/index.vue +++ b/apps/web-antd/src/views/tool/gen/index.vue @@ -29,6 +29,12 @@ import tableImportModal from './table-import-modal.vue'; const formOptions: VbenFormProps = { schema: querySchema(), + commonConfig: { + labelWidth: 80, + componentProps: { + allowClear: true, + }, + }, wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', };