diff --git a/base/ctx/req_ctx.go b/base/ctx/req_ctx.go index 8e9ff114..897bdf44 100644 --- a/base/ctx/req_ctx.go +++ b/base/ctx/req_ctx.go @@ -1,6 +1,7 @@ package ctx import ( + "io" "mayfly-go/base/ginx" "mayfly-go/base/model" "mayfly-go/base/utils/assert" @@ -59,9 +60,9 @@ func (rc *ReqCtx) Handle(handler HandlerFunc) { } } -func (rc *ReqCtx) Download(data []byte, filename string) { +func (rc *ReqCtx) Download(reader io.Reader, filename string) { rc.noRes = true - ginx.Download(rc.GinCtx, data, filename) + ginx.Download(rc.GinCtx, reader, filename) } // 新建请求上下文，默认需要校验token diff --git a/base/ginx/ginx.go b/base/ginx/ginx.go index 1b3c665f..d8e9ec83 100644 --- a/base/ginx/ginx.go +++ b/base/ginx/ginx.go @@ -1,6 +1,7 @@ package ginx import ( + "io" "mayfly-go/base/biz" "mayfly-go/base/global" "mayfly-go/base/model" @@ -47,10 +48,10 @@ func PathParamInt(g *gin.Context, pm string) int { } // 文件下载 -func Download(g *gin.Context, data []byte, filename string) { +func Download(g *gin.Context, reader io.Reader, filename string) { g.Header("Content-Type", "application/octet-stream") g.Header("Content-Disposition", "attachment; filename="+filename) - g.Data(http.StatusOK, "application/octet-stream", data) + io.Copy(g.Writer, reader) } // 返回统一成功结果 @@ -63,17 +64,14 @@ func ErrorRes(g *gin.Context, err interface{}) { switch t := err.(type) { case *biz.BizError: g.JSON(http.StatusOK, model.Error(t)) - break case error: g.JSON(http.StatusOK, model.ServerError()) global.Log.Error(t) // panic(err) - break case string: g.JSON(http.StatusOK, model.ServerError()) global.Log.Error(t) // panic(err) - break default: global.Log.Error(t) } diff --git a/mayfly_go_web/.eslintrc.js b/mayfly_go_web/.eslintrc.js index 5916d532..59bccd0f 100644 --- a/mayfly_go_web/.eslintrc.js +++ b/mayfly_go_web/.eslintrc.js @@ -12,7 +12,7 @@ module.exports = { sourceType: 'module', }, extends: ['plugin:vue/essential'], - plugins: ['vue', '@typescript-eslint'], + // plugins: ['vue', '@typescript-eslint'], rules: { // http://eslint.cn/docs/rules/ // https://eslint.vuejs.org/rules/ diff --git a/mayfly_go_web/public/config.js b/mayfly_go_web/public/config.js index fd595d5f..1a8254c6 100644 --- a/mayfly_go_web/public/config.js +++ b/mayfly_go_web/public/config.js @@ -1,4 +1,4 @@ window.globalConfig = { - "BaseApiUrl": "/api", + "BaseApiUrl": "http://localhost:8888", "BaseWsUrl": "ws://localhost:8888" } \ No newline at end of file diff --git a/mayfly_go_web/src/assets/font/JetBrainsMono-Regular.ttf b/mayfly_go_web/src/assets/font/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..7db854fd Binary files /dev/null and b/mayfly_go_web/src/assets/font/JetBrainsMono-Regular.ttf differ diff --git a/mayfly_go_web/src/assets/font/font.css b/mayfly_go_web/src/assets/font/font.css new file mode 100644 index 00000000..dc023754 --- /dev/null +++ b/mayfly_go_web/src/assets/font/font.css @@ -0,0 +1,4 @@ +@font-face { + font-family: 'JetBrainsMono'; + src: url('JetBrainsMono-Regular.ttf'); +} \ No newline at end of file diff --git a/mayfly_go_web/src/components/codemirror/codemirror.vue b/mayfly_go_web/src/components/codemirror/codemirror.vue index 376cebd4..3f31704f 100644 --- a/mayfly_go_web/src/components/codemirror/codemirror.vue +++ b/mayfly_go_web/src/components/codemirror/codemirror.vue @@ -320,6 +320,7 @@ export default defineComponent({ .CodeMirror-code { line-height: 19px; } + font-family: 'JetBrainsMono'; } .code-mode-select { diff --git a/mayfly_go_web/src/main.ts b/mayfly_go_web/src/main.ts index 6a286067..1e63ca32 100644 --- a/mayfly_go_web/src/main.ts +++ b/mayfly_go_web/src/main.ts @@ -15,6 +15,7 @@ import locale from 'element-plus/lib/locale/lang/zh-cn' import * as svg from '@element-plus/icons-vue'; import SvgIcon from '@/components/svgIcon/index.vue'; +import '@/assets/font/font.css' const app = createApp(App); @@ -31,7 +32,7 @@ const app = createApp(App); app.component('SvgIcon', SvgIcon); } -elSvg(app) +elSvg(app); directive(app); app.use(router) diff --git a/mayfly_go_web/src/views/layout/navBars/breadcrumb/setings.vue b/mayfly_go_web/src/views/layout/navBars/breadcrumb/setings.vue index 56e4a116..1b113cfe 100644 --- a/mayfly_go_web/src/views/layout/navBars/breadcrumb/setings.vue +++ b/mayfly_go_web/src/views/layout/navBars/breadcrumb/setings.vue @@ -7,22 +7,25 @@
字体颜色
- + +
背景颜色
- + +
cursor颜色
- + +
-
+
字体大小
+ 全局主题 diff --git a/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue b/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue index 56c02181..ef907a26 100644 --- a/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue +++ b/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue @@ -33,14 +33,14 @@ name="Close" class="layout-navbars-tagsview-ul-li-icon layout-icon-active" v-if="!v.meta.isAffix" - @click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.url)" + @click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.path)" /> @@ -136,6 +136,7 @@ export default { // 3、关闭当前 tagsView：如果是设置了固定的（isAffix），不可以关闭 // path为fullPath const closeCurrentTagsView = (path: string) => { + console.log(path) state.tagsViewList.map((v: any, k: number, arr: any) => { if (!v.meta.isAffix) { if (v.fullPath === path) { diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index afedae51..76454125 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -911,9 +911,8 @@ export default defineComponent({