diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index c2b59b1a..6d80efc0 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -387,7 +387,7 @@ onBeforeUnmount(() => {
* 设置editor高度和数据表高度
*/
const setHeight = () => {
- state.editorHeight = window.innerHeight - 500 + 'px';
+ state.editorHeight = window.innerHeight - 520 + 'px';
state.dataTabsTableHeight = window.innerHeight - 255;
state.tablesOpHeight = window.innerHeight - 220 + 'px';
};
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 52591d3d..8672e4fc 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
@@ -48,37 +48,77 @@
-
-
-
-
- 提交
-
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dt.label }}
+
+
+
+
+
+ {{ dt.execTime }}ms
+
+ {{ dt.data?.length }}
+
+
+ {{ dt.sql }}
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+ 取消
+
+
+
+
+
+
+
+
@@ -550,4 +690,17 @@ const cancelUpdateFields = () => {
height: 3px;
text-align: center;
}
+
+.sql-exec-res {
+ .el-tabs__header {
+ margin: 0 0 !important;
+ }
+
+ .el-tabs__item {
+ font-size: 12px;
+ height: 20px;
+ margin: 0px;
+ padding: 0 6px !important;
+ }
+}
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 79bf5540..a792036c 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
@@ -360,6 +360,7 @@ onMounted(async () => {
state.dbType = props.dbType;
state.db = props.db;
state.table = props.table;
+ setTableData(props.data);
});
const setTableData = (datas: any) => {
@@ -386,7 +387,9 @@ const setTableColumns = (columns: any) => {
hidden: !x.show,
};
});
- state.columns.unshift(rowNoColumn);
+ if (state.columns.length > 0) {
+ state.columns.unshift(rowNoColumn);
+ }
};
/**
diff --git a/mayfly_go_web/src/views/system/role/RoleEdit.vue b/mayfly_go_web/src/views/system/role/RoleEdit.vue
index 83d09f6f..16895f6e 100755
--- a/mayfly_go_web/src/views/system/role/RoleEdit.vue
+++ b/mayfly_go_web/src/views/system/role/RoleEdit.vue
@@ -8,6 +8,11 @@
+
+
+
+
+
@@ -25,6 +30,7 @@