+
失败 | {{ formData?.resultCode }} | {{ formData?.resultMsg }}
diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
index 08fd4bec7..c834daee7 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
@@ -54,6 +54,7 @@ const [Modal, modalApi] = useVbenModal({
// 提交表单
const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student;
// 拼接子表的数据
+ // TODO @puhui999:字段对不上
data.demo03Courses = demo03CourseFormRef.value?.getData();
data.demo03Grade = await demo03GradeFormRef.value?.getValues();
try {
diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts
index 72aeed3eb..4aafabd19 100644
--- a/apps/web-antd/src/views/system/dict/data.ts
+++ b/apps/web-antd/src/views/system/dict/data.ts
@@ -1,5 +1,7 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemDictDataApi } from '#/api/system/dict/data';
+import type { SystemDictTypeApi } from '#/api/system/dict/type';
import { useAccess } from '@vben/access';
@@ -94,7 +96,7 @@ export function useTypeGridFormSchema(): VbenFormSchema[] {
}
/** 类型列表的字段 */
-export function useTypeGridColumns
(
+export function useTypeGridColumns(
onActionClick: OnActionClickFn,
): VxeTableGridOptions['columns'] {
return [
@@ -312,7 +314,7 @@ export function useDataGridFormSchema(): VbenFormSchema[] {
/**
* 字典数据表格列
*/
-export function useDataGridColumns(
+export function useDataGridColumns(
onActionClick: OnActionClickFn,
): VxeTableGridOptions['columns'] {
return [
diff --git a/apps/web-antd/src/views/system/dict/modules/data-grid.vue b/apps/web-antd/src/views/system/dict/modules/data-grid.vue
index a6688a248..ff9f34214 100644
--- a/apps/web-antd/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-grid.vue
@@ -1,5 +1,9 @@
diff --git a/apps/web-antd/src/views/system/notify/my/modules/detail.vue b/apps/web-antd/src/views/system/notify/my/modules/detail.vue
index 24b424bc9..5f1c124a9 100644
--- a/apps/web-antd/src/views/system/notify/my/modules/detail.vue
+++ b/apps/web-antd/src/views/system/notify/my/modules/detail.vue
@@ -43,7 +43,6 @@ const [Modal, modalApi] = useVbenModal({
{{ formData?.templateNickname }}
-
{{ formatDateTime(formData?.createTime) }}
diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index 17e5848f3..b66654d0e 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -1,6 +1,12 @@
import dayjs from 'dayjs';
-export function formatDate(time: number | string | Date, format = 'YYYY-MM-DD') {
+export function formatDate(
+ time: Date | number | string | undefined,
+ format = 'YYYY-MM-DD',
+) {
+ if (!time) {
+ return time;
+ }
try {
const date = dayjs(time);
if (!date.isValid()) {
@@ -13,7 +19,10 @@ export function formatDate(time: number | string | Date, format = 'YYYY-MM-DD')
}
}
-export function formatDateTime(time: number | string | Date) {
+export function formatDateTime(time: Date | number | string | undefined) {
+ if (!time) {
+ return time;
+ }
return formatDate(time, 'YYYY-MM-DD HH:mm:ss');
}
diff --git a/packages/effects/common-ui/src/components/captcha/verification/Verify/VerifyPoints.vue b/packages/effects/common-ui/src/components/captcha/verification/Verify/VerifyPoints.vue
index f1dc502d7..498d7ada6 100644
--- a/packages/effects/common-ui/src/components/captcha/verification/Verify/VerifyPoints.vue
+++ b/packages/effects/common-ui/src/components/captcha/verification/Verify/VerifyPoints.vue
@@ -1,8 +1,9 @@