diff --git a/yudao-ui-admin-vue3/src/api/infra/config/index.ts b/yudao-ui-admin-vue3/src/api/infra/config/index.ts index 66a850eb0..ef185d447 100644 --- a/yudao-ui-admin-vue3/src/api/infra/config/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/config/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type ConfigVO = { +export interface ConfigVO { id: number group: string name: string diff --git a/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts b/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts index 2b25bd72e..de98c1092 100644 --- a/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type DataSourceConfigVO = { +export interface DataSourceConfigVO { id: number name: string url: string diff --git a/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/types.ts b/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/types.ts deleted file mode 100644 index cba6eb7be..000000000 --- a/yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/types.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type DataSourceConfigVO = { - id: number - name: string - url: string - username: string - password: string - createTime: string -} diff --git a/yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts b/yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts index 2ba10879e..b925a7eba 100644 --- a/yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts @@ -1,5 +1,28 @@ import request from '@/config/axios' -import type { FileConfigVO } from './types' + +export interface ConfigType { + basePath: string + host: string + port: string + username: string + password: string + mode: string + endpoint: string + bucket: string + accessKey: string + accessSecret: string + domain: string +} +export interface FileConfigVO { + id: number + name: string + storage: string + master: boolean + visible: boolean + config: ConfigType + remark: string + createTime: string +} // 查询文件配置列表 export const getFileConfigPageApi = (params) => { diff --git a/yudao-ui-admin-vue3/src/api/infra/fileConfig/types.ts b/yudao-ui-admin-vue3/src/api/infra/fileConfig/types.ts deleted file mode 100644 index c212d7b4d..000000000 --- a/yudao-ui-admin-vue3/src/api/infra/fileConfig/types.ts +++ /dev/null @@ -1,23 +0,0 @@ -export type ConfigType = { - basePath: string - host: string - port: string - username: string - password: string - mode: string - endpoint: string - bucket: string - accessKey: string - accessSecret: string - domain: string -} -export type FileConfigVO = { - id: number - name: string - storage: string - master: boolean - visible: boolean - config: ConfigType - remark: string - createTime: string -} diff --git a/yudao-ui-admin-vue3/src/api/infra/fileList/index.ts b/yudao-ui-admin-vue3/src/api/infra/fileList/index.ts index bbf61d35f..c5315afe0 100644 --- a/yudao-ui-admin-vue3/src/api/infra/fileList/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/fileList/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type FileVO = { +export interface FileVO { id: number path: string url: string diff --git a/yudao-ui-admin-vue3/src/api/infra/job/index.ts b/yudao-ui-admin-vue3/src/api/infra/job/index.ts index a34f9e411..4ad8c7cb9 100644 --- a/yudao-ui-admin-vue3/src/api/infra/job/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/job/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type JobVO = { +export interface JobVO { id: number name: string status: number diff --git a/yudao-ui-admin-vue3/src/api/infra/job/types.ts b/yudao-ui-admin-vue3/src/api/infra/job/types.ts deleted file mode 100644 index 5a3b74fd7..000000000 --- a/yudao-ui-admin-vue3/src/api/infra/job/types.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type JobVO = { - id: number - name: string - status: number - handlerName: string - handlerParam: string - cronExpression: string - retryCount: number - retryInterval: number - monitorTimeout: number -} diff --git a/yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts b/yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts index b69f05301..314023961 100644 --- a/yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts +++ b/yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type JobLogVO = { +export interface JobLogVO { id: number jobId: number handlerName: string diff --git a/yudao-ui-admin-vue3/src/api/infra/jobLog/types.ts b/yudao-ui-admin-vue3/src/api/infra/jobLog/types.ts deleted file mode 100644 index 0e6e90313..000000000 --- a/yudao-ui-admin-vue3/src/api/infra/jobLog/types.ts +++ /dev/null @@ -1,13 +0,0 @@ -export type JobLogVO = { - id: number - jobId: number - handlerName: string - handlerParam: string - cronExpression: string - executeIndex: string - beginTime: Date - endTime: Date - duration: string - status: number - createTime: string -} diff --git a/yudao-ui-admin-vue3/src/api/system/dept/index.ts b/yudao-ui-admin-vue3/src/api/system/dept/index.ts index 2e22e4bff..32badefeb 100644 --- a/yudao-ui-admin-vue3/src/api/system/dept/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/dept/index.ts @@ -1,5 +1,6 @@ import request from '@/config/axios' -export type DeptVO = { + +export interface DeptVO { id?: number name: string parentId: number diff --git a/yudao-ui-admin-vue3/src/api/system/dept/types.ts b/yudao-ui-admin-vue3/src/api/system/dept/types.ts deleted file mode 100644 index 470fcd3d8..000000000 --- a/yudao-ui-admin-vue3/src/api/system/dept/types.ts +++ /dev/null @@ -1,15 +0,0 @@ -export type DeptVO = { - id: number - name: string - parentId: number - status: number - sort: number - leaderUserId: number - phone: string - email: string -} - -export type DeptListReqVO = { - name: string - status: number -} diff --git a/yudao-ui-admin-vue3/src/api/system/errorCode/index.ts b/yudao-ui-admin-vue3/src/api/system/errorCode/index.ts index c97194ed7..b42b7ba27 100644 --- a/yudao-ui-admin-vue3/src/api/system/errorCode/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/errorCode/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' + export interface ErrorCodeVO { id: number type: number diff --git a/yudao-ui-admin-vue3/src/api/system/notice/index.ts b/yudao-ui-admin-vue3/src/api/system/notice/index.ts index 221a91705..48afe8df0 100644 --- a/yudao-ui-admin-vue3/src/api/system/notice/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/notice/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' + export interface NoticeVO { id: number title: string diff --git a/yudao-ui-admin-vue3/src/api/system/oauth2/client.ts b/yudao-ui-admin-vue3/src/api/system/oauth2/client.ts index f384ee9dc..677c54946 100644 --- a/yudao-ui-admin-vue3/src/api/system/oauth2/client.ts +++ b/yudao-ui-admin-vue3/src/api/system/oauth2/client.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' + export interface OAuth2ClientVO { id: number clientId: string diff --git a/yudao-ui-admin-vue3/src/api/system/operatelog/index.ts b/yudao-ui-admin-vue3/src/api/system/operatelog/index.ts index 994fe09c3..0745d6655 100644 --- a/yudao-ui-admin-vue3/src/api/system/operatelog/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/operatelog/index.ts @@ -22,6 +22,7 @@ export type OperateLogVO = { resultMsg: string resultData: string } + export interface OperateLogPageReqVO extends PageParam { module?: string userNickname?: string diff --git a/yudao-ui-admin-vue3/src/api/system/role/index.ts b/yudao-ui-admin-vue3/src/api/system/role/index.ts index 83292c72a..4616ae9bb 100644 --- a/yudao-ui-admin-vue3/src/api/system/role/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/role/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type RoleVO = { +export interface RoleVO { id: number name: string code: string diff --git a/yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts b/yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts index cad4f36a9..045909021 100644 --- a/yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export type SensitiveWordVO = { +export interface SensitiveWordVO { id: number name: string status: number diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts index 48aaf4c93..d7801ee3c 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts @@ -1,5 +1,6 @@ import request from '@/config/axios' -export type SmsChannelVO = { + +export interface SmsChannelVO { id: number status: number signature: string diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts index 501736de4..fef133248 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts @@ -1,5 +1,6 @@ import request from '@/config/axios' -export type SmsLogVO = { + +export interface SmsLogVO { id: number idchannelId: number templateId: number diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts index 1497d18d0..a0be75bd7 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts @@ -1,5 +1,6 @@ import request from '@/config/axios' -export type SmsTemplateVO = { + +export interface SmsTemplateVO { id: number type: number status: number diff --git a/yudao-ui-admin-vue3/src/api/system/user/index.ts b/yudao-ui-admin-vue3/src/api/system/user/index.ts index f5324c98c..0475d3b31 100644 --- a/yudao-ui-admin-vue3/src/api/system/user/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/user/index.ts @@ -1,5 +1,6 @@ import request from '@/config/axios' -export type UserVO = { + +export interface UserVO { id: number username: string nickname: string diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue index b8fae8120..c77567ed8 100644 --- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue @@ -86,14 +86,13 @@ import { VxeGridInstance } from 'vxe-table' import { FormExpose } from '@/components/Form' // 业务相关的 import import * as FileConfigApi from '@/api/infra/fileConfig' -import type { FileConfigVO } from '@/api/infra/fileConfig/types' import { rules, allSchemas } from './fileConfig.data' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 const xGrid = ref() // 列表 Grid Ref -const { gridOptions, getList, deleteData } = useVxeGrid({ +const { gridOptions, getList, deleteData } = useVxeGrid({ allSchemas: allSchemas, getListApi: FileConfigApi.getFileConfigPageApi, deleteApi: FileConfigApi.deleteFileConfigApi @@ -135,7 +134,7 @@ const handleDetail = async (rowId: number) => { } // 主配置操作 -const handleMaster = (row: FileConfigVO) => { +const handleMaster = (row: FileConfigApi.FileConfigVO) => { message .confirm('是否确认修改配置【 ' + row.name + ' 】为主配置?', t('common.reminder')) .then(async () => { @@ -158,7 +157,7 @@ const submitForm = async () => { actionLoading.value = true // 提交请求 try { - const data = unref(formRef)?.formModel as FileConfigVO + const data = unref(formRef)?.formModel as FileConfigApi.FileConfigVO if (actionType.value === 'create') { await FileConfigApi.createFileConfigApi(data) message.success(t('common.createSuccess')) diff --git a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue index 3bb03e804..dcc591bfa 100644 --- a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue +++ b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue @@ -55,7 +55,6 @@ import { useI18n } from '@/hooks/web/useI18n' import { useVxeGrid } from '@/hooks/web/useVxeGrid' import { VxeGridInstance } from 'vxe-table' import * as JobLogApi from '@/api/infra/jobLog' -import { JobLogVO } from '@/api/infra/jobLog/types' import { allSchemas } from './jobLog.data' const { t } = useI18n() // 国际化 @@ -74,7 +73,7 @@ const dialogTitle = ref('') // 弹出层标题 const detailRef = ref() // 详情 Ref // 详情操作 -const handleDetail = async (row: JobLogVO) => { +const handleDetail = async (row: JobLogApi.JobLogVO) => { // 设置数据 const res = JobLogApi.getJobLogApi(row.id) detailRef.value = res