From c28254855c80e0abad5fa62752fa92f4c574759b Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Tue, 11 Oct 2022 08:25:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95sql=E8=B0=83=E6=95=B4?= =?UTF-8?q?&=E5=85=B6=E4=BB=96=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/codemirror/codemirror.vue | 31 +- mayfly_go_web/src/theme/iconSelector.scss | 87 ++++ mayfly_go_web/src/theme/index.scss | 1 + mayfly_go_web/src/views/home/index.vue | 8 +- .../views/ops/component/ProjectEnvSelect.vue | 2 +- .../src/views/ops/machine/MachineList.vue | 66 ++- .../src/views/ops/machine/ScriptEdit.vue | 7 +- .../src/views/ops/redis/DataOperation.vue | 2 +- server/go.mod | 2 +- .../internal/redis/application/redis_app.go | 2 +- server/mayfly-go.sql | 455 ++++++++++-------- ...664371959499.css => 401.1665447590227.css} | 0 ....1664371959499.js => 401.1665447590227.js} | 2 +- ...664371959499.png => 401.1665447590227.png} | Bin ...664371959499.css => 404.1665447590227.css} | 0 ....1664371959499.js => 404.1665447590227.js} | 2 +- ...664371959499.png => 404.1665447590227.png} | Bin ....1664371959499.js => Api.1665447590227.js} | 2 +- ...1959499.js => ConfigList.1665447590227.js} | 2 +- .../assets/DataOperation.1664371959499.js | 1 - ...99.css => DataOperation.1665447590227.css} | 0 .../assets/DataOperation.1665447590227.js | 1 + ...64371959499.js => DbList.1665447590227.js} | 2 +- ...1664371959499.js => Enum.1665447590227.js} | 0 ... JetBrainsMono-Regular.1665447590227.woff} | Bin ...59499.css => MachineRec.1665447590227.css} | 0 ...1959499.js => MachineRec.1665447590227.js} | 2 +- ...9499.css => MongoDataOp.1665447590227.css} | 2 +- ...959499.js => MongoDataOp.1665447590227.js} | 2 +- ...71959499.js => MongoList.1665447590227.js} | 2 +- ...9.js => ProjectEnvSelect.1665447590227.js} | 2 +- ...959499.js => ProjectList.1665447590227.js} | 2 +- ...59499.css => SqlExecBox.1665447590227.css} | 0 ...1959499.js => SqlExecBox.1665447590227.js} | 2 +- ...9499.css => SshTerminal.1665447590227.css} | 0 ...959499.js => SshTerminal.1665447590227.js} | 2 +- ...99.js => SshTerminalPage.1665447590227.js} | 2 +- ...1959499.js => SyslogList.1665447590227.js} | 2 +- .../static/assets/api.16643719594995.js | 1 - ...6643719594992.js => api.16654475902272.js} | 2 +- ...6643719594993.js => api.16654475902273.js} | 2 +- ...6643719594994.js => api.16654475902274.js} | 2 +- .../static/assets/api.16654475902275.js | 1 + ...6643719594996.js => api.16654475902276.js} | 2 +- ...64371959499.js => assert.1665447590227.js} | 0 ...1959499.png => bg-login.1665447590227.png} | Bin ...59499.css => codemirror.1665447590227.css} | 2 +- ...1959499.js => codemirror.1665447590227.js} | 2 +- ...664371959499.js => enums.1665447590227.js} | 2 +- ...64371959499.js => format.1665447590227.js} | 0 .../static/assets/index.166437195949910.js | 1 - .../static/assets/index.16643719594996.css | 1 - .../static/assets/index.16643719594997.css | 1 - .../static/assets/index.1665447590227.css | 1 + ...664371959499.js => index.1665447590227.js} | 4 +- .../static/assets/index.166544759022710.js | 1 + ...719594993.css => index.16654475902272.css} | 0 ...43719594992.js => index.16654475902272.js} | 2 +- ...719594994.css => index.16654475902273.css} | 0 ...43719594993.js => index.16654475902273.js} | 2 +- .../static/assets/index.16654475902274.css | 1 + ...43719594994.js => index.16654475902274.js} | 2 +- ...371959499.css => index.16654475902275.css} | 0 ...43719594995.js => index.16654475902275.js} | 2 +- ...719594992.css => index.16654475902276.css} | 2 +- ...43719594996.js => index.16654475902276.js} | 30 +- ...719594995.css => index.16654475902277.css} | 0 ...43719594997.js => index.16654475902277.js} | 2 +- ...719594998.css => index.16654475902278.css} | 2 +- ...43719594998.js => index.16654475902278.js} | 2 +- ...43719594999.js => index.16654475902279.js} | 2 +- ...svg => jsoneditor-icons.1665447590227.svg} | 0 ...64371959499.svg => logo.1665447590227.svg} | 0 ....1664371959499.js => rsa.1665447590227.js} | 2 +- server/static/static/index.html | 4 +- 75 files changed, 482 insertions(+), 293 deletions(-) create mode 100644 mayfly_go_web/src/theme/iconSelector.scss rename server/static/static/assets/{401.1664371959499.css => 401.1665447590227.css} (100%) rename server/static/static/assets/{401.1664371959499.js => 401.1665447590227.js} (88%) rename server/static/static/assets/{401.1664371959499.png => 401.1665447590227.png} (100%) rename server/static/static/assets/{404.1664371959499.css => 404.1665447590227.css} (100%) rename server/static/static/assets/{404.1664371959499.js => 404.1665447590227.js} (89%) rename server/static/static/assets/{404.1664371959499.png => 404.1665447590227.png} (100%) rename server/static/static/assets/{Api.1664371959499.js => Api.1665447590227.js} (82%) rename server/static/static/assets/{ConfigList.1664371959499.js => ConfigList.1665447590227.js} (96%) delete mode 100644 server/static/static/assets/DataOperation.1664371959499.js rename server/static/static/assets/{DataOperation.1664371959499.css => DataOperation.1665447590227.css} (100%) create mode 100644 server/static/static/assets/DataOperation.1665447590227.js rename server/static/static/assets/{DbList.1664371959499.js => DbList.1665447590227.js} (98%) rename server/static/static/assets/{Enum.1664371959499.js => Enum.1665447590227.js} (100%) rename server/static/static/assets/{JetBrainsMono-Regular.1664371959499.woff => JetBrainsMono-Regular.1665447590227.woff} (100%) rename server/static/static/assets/{MachineRec.1664371959499.css => MachineRec.1665447590227.css} (100%) rename server/static/static/assets/{MachineRec.1664371959499.js => MachineRec.1665447590227.js} (99%) rename server/static/static/assets/{MongoDataOp.1664371959499.css => MongoDataOp.1665447590227.css} (97%) rename server/static/static/assets/{MongoDataOp.1664371959499.js => MongoDataOp.1665447590227.js} (99%) rename server/static/static/assets/{MongoList.1664371959499.js => MongoList.1665447590227.js} (98%) rename server/static/static/assets/{ProjectEnvSelect.1664371959499.js => ProjectEnvSelect.1665447590227.js} (92%) rename server/static/static/assets/{ProjectList.1664371959499.js => ProjectList.1665447590227.js} (98%) rename server/static/static/assets/{SqlExecBox.1664371959499.css => SqlExecBox.1665447590227.css} (100%) rename server/static/static/assets/{SqlExecBox.1664371959499.js => SqlExecBox.1665447590227.js} (99%) rename server/static/static/assets/{SshTerminal.1664371959499.css => SshTerminal.1665447590227.css} (100%) rename server/static/static/assets/{SshTerminal.1664371959499.js => SshTerminal.1665447590227.js} (99%) rename server/static/static/assets/{SshTerminalPage.1664371959499.js => SshTerminalPage.1665447590227.js} (80%) rename server/static/static/assets/{SyslogList.1664371959499.js => SyslogList.1665447590227.js} (94%) delete mode 100644 server/static/static/assets/api.16643719594995.js rename server/static/static/assets/{api.16643719594992.js => api.16654475902272.js} (95%) rename server/static/static/assets/{api.16643719594993.js => api.16654475902273.js} (95%) rename server/static/static/assets/{api.16643719594994.js => api.16654475902274.js} (89%) create mode 100644 server/static/static/assets/api.16654475902275.js rename server/static/static/assets/{api.16643719594996.js => api.16654475902276.js} (89%) rename server/static/static/assets/{assert.1664371959499.js => assert.1665447590227.js} (100%) rename server/static/static/assets/{bg-login.1664371959499.png => bg-login.1665447590227.png} (100%) rename server/static/static/assets/{codemirror.1664371959499.css => codemirror.1665447590227.css} (95%) rename server/static/static/assets/{codemirror.1664371959499.js => codemirror.1665447590227.js} (99%) rename server/static/static/assets/{enums.1664371959499.js => enums.1665447590227.js} (83%) rename server/static/static/assets/{format.1664371959499.js => format.1665447590227.js} (100%) delete mode 100644 server/static/static/assets/index.166437195949910.js delete mode 100644 server/static/static/assets/index.16643719594996.css delete mode 100644 server/static/static/assets/index.16643719594997.css create mode 100644 server/static/static/assets/index.1665447590227.css rename server/static/static/assets/{index.1664371959499.js => index.1665447590227.js} (99%) create mode 100644 server/static/static/assets/index.166544759022710.js rename server/static/static/assets/{index.16643719594993.css => index.16654475902272.css} (100%) rename server/static/static/assets/{index.16643719594992.js => index.16654475902272.js} (68%) rename server/static/static/assets/{index.16643719594994.css => index.16654475902273.css} (100%) rename server/static/static/assets/{index.16643719594993.js => index.16654475902273.js} (98%) create mode 100644 server/static/static/assets/index.16654475902274.css rename server/static/static/assets/{index.16643719594994.js => index.16654475902274.js} (97%) rename server/static/static/assets/{index.1664371959499.css => index.16654475902275.css} (100%) rename server/static/static/assets/{index.16643719594995.js => index.16654475902275.js} (98%) rename server/static/static/assets/{index.16643719594992.css => index.16654475902276.css} (97%) rename server/static/static/assets/{index.16643719594996.js => index.16654475902276.js} (93%) rename server/static/static/assets/{index.16643719594995.css => index.16654475902277.css} (100%) rename server/static/static/assets/{index.16643719594997.js => index.16654475902277.js} (98%) rename server/static/static/assets/{index.16643719594998.css => index.16654475902278.css} (99%) rename server/static/static/assets/{index.16643719594998.js => index.16654475902278.js} (97%) rename server/static/static/assets/{index.16643719594999.js => index.16654475902279.js} (98%) rename server/static/static/assets/{jsoneditor-icons.1664371959499.svg => jsoneditor-icons.1665447590227.svg} (100%) rename server/static/static/assets/{logo.1664371959499.svg => logo.1665447590227.svg} (100%) rename server/static/static/assets/{rsa.1664371959499.js => rsa.1665447590227.js} (99%) diff --git a/mayfly_go_web/src/components/codemirror/codemirror.vue b/mayfly_go_web/src/components/codemirror/codemirror.vue index 201cac41..38959646 100644 --- a/mayfly_go_web/src/components/codemirror/codemirror.vue +++ b/mayfly_go_web/src/components/codemirror/codemirror.vue @@ -47,7 +47,7 @@ const CodeMirror = (window as any).CodeMirror || _CodeMirror; export default defineComponent({ name: 'CodeMirror', - components: { + components: { ElOption, ElSelect, }, @@ -61,11 +61,11 @@ export default defineComponent({ }, height: { type: String, - default: "500px", + default: '500px', }, width: { type: String, - default: "auto", + default: 'auto', }, canChangeMode: { type: Boolean, @@ -300,7 +300,7 @@ export default defineComponent({ coder.setValue(newVal); state.content = newVal; coder.scrollTo(scrollInfo.left, scrollInfo.top); - refresh() + refresh(); } }; @@ -327,7 +327,6 @@ export default defineComponent({ } font-family: 'JetBrainsMono'; } - .code-mode-select { position: absolute; z-index: 2; @@ -336,4 +335,26 @@ export default defineComponent({ max-width: 130px; } } +.CodeMirror-hints { + position: absolute; + z-index: 10000; + overflow: hidden; + list-style: none; + + margin: 0; + padding: 2px; + + -webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, 0.2); + box-shadow: 2px 3px 5px rgba(0, 0, 0, 0.2); + border-radius: 3px; + border: 1px solid silver; + + background: white; + font-size: 90%; + font-family: 'JetBrainsMono'; + + max-height: 20em; + overflow-y: auto; +} \ No newline at end of file diff --git a/mayfly_go_web/src/theme/iconSelector.scss b/mayfly_go_web/src/theme/iconSelector.scss new file mode 100644 index 00000000..afee8718 --- /dev/null +++ b/mayfly_go_web/src/theme/iconSelector.scss @@ -0,0 +1,87 @@ +/* Popover 弹出框(图标选择器) +------------------------------- */ +.icon-selector-popper { + padding: 0 !important; + .icon-selector-warp { + .icon-selector-warp-title { + height: 40px; + line-height: 40px; + padding: 0 15px; + } + .icon-selector-warp-row { + max-height: 260px; + overflow-y: auto; + padding: 15px 15px 5px; + border-top: 1px solid #ebeef5; + .ele-col:nth-last-child(1), + .ele-col:nth-last-child(2) { + display: none; + } + .awe-col:nth-child(-n + 24) { + display: none; + } + .icon-selector-warp-item { + display: flex; + border: 1px solid #ebeef5; + padding: 10px; + border-radius: 5px; + margin-bottom: 10px; + transition: all 0.3s ease; + .icon-selector-warp-item-value { + transition: all 0.3s ease; + i { + font-size: 20px; + color: #606266; + } + } + &:hover { + border: 1px solid var(--color-primary); + cursor: pointer; + transition: all 0.3s ease; + .icon-selector-warp-item-value { + i { + color: var(--color-primary); + transition: all 0.3s ease; + } + } + } + } + .icon-selector-active { + border: 1px solid var(--color-primary); + .icon-selector-warp-item-value { + i { + color: var(--color-primary); + } + } + } + } + .icon-selector-all { + .el-input { + padding: 0 15px; + margin-bottom: 10px; + } + &-tabs { + display: flex; + height: 30px; + line-height: 30px; + padding: 0 15px; + margin-bottom: 5px; + &-item { + flex: 1; + text-align: center; + cursor: pointer; + &:hover { + color: var(--color-primary); + } + } + &-active { + background: var(--color-primary); + border-radius: 5px; + .label { + color: #ffffff; + } + } + } + } + } +} diff --git a/mayfly_go_web/src/theme/index.scss b/mayfly_go_web/src/theme/index.scss index 7781d443..6a9e9fe2 100644 --- a/mayfly_go_web/src/theme/index.scss +++ b/mayfly_go_web/src/theme/index.scss @@ -4,3 +4,4 @@ @import './element.scss'; @import './media/media.scss'; @import './waves.scss'; +@import './iconSelector.scss'; \ No newline at end of file diff --git a/mayfly_go_web/src/views/home/index.vue b/mayfly_go_web/src/views/home/index.vue index fc6e11cb..6debd7da 100644 --- a/mayfly_go_web/src/views/home/index.vue +++ b/mayfly_go_web/src/views/home/index.vue @@ -88,19 +88,19 @@ export default { break; } case 'projectNum': { - router.push('/ops/projects'); + router.push('/project/projects'); break; } case 'machineNum': { - router.push('/ops/machines'); + router.push('/machine/machines'); break; } case 'dbNum': { - router.push('/ops/dbms/dbs'); + router.push('/dbms/sql-exec'); break; } case 'redisNum': { - router.push('/ops/redis/manage'); + router.push('/redis/data-operation'); break; } } diff --git a/mayfly_go_web/src/views/ops/component/ProjectEnvSelect.vue b/mayfly_go_web/src/views/ops/component/ProjectEnvSelect.vue index 3de99c69..f747b719 100644 --- a/mayfly_go_web/src/views/ops/component/ProjectEnvSelect.vue +++ b/mayfly_go_web/src/views/ops/component/ProjectEnvSelect.vue @@ -8,7 +8,7 @@ - + {{ item.name }} {{ item.remark }} diff --git a/mayfly_go_web/src/views/ops/machine/MachineList.vue b/mayfly_go_web/src/views/ops/machine/MachineList.vue index a797c4b6..4c1ad82e 100644 --- a/mayfly_go_web/src/views/ops/machine/MachineList.vue +++ b/mayfly_go_web/src/views/ops/machine/MachineList.vue @@ -74,7 +74,7 @@ - + @@ -395,4 +416,11 @@ export default defineComponent({ .el-dialog__body { padding: 2px 2px; } +.el-dropdown-link-machine-list { + cursor: pointer; + color: var(--el-color-primary); + display: flex; + align-items: center; + margin-top: 6px; +} diff --git a/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue b/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue index 96027b21..041537a3 100644 --- a/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue +++ b/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue @@ -9,7 +9,7 @@ :destroy-on-close="true" width="900px" > - + @@ -187,11 +187,6 @@ export default defineComponent({ });