diff --git a/apps/web-antd/src/api/infra/demo/demo01/index.ts b/apps/web-antd/src/api/infra/demo/demo01/index.ts index b03a2aef0..5a940a61d 100644 --- a/apps/web-antd/src/api/infra/demo/demo01/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo01/index.ts @@ -1,3 +1,5 @@ +import type { Dayjs } from 'dayjs'; + import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -7,8 +9,8 @@ export namespace Demo01ContactApi { export interface Demo01Contact { id: number; // 编号 name?: string; // 名字 - sex?: number; // 性别 - birthday?: Date; // 出生年 + sex?: boolean; // 性别 + birthday?: Dayjs | string; // 出生年 description?: string; // 简介 avatar: string; // 头像 } diff --git a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts index 02183af11..f9704bf14 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts @@ -1,3 +1,5 @@ +import type { Dayjs } from 'dayjs'; + import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -24,7 +26,7 @@ export namespace Demo03StudentApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Date; // 出生日期 + birthday?: Dayjs | string; // 出生日期 description?: string; // 简介 } } diff --git a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts index a83cf4215..a04a919e9 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts @@ -1,3 +1,5 @@ +import type { Dayjs } from 'dayjs'; + import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -24,7 +26,7 @@ export namespace Demo03StudentApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Date; // 出生日期 + birthday?: Dayjs | string; // 出生日期 description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; diff --git a/apps/web-antd/src/components/content-wrap/content-wrap.vue b/apps/web-antd/src/components/content-wrap/content-wrap.vue index 306e0fa6d..761a312ea 100644 --- a/apps/web-antd/src/components/content-wrap/content-wrap.vue +++ b/apps/web-antd/src/components/content-wrap/content-wrap.vue @@ -5,25 +5,45 @@ diff --git a/apps/web-antd/src/components/table-toolbar/index.ts b/apps/web-antd/src/components/table-toolbar/index.ts new file mode 100644 index 000000000..720e3224b --- /dev/null +++ b/apps/web-antd/src/components/table-toolbar/index.ts @@ -0,0 +1 @@ +export { default as TableToolbar } from './table-toolbar.vue'; diff --git a/apps/web-antd/src/components/table-toolbar/table-toolbar.vue b/apps/web-antd/src/components/table-toolbar/table-toolbar.vue new file mode 100644 index 000000000..099d3a8c9 --- /dev/null +++ b/apps/web-antd/src/components/table-toolbar/table-toolbar.vue @@ -0,0 +1,54 @@ + + + diff --git a/apps/web-antd/src/utils/date.ts b/apps/web-antd/src/utils/date.ts index dec8e105a..227cf762d 100644 --- a/apps/web-antd/src/utils/date.ts +++ b/apps/web-antd/src/utils/date.ts @@ -3,7 +3,7 @@ import dayjs from 'dayjs'; // TODO @芋艿:后续整理下 迁移至 packages/core/base/shared/src/utils/date.ts,后续删除 使用 @vben/utils 的 getRangePickerDefaultProps /** 时间段选择器拓展 */ -export function getRangePickerDefaultProps() { +export function getRangePickerDefaultProps(): any { return { showTime: { format: 'HH:mm:ss', diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue index d5136a881..2ae8cb9f6 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue @@ -1,10 +1,12 @@ @@ -128,23 +142,16 @@ onMounted(() => { - + - -
+ - @@ -152,7 +159,7 @@ onMounted(() => { v-model:value="queryParams.sex" placeholder="请选择性别" allow-clear - class="!w-240px" + class="w-full" > + > + {{ dict.label }} + - - - - + - - + +
+
+ + + + + @@ -253,7 +261,6 @@ onMounted(() => {
- >({ id: undefined, name: undefined, @@ -90,8 +88,7 @@ const [Modal, modalApi] = useVbenModal({ resetForm(); return; } - - // 加载数据 TODO @puhui999:这里不用空行 + // 加载数据 let data = modalApi.getData(); if (!data) { return; @@ -115,8 +112,8 @@ const [Modal, modalApi] = useVbenModal({ ref="formRef" :model="formData" :rules="rules" - :label-col="labelCol" - :wrapper-col="wrapperCol" + :label-col="{ span: 5 }" + :wrapper-col="{ span: 18 }" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo02/index.vue b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue new file mode 100644 index 000000000..8bb56b01d --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue @@ -0,0 +1,266 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo02/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo02/modules/form.vue new file mode 100644 index 000000000..c65c286e2 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo02/modules/form.vue @@ -0,0 +1,135 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue new file mode 100644 index 000000000..7b0c444a5 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue @@ -0,0 +1,324 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-form.vue new file mode 100644 index 000000000..1da9fedaf --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-form.vue @@ -0,0 +1,120 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue new file mode 100644 index 000000000..2cdc246e3 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue @@ -0,0 +1,265 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-form.vue new file mode 100644 index 000000000..7eb9c8dc5 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-form.vue @@ -0,0 +1,120 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue new file mode 100644 index 000000000..bb8ff5cc5 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue @@ -0,0 +1,265 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue new file mode 100644 index 000000000..4e838485a --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue @@ -0,0 +1,141 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue new file mode 100644 index 000000000..71db5bf9b --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue @@ -0,0 +1,311 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-form.vue new file mode 100644 index 000000000..26c1e8908 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-form.vue @@ -0,0 +1,96 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue new file mode 100644 index 000000000..adf0cd8dd --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue @@ -0,0 +1,59 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-form.vue new file mode 100644 index 000000000..1c6cf36f3 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-form.vue @@ -0,0 +1,67 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue new file mode 100644 index 000000000..e7c29d1d1 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue @@ -0,0 +1,59 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue new file mode 100644 index 000000000..3d02f066e --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue @@ -0,0 +1,172 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue new file mode 100644 index 000000000..5837f54e8 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue @@ -0,0 +1,291 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-course-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-course-form.vue new file mode 100644 index 000000000..26c1e8908 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-course-form.vue @@ -0,0 +1,96 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-grade-form.vue new file mode 100644 index 000000000..1c6cf36f3 --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/demo03-grade-form.vue @@ -0,0 +1,67 @@ + + + diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue new file mode 100644 index 000000000..3d02f066e --- /dev/null +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue @@ -0,0 +1,172 @@ + + + diff --git a/packages/@core/base/icons/src/lucide.ts b/packages/@core/base/icons/src/lucide.ts index 514474cfe..a4e6f0507 100644 --- a/packages/@core/base/icons/src/lucide.ts +++ b/packages/@core/base/icons/src/lucide.ts @@ -60,6 +60,7 @@ export { Search, SearchX, Settings, + ShieldQuestion, Shrink, Square, SquareCheckBig, diff --git a/packages/effects/hooks/src/use-content-maximize.ts b/packages/effects/hooks/src/use-content-maximize.ts index 77d1fab35..142a254f0 100644 --- a/packages/effects/hooks/src/use-content-maximize.ts +++ b/packages/effects/hooks/src/use-content-maximize.ts @@ -17,8 +17,25 @@ export function useContentMaximize() { }, }); } + + function toggleMaximizeAndTabbarHidden() { + const isMaximize = contentIsMaximize.value; + updatePreferences({ + header: { + hidden: !isMaximize, + }, + sidebar: { + hidden: !isMaximize, + }, + tabbar: { + enable: isMaximize, + }, + }); + } + return { contentIsMaximize, toggleMaximize, + toggleMaximizeAndTabbarHidden, }; }