diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index 98522e7b..895b9417 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -10,12 +10,12 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "asciinema-player": "^3.0.1", + "asciinema-player": "^3.1.0", "axios": "^1.3.2", "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.4.0", - "element-plus": "^2.2.30", + "element-plus": "^2.2.32", "jsencrypt": "^3.2.1", "lodash": "^4.17.21", "mitt": "^3.0.0", @@ -25,7 +25,7 @@ "nprogress": "^0.2.0", "screenfull": "^6.0.2", "sortablejs": "^1.13.0", - "sql-formatter": "^9.2.0", + "sql-formatter": "^12.1.2", "vue": "^3.2.47", "vue-clipboard3": "^1.0.1", "vue-router": "^4.1.6", diff --git a/mayfly_go_web/src/store/index.ts b/mayfly_go_web/src/store/index.ts index 20b421d4..50e8e872 100644 --- a/mayfly_go_web/src/store/index.ts +++ b/mayfly_go_web/src/store/index.ts @@ -5,9 +5,6 @@ import themeConfig from '@/store/modules/themeConfig.ts'; import routesList from '@/store/modules/routesList.ts'; import keepAliveNames from '@/store/modules/keepAliveNames.ts'; import userInfos from '@/store/modules/userInfos.ts'; -import sqlExecInfo from '@/store/modules/mysqlDbOptInfo.ts'; -import redisDbOptInfo from '@/store/modules/redisDbOptInfo.ts'; -import mongoDbOptInfo from '@/store/modules/mongoDbOptInfo.ts'; export const key: InjectionKey> = Symbol(); @@ -17,9 +14,6 @@ export const store = createStore({ routesList, keepAliveNames, userInfos, - sqlExecInfo, - redisDbOptInfo, - mongoDbOptInfo, }, }); diff --git a/mayfly_go_web/src/store/interface/index.ts b/mayfly_go_web/src/store/interface/index.ts index eb4979c8..e335e69a 100644 --- a/mayfly_go_web/src/store/interface/index.ts +++ b/mayfly_go_web/src/store/interface/index.ts @@ -72,14 +72,6 @@ export interface UserInfosState { userInfos: object; } -// 数据操作信息 -export interface DbOptInfoState { - dbOptInfo: { - tagPath?: string, - dbId?: number, - db?: string, - } -} // 后端返回原始路由(未处理时) // export interface RequestOldRoutesState { @@ -92,8 +84,5 @@ export interface RootStateTypes { routesList: RoutesListState; keepAliveNames: KeepAliveNamesState; userInfos: UserInfosState; - sqlExecInfo: DbOptInfoState; - redisDbOptInfo: DbOptInfoState; - mongoDbOptInfo: DbOptInfoState; // requestOldRoutes: RequestOldRoutesState; } diff --git a/mayfly_go_web/src/store/modules/mongoDbOptInfo.ts b/mayfly_go_web/src/store/modules/mongoDbOptInfo.ts deleted file mode 100644 index b184284c..00000000 --- a/mayfly_go_web/src/store/modules/mongoDbOptInfo.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Module } from 'vuex'; -// 此处加上 `.ts` 后缀报错，具体原因不详 -import {DbOptInfoState, RootStateTypes} from '@/store/interface'; - -const mongoDbOptInfoModule: Module = { - namespaced: true, - state: { - dbOptInfo: { - tagPath: '', - dbId: 0, - db: '0', - }, - }, - mutations: { - // 设置用户信息 - getMongoDbOptInfo(state: any, data: object) { - state.dbOptInfo = data; - }, - }, - actions: { - // 设置用户信息 - async setMongoDbOptInfo({ commit }, data: object) { - if (data) { - commit('getMongoDbOptInfo', data); - } - }, - }, -}; - -export default mongoDbOptInfoModule; diff --git a/mayfly_go_web/src/store/modules/mysqlDbOptInfo.ts b/mayfly_go_web/src/store/modules/mysqlDbOptInfo.ts deleted file mode 100644 index b92c03fd..00000000 --- a/mayfly_go_web/src/store/modules/mysqlDbOptInfo.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Module } from 'vuex'; -// 此处加上 `.ts` 后缀报错，具体原因不详 -import { DbOptInfoState, RootStateTypes } from '@/store/interface'; - -const sqlExecInfoModule: Module = { - namespaced: true, - state: { - dbOptInfo: { - tagPath: '', - dbId: 0, - db: '0', - } - }, - mutations: { - // 设置用户信息 - getSqlExecInfo(state: any, data: object) { - state.dbOptInfo = data; - }, - }, - actions: { - // 设置用户信息 - async setSqlExecInfo({ commit }, data: object) { - if (data) { - commit('getSqlExecInfo', data); - } - }, - }, -}; - -export default sqlExecInfoModule; diff --git a/mayfly_go_web/src/store/modules/redisDbOptInfo.ts b/mayfly_go_web/src/store/modules/redisDbOptInfo.ts deleted file mode 100644 index 4e897947..00000000 --- a/mayfly_go_web/src/store/modules/redisDbOptInfo.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Module } from 'vuex'; -// 此处加上 `.ts` 后缀报错，具体原因不详 -import {DbOptInfoState, RootStateTypes} from '@/store/interface'; - -const redisDbOptInfoModule: Module = { - namespaced: true, - state: { - dbOptInfo: { - tagPath: '', - dbId: 0, - db: '0', - }, - }, - mutations: { - // 设置用户信息 - getRedisDbOptInfo(state: any, data: object) { - state.dbOptInfo = data; - }, - }, - actions: { - // 设置用户信息 - async setRedisDbOptInfo({ commit }, data: object) { - if (data) { - commit('getRedisDbOptInfo', data); - } - }, - }, -}; - -export default redisDbOptInfoModule; diff --git a/mayfly_go_web/src/store/modules/themeConfig.ts b/mayfly_go_web/src/store/modules/themeConfig.ts index 8708c613..3f1e658f 100644 --- a/mayfly_go_web/src/store/modules/themeConfig.ts +++ b/mayfly_go_web/src/store/modules/themeConfig.ts @@ -107,11 +107,11 @@ const themeConfigModule: Module = { layout: 'classic', // ssh终端字体颜色 - terminalForeground: '#50583E', + terminalForeground: '#C5C8C6', // ssh终端背景色 - terminalBackground: '#FFFFDD', + terminalBackground: '#121212', // ssh终端cursor色 - terminalCursor: '#979b7c', + terminalCursor: '#F0CC09', terminalFontSize: 14, terminalFontWeight: 'bold', diff --git a/mayfly_go_web/src/views/login/index.vue b/mayfly_go_web/src/views/login/index.vue index ba3aad9e..c1ea8842 100644 --- a/mayfly_go_web/src/views/login/index.vue +++ b/mayfly_go_web/src/views/login/index.vue @@ -24,10 +24,10 @@ --> - diff --git a/mayfly_go_web/src/views/ops/component/TagInfo.vue b/mayfly_go_web/src/views/ops/component/TagInfo.vue index bc70f867..93bda83f 100644 --- a/mayfly_go_web/src/views/ops/component/TagInfo.vue +++ b/mayfly_go_web/src/views/ops/component/TagInfo.vue @@ -1,7 +1,7 @@