diff --git a/mayfly_go_web/src/theme/app.scss b/mayfly_go_web/src/theme/app.scss index bd2c783f..d8b148cc 100644 --- a/mayfly_go_web/src/theme/app.scss +++ b/mayfly_go_web/src/theme/app.scss @@ -248,7 +248,7 @@ body, /* 字体大小全局样式 ------------------------------- */ -@for $i from 10 through 32 { +@for $i from 8 through 32 { .font#{$i} { font-size: #{$i}px !important; } diff --git a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue index 682d5261..35efa299 100644 --- a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue +++ b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue @@ -362,9 +362,10 @@ const onRunSql = async (newTab = false) => { // 要实时响应,故需要用索引改变数据才生效 state.execResTabs[i].data = colAndData.res; // 兼容表格字段配置 - state.execResTabs[i].tableColumn = colAndData.colNames.map((x: any) => { + state.execResTabs[i].tableColumn = colAndData.columns.map((x: any) => { return { - columnName: x, + columnName: x.name, + columnType: x.type, show: true, }; }); diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue index 430dee62..8dcf0ba3 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue @@ -26,16 +26,23 @@ borderRight: 'var(--el-table-border)', }" > - -
+ +
{{ column.title }}
-
+ +
+
+ {{ dbDialect.getShortColumnType(column.columnType) }} +
+
- {{ column.title }} + + {{ column.title }} + @@ -48,7 +55,9 @@
- {{ column.title }} + + {{ column.title }} +
@@ -58,7 +67,7 @@