From ffb91e9169343060a20ca6463f720bdc8d59324d Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Thu, 12 May 2022 10:34:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=BA=E5=99=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5,=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- mayfly_go_web/src/theme/element.scss | 64 ------------------- mayfly_go_web/src/views/ops/db/DbEdit.vue | 11 +++- mayfly_go_web/src/views/ops/db/DbList.vue | 14 ++-- mayfly_go_web/src/views/ops/db/SqlExec.vue | 1 + .../views/ops/db/component/SqlExecDialog.vue | 2 +- .../src/views/ops/machine/FileManage.vue | 35 ++++++++-- .../src/views/ops/machine/MachineEdit.vue | 23 +++---- .../src/views/ops/machine/MachineList.vue | 50 ++++++++++----- .../src/views/ops/machine/ServiceManage.vue | 36 +++++++++-- .../src/views/ops/redis/DataEdit.vue | 2 +- .../src/views/ops/redis/RedisEdit.vue | 2 + .../src/views/ops/redis/RedisList.vue | 4 +- server/devops/api/form/form.go | 5 +- server/devops/api/vo/vo.go | 1 + server/devops/application/db_app.go | 12 ++-- server/devops/application/machine_app.go | 5 +- server/devops/application/redis_app.go | 9 +-- server/devops/domain/entity/machine.go | 1 + server/mayfly-go.sql | 1 + 20 files changed, 147 insertions(+), 135 deletions(-) diff --git a/README.md b/README.md index 11827351..091098f6 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ 119699946 ### 系统相关资料 -- 在线文档: https://objs.gitee.io/mayfly-go-docs -- 系统操作视频: https://space.bilibili.com/484091081/channel/seriesdetail?sid=2064467 +- 项目文档: https://objs.gitee.io/mayfly-go-docs +- 系统操作视频: https://space.bilibili.com/484091081/channel/collectiondetail?sid=392854 ### 系统功能 diff --git a/mayfly_go_web/src/theme/element.scss b/mayfly_go_web/src/theme/element.scss index cf112dff..61377590 100644 --- a/mayfly_go_web/src/theme/element.scss +++ b/mayfly_go_web/src/theme/element.scss @@ -150,70 +150,6 @@ margin-right: 5px; } -/* Link 文字链接 -------------------------------- */ -// default -.el-link.el-link--default:hover { - color: set-color(primary-light-3); -} -// primary -.el-link.el-link--primary { - color: set-color(primary); - &:hover { - color: set-color(primary-light-3); - } -} -.el-link.el-link--default::after, -.el-link.is-underline:hover::after, -.el-link.el-link--primary.is-underline:hover::after, -.el-link.el-link--primary::after { - border-color: set-color(primary); -} -// success -.el-link.el-link--success { - color: set-color(success); - &:hover { - color: set-color(success-light-3); - } -} -.el-link.el-link--success.is-underline:hover::after, -.el-link.el-link--success::after { - border-color: set-color(success); -} -// info -.el-link.el-link--info { - color: set-color(info); - &:hover { - color: set-color(info-light-3); - } -} -.el-link.el-link--info.is-underline:hover::after, -.el-link.el-link--info::after { - border-color: set-color(info); -} -// warning -.el-link.el-link--warning { - color: set-color(warning); - &:hover { - color: set-color(warning-light-3); - } -} -.el-link.el-link--warning.is-underline:hover::after, -.el-link.el-link--warning::after { - border-color: set-color(warning); -} -// danger -.el-link.el-link--danger { - color: set-color(danger); - &:hover { - color: set-color(danger-light-3); - } -} -.el-link.el-link--danger.is-underline:hover::after, -.el-link.el-link--danger::after { - border-color: set-color(danger); -} - /* Radio 单选框 ------------------------------- */ .el-radio__input.is-checked + .el-radio__label, diff --git a/mayfly_go_web/src/views/ops/db/DbEdit.vue b/mayfly_go_web/src/views/ops/db/DbEdit.vue index 0454e11c..aa67b2bc 100644 --- a/mayfly_go_web/src/views/ops/db/DbEdit.vue +++ b/mayfly_go_web/src/views/ops/db/DbEdit.vue @@ -35,7 +35,7 @@ type="password" show-password v-model.trim="form.password" - placeholder="请输入密码，新增为必填项" + placeholder="请输入密码，修改操作可不填" autocomplete="new-password" > @@ -81,6 +81,7 @@ import { dbApi } from './api'; import { projectApi } from '../project/api.ts'; import { ElMessage } from 'element-plus'; import type { ElInput } from 'element-plus'; +import { notBlank } from '@/common/assert'; export default defineComponent({ name: 'DbEdit', @@ -189,7 +190,7 @@ export default defineComponent({ }, }); - watch(props, async (newValue) => { + watch(props, (newValue) => { state.projects = newValue.projects; if (newValue.db) { getEnvs(newValue.db.projectId); @@ -199,6 +200,7 @@ export default defineComponent({ } else { state.envs = []; state.form = { port: 3306 } as any; + state.databaseList = []; } state.dialogVisible = newValue.visible; }); @@ -241,6 +243,8 @@ export default defineComponent({ state.form.project = p.name; } } + state.form.envId = null; + state.form.env = null; state.envs = []; getEnvs(projectId); }; @@ -254,6 +258,9 @@ export default defineComponent({ }; const btnOk = async () => { + if (!state.form.id) { + notBlank(state.form.password, '新增操作，密码不可为空'); + } dbForm.value.validate((valid: boolean) => { if (valid) { state.form.port = Number.parseInt(state.form.port as any); diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue index 947beed7..5fb7b658 100644 --- a/mayfly_go_web/src/views/ops/db/DbList.vue +++ b/mayfly_go_web/src/views/ops/db/DbList.vue @@ -19,7 +19,7 @@ - + - + @@ -78,7 +78,7 @@ 创建表 - + - + @@ -134,7 +134,7 @@ - + @@ -264,6 +264,8 @@ export default defineComponent({ }; const valChange = () => { + state.chooseData = null; + state.chooseId = null; search(); }; diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 9c6406cf..f8cc2eb6 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -85,6 +85,7 @@ filterable allow-create default-first-option + size="small" class="mr10" > diff --git a/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue b/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue index dd950b8d..0bb39e91 100644 --- a/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue +++ b/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue @@ -4,8 +4,8 @@ diff --git a/mayfly_go_web/src/views/ops/machine/FileManage.vue b/mayfly_go_web/src/views/ops/machine/FileManage.vue index 14fe8e35..8ae4bfd4 100755 --- a/mayfly_go_web/src/views/ops/machine/FileManage.vue +++ b/mayfly_go_web/src/views/ops/machine/FileManage.vue @@ -6,9 +6,6 @@ 添加 - + + + @@ -157,8 +165,8 @@ @@ -217,12 +225,18 @@ export default defineComponent({ const state = reactive({ dialogVisible: false, + query: { + id: 0, + pageNum: 1, + pageSize: 8, + }, form: { id: null, type: null, name: '', remark: '', }, + total: 0, fileTable: [] as any, btnLoading: false, fileContent: { @@ -265,8 +279,15 @@ export default defineComponent({ }); const getFiles = async () => { - const res = await files.request({ id: props.machineId }); + state.query.id = props.machineId; + const res = await files.request(state.query); state.fileTable = res.list; + state.total = res.total; + }; + + const handlePageChange = (curPage: number) => { + state.query.pageNum = curPage; + getFiles(); }; /** @@ -307,7 +328,8 @@ export default defineComponent({ id: row.id, }) .then(() => { - state.fileTable.splice(idx, 1); + getFiles(); + // state.fileTable.splice(idx, 1); }); }); } else { @@ -571,6 +593,7 @@ export default defineComponent({ cmOptions, add, getFiles, + handlePageChange, addFiles, deleteRow, getConf, diff --git a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue index ace74bcd..6e652377 100644 --- a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue +++ b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue @@ -1,7 +1,7 @@