diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d62455..cc8867b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -186,5 +186,8 @@ "enable": true }, "terminal.integrated.scrollback": 10000, - "nuxt.isNuxtApp": false + "nuxt.isNuxtApp": false, + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + } } diff --git a/src/api/system/operatelog/index.ts b/src/api/system/operatelog/index.ts index 7861489..58d9e14 100644 --- a/src/api/system/operatelog/index.ts +++ b/src/api/system/operatelog/index.ts @@ -1,37 +1,37 @@ -import { defHttp } from "@/utils/http/axios"; +import { defHttp } from '@/utils/http/axios' export interface OperateLogVO { - id: number; - traceId: string; - userType: number; - userId: number; - userName: string; - type: string; - subType: string; - bizId: number; - action: string; - extra: string; - requestMethod: string; - requestUrl: string; - userIp: string; - creator: string; - creatorName: string; - createTime: Date; + id: number + traceId: string + userType: number + userId: number + userName: string + type: string + subType: string + bizId: number + action: string + extra: string + requestMethod: string + requestUrl: string + userIp: string + creator: string + creatorName: string + createTime: Date } export interface OperateLogPageReqVO extends PageParam { - module?: string; - userNickname?: string; - type?: number; - success?: boolean; - startTime?: Date[]; + module?: string + userNickname?: string + type?: number + success?: boolean + startTime?: Date[] } // 查询操作日志列表 export function getOperateLogPage(params: OperateLogPageReqVO) { - return defHttp.get({ url: "/system/operate-log/page", params }); + return defHttp.get({ url: '/system/operate-log/page', params }) } // 导出操作日志 export function exportOperateLog(params: OperateLogPageReqVO) { - return defHttp.download({ url: "/system/operate-log/export", params }, "操作日志.xls"); + return defHttp.download({ url: '/system/operate-log/export', params }, '操作日志.xls') } diff --git a/src/components/DocAlert/src/DocAlert.vue b/src/components/DocAlert/src/DocAlert.vue index 7008372..f3b19c2 100644 --- a/src/components/DocAlert/src/DocAlert.vue +++ b/src/components/DocAlert/src/DocAlert.vue @@ -1,13 +1,13 @@ + + - \ No newline at end of file diff --git a/src/components/Form/src/types/formItem.ts b/src/components/Form/src/types/formItem.ts index 469b198..9218520 100644 --- a/src/components/Form/src/types/formItem.ts +++ b/src/components/Form/src/types/formItem.ts @@ -88,4 +88,5 @@ export interface FormItem { * When to validate the value of children node */ validateTrigger?: string | string[] | false + message?: string } diff --git a/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue b/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue index 0843b5a..5a30813 100644 --- a/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue +++ b/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue @@ -2,8 +2,9 @@ * @Description: 表单项属性 -->