diff --git a/README.md b/README.md index d701848ea9538525d7a2c5861bb375102e84b64e..696fa095644e3e63863af33a2df4de0688a52ac9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@

star - Build Status Build Status Downloads diff --git a/src/design/components/antdv.less b/src/design/components/antdv.less index ea76b0d71cc9d3714a5f953a650ec6f918abe3ff..1c34dc7aa949d29444d9bdaa575760fab14a70dd 100644 --- a/src/design/components/antdv.less +++ b/src/design/components/antdv.less @@ -14,7 +14,7 @@ /* 分页列表搜索栏 */ .page-query { .ant-form-item { - margin-bottom: 8px; + margin-bottom: 8px !important; } .ant-row { width: 100%; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 2686d22b429f67c8e325d935eecbf453359b502c..879f83080b6ea65f39270e1fff29926ab0f09410 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,7 +16,7 @@ import { h } from 'vue' import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload' // @ts-ignore import { getUserInfo } from '/@/api/sys/user' -import { closeWebSocket, initWebSocket } from "/@/logics/websocket/UserGlobalWebSocker"; +import { closeWebSocket, initWebSocket } from '/@/logics/websocket/UserGlobalWebSocker' interface UserState { userInfo: Nullable diff --git a/src/views/account/security/EmailBind.vue b/src/views/account/security/EmailBind.vue index e90f452ba49a1114f58c6e5710f7ed4256f06e72..e286fa8cb7a6a8e4eced62a547c252cd94e3a0db 100644 --- a/src/views/account/security/EmailBind.vue +++ b/src/views/account/security/EmailBind.vue @@ -45,7 +45,7 @@ import { useMessage } from '/@/hooks/web/useMessage' import { validateEmail } from '/@/utils/validate' import { bindEmail } from '/@/views/account/account.api' - import CountDownInput from "/@/components/CountDown/src/CountdownInput.vue"; + import CountDownInput from '/@/components/CountDown/src/CountdownInput.vue' const emits = defineEmits(['ok']) const { visible, confirmLoading, modalWidth, labelCol, wrapperCol, handleCancel } = useFormEdit() diff --git a/src/views/modules/bpm/model/BpmModelEdit.vue b/src/views/modules/bpm/model/BpmModelEdit.vue index 1a173a7f3c7e1aa5a9dd3148f391356f2a8e0daf..f9d313aa75083968d8bb2eac425f1968992821c1 100644 --- a/src/views/modules/bpm/model/BpmModelEdit.vue +++ b/src/views/modules/bpm/model/BpmModelEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/BpmModelNodeEdit.vue index d169f47076ad29d08fb895b9dafe68a6b8fc3352..d5e40279cafc7d53d60b3e781cbb31bb65524b34 100644 --- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue +++ b/src/views/modules/bpm/model/BpmModelNodeEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue b/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue index 1900d58c4dfbf3e099e3f5dae110f0406a5d8bca..dc706a6bcc9e18eef803d6b40500b2aa2906ddd6 100644 --- a/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue +++ b/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + @@ -105,7 +105,9 @@ // 重置表单 function resetForm() { nextTick(() => { + console.log(form) formRef?.resetFields() + console.log(form) }) } defineExpose({ diff --git a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue index b7c97f9d84077341ee818560aa304c2a921d45e9..d4706ae36919aaecd31ed7d4c0cb5f4fa7aaf230 100644 --- a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue +++ b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue @@ -17,15 +17,12 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + - - - diff --git a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue index 1e38c8a4f7f4bf130c24be4b35b1dda798942e11..62d3c5c10e84d073117233dd2fc29d016978416f 100644 --- a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue +++ b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/demo/notice/email/EmailSenderDemo.vue b/src/views/modules/demo/notice/email/EmailSenderDemo.vue new file mode 100644 index 0000000000000000000000000000000000000000..41fab0ad54023bca23cef4b7f7d6d41bc298b2d7 --- /dev/null +++ b/src/views/modules/demo/notice/email/EmailSenderDemo.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/modules/demo/notice/email/SimpleEmailSender.vue b/src/views/modules/demo/notice/email/SimpleEmailSender.vue new file mode 100644 index 0000000000000000000000000000000000000000..b01aa4d7a2ad62c9cd8c1ae0e490f54695ce5e7a --- /dev/null +++ b/src/views/modules/demo/notice/email/SimpleEmailSender.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/modules/demo/notice/email/StandardEmailSender.vue b/src/views/modules/demo/notice/email/StandardEmailSender.vue new file mode 100644 index 0000000000000000000000000000000000000000..7c410af16664dae162b35e4719b88b28fd5caca9 --- /dev/null +++ b/src/views/modules/demo/notice/email/StandardEmailSender.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/modules/demo/notice/email/emailSenderDemo.api.ts b/src/views/modules/demo/notice/email/emailSenderDemo.api.ts new file mode 100644 index 0000000000000000000000000000000000000000..78c734115450689bbe919f3cbab5a932e6c53765 --- /dev/null +++ b/src/views/modules/demo/notice/email/emailSenderDemo.api.ts @@ -0,0 +1,21 @@ +import { defHttp } from '/@/utils/http/axios' +import { PageResult, Result } from '/#/axios' +import { BaseEntity } from '/#/web' +/** + * 简单邮件发送 + */ +export function sentSimpleMail(obj) { + return defHttp.post({ + url: '/demo/notice/email/sentSimpleMail', + data: obj, + }) +} +/** + * 标准邮件发送 + */ +export function sentMail(obj) { + return defHttp.post({ + url: '/demo/notice/email/sentMail', + data: obj, + }) +} diff --git a/src/views/modules/demo/query/SuperQueryDemoEdit.vue b/src/views/modules/demo/query/SuperQueryDemoEdit.vue index ef5fb302f2bf83a113ba64b7468b5f5efbd208e3..1e430b690ea86a9af64a1f3f3520f0f19bfab011 100644 --- a/src/views/modules/demo/query/SuperQueryDemoEdit.vue +++ b/src/views/modules/demo/query/SuperQueryDemoEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/develop/dynamicform/DynamicFormEdit.vue b/src/views/modules/develop/dynamicform/DynamicFormEdit.vue index 25e5c1c8d7eec7516744728ce6e2b3566337876e..69263b6375042500646aaff564a9718555417abc 100644 --- a/src/views/modules/develop/dynamicform/DynamicFormEdit.vue +++ b/src/views/modules/develop/dynamicform/DynamicFormEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue index 140a4eb25ea33fa5f3d0d519fd9417d5a1770e79..b7f60357a4d25b949dc8c7ae2e2bde558488eb80 100644 --- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue +++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/develop/report/ProjectInfo.api.ts b/src/views/modules/develop/report/ProjectInfo.api.ts new file mode 100644 index 0000000000000000000000000000000000000000..ab58ff37c47233076c748bdec356fc2c39c6e6dd --- /dev/null +++ b/src/views/modules/develop/report/ProjectInfo.api.ts @@ -0,0 +1,128 @@ +import { defHttp } from '/@/utils/http/axios' +import { PageResult, Result } from '/#/axios' +import { BaseEntity } from '/#/web' + +/** + * 分页 + */ +export function page(params) { + return defHttp.get>>({ + url: '/goview/admin/page', + params, + }) +} + +/** + * 获取单条 + */ +export function get(id) { + return defHttp.get>({ + url: '/goview/admin/findById', + params: { id }, + }) +} + +/** + * 获取GoView的地址 + */ +export function getGoViewUrl() { + return defHttp.get>({ + url: '/goview/admin/getGoViewUrl', + }) +} + +/** + * 添加 + */ +export function add(obj: ProjectInfo) { + return defHttp.post({ + url: '/goview/admin/add', + data: obj, + }) +} + +/** + * 更新 + */ +export function update(obj: ProjectInfo) { + return defHttp.post({ + url: '/goview/admin/update', + data: obj, + }) +} + +/** + * 发布 + */ +export function publish(id) { + return defHttp.post({ + url: '/goview/admin/publish', + params: { id }, + }) +} + +/** + * 取消发布 + */ +export function unPublish(id) { + return defHttp.post({ + url: '/goview/admin/unPublish', + params: { id }, + }) +} + +/** + * 应用编辑中的信息 + */ +export function enableEditContent(id) { + return defHttp.post({ + url: '/goview/admin/enableEditContent', + params: { id }, + }) +} + +/** + * 重置编辑中的信息 + */ +export function resetEditContent(id) { + return defHttp.post({ + url: '/goview/admin/resetEditContent', + params: { id }, + }) +} + +/** + * 复制 + */ +export function copy(id) { + return defHttp.post({ + url: '/goview/admin/copy', + params: { id }, + }) +} + +/** + * 删除 + */ +export function del(id) { + return defHttp.delete({ + url: '/goview/admin/delete', + params: { id }, + }) +} + +/** + * 自定义大屏信息 + */ +export interface ProjectInfo extends BaseEntity { + // 项目名称 + name?: string + // 发布状态 + state?: number + // 备注 + remark?: string + // 预览图片id + indexImage?: string + // 是否在编辑中 + edit?: boolean +} diff --git a/src/views/modules/monitor/data/DataVersionLogEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue similarity index 72% rename from src/views/modules/monitor/data/DataVersionLogEdit.vue rename to src/views/modules/develop/report/ProjectInfoEdit.vue index ca845b1e2abb4adcf37b31d4da360d242f99b605..91c10f6703d9b86ba042d96c4739d0a55b4db74b 100644 --- a/src/views/modules/monitor/data/DataVersionLogEdit.vue +++ b/src/views/modules/develop/report/ProjectInfoEdit.vue @@ -2,24 +2,29 @@ - + - - - - - + + - - + + diff --git a/src/views/modules/monitor/operate/OperateLogInfo.vue b/src/views/modules/monitor/operate/OperateLogInfo.vue index b19efc647ae75dbdfdef7d4f3a2e1beb0fd0f8f6..7179032751a0e3eeaf6295913e68188605c7f069 100644 --- a/src/views/modules/monitor/operate/OperateLogInfo.vue +++ b/src/views/modules/monitor/operate/OperateLogInfo.vue @@ -50,7 +50,6 @@ import { $ref } from 'vue/macros' import { get, OperateLog } from './OperateLog.api' import { BasicModal } from '/@/components/Modal' - import Description from '/@/components/Description/src/Description.vue' import { DescItem } from '/@/components/Description' import { useDict } from '/@/hooks/bootx/useDict' diff --git a/src/views/modules/notice/mail/MailConfigEdit.vue b/src/views/modules/notice/mail/MailConfigEdit.vue index 91cb5e1f5d68e481e8c66652a160097f3e9d0e15..022d8076018bd8f3cacaa3a99d43e63f15a5c302 100644 --- a/src/views/modules/notice/mail/MailConfigEdit.vue +++ b/src/views/modules/notice/mail/MailConfigEdit.vue @@ -17,7 +17,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/notice/template/MessageTemplateEdit.vue b/src/views/modules/notice/template/MessageTemplateEdit.vue index 2890bfbbb8634ff18410257c13cefce773d4567c..dfe4ba9cfa4ac31747a9070580a68e4a46bb4dd4 100644 --- a/src/views/modules/notice/template/MessageTemplateEdit.vue +++ b/src/views/modules/notice/template/MessageTemplateEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue b/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue index 575bdd8299527b44ecd5e3e950e96bd0082994bf..21067ae007267f1dde3d54f7e6c05051fae5cc16 100644 --- a/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue +++ b/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue @@ -18,7 +18,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue b/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue index b1df795588f760da8ce7142fbf05ced40ada4882..14f5a47523d206864e87d6748d3a0eee342de040 100644 --- a/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue +++ b/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue @@ -18,7 +18,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/system/client/ClientEdit.vue b/src/views/modules/system/client/ClientEdit.vue index 5e042b254134227dc475b826d111d773eeaa0f7e..d2a3b45b6ce454fea700ba5d827766f5e5693fca 100644 --- a/src/views/modules/system/client/ClientEdit.vue +++ b/src/views/modules/system/client/ClientEdit.vue @@ -10,7 +10,7 @@ > - + diff --git a/src/views/modules/system/dept/DeptEdit.vue b/src/views/modules/system/dept/DeptEdit.vue index d6e3ecaa5fced1ff2445576a466782b3c4968406..67a76de70f2fc17d6902344edd7a0e4995c27986 100644 --- a/src/views/modules/system/dept/DeptEdit.vue +++ b/src/views/modules/system/dept/DeptEdit.vue @@ -18,7 +18,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/system/dict/DictEdit.vue b/src/views/modules/system/dict/DictEdit.vue index 2db551024db1acac031ac41596374947a3c21d0a..75a03f6e50103fb4b5e1fd5fc60d19756cb8abe2 100644 --- a/src/views/modules/system/dict/DictEdit.vue +++ b/src/views/modules/system/dict/DictEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/system/dict/DictItemEdit.vue b/src/views/modules/system/dict/DictItemEdit.vue index 0765755f827a58a36c6e214c5822994a72c80ef0..35aee1612832af072af5a48470a728afd28d20d4 100644 --- a/src/views/modules/system/dict/DictItemEdit.vue +++ b/src/views/modules/system/dict/DictItemEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/system/menu/ResourceEdit.vue b/src/views/modules/system/menu/ResourceEdit.vue index db054f59b8b3a84e81cb30d43168402852b7ff62..36ef8b15131777bcedeba99613eca2023bf0582e 100644 --- a/src/views/modules/system/menu/ResourceEdit.vue +++ b/src/views/modules/system/menu/ResourceEdit.vue @@ -9,7 +9,7 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + diff --git a/src/views/modules/system/param/SystemParamEdit.vue b/src/views/modules/system/param/SystemParamEdit.vue index 5c010c5f8a8cd603dfb56f9f458112f31fd7abec..9fbc5b8e3ce648310a2fa0a4d032878304a25466 100644 --- a/src/views/modules/system/param/SystemParamEdit.vue +++ b/src/views/modules/system/param/SystemParamEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/system/path/PermPathEdit.vue b/src/views/modules/system/path/PermPathEdit.vue index 3b0288aa8b7a2b2cdc6b12343a8c96c1462943f2..29a805d86e84995b7c61d5cc07aa2f9a2734e3ab 100644 --- a/src/views/modules/system/path/PermPathEdit.vue +++ b/src/views/modules/system/path/PermPathEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/system/quartz/QuartzJobEdit.vue b/src/views/modules/system/quartz/QuartzJobEdit.vue index 413b7faf7250b8d2c7ef292bf0d7f3ca45ead24d..237e18032b5aa24d85aaa80820bf90ec7468ee58 100644 --- a/src/views/modules/system/quartz/QuartzJobEdit.vue +++ b/src/views/modules/system/quartz/QuartzJobEdit.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > - + diff --git a/src/views/modules/system/role/RoleEdit.vue b/src/views/modules/system/role/RoleEdit.vue index 027896eead33bbb529c9c75b21a8c9f25a63317d..357093b04066e8d2083ebbbab33ff0129f448e08 100644 --- a/src/views/modules/system/role/RoleEdit.vue +++ b/src/views/modules/system/role/RoleEdit.vue @@ -1,7 +1,7 @@