-
+
-
- + - - - -
{{ $t('layout.config.interfaceDisplay') }} @@ -309,7 +283,7 @@ {{ $t('layout.config.isSortableTagsView') }}
-
@@ -451,19 +425,60 @@
+
diff --git a/frontend/src/layout/navBars/tagsView/tagsView.vue b/frontend/src/layout/navBars/tagsView/tagsView.vue
index e9c301a6..02e78334 100644
--- a/frontend/src/layout/navBars/tagsView/tagsView.vue
+++ b/frontend/src/layout/navBars/tagsView/tagsView.vue
@@ -46,12 +46,11 @@
@@ -122,19 +116,42 @@ onBeforeRouteUpdate((to) => {
overflow: hidden;
margin-right: 30px;
- ::v-deep(.el-scrollbar__bar.is-vertical) {
- display: none;
- }
-
- ::v-deep(a) {
- width: 100%;
- }
-
- .el-menu.el-menu--horizontal {
- display: flex;
+ .horizontal-menu {
+ border: none !important;
height: 100%;
width: 100%;
box-sizing: border-box;
+
+ ::v-deep(.el-menu-item) {
+ height: 42px;
+ line-height: 42px;
+ padding: 0 15px !important;
+ margin: 0 5px;
+ border-radius: 6px;
+ display: flex;
+ align-items: center;
+ }
+
+ ::v-deep(.el-sub-menu__title) {
+ height: 42px;
+ line-height: 42px;
+ padding: 0 25px 0 15px !important; /* 右边留出更多空间给箭头图标 */
+ margin: 0 5px;
+ border-radius: 6px;
+ display: flex;
+ align-items: center;
+ }
+
+ ::v-deep(.el-sub-menu__icon-arrow) {
+ right: 5px !important;
+ margin-top: -5px !important;
+ }
+
+ ::v-deep(.el-menu-item.is-active),
+ ::v-deep(.el-sub-menu.is-active .el-sub-menu__title) {
+ color: #409eff;
+ background-color: rgba(64, 158, 255, 0.1);
+ }
}
}
diff --git a/frontend/src/layout/navMenu/subItem.vue b/frontend/src/layout/navMenu/subItem.vue
index 3c55c811..033b45d6 100644
--- a/frontend/src/layout/navMenu/subItem.vue
+++ b/frontend/src/layout/navMenu/subItem.vue
@@ -13,7 +13,7 @@
{{ $t(val.meta.title) }}
-
+
-
-
+
+
-
+
+
diff --git a/frontend/src/layout/routerView/link.vue b/frontend/src/layout/routerView/link.vue
index 87591567..380dff58 100644
--- a/frontend/src/layout/routerView/link.vue
+++ b/frontend/src/layout/routerView/link.vue
@@ -1,29 +1,64 @@
-
+
+
+
+
+
+
+
+ loading...
+
-
- {{ $t(currentRouteMeta.title) }}：{{ currentRouteMeta.link }}
+
-
+
-
+
+
+
diff --git a/frontend/src/router/dynamicRouter.ts b/frontend/src/router/dynamicRouter.ts
index d1ead1d0..038514a1 100644
--- a/frontend/src/router/dynamicRouter.ts
+++ b/frontend/src/router/dynamicRouter.ts
@@ -7,6 +7,7 @@ import { useKeepALiveNames } from '@/store/keepAliveNames';
import router from '.';
import { RouteRecordRaw } from 'vue-router';
import { LAYOUT_ROUTE_NAME } from './staticRouter';
+import { LinkTypeEnum } from '@/common/commonEnum';
/**
* 获取目录下的 route.ts 全部文件
@@ -119,9 +120,19 @@ export function backEndRouterConverter(allModuleRoutes: any, routes: any, callba
delete item['name'];
// route.name == resource.meta.routeName
- item.name = item.meta.routeName;
- // routerName == 模块下route.ts 字段key == 组件名
- item.component = allModuleRoutes[item.meta.routeName];
+ const routerName = item.meta.routeName;
+ item.name = routerName;
+ // 如果是外链类型，name的路由名都是Link 或者 Iframes会导致路由名重复，无法添加多个外链
+ if (item.meta.link) {
+ if (item.meta.linkType == LinkTypeEnum.Link.value) {
+ item.component = () => import('@/layout/routerView/link.vue');
+ } else {
+ item.component = () => import('@/layout/routerView/iframes.vue');
+ }
+ } else {
+ // routerName == 模块下route.ts 字段key == 组件名
+ item.component = allModuleRoutes[routerName];
+ }
delete item.meta['routeName'];
// route.redirect == resource.meta.redirect
diff --git a/frontend/src/store/tagsViews.ts b/frontend/src/store/tagsViews.ts
index 574f2622..29c1c0a5 100644
--- a/frontend/src/store/tagsViews.ts
+++ b/frontend/src/store/tagsViews.ts
@@ -6,10 +6,14 @@ import { defineStore } from 'pinia';
export const useTagsViews = defineStore('tagsViews', {
state: (): TagsViewsState => ({
tagsViews: [],
+ currentRefreshPath: '',
}),
actions: {
setTagsViews(data: Array) {
this.tagsViews = data;
},
+ setCurrentRefreshPath(path: string) {
+ this.currentRefreshPath = path;
+ },
},
});
diff --git a/frontend/src/store/themeConfig.ts b/frontend/src/store/themeConfig.ts
index faeef067..812ad024 100644
--- a/frontend/src/store/themeConfig.ts
+++ b/frontend/src/store/themeConfig.ts
@@ -63,10 +63,6 @@ export const useThemeConfig = defineStore('themeConfig', {
isFixedHeaderChange: false,
// 是否开启经典布局分割菜单（仅经典布局生效）
isClassicSplitMenu: false,
- // 是否开启自动锁屏
- isLockScreen: false,
- // 开启自动锁屏倒计时(s/秒)
- lockScreenTime: 30,
/* 界面显示
------------------------------- */
@@ -138,6 +134,7 @@ export const useThemeConfig = defineStore('themeConfig', {
globalTitle: 'mayfly',
// 网站副标题（登录页顶部文字）
globalViceTitle: 'mayfly-go',
+ appSlogan: 'common.appSlogan',
// 网站logo icon, base64编码内容
logoIcon: logoIcon,
// 默认初始语言，可选值""，默认 zh-cn
diff --git a/frontend/src/theme/element.scss b/frontend/src/theme/element.scss
index 9baa1888..5cbcc3b9 100644
--- a/frontend/src/theme/element.scss
+++ b/frontend/src/theme/element.scss
@@ -32,11 +32,12 @@
/* NavMenu 导航菜单
------------------------------- */
$radius: 6px;
-$menuHeight: 46px !important;
+$menuHeight: 42px !important;
+$spacing: 8px;
// 鼠标 hover 时颜色
.el-menu-hover-bg-color {
- background-color: var(--bg-menuBarActiveColor) !important;
+ background-color: #f0f8ff !important; // 更舒适的悬停背景色
}
// 默认样式修改
@@ -45,21 +46,45 @@ $menuHeight: 46px !important;
width: 220px;
}
-.el-menu-item {
+.el-menu-item,
+.el-sub-menu__title {
height: $menuHeight;
line-height: $menuHeight;
border-radius: $radius;
+ color: #5a5a5a; // 统一调整菜单字体颜色为更舒适的深灰色
+ transition: all 0.2s ease;
+
+ // 第三方图标字体间距/大小设置
+ .icon,
+ .fa {
+ @include mixins.generalIcon;
+ }
}
-.el-menu-item,
-.el-sub-menu__title {
- color: var(--bg-menuBarColor);
- height: $menuHeight;
+.el-menu-item {
+ margin: 2px $spacing;
+ width: calc(100% - #{2 * $spacing});
}
// 修复点击左侧菜单折叠再展开时，宽度不跟随问题
.el-menu--collapse {
width: 64px !important;
+
+ // 菜单收起时，图标不居中问题
+ .el-menu-item,
+ .el-sub-menu__title {
+ margin: 4px 0;
+ width: auto;
+
+ .iconfont,
+ .fa {
+ margin-right: 0 !important;
+ }
+ }
+
+ .el-sub-menu__title {
+ padding-right: 0 !important;
+ }
}
// 外部链接时
@@ -71,29 +96,48 @@ $menuHeight: 46px !important;
text-decoration: none;
}
-// 第三方图标字体间距/大小设置
-.el-menu-item .icon,
-.el-sub-menu .icon,
-.el-menu-item .fa,
-.el-sub-menu .fa {
- @include mixins.generalIcon;
-}
-
// 水平菜单、横向菜单高亮 背景色，鼠标 hover 时，有子级菜单的背景色
.el-menu-item.is-active,
-.el-sub-menu.is-active .el-sub-menu__title,
+.el-sub-menu.is-active>.el-sub-menu__title,
.el-sub-menu:not(.is-opened):hover .el-sub-menu__title {
@extend .el-menu-hover-bg-color;
- border-radius: $radius;
+ color: #409eff;
}
.el-menu-item:hover {
@extend .el-menu-hover-bg-color;
- border-radius: $radius;
+ transform: translateX(2px);
}
-.el-sub-menu.is-active.is-opened .el-sub-menu__title {
+// 确保展开的子菜单项在hover时也使用统一的样式
+.el-sub-menu.is-opened .el-sub-menu__title:hover {
+ @extend .el-menu-hover-bg-color;
+}
+
+// 只有直接激活的菜单项才应用高亮样式
+.el-menu-item.is-active {
+ color: #409eff !important;
+}
+
+// 只有当前路由匹配的菜单项才应用高亮样式
+.el-menu-item.is-active:not(.is-disabled) {
+ color: #409eff !important;
+}
+
+// 重置所有子菜单标题的默认样式，确保与普通菜单项一致
+.el-sub-menu .el-sub-menu__title {
+ color: #5a5a5a !important;
+}
+
+// 只有真正激活且未展开的子菜单才应用高亮样式
+.el-sub-menu.is-active:not(.is-opened)>.el-sub-menu__title {
+ color: #409eff !important;
+}
+
+// 展开的子菜单保持默认样式
+.el-sub-menu.is-active.is-opened>.el-sub-menu__title {
background-color: unset !important;
+ color: #5a5a5a !important;
}
// 水平菜单、横向菜单折叠 a 标签
@@ -107,24 +151,11 @@ $menuHeight: 46px !important;
// 水平菜单
.el-menu--vertical {
- background: var(--bg-menuBar);
+ background: #fafafa; // 更舒适的背景色
.el-sub-menu.is-active .el-sub-menu__title {
color: var(--el-menu-active-color);
}
-
- .el-popper.is-pure.is-light {
- .el-menu--vertical {
- .el-sub-menu .el-sub-menu__title {
- background-color: unset !important;
- color: var(--bg-menuBarColor);
- }
-
- .el-sub-menu.is-active .el-sub-menu__title {
- color: var(--el-menu-active-color);
- }
- }
- }
}
// 横向菜单
@@ -133,33 +164,31 @@ $menuHeight: 46px !important;
.el-menu-item,
.el-sub-menu {
- height: 48px !important;
- line-height: 48px !important;
+ height: $menuHeight;
+ line-height: $menuHeight;
color: var(--bg-topBarColor);
+ border-radius: $radius;
+ padding: 0 10px !important; // 减小内边距
.el-sub-menu__title {
- height: 48px !important;
- line-height: 48px !important;
+ height: $menuHeight;
+ line-height: $menuHeight;
color: var(--bg-topBarColor);
- }
-
- .el-popper.is-pure.is-light {
- .el-menu--horizontal {
- .el-sub-menu .el-sub-menu__title {
- background-color: unset !important;
- color: var(--bg-topBarColor);
- }
-
- .el-sub-menu.is-active .el-sub-menu__title {
- color: var(--el-menu-active-color);
- }
- }
+ border-radius: $radius;
+ padding: 0 10px !important; // 减小内边距
}
}
.el-menu-item.is-active,
.el-sub-menu.is-active .el-sub-menu__title {
- color: var(--el-menu-active-color);
+ color: #409eff;
+ background-color: rgba(64, 158, 255, 0.1);
+ }
+
+ .el-menu-item:hover,
+ .el-sub-menu:not(.is-active):hover .el-sub-menu__title {
+ background-color: rgba(64, 158, 255, 0.05);
+ transform: translateY(-1px);
}
}
}
@@ -171,28 +200,107 @@ $menuHeight: 46px !important;
.el-menu-item,
.el-sub-menu__title {
- height: 48px !important;
+ height: $menuHeight;
+ line-height: $menuHeight;
color: var(--bg-topBarColor);
+ border-radius: $radius;
+ transition: all 0.2s ease;
+ padding: 0 10px !important; // 减小内边距
+ border-bottom: none !important;
}
.el-menu-item:not(.is-active):hover,
.el-sub-menu:not(.is-active):hover .el-sub-menu__title {
color: var(--bg-topBarColor);
+ background-color: rgba(0, 0, 0, 0.03);
+ }
+
+ .el-menu-item.is-active,
+ .el-sub-menu.is-active .el-sub-menu__title {
+ background-color: rgba(64, 158, 255, 0.1);
+ color: #409eff;
+ font-weight: 500;
+ border-bottom: none !important;
+ }
+
+ // 为水平菜单的子菜单项正确处理箭头图标位置
+ .el-sub-menu {
+ .el-sub-menu__title {
+ padding-right: 20px !important; // 调整箭头图标空间
+ border-bottom: none !important;
+ }
+
+ // 确保水平菜单的箭头图标正确显示在右侧
+ .el-sub-menu__icon-arrow {
+ right: 8px !important;
+ margin-top: -6px !important;
+ }
+ }
+
+ // 移除可能的伪元素下划线
+ .el-menu-item::after,
+ .el-sub-menu__title::after {
+ display: none !important;
}
}
-// 菜单收起时，图标不居中问题
-.el-menu--collapse {
-
- .el-menu-item .iconfont,
- .el-sub-menu .iconfont,
- .el-menu-item .fa,
- .el-sub-menu .fa {
- margin-right: 0 !important;
+// 暗黑模式下的菜单样式
+html.dark {
+ .el-menu-hover-bg-color {
+ background-color: #2c2c2c !important; // 暗黑模式下的悬停背景色
}
+ .el-menu-item,
.el-sub-menu__title {
- padding-right: 0 !important;
+ color: #b2b2b2; // 暗黑模式下的菜单字体颜色
+ }
+
+ .el-menu-item.is-active,
+ .el-menu-item.is-active:not(.is-disabled) {
+ color: #409eff !important;
+ }
+
+ // 重置所有子菜单标题的默认样式，确保与普通菜单项一致 - 暗黑模式
+ .el-sub-menu .el-sub-menu__title {
+ color: #b2b2b2 !important;
+ }
+
+ // 只有真正激活且未展开的子菜单才应用高亮样式 - 暗黑模式
+ .el-sub-menu.is-active:not(.is-opened)>.el-sub-menu__title {
+ color: #409eff !important;
+ }
+
+ // 展开的子菜单保持默认样式 - 暗黑模式
+ .el-sub-menu.is-active.is-opened>.el-sub-menu__title {
+ background-color: unset !important;
+ color: #b2b2b2 !important;
+ }
+
+ // 水平菜单、横向菜单折叠背景色 - 暗黑模式
+ .el-popper.is-pure.is-light {
+
+ // 水平菜单
+ .el-menu--vertical {
+ background: #1f1f1f; // 暗黑模式下的背景色
+ }
+ }
+
+ // 横向菜单（经典、横向）布局 - 暗黑模式
+ .el-menu.el-menu--horizontal {
+
+ .el-menu-item,
+ .el-sub-menu__title {
+ color: #b2b2b2; // 暗黑模式下的字体颜色
+ }
+ }
+
+ .el-menu {
+ background-color: #1f1f1f; // 暗黑模式下的菜单背景色
+ }
+
+ // 确保暗黑模式下展开的子菜单项在hover时也使用统一的样式
+ .el-sub-menu.is-opened .el-sub-menu__title:hover {
+ @extend .el-menu-hover-bg-color;
}
}
diff --git a/frontend/src/theme/loading.scss b/frontend/src/theme/loading.scss
index 3067324f..27cfd95f 100644
--- a/frontend/src/theme/loading.scss
+++ b/frontend/src/theme/loading.scss
@@ -1,51 +1,129 @@
.loading-next {
- width: 100%;
- height: 100%;
+ position: fixed !important;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+ background: linear-gradient(135deg, #f5f7fa 0%, #e4edf5 100%);
+ z-index: 999999;
+ overflow: hidden;
+ margin: 0;
+ padding: 0;
+
+ &.dark {
+ background: linear-gradient(135deg, #1a2a3a 0%, #111827 100%);
+ }
}
-.loading-next .loading-next-box {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
+
+.loading-next-box {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 40px;
+ height: 40px;
}
-.loading-next .loading-next-box-warp {
- width: 80px;
- height: 80px;
+
+.loading-next-box-warp {
+ width: 40px;
+ height: 40px;
+ position: relative;
+ transform: rotate(45deg);
+ animation: loading-next-box-warp 2s infinite linear;
}
-.loading-next .loading-next-box-warp .loading-next-box-item {
- width: 33.333333%;
- height: 33.333333%;
- background: var(--el-color-primary);
- float: left;
- animation: loading-next-animation 1.2s infinite ease;
- border-radius: 1px;
+
+.loading-next-box-item {
+ width: 10px;
+ height: 10px;
+ position: absolute;
+ background: #0ea5e9; // cyan-500
+ border-radius: 2px;
+ animation: loading-next-box-item 2s infinite linear;
+
+ &:nth-child(1) {
+ top: 0;
+ left: 0;
+ }
+
+ &:nth-child(2) {
+ top: 0;
+ right: 0;
+ animation-delay: 0.2s;
+ }
+
+ &:nth-child(3) {
+ bottom: 0;
+ right: 0;
+ animation-delay: 0.4s;
+ }
+
+ &:nth-child(4) {
+ bottom: 0;
+ left: 0;
+ animation-delay: 0.6s;
+ }
+
+ &:nth-child(5) {
+ top: 0;
+ left: 15px;
+ animation-delay: 0.1s;
+ }
+
+ &:nth-child(6) {
+ top: 15px;
+ right: 0;
+ animation-delay: 0.3s;
+ }
+
+ &:nth-child(7) {
+ bottom: 15px;
+ right: 0;
+ animation-delay: 0.5s;
+ }
+
+ &:nth-child(8) {
+ bottom: 0;
+ left: 15px;
+ animation-delay: 0.7s;
+ }
+
+ &:nth-child(9) {
+ top: 15px;
+ left: 0;
+ animation-delay: 0.8s;
+ }
}
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(7) {
- animation-delay: 0s;
+
+@keyframes loading-next-box-warp {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
}
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(4),
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(8) {
- animation-delay: 0.1s;
+
+@keyframes loading-next-box-item {
+ 0% {
+ opacity: 1;
+ transform: scale(1);
+ }
+
+ 50% {
+ opacity: 0.5;
+ transform: scale(0.5);
+ }
+
+ 100% {
+ opacity: 1;
+ transform: scale(1);
+ }
}
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(1),
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(5),
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(9) {
- animation-delay: 0.2s;
-}
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(2),
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(6) {
- animation-delay: 0.3s;
-}
-.loading-next .loading-next-box-warp .loading-next-box-item:nth-child(3) {
- animation-delay: 0.4s;
-}
-@keyframes loading-next-animation {
- 0%,
- 70%,
- 100% {
- transform: scale3D(1, 1, 1);
- }
- 35% {
- transform: scale3D(0, 0, 1);
- }
+
+// 暗黑模式样式
+.dark {
+ .loading-next-box-item {
+ background: #06b6d4; // cyan-400 (暗色模式下更亮一些)
+ }
}
\ No newline at end of file
diff --git a/frontend/src/theme/tailwind.css b/frontend/src/theme/tailwind.css
index 022157d5..6a353692 100644
--- a/frontend/src/theme/tailwind.css
+++ b/frontend/src/theme/tailwind.css
@@ -1,2 +1,3 @@
-@import "tailwindcss";
\ No newline at end of file
+@import "tailwindcss";
+@custom-variant dark (&:where(.dark, .dark *));
\ No newline at end of file
diff --git a/frontend/src/types/pinia.d.ts b/frontend/src/types/pinia.d.ts
index 52d43eff..686ecce2 100644
--- a/frontend/src/types/pinia.d.ts
+++ b/frontend/src/types/pinia.d.ts
@@ -25,8 +25,6 @@ declare interface ThemeConfigState {
isFixedHeader: boolean;
isFixedHeaderChange: boolean;
isClassicSplitMenu: boolean;
- isLockScreen: boolean;
- lockScreenTime: number;
isShowLogo: boolean;
isShowLogoChange: boolean;
isBreadcrumb: boolean;
@@ -49,6 +47,7 @@ declare interface ThemeConfigState {
isRequestRoutes: boolean;
globalTitle: string;
globalViceTitle: string;
+ appSlogan: string;
logoIcon: string;
globalI18n: string;
globalComponentSize: string;
@@ -98,6 +97,7 @@ declare interface TagsView {
// TagsView 路由列表
declare interface TagsViewsState<> {
tagsViews: TagsView[];
+ currentRefreshPath: string; // 当前刷新的路由 path
}
// 路由列表
diff --git a/frontend/src/views/flow/ProcdefList.vue b/frontend/src/views/flow/ProcdefList.vue
index 5b75a666..75c0aea2 100644
--- a/frontend/src/views/flow/ProcdefList.vue
+++ b/frontend/src/views/flow/ProcdefList.vue
@@ -43,7 +43,7 @@ import { procdefApi, procinstApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import ProcdefEdit from './ProcdefEdit.vue';
import { ProcdefStatus } from './enums';
import TagCodePath from '../ops/component/TagCodePath.vue';
diff --git a/frontend/src/views/flow/ProcinstList.vue b/frontend/src/views/flow/ProcinstList.vue
index 08b58cc4..57706f2e 100644
--- a/frontend/src/views/flow/ProcinstList.vue
+++ b/frontend/src/views/flow/ProcinstList.vue
@@ -46,7 +46,7 @@ import { ref, toRefs, reactive, Ref } from 'vue';
import { procinstApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import ProcinstDetail from './ProcinstDetail.vue';
import { FlowBizType, ProcinstBizStatus, ProcinstStatus } from './enums';
import { formatTime } from '@/common/utils/format';
diff --git a/frontend/src/views/flow/ProcinstTaskList.vue b/frontend/src/views/flow/ProcinstTaskList.vue
index 88a2dcde..0f6b08e9 100644
--- a/frontend/src/views/flow/ProcinstTaskList.vue
+++ b/frontend/src/views/flow/ProcinstTaskList.vue
@@ -63,7 +63,7 @@ import { ref, toRefs, reactive, Ref, useTemplateRef } from 'vue';
import { procinstTaskApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import ProcinstDetail from './ProcinstDetail.vue';
import { FlowBizType, ProcinstStatus, ProcinstTaskStatus } from './enums';
import { formatTime } from '@/common/utils/format';
diff --git a/frontend/src/views/login/component/AccountLogin.vue b/frontend/src/views/login/component/AccountLogin.vue
index ab93cae0..06d7c0ea 100644
--- a/frontend/src/views/login/component/AccountLogin.vue
+++ b/frontend/src/views/login/component/AccountLogin.vue
@@ -504,4 +504,11 @@ defineExpose({
margin-top: 15px;
}
}
+
+// 修复表单label与输入框不对齐的问题
+:deep(.el-form-item .el-form-item__label) {
+ align-items: center;
+ display: flex;
+ height: 100%;
+}
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index eb78e78c..f40b4c3a 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -1,79 +1,101 @@
-
+
-
+
+
diff --git a/frontend/src/layout/routerView/parent.vue b/frontend/src/layout/routerView/parent.vue
index eb38c2af..7462787b 100644
--- a/frontend/src/layout/routerView/parent.vue
+++ b/frontend/src/layout/routerView/parent.vue
@@ -1,51 +1,76 @@
+
+
+
+
+
+
+ 立即前往体验
+
+
页面 "{{ $t(state.title) }}" 已在新窗口中打开
+
-
- ![]()
-
+
- ![]()
-
-
- {{ themeConfig.globalViceTitle }}
-
-
- ![]()
-
-
+
+
+
-
-
-
-
-
-
- = ref(null);
diff --git a/frontend/src/views/ops/db/DbBackupList.vue b/frontend/src/views/ops/db/DbBackupList.vue
index 63b79cfc..7a90cc0a 100644
--- a/frontend/src/views/ops/db/DbBackupList.vue
+++ b/frontend/src/views/ops/db/DbBackupList.vue
@@ -50,7 +50,7 @@ import { toRefs, reactive, defineAsyncComponent, Ref, ref } from 'vue';
import { dbApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { ElMessage, ElMessageBox } from 'element-plus';
const DbBackupEdit = defineAsyncComponent(() => import('./DbBackupEdit.vue'));
diff --git a/frontend/src/views/ops/db/DbRestoreList.vue b/frontend/src/views/ops/db/DbRestoreList.vue
index 86b02652..5c264413 100644
--- a/frontend/src/views/ops/db/DbRestoreList.vue
+++ b/frontend/src/views/ops/db/DbRestoreList.vue
@@ -64,7 +64,7 @@ import { toRefs, reactive, defineAsyncComponent, Ref, ref } from 'vue';
import { dbApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { ElMessage, ElMessageBox } from 'element-plus';
import { formatDate } from '@/common/utils/format';
const DbRestoreEdit = defineAsyncComponent(() => import('./DbRestoreEdit.vue'));
diff --git a/frontend/src/views/ops/db/DbSqlExecLog.vue b/frontend/src/views/ops/db/DbSqlExecLog.vue
index 2048f5bf..633357db 100644
--- a/frontend/src/views/ops/db/DbSqlExecLog.vue
+++ b/frontend/src/views/ops/db/DbSqlExecLog.vue
@@ -45,7 +45,7 @@ import { dbApi } from './api';
import { DbSqlExecTypeEnum, DbSqlExecStatusEnum } from './enums';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { formatDate } from '@/common/utils/format';
const props = defineProps({
diff --git a/frontend/src/views/ops/db/DbTransferList.vue b/frontend/src/views/ops/db/DbTransferList.vue
index 718acbf5..9491d85b 100644
--- a/frontend/src/views/ops/db/DbTransferList.vue
+++ b/frontend/src/views/ops/db/DbTransferList.vue
@@ -88,7 +88,7 @@ import { dbApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { getDbDialect } from '@/views/ops/db/dialect';
import { DbTransferRunningStateEnum } from './enums';
import TerminalLog from '@/components/terminal/TerminalLog.vue';
diff --git a/frontend/src/views/ops/db/InstanceList.vue b/frontend/src/views/ops/db/InstanceList.vue
index f9158898..25859649 100644
--- a/frontend/src/views/ops/db/InstanceList.vue
+++ b/frontend/src/views/ops/db/InstanceList.vue
@@ -83,7 +83,7 @@ import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
import SvgIcon from '@/components/svgIcon/index.vue';
import { getDbDialect } from './dialect';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import ResourceAuthCert from '../component/ResourceAuthCert.vue';
import ResourceTags from '../component/ResourceTags.vue';
import { getTagPathSearchItem } from '../component/tag';
diff --git a/frontend/src/views/ops/db/SyncTaskList.vue b/frontend/src/views/ops/db/SyncTaskList.vue
index d7607a2e..23c2f688 100644
--- a/frontend/src/views/ops/db/SyncTaskList.vue
+++ b/frontend/src/views/ops/db/SyncTaskList.vue
@@ -54,7 +54,7 @@ import { dbApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { DbDataSyncRecentStateEnum, DbDataSyncRunningStateEnum } from './enums';
import { useI18nConfirm, useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle, useI18nOperateSuccessMsg } from '@/hooks/useI18n';
diff --git a/frontend/src/views/ops/db/component/DbDetail.vue b/frontend/src/views/ops/db/component/DbDetail.vue
new file mode 100644
index 00000000..3e41b070
--- /dev/null
+++ b/frontend/src/views/ops/db/component/DbDetail.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+ {{ state.detail.id }}
+ {{ state.detail.code }}
+ {{ state.detail.name }}
+
+
+
+
+
+
+ {{ state.detail.authCertName }}
+
+ {{ state.detail.remark }}
+
+ {{ formatDate(state.detail.createTime) }}
+ {{ state.detail.creator }}
+
+ {{ formatDate(state.detail.updateTime) }}
+ {{ state.detail.modifier }}
+
+
+
+
+
+
+
diff --git a/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
index a8e8d6a2..2715b361 100644
--- a/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
+++ b/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
@@ -301,13 +301,13 @@ const getKey = () => {
return props.dbId + ':' + props.dbName;
};
-/**
+/*
* 执行sql
*/
const onRunSql = async (newTab = false) => {
// 没有选中的文本，则为全部文本
let sql = getSql() as string;
- notBlank(sql && sql.trim(), t('db.noSelctRunSqlMsg'));
+ notBlank(sql && sql.trim(), t('db.noSelctRunSqlTips'));
// 去除字符串前的空格、换行等
sql = sql.replace(/(^\s*)/g, '');
@@ -315,17 +315,8 @@ const onRunSql = async (newTab = false) => {
if (sqls.length == 1) {
const oneSql = sqls[0];
- // 简单截取前十个字符
- const sqlPrefix = oneSql.slice(0, 10).toLowerCase();
- const nonQuery =
- sqlPrefix.startsWith('update') ||
- sqlPrefix.startsWith('insert') ||
- sqlPrefix.startsWith('delete') ||
- sqlPrefix.startsWith('alter') ||
- sqlPrefix.startsWith('drop') ||
- sqlPrefix.startsWith('create');
let execRemark;
- if (nonQuery) {
+ if (!getNowDbInst().isQuerySql(oneSql)) {
const res: any = await ElMessageBox.prompt(t('db.enterExecRemarkTips'), 'Tip', {
confirmButtonText: t('common.confirm'),
cancelButtonText: t('common.cancel'),
@@ -334,17 +325,115 @@ const onRunSql = async (newTab = false) => {
execRemark = res.value;
}
runSql(oneSql, execRemark, newTab);
+ return;
+ }
+
+ // 处理多条SQL - 合并相同类型的结果
+ await runMultipleSqls(sqls, newTab);
+};
+
+/**
+ * 执行多条SQL并合并结果
+ */
+const runMultipleSqls = async (sqls: string[], newTab: boolean) => {
+ // 分类SQL语句
+ const nonQuerySqls: string[] = []; // 影响行数类SQL (UPDATE, INSERT, DELETE等)
+ const querySqls: string[] = []; // 查询类SQL (SELECT等)
+
+ const dbInst = getNowDbInst();
+ // 分类SQL
+ sqls.forEach((sql) => {
+ if (!dbInst.isQuerySql(sql)) {
+ nonQuerySqls.push(sql);
+ } else {
+ querySqls.push(sql);
+ }
+ });
+
+ // 先执行非查询类SQL（可以合并结果）
+ if (nonQuerySqls.length > 0) {
+ await runNonQuerySqls(nonQuerySqls, newTab);
+ newTab = true; // 后续查询需要新标签页
+ }
+
+ // 再执行查询类SQL（每条需要独立标签页）
+ for (let i = 0; i < querySqls.length; i++) {
+ const sql = querySqls[i];
+ await runSql(sql, '', newTab || i > 0);
+ }
+};
+
+/**
+ * 执行非查询类SQL并合并结果
+ */
+const runNonQuerySqls = async (sqls: string[], newTab: boolean) => {
+ let execRes: ExecResTab;
+ let i = 0;
+ let id;
+
+ // 获取或创建结果标签页
+ if (newTab || state.execResTabs.length == 0) {
+ id = state.execResTabs.length == 0 ? 1 : state.execResTabs[state.execResTabs.length - 1].id + 1;
+ execRes = new ExecResTab(id);
+ state.execResTabs.push(execRes);
+ i = state.execResTabs.length - 1;
} else {
- let isFirst = true;
- for (let s of sqls) {
- if (isFirst) {
- isFirst = false;
- runSql(s, '', newTab);
- } else {
- runSql(s, '', true);
+ i = state.execResTabs.findIndex((x) => x.id == state.activeTab);
+ execRes = state.execResTabs[i];
+ if (unref(execRes.loading)) {
+ ElMessage.error(t('db.currentSqlTabIsRunning'));
+ return;
+ }
+ id = execRes.id;
+ }
+
+ state.activeTab = id;
+ const startTime = new Date().getTime();
+
+ try {
+ execRes.errorMsg = '';
+ execRes.sql = sqls.join('\n\n---\n\n'); // 显示所有SQL
+
+ // 执行所有非查询SQL
+ const results: any[] = [];
+ for (const sql of sqls) {
+ try {
+ const { data, execute } = getNowDbInst().execSql(props.dbName, sql, '');
+ await execute();
+ const result: any = (data.value as any)[0];
+ results.push({
+ sql: result.sql,
+ rowsAffected: result.res?.[0]?.rowsAffected,
+ error: result.errorMsg || '-',
+ });
+ } catch (error: any) {
+ results.push({
+ sql: sql,
+ error: error.message || error.msg,
+ });
}
}
+
+ // 设置表格列
+ state.execResTabs[i].tableColumn = [
+ { columnName: 'sql', columnType: 'string', show: true },
+ { columnName: 'rowsAffected', columnType: 'number', show: true },
+ { columnName: 'error', columnType: 'string', show: true },
+ ];
+
+ state.execResTabs[i].data = results;
+ cancelUpdateFields(execRes);
+ } catch (e: any) {
+ execRes.data = [];
+ execRes.tableColumn = [];
+ execRes.table = '';
+ state.execResTabs[i].errorMsg = e.message || e.msg || 'Execution failed';
+ return;
+ } finally {
+ execRes.execTime = new Date().getTime() - startTime;
}
+
+ execRes.table = '';
};
/**
diff --git a/frontend/src/views/ops/db/db.ts b/frontend/src/views/ops/db/db.ts
index bec1468f..21d75648 100644
--- a/frontend/src/views/ops/db/db.ts
+++ b/frontend/src/views/ops/db/db.ts
@@ -381,6 +381,24 @@ export class DbInst {
return this.getDialect().quoteIdentifier(name);
};
+ /**
+ * 判断sql是否为查询类sql
+ * @param sql sql
+ * @returns
+ */
+ isQuerySql(sql: string) {
+ // 简单截取前十个字符
+ const sqlPrefix = sql.slice(0, 10).toLowerCase();
+ const nonQuery =
+ sqlPrefix.startsWith('update') ||
+ sqlPrefix.startsWith('insert') ||
+ sqlPrefix.startsWith('delete') ||
+ sqlPrefix.startsWith('alter') ||
+ sqlPrefix.startsWith('drop') ||
+ sqlPrefix.startsWith('create');
+ return !nonQuery;
+ }
+
/**
* 获取或新建dbInst，如果缓存中不存在则新建，否则直接返回
* @param inst 数据库实例，后端返回的列表接口中的信息
diff --git a/frontend/src/views/ops/es/EsInstanceList.vue b/frontend/src/views/ops/es/EsInstanceList.vue
index da515e8d..0b79c656 100644
--- a/frontend/src/views/ops/es/EsInstanceList.vue
+++ b/frontend/src/views/ops/es/EsInstanceList.vue
@@ -69,7 +69,7 @@ import { formatDate } from '@/common/utils/format';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import ResourceAuthCert from '../component/ResourceAuthCert.vue';
import ResourceTags from '../component/ResourceTags.vue';
import { getTagPathSearchItem } from '../component/tag';
diff --git a/frontend/src/views/ops/machine/MachineList.vue b/frontend/src/views/ops/machine/MachineList.vue
index cb3a7531..8e871579 100644
--- a/frontend/src/views/ops/machine/MachineList.vue
+++ b/frontend/src/views/ops/machine/MachineList.vue
@@ -270,7 +270,7 @@ import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
import { formatByteSize, formatDate } from '@/common/utils/format';
import { TagResourceTypePath } from '@/common/commonEnum';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { getTagPathSearchItem } from '../component/tag';
import MachineFile from '@/views/ops/machine/file/MachineFile.vue';
import ResourceAuthCert from '../component/ResourceAuthCert.vue';
diff --git a/frontend/src/views/ops/machine/ScriptManage.vue b/frontend/src/views/ops/machine/ScriptManage.vue
index d09f6c20..18e5fec4 100644
--- a/frontend/src/views/ops/machine/ScriptManage.vue
+++ b/frontend/src/views/ops/machine/ScriptManage.vue
@@ -96,10 +96,10 @@ import ScriptEdit from './ScriptEdit.vue';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { DynamicFormDialog } from '@/components/dynamic-form';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { useI18n } from 'vue-i18n';
import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle } from '@/hooks/useI18n';
-import { OptionsApi } from '@/components/SearchForm/index';
+import { OptionsApi } from '@/components/pagetable/SearchForm/index';
const { t } = useI18n();
diff --git a/frontend/src/views/ops/machine/component/MachineDetail.vue b/frontend/src/views/ops/machine/component/MachineDetail.vue
index 65debe5e..07f12d50 100644
--- a/frontend/src/views/ops/machine/component/MachineDetail.vue
+++ b/frontend/src/views/ops/machine/component/MachineDetail.vue
@@ -1,37 +1,37 @@
- {{ formatDate(state.machineDetail.updateTime) }}
+ {{ state.machineDetail.modifier }}
+
+
- {{ themeConfig.globalViceTitle }}
-
-
+
+
@@ -83,14 +105,13 @@
-
diff --git a/frontend/src/views/msg/channel/ChannelList.vue b/frontend/src/views/msg/channel/ChannelList.vue
index c15282d4..ccd5bc47 100755
--- a/frontend/src/views/msg/channel/ChannelList.vue
+++ b/frontend/src/views/msg/channel/ChannelList.vue
@@ -30,7 +30,7 @@ import { ref, toRefs, reactive, onMounted, Ref } from 'vue';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle } from '@/hooks/useI18n';
import { channelApi } from '../api';
import { ChannelStatusEnum, ChannelTypeEnum } from '../enums';
diff --git a/frontend/src/views/msg/tmpl/TmplList.vue b/frontend/src/views/msg/tmpl/TmplList.vue
index 87034bb0..9847a0e8 100755
--- a/frontend/src/views/msg/tmpl/TmplList.vue
+++ b/frontend/src/views/msg/tmpl/TmplList.vue
@@ -61,7 +61,7 @@ import { ref, toRefs, reactive, onMounted, Ref } from 'vue';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle, useI18nOperateSuccessMsg } from '@/hooks/useI18n';
import { tmplApi } from '../api';
import { TmplStatusEnum, TmplTypeEnum, ChannelTypeEnum } from '../enums';
diff --git a/frontend/src/views/oauth/Oauth2Callback.vue b/frontend/src/views/oauth/Oauth2Callback.vue
index 058dd79d..518071f7 100644
--- a/frontend/src/views/oauth/Oauth2Callback.vue
+++ b/frontend/src/views/oauth/Oauth2Callback.vue
@@ -3,7 +3,7 @@
diff --git a/frontend/src/views/ops/component/tag.ts b/frontend/src/views/ops/component/tag.ts
index 8ff34937..83eaae95 100644
--- a/frontend/src/views/ops/component/tag.ts
+++ b/frontend/src/views/ops/component/tag.ts
@@ -1,4 +1,4 @@
-import { OptionsApi, SearchItem } from '@/components/SearchForm';
+import { OptionsApi, SearchItem } from '@/components/pagetable/SearchForm';
import { ContextmenuItem } from '@/components/contextmenu';
import { TagResourceTypeEnum } from '@/common/commonEnum';
import { tagApi } from '../tag/api';
diff --git a/frontend/src/views/ops/db/DbBackupHistoryList.vue b/frontend/src/views/ops/db/DbBackupHistoryList.vue
index aba70460..d97d37d7 100644
--- a/frontend/src/views/ops/db/DbBackupHistoryList.vue
+++ b/frontend/src/views/ops/db/DbBackupHistoryList.vue
@@ -37,7 +37,7 @@ import { toRefs, reactive, Ref, ref } from 'vue';
import { dbApi } from './api';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn } from '@/components/pagetable';
-import { SearchItem } from '@/components/SearchForm';
+import { SearchItem } from '@/components/pagetable/SearchForm';
import { ElMessage, ElMessageBox } from 'element-plus';
const pageTableRef: Ref
+
+
+
+
+
+
+ ![]()
-
- {{ item.label }}
-
-
-
-
+
+
-
-
- + {{ themeConfig.globalViceTitle }} +
+{{ $t(themeConfig.appSlogan) }}
+
+
+
+ {{ item.extra.flag }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
- {{ $t('login.thirdPartyLogin') }}:
-
-
-
-
-
-
-
-
+
+
+
+ {{ $t('login.thirdPartyLogin') }}
+
+
+
+
+
+
+
+
+
+
+ © {{ new Date().getFullYear() }} {{ themeConfig.globalViceTitle }}. All rights reserved.
-
-
- {{ props.code }}
-
+
+
+
+ {{ props.code }}
+
+
-
- {{ state.machineDetail.id }}
- {{ state.machineDetail.code }}
- {{ state.machineDetail.name }}
+
+ {{ state.machineDetail.id }}
+ {{ state.machineDetail.code }}
+ {{ state.machineDetail.name }}
- {{ state.machineDetail.ip }}
- {{ state.machineDetail.port }}
+ {{ state.machineDetail.ip }}
+ {{ state.machineDetail.port }}
- {{ state.machineDetail.remark }}
+ {{ state.machineDetail.remark }}
-
- {{ state.machineDetail.sshTunnelMachineId > 0 ? $t('common.yes') : $t('common.no') }}
-
-
- {{ state.machineDetail.enableRecorder == 1 ? $t('common.yes') : $t('common.no') }}
-
+
+ {{ state.machineDetail.sshTunnelMachineId > 0 ? $t('common.yes') : $t('common.no') }}
+
+
+ {{ state.machineDetail.enableRecorder == 1 ? $t('common.yes') : $t('common.no') }}
+
- {{ formatDate(state.machineDetail.createTime) }}
- {{ state.machineDetail.creator }}
+ {{ formatDate(state.machineDetail.createTime) }}
+ {{ state.machineDetail.creator }}
- {{ formatDate(state.machineDetail.updateTime) }}
- {{ state.machineDetail.modifier }}
-
-
-
+