diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index b050f74a..2ba8baa3 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -13,7 +13,7 @@ "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.4.0", - "element-plus": "^2.2.26", + "element-plus": "^2.2.29", "jsencrypt": "^3.2.1", "lodash": "^4.17.21", "mitt": "^3.0.0", @@ -44,10 +44,10 @@ "eslint": "^8.5.0", "eslint-plugin-vue": "^8.2.0", "prettier": "^2.3.0", - "sass": "^1.45.1", - "sass-loader": "^12.4.0", + "sass": "^1.58.0", + "sass-loader": "^13.2.0", "typescript": "^4.7.4", - "vite": "^4.0.4", + "vite": "^4.1.1", "vue-eslint-parser": "^8.0.1" }, "browserslist": [ diff --git a/mayfly_go_web/src/common/config.ts b/mayfly_go_web/src/common/config.ts index ebe330fc..befb7092 100644 --- a/mayfly_go_web/src/common/config.ts +++ b/mayfly_go_web/src/common/config.ts @@ -1,6 +1,14 @@ +function getBaseApiUrl() { + let path = window.location.pathname; + if (path == '/') { + return window.location.host; + } + return window.location.host + path; +} + const config = { - baseApiUrl: `${(window as any).globalConfig.BaseApiUrl}/api`, - baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${location.host}`}/api`, + baseApiUrl: `${(window as any).globalConfig.BaseApiUrl || location.protocol + '//' + getBaseApiUrl()}/api`, + baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`, // 系统版本 version: 'v1.3.1' diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 1c898fb5..92eb8a4d 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -1,213 +1,231 @@ - + @@ -1833,12 +1854,14 @@ const addQueryTab = async () => { #data-exec { min-height: calc(100vh - 155px); - .el-tabs__header{ - margin: 0 0 5px; - .el-tabs__item{ - padding: 0 5px; + + .el-tabs__header { + margin: 0 0 5px; + + .el-tabs__item { + padding: 0 5px; + } } - } } .update_field_active { diff --git a/mayfly_go_web/src/views/ops/db/component/InstanceTree.vue b/mayfly_go_web/src/views/ops/db/component/InstanceTree.vue index e0648af6..e3a1ab21 100644 --- a/mayfly_go_web/src/views/ops/db/component/InstanceTree.vue +++ b/mayfly_go_web/src/views/ops/db/component/InstanceTree.vue @@ -1,115 +1,122 @@