diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 2e15f735..a39c4b12 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -7,13 +7,13 @@
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
},
"dependencies": {
- "@element-plus/icons-vue": "^2.0.9",
+ "@element-plus/icons-vue": "^2.0.10",
"asciinema-player": "^3.0.1",
"axios": "^1.1.2",
"countup.js": "^2.0.7",
"cropperjs": "^1.5.11",
"echarts": "^5.3.3",
- "element-plus": "^2.2.20",
+ "element-plus": "^2.2.22",
"jsencrypt": "^3.2.1",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
@@ -24,7 +24,7 @@
"screenfull": "^6.0.2",
"sortablejs": "^1.13.0",
"sql-formatter": "^9.2.0",
- "vue": "^3.2.41",
+ "vue": "^3.2.45",
"vue-clipboard3": "^1.0.1",
"vue-router": "^4.1.6",
"vuex": "^4.0.2",
diff --git a/mayfly_go_web/src/views/layout/component/main.vue b/mayfly_go_web/src/views/layout/component/main.vue
index 92e4579a..798040f2 100644
--- a/mayfly_go_web/src/views/layout/component/main.vue
+++ b/mayfly_go_web/src/views/layout/component/main.vue
@@ -83,7 +83,7 @@ export default defineComponent({
() => route.path,
() => {
initCurrentRouteMeta(route.meta);
- proxy.$refs.layoutScrollbarRef.wrap$.scrollTop = 0;
+ proxy.$refs.layoutScrollbarRef.wrapRef.scrollTop = 0;
}
);
return {
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 ef907a26..8a7ac494 100644
--- a/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue
+++ b/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue
@@ -234,7 +234,7 @@ export default {
};
// 鼠标滚轮滚动
const onHandleScroll = (e: any) => {
- proxy.$refs.scrollbarRef.$refs.wrap.scrollLeft += e.wheelDelta / 4;
+ proxy.$refs.scrollbarRef.$refs.wrapRef.scrollLeft += e.wheelDelta / 4;
};
// tagsView 横向滚动
const tagsViewmoveToCurrentTag = () => {
@@ -251,7 +251,7 @@ export default {
// 最后 li
let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
// 当前滚动条的值
- let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrap$;
+ let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrapRef;
// 当前滚动条滚动宽度
let scrollS = scrollRefs.scrollWidth;
// 当前滚动条偏移宽度
diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue
index 9823e3ec..c24de0da 100644
--- a/mayfly_go_web/src/views/ops/db/DbList.vue
+++ b/mayfly_go_web/src/views/ops/db/DbList.vue
@@ -57,16 +57,13 @@
-
-
+
- {{ dateFormat(scope.row.createTime) }}
-
-
-
-
-
-
+
+ 详情
+
+
SQL执行记录
@@ -144,9 +141,9 @@
字段
索引
- 编辑表
+ 编辑表
DDL
@@ -242,15 +239,41 @@
size="small">
+
+
+ {{ infoDialog.data.id }}
+ {{ infoDialog.data.name }}
+
+ {{ infoDialog.data.tagPath }}
+
+ {{ infoDialog.data.host }}
+ {{ infoDialog.data.port }}
+
+ {{ infoDialog.data.username }}
+ {{ infoDialog.data.type }}
+
+ {{ infoDialog.data.params }}
+ {{ infoDialog.data.remark }}
+ {{ infoDialog.data.database }}
+
+ {{ infoDialog.data.enableSshTunnel == 1 ? '是' : '否' }}
+
+
+ {{ dateFormat(infoDialog.data.createTime) }}
+
+ {{ infoDialog.data.creator }}
+
+ {{ dateFormat(infoDialog.data.updateTime) }}
+
+ {{ infoDialog.data.modifier }}
+
+
+
-
+
+
@@ -298,6 +321,10 @@ const state = reactive({
},
datas: [],
total: 0,
+ infoDialog: {
+ visible: false,
+ data: null as any,
+ },
showDumpInfo: false,
dumpInfo: {
id: 0,
@@ -355,7 +382,7 @@ const state = reactive({
visible: false,
activeName: '1',
type: '',
- enableEditTypes:['mysql'], // 支持"编辑表"的数据库类型
+ enableEditTypes: ['mysql'], // 支持"编辑表"的数据库类型
data: { // 修改表时,传递修改数据
edit: false,
row: {},
@@ -378,6 +405,7 @@ const {
query,
datas,
total,
+ infoDialog,
showDumpInfo,
dumpInfo,
sqlExecLogDialog,
@@ -441,6 +469,11 @@ const handlePageChange = (curPage: number) => {
search();
};
+const showInfo = (info: any) => {
+ state.infoDialog.data = info;
+ state.infoDialog.visible = true;
+}
+
const getTags = async () => {
state.tags = await tagApi.getAccountTags.request(null);
};
@@ -589,7 +622,7 @@ const showTableInfo = async (row: any, db: string) => {
}
};
-const onSubmitSql = async (row: {tableName: string}) => {
+const onSubmitSql = async (row: { tableName: string }) => {
await openEditTable(row)
state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: state.dbId, db: state.db });
}
diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index b42169e0..c6b0f08e 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -246,7 +246,7 @@