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({ });