From 17d11cef21c619be329465327761112032df5015 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 18 Oct 2023 17:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E5=8C=85?= =?UTF-8?q?=E7=BB=93=E6=9E=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orion-ops-ui/src/App.vue | 12 ++--- .../src/api/{message => system}/message.ts | 0 orion-ops-ui/src/assets/style/layout.less | 1 + .../components/{ => app}/breadcrumb/index.vue | 0 .../src/components/{ => app}/footer/index.vue | 0 .../src/components/{ => app}/navbar/const.ts | 0 .../src/components/{ => app}/navbar/index.vue | 12 ++--- .../{global-setting => app/setting}/block.vue | 0 .../setting}/form-wrapper.vue | 0 .../{global-setting => app/setting}/index.vue | 0 .../components/{ => app}/tab-bar/index.vue | 0 .../components/{ => app}/tab-bar/tab-item.vue | 0 orion-ops-ui/src/components/index.ts | 6 +-- .../{ => meta}/tag/tag-multi-selector.vue | 0 .../menu/selector/menu-selector-tree.vue | 0 .../{ => system}/menu/tree/index.vue | 0 .../{ => system}/menu/tree/use-menu-tree.ts | 0 .../{ => system}/message-box/index.vue | 2 +- .../{ => system}/message-box/list.vue | 2 +- .../{card/list => view/card-list}/index.vue | 0 .../src/components/{ => view}/chart/index.vue | 0 orion-ops-ui/src/layout/default-layout.vue | 8 +-- orion-ops-ui/src/locale/zh-CN.ts | 2 +- orion-ops-ui/src/router/routes/base.ts | 8 +-- .../src/router/routes/modules/user.ts | 5 ++ orion-ops-ui/src/types/symbol.ts | 3 +- .../asset/host/components/host-card-list.vue | 2 +- .../asset/host/components/host-form-modal.vue | 2 +- .../asset/host/components/host-table.vue | 2 +- .../login/components/banner.vue | 0 .../login/components/login-form.vue | 0 .../{ => authentication}/login/index.vue | 2 +- .../login/locale/zh-CN.ts | 0 .../src/views/{ => base}/redirect/index.vue | 0 .../status}/forbidden/index.vue | 0 .../status}/not-found/index.vue | 0 .../dict/components/dict-value-table.vue | 19 +++++-- orion-ops-ui/src/views/user/mine/index.vue | 53 +++++++++++++++++++ .../role/components/role-menu-grant-modal.vue | 2 +- 39 files changed, 107 insertions(+), 36 deletions(-) rename orion-ops-ui/src/api/{message => system}/message.ts (100%) rename orion-ops-ui/src/components/{ => app}/breadcrumb/index.vue (100%) rename orion-ops-ui/src/components/{ => app}/footer/index.vue (100%) rename orion-ops-ui/src/components/{ => app}/navbar/const.ts (100%) rename orion-ops-ui/src/components/{ => app}/navbar/index.vue (96%) rename orion-ops-ui/src/components/{global-setting => app/setting}/block.vue (100%) rename orion-ops-ui/src/components/{global-setting => app/setting}/form-wrapper.vue (100%) rename orion-ops-ui/src/components/{global-setting => app/setting}/index.vue (100%) rename orion-ops-ui/src/components/{ => app}/tab-bar/index.vue (100%) rename orion-ops-ui/src/components/{ => app}/tab-bar/tab-item.vue (100%) rename orion-ops-ui/src/components/{ => meta}/tag/tag-multi-selector.vue (100%) rename orion-ops-ui/src/components/{ => system}/menu/selector/menu-selector-tree.vue (100%) rename orion-ops-ui/src/components/{ => system}/menu/tree/index.vue (100%) rename orion-ops-ui/src/components/{ => system}/menu/tree/use-menu-tree.ts (100%) rename orion-ops-ui/src/components/{ => system}/message-box/index.vue (98%) rename orion-ops-ui/src/components/{ => system}/message-box/list.vue (98%) rename orion-ops-ui/src/components/{card/list => view/card-list}/index.vue (100%) rename orion-ops-ui/src/components/{ => view}/chart/index.vue (100%) rename orion-ops-ui/src/views/{ => authentication}/login/components/banner.vue (100%) rename orion-ops-ui/src/views/{ => authentication}/login/components/login-form.vue (100%) rename orion-ops-ui/src/views/{ => authentication}/login/index.vue (96%) rename orion-ops-ui/src/views/{ => authentication}/login/locale/zh-CN.ts (100%) rename orion-ops-ui/src/views/{ => base}/redirect/index.vue (100%) rename orion-ops-ui/src/views/{exception => base/status}/forbidden/index.vue (100%) rename orion-ops-ui/src/views/{exception => base/status}/not-found/index.vue (100%) create mode 100644 orion-ops-ui/src/views/user/mine/index.vue diff --git a/orion-ops-ui/src/App.vue b/orion-ops-ui/src/App.vue index 7de84eb7..0b785d0b 100644 --- a/orion-ops-ui/src/App.vue +++ b/orion-ops-ui/src/App.vue @@ -1,16 +1,16 @@ diff --git a/orion-ops-ui/src/api/message/message.ts b/orion-ops-ui/src/api/system/message.ts similarity index 100% rename from orion-ops-ui/src/api/message/message.ts rename to orion-ops-ui/src/api/system/message.ts diff --git a/orion-ops-ui/src/assets/style/layout.less b/orion-ops-ui/src/assets/style/layout.less index 71a60418..bfcabe61 100644 --- a/orion-ops-ui/src/assets/style/layout.less +++ b/orion-ops-ui/src/assets/style/layout.less @@ -42,6 +42,7 @@ align-items: center; font-size: 16px; font-weight: 600; + margin-right: 16px; } } } diff --git a/orion-ops-ui/src/components/breadcrumb/index.vue b/orion-ops-ui/src/components/app/breadcrumb/index.vue similarity index 100% rename from orion-ops-ui/src/components/breadcrumb/index.vue rename to orion-ops-ui/src/components/app/breadcrumb/index.vue diff --git a/orion-ops-ui/src/components/footer/index.vue b/orion-ops-ui/src/components/app/footer/index.vue similarity index 100% rename from orion-ops-ui/src/components/footer/index.vue rename to orion-ops-ui/src/components/app/footer/index.vue diff --git a/orion-ops-ui/src/components/navbar/const.ts b/orion-ops-ui/src/components/app/navbar/const.ts similarity index 100% rename from orion-ops-ui/src/components/navbar/const.ts rename to orion-ops-ui/src/components/app/navbar/const.ts diff --git a/orion-ops-ui/src/components/navbar/index.vue b/orion-ops-ui/src/components/app/navbar/index.vue similarity index 96% rename from orion-ops-ui/src/components/navbar/index.vue rename to orion-ops-ui/src/components/app/navbar/index.vue index a1400e7a..072a3a49 100644 --- a/orion-ops-ui/src/components/navbar/index.vue +++ b/orion-ops-ui/src/components/app/navbar/index.vue @@ -135,7 +135,7 @@ + @click="openAppSetting"> @@ -188,9 +188,9 @@ import useLocale from '@/hooks/locale'; import useUser from '@/hooks/user'; import { triggerMouseEvent } from '@/utils'; - import Menu from '@/components/menu/tree/index.vue'; - import MessageBox from '../message-box/index.vue'; - import { openGlobalSettingKey, toggleDrawerMenuKey } from '@/types/symbol'; + import Menu from '@/components/system/menu/tree/index.vue'; + import MessageBox from '@/components/system/message-box/index.vue'; + import { openAppSettingKey, toggleDrawerMenuKey } from '@/types/symbol'; import { preferenceTipsKey } from './const'; const tipsStore = useTipsStore(); @@ -230,8 +230,8 @@ useToggle(darkTheme)(); }; - // 打开系统设置 - const openGlobalSetting = inject(openGlobalSettingKey) as () => void; + // 打开应用设置 + const openAppSetting = inject(openAppSettingKey) as () => void; // 消息触发器 ref const refMessageBoxTrigger = ref(); diff --git a/orion-ops-ui/src/components/global-setting/block.vue b/orion-ops-ui/src/components/app/setting/block.vue similarity index 100% rename from orion-ops-ui/src/components/global-setting/block.vue rename to orion-ops-ui/src/components/app/setting/block.vue diff --git a/orion-ops-ui/src/components/global-setting/form-wrapper.vue b/orion-ops-ui/src/components/app/setting/form-wrapper.vue similarity index 100% rename from orion-ops-ui/src/components/global-setting/form-wrapper.vue rename to orion-ops-ui/src/components/app/setting/form-wrapper.vue diff --git a/orion-ops-ui/src/components/global-setting/index.vue b/orion-ops-ui/src/components/app/setting/index.vue similarity index 100% rename from orion-ops-ui/src/components/global-setting/index.vue rename to orion-ops-ui/src/components/app/setting/index.vue diff --git a/orion-ops-ui/src/components/tab-bar/index.vue b/orion-ops-ui/src/components/app/tab-bar/index.vue similarity index 100% rename from orion-ops-ui/src/components/tab-bar/index.vue rename to orion-ops-ui/src/components/app/tab-bar/index.vue diff --git a/orion-ops-ui/src/components/tab-bar/tab-item.vue b/orion-ops-ui/src/components/app/tab-bar/tab-item.vue similarity index 100% rename from orion-ops-ui/src/components/tab-bar/tab-item.vue rename to orion-ops-ui/src/components/app/tab-bar/tab-item.vue diff --git a/orion-ops-ui/src/components/index.ts b/orion-ops-ui/src/components/index.ts index ea1293c9..b9154df4 100644 --- a/orion-ops-ui/src/components/index.ts +++ b/orion-ops-ui/src/components/index.ts @@ -10,9 +10,9 @@ import { DataZoomComponent, GraphicComponent, } from 'echarts/components'; -import Chart from './chart/index.vue'; -import Breadcrumb from './breadcrumb/index.vue'; -import CardList from './card/list/index.vue'; +import Breadcrumb from './app/breadcrumb/index.vue'; +import Chart from './view/chart/index.vue'; +import CardList from './view/card-list/index.vue'; use([ CanvasRenderer, diff --git a/orion-ops-ui/src/components/tag/tag-multi-selector.vue b/orion-ops-ui/src/components/meta/tag/tag-multi-selector.vue similarity index 100% rename from orion-ops-ui/src/components/tag/tag-multi-selector.vue rename to orion-ops-ui/src/components/meta/tag/tag-multi-selector.vue diff --git a/orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue b/orion-ops-ui/src/components/system/menu/selector/menu-selector-tree.vue similarity index 100% rename from orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue rename to orion-ops-ui/src/components/system/menu/selector/menu-selector-tree.vue diff --git a/orion-ops-ui/src/components/menu/tree/index.vue b/orion-ops-ui/src/components/system/menu/tree/index.vue similarity index 100% rename from orion-ops-ui/src/components/menu/tree/index.vue rename to orion-ops-ui/src/components/system/menu/tree/index.vue diff --git a/orion-ops-ui/src/components/menu/tree/use-menu-tree.ts b/orion-ops-ui/src/components/system/menu/tree/use-menu-tree.ts similarity index 100% rename from orion-ops-ui/src/components/menu/tree/use-menu-tree.ts rename to orion-ops-ui/src/components/system/menu/tree/use-menu-tree.ts diff --git a/orion-ops-ui/src/components/message-box/index.vue b/orion-ops-ui/src/components/system/message-box/index.vue similarity index 98% rename from orion-ops-ui/src/components/message-box/index.vue rename to orion-ops-ui/src/components/system/message-box/index.vue index 1d62ce58..4ef7f4fd 100644 --- a/orion-ops-ui/src/components/message-box/index.vue +++ b/orion-ops-ui/src/components/system/message-box/index.vue @@ -28,7 +28,7 @@ setMessageStatus, MessageRecord, MessageListType, - } from '@/api/message/message'; + } from '@/api/system/message'; import useLoading from '@/hooks/loading'; import List from './list.vue'; diff --git a/orion-ops-ui/src/components/message-box/list.vue b/orion-ops-ui/src/components/system/message-box/list.vue similarity index 98% rename from orion-ops-ui/src/components/message-box/list.vue rename to orion-ops-ui/src/components/system/message-box/list.vue index b4e8a489..c23e592e 100644 --- a/orion-ops-ui/src/components/message-box/list.vue +++ b/orion-ops-ui/src/components/system/message-box/list.vue @@ -73,7 +73,7 @@ diff --git a/orion-ops-ui/src/views/login/locale/zh-CN.ts b/orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts similarity index 100% rename from orion-ops-ui/src/views/login/locale/zh-CN.ts rename to orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts diff --git a/orion-ops-ui/src/views/redirect/index.vue b/orion-ops-ui/src/views/base/redirect/index.vue similarity index 100% rename from orion-ops-ui/src/views/redirect/index.vue rename to orion-ops-ui/src/views/base/redirect/index.vue diff --git a/orion-ops-ui/src/views/exception/forbidden/index.vue b/orion-ops-ui/src/views/base/status/forbidden/index.vue similarity index 100% rename from orion-ops-ui/src/views/exception/forbidden/index.vue rename to orion-ops-ui/src/views/base/status/forbidden/index.vue diff --git a/orion-ops-ui/src/views/exception/not-found/index.vue b/orion-ops-ui/src/views/base/status/not-found/index.vue similarity index 100% rename from orion-ops-ui/src/views/exception/not-found/index.vue rename to orion-ops-ui/src/views/base/status/not-found/index.vue diff --git a/orion-ops-ui/src/views/system/dict/components/dict-value-table.vue b/orion-ops-ui/src/views/system/dict/components/dict-value-table.vue index 84d368f7..84a251da 100644 --- a/orion-ops-ui/src/views/system/dict/components/dict-value-table.vue +++ b/orion-ops-ui/src/views/system/dict/components/dict-value-table.vue @@ -32,6 +32,17 @@
数据字典
+ + + + 新增配置项 + + +
@@ -39,7 +50,7 @@ + @click="emits('openAddValue')"> 新增字典值