diff --git a/frontend/README.md b/frontend/README.md index 9d833c6204..ecc6ce1dfd 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -362,20 +362,12 @@ export default function usePermission() { - + - - ``` diff --git a/frontend/src/api/modules/system/member.ts b/frontend/src/api/modules/setting/member.ts similarity index 67% rename from frontend/src/api/modules/system/member.ts rename to frontend/src/api/modules/setting/member.ts index 2ee32e53a9..f4afc923b9 100644 --- a/frontend/src/api/modules/system/member.ts +++ b/frontend/src/api/modules/setting/member.ts @@ -1,6 +1,6 @@ import MSR from '@/api/http/index'; -import { GetMemberListUrl, AddMemberUrl } from '@/api/requrls/system/member'; -import type { UserListItem, CreateUserParams } from '@/models/system/user'; +import { GetMemberListUrl, AddMemberUrl } from '@/api/requrls/setting/member'; +import type { UserListItem, CreateUserParams } from '@/models/setting/user'; import type { TableQueryParams } from '@/models/common'; export function getMemberList(data: TableQueryParams) { diff --git a/frontend/src/api/modules/system/pluginManger.ts b/frontend/src/api/modules/setting/pluginManger.ts similarity index 68% rename from frontend/src/api/modules/system/pluginManger.ts rename to frontend/src/api/modules/setting/pluginManger.ts index 007a68562e..baf59e1bd3 100644 --- a/frontend/src/api/modules/system/pluginManger.ts +++ b/frontend/src/api/modules/setting/pluginManger.ts @@ -1,6 +1,6 @@ import MSR from '@/api/http/index'; -import { GetPluginListUrl } from '@/api/requrls/system/plugin'; -import type { PluginList } from '@/models/system/plugin'; +import { GetPluginListUrl } from '@/api/requrls/setting/plugin'; +import type { PluginList } from '@/models/setting/plugin'; import type { TableQueryParams } from '@/models/common'; // eslint-disable-next-line import/prefer-default-export diff --git a/frontend/src/api/modules/system/project.ts b/frontend/src/api/modules/setting/project.ts similarity index 61% rename from frontend/src/api/modules/system/project.ts rename to frontend/src/api/modules/setting/project.ts index cf125cbf67..2d0fc60531 100644 --- a/frontend/src/api/modules/system/project.ts +++ b/frontend/src/api/modules/setting/project.ts @@ -1,6 +1,6 @@ import MSR from '@/api/http/index'; -import { ProjectListUrl } from '@/api/requrls/system/project'; -import type { ProjectListItem } from '@/models/system/project'; +import { ProjectListUrl } from '@/api/requrls/setting/project'; +import type { ProjectListItem } from '@/models/setting/project'; export function getProjectList(organizationId: string) { return MSR.get({ url: ProjectListUrl, params: organizationId }); diff --git a/frontend/src/api/modules/system/resourcePool.ts b/frontend/src/api/modules/setting/resourcePool.ts similarity index 92% rename from frontend/src/api/modules/system/resourcePool.ts rename to frontend/src/api/modules/setting/resourcePool.ts index 9d382781e2..66096889eb 100644 --- a/frontend/src/api/modules/system/resourcePool.ts +++ b/frontend/src/api/modules/setting/resourcePool.ts @@ -1,8 +1,8 @@ import MSR from '@/api/http/index'; -import { PoolListUrl, UpdatePoolUrl, AddPoolUrl, DetailPoolUrl } from '@/api/requrls/system/resourcePool'; +import { PoolListUrl, UpdatePoolUrl, AddPoolUrl, DetailPoolUrl } from '@/api/requrls/setting/resourcePool'; import type { LocationQueryValue } from 'vue-router'; -import type { ResourcePoolItem, AddResourcePoolParams } from '@/models/system/resourcePool'; +import type { ResourcePoolItem, AddResourcePoolParams } from '@/models/setting/resourcePool'; import type { TableQueryParams } from '@/models/common'; // 获取资源池列表 diff --git a/frontend/src/api/modules/system/user.ts b/frontend/src/api/modules/setting/user.ts similarity index 82% rename from frontend/src/api/modules/system/user.ts rename to frontend/src/api/modules/setting/user.ts index dcdd26c5fb..8552fb3ecb 100644 --- a/frontend/src/api/modules/system/user.ts +++ b/frontend/src/api/modules/setting/user.ts @@ -1,6 +1,6 @@ import MSR from '@/api/http/index'; -import { GetUserListUrl, CreateUserUrl, UpdateUserUrl } from '@/api/requrls/system/user'; -import type { UserListItem, CreateUserParams } from '@/models/system/user'; +import { GetUserListUrl, CreateUserUrl, UpdateUserUrl } from '@/api/requrls/setting/user'; +import type { UserListItem, CreateUserParams } from '@/models/setting/user'; import type { TableQueryParams } from '@/models/common'; export function getUserList(data: TableQueryParams) { diff --git a/frontend/src/api/modules/system/usergroup.ts b/frontend/src/api/modules/setting/usergroup.ts similarity index 94% rename from frontend/src/api/modules/system/usergroup.ts rename to frontend/src/api/modules/setting/usergroup.ts index cc76ad818b..18649ba49d 100644 --- a/frontend/src/api/modules/system/usergroup.ts +++ b/frontend/src/api/modules/setting/usergroup.ts @@ -8,9 +8,9 @@ import { editGlobalUSettingUrl, postUserByUserGroupUrl, deleteUserFromUserGroupUrl, -} from '@/api/requrls/system/usergroup'; +} from '@/api/requrls/setting/usergroup'; import { TableQueryParams, CommonList } from '@/models/common'; -import { UserGroupItem, UserGroupAuthSeting, SaveGlobalUSettingData, UserTableItem } from '@/models/system/usergroup'; +import { UserGroupItem, UserGroupAuthSeting, SaveGlobalUSettingData, UserTableItem } from '@/models/setting/usergroup'; export function updateOrAddUserGroup(data: Partial) { return MSR.post({ diff --git a/frontend/src/api/requrls/system/member.ts b/frontend/src/api/requrls/setting/member.ts similarity index 100% rename from frontend/src/api/requrls/system/member.ts rename to frontend/src/api/requrls/setting/member.ts diff --git a/frontend/src/api/requrls/system/plugin.ts b/frontend/src/api/requrls/setting/plugin.ts similarity index 100% rename from frontend/src/api/requrls/system/plugin.ts rename to frontend/src/api/requrls/setting/plugin.ts diff --git a/frontend/src/api/requrls/system/project.ts b/frontend/src/api/requrls/setting/project.ts similarity index 100% rename from frontend/src/api/requrls/system/project.ts rename to frontend/src/api/requrls/setting/project.ts diff --git a/frontend/src/api/requrls/system/resourcePool.ts b/frontend/src/api/requrls/setting/resourcePool.ts similarity index 100% rename from frontend/src/api/requrls/system/resourcePool.ts rename to frontend/src/api/requrls/setting/resourcePool.ts diff --git a/frontend/src/api/requrls/system/user.ts b/frontend/src/api/requrls/setting/user.ts similarity index 100% rename from frontend/src/api/requrls/system/user.ts rename to frontend/src/api/requrls/setting/user.ts diff --git a/frontend/src/api/requrls/system/usergroup.ts b/frontend/src/api/requrls/setting/usergroup.ts similarity index 100% rename from frontend/src/api/requrls/system/usergroup.ts rename to frontend/src/api/requrls/setting/usergroup.ts diff --git a/frontend/src/components/pure/menu/index.vue b/frontend/src/components/pure/menu/index.vue index dddcf86129..56b61b5394 100644 --- a/frontend/src/components/pure/menu/index.vue +++ b/frontend/src/components/pure/menu/index.vue @@ -10,6 +10,7 @@ import useMenuTree from './use-menu-tree'; import { PERSONAL_ROUTE } from '@/router/routes/base'; import { BOTTOM_MENU_LIST } from '@/router/constants'; + import MsIcon from '@/components/pure/ms-icon-font/index.vue'; export default defineComponent({ emit: ['collapse'], @@ -114,20 +115,20 @@ const personalMenus = [ { label: t('personal.info'), - icon: , + icon: , // eslint-disable-next-line @typescript-eslint/no-non-null-assertion route: PERSONAL_ROUTE.children![0], }, { label: t('personal.switchOrg'), - icon: , + icon: , }, { divider: , }, { label: t('personal.exit'), - icon: , + icon: , event: () => logout(), }, ]; @@ -176,7 +177,7 @@ >
- + {userStore.name}
@@ -189,7 +190,7 @@ function travel(_route: (RouteRecordRaw | null)[] | null, nodes = []) { if (_route) { _route.forEach((element) => { - const icon = element?.meta?.icon ? () => h(compile(`<${element?.meta?.icon}/>`)) : null; + const icon = element?.meta?.icon ? () => : null; const node = element?.children && element?.children.length !== 0 ? ( +@/models/setting/project @/api/modules/setting/project diff --git a/frontend/src/components/pure/tab-bar/index.vue b/frontend/src/components/pure/tab-bar/index.vue deleted file mode 100644 index 20a4ecc577..0000000000 --- a/frontend/src/components/pure/tab-bar/index.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/frontend/src/components/pure/tab-bar/readme.md b/frontend/src/components/pure/tab-bar/readme.md deleted file mode 100644 index cea5c93424..0000000000 --- a/frontend/src/components/pure/tab-bar/readme.md +++ /dev/null @@ -1,12 +0,0 @@ -## 组件说明 - -该组件非官方最终设计规范,以单独组件存在。 - -同时仅仅提供最基本的功能,后续进行优化及更改。 - - -## Component description - -The component unofficial final design specification exists as a separate component. - -At the same time, only the most basic functions are provided, and subsequent optimizations and changes will be made. \ No newline at end of file diff --git a/frontend/src/components/pure/tab-bar/tab-item.vue b/frontend/src/components/pure/tab-bar/tab-item.vue deleted file mode 100644 index 0be90c86af..0000000000 --- a/frontend/src/components/pure/tab-bar/tab-item.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue index 29ef2cb427..7123e41334 100644 --- a/frontend/src/layout/default-layout.vue +++ b/frontend/src/layout/default-layout.vue @@ -42,7 +42,6 @@ width: `calc(100vw - ${menuWidth}px)`, }" > - @@ -62,7 +61,6 @@ import NavBar from '@/components/pure/navbar/index.vue'; import Menu from '@/components/pure/menu/index.vue'; import Footer from '@/components/pure/footer/index.vue'; - import TabBar from '@/components/pure/tab-bar/index.vue'; import usePermission from '@/hooks/usePermission'; import PageLayout from './page-layout.vue'; import MsBreadCrumb from '@/components/bussiness/ms-breadcrumb/index.vue'; diff --git a/frontend/src/layout/page-layout.vue b/frontend/src/layout/page-layout.vue index b65017d39c..99eb426d6e 100644 --- a/frontend/src/layout/page-layout.vue +++ b/frontend/src/layout/page-layout.vue @@ -4,7 +4,7 @@
- +
@@ -12,14 +12,7 @@ - + +@/models/setting/member diff --git a/frontend/src/views/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue similarity index 98% rename from frontend/src/views/organization/member/index.vue rename to frontend/src/views/setting/organization/member/index.vue index c3b5d86356..182b0ecbe2 100644 --- a/frontend/src/views/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -55,7 +55,7 @@ import { Message } from '@arco-design/web-vue'; import useTable from '@/components/pure/ms-table/useTable'; import addMemberModal from './components/addMemberModal.vue'; - import { getMemberList } from '@/api/modules/system/member'; + import { getMemberList } from '@/api/modules/setting/member'; import type { MsTableColumn } from '@/components/pure/ms-table/type'; import useModal from '@/hooks/useModal'; import { useCommandComponent } from '@/hooks/useCommandComponent'; @@ -170,3 +170,4 @@ +@/api/modules/setting/member diff --git a/frontend/src/views/organization/member/locale/en-US.ts b/frontend/src/views/setting/organization/member/locale/en-US.ts similarity index 100% rename from frontend/src/views/organization/member/locale/en-US.ts rename to frontend/src/views/setting/organization/member/locale/en-US.ts diff --git a/frontend/src/views/organization/member/locale/zh-CN.ts b/frontend/src/views/setting/organization/member/locale/zh-CN.ts similarity index 100% rename from frontend/src/views/organization/member/locale/zh-CN.ts rename to frontend/src/views/setting/organization/member/locale/zh-CN.ts diff --git a/frontend/src/views/system/pluginManager/components/SceneList.vue b/frontend/src/views/setting/system/pluginManager/components/SceneList.vue similarity index 94% rename from frontend/src/views/system/pluginManager/components/SceneList.vue rename to frontend/src/views/setting/system/pluginManager/components/SceneList.vue index 43a70c493e..a270062b48 100644 --- a/frontend/src/views/system/pluginManager/components/SceneList.vue +++ b/frontend/src/views/setting/system/pluginManager/components/SceneList.vue @@ -20,7 +20,7 @@ +@/api/modules/setting/pluginManger diff --git a/frontend/src/views/system/pluginManager/components/sceneChangeModal.vue b/frontend/src/views/setting/system/pluginManager/components/sceneChangeModal.vue similarity index 96% rename from frontend/src/views/system/pluginManager/components/sceneChangeModal.vue rename to frontend/src/views/setting/system/pluginManager/components/sceneChangeModal.vue index 045742140e..211b65bcb8 100644 --- a/frontend/src/views/system/pluginManager/components/sceneChangeModal.vue +++ b/frontend/src/views/setting/system/pluginManager/components/sceneChangeModal.vue @@ -41,7 +41,7 @@ +@/models/setting/plugin diff --git a/frontend/src/views/system/pluginManager/components/uploadModel.vue b/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue similarity index 96% rename from frontend/src/views/system/pluginManager/components/uploadModel.vue rename to frontend/src/views/setting/system/pluginManager/components/uploadModel.vue index 40a0215f07..53d8614337 100644 --- a/frontend/src/views/system/pluginManager/components/uploadModel.vue +++ b/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue @@ -29,7 +29,7 @@ +@/models/setting/plugin diff --git a/frontend/src/views/system/pluginManager/components/uploadPlugin.vue b/frontend/src/views/setting/system/pluginManager/components/uploadPlugin.vue similarity index 100% rename from frontend/src/views/system/pluginManager/components/uploadPlugin.vue rename to frontend/src/views/setting/system/pluginManager/components/uploadPlugin.vue diff --git a/frontend/src/views/system/pluginManager/components/uploadSuccessModal.vue b/frontend/src/views/setting/system/pluginManager/components/uploadSuccessModal.vue similarity index 100% rename from frontend/src/views/system/pluginManager/components/uploadSuccessModal.vue rename to frontend/src/views/setting/system/pluginManager/components/uploadSuccessModal.vue diff --git a/frontend/src/views/system/pluginManager/index.vue b/frontend/src/views/setting/system/pluginManager/index.vue similarity index 100% rename from frontend/src/views/system/pluginManager/index.vue rename to frontend/src/views/setting/system/pluginManager/index.vue diff --git a/frontend/src/views/system/pluginManager/locale/en-US.ts b/frontend/src/views/setting/system/pluginManager/locale/en-US.ts similarity index 100% rename from frontend/src/views/system/pluginManager/locale/en-US.ts rename to frontend/src/views/setting/system/pluginManager/locale/en-US.ts diff --git a/frontend/src/views/system/pluginManager/locale/zh-CN.ts b/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts similarity index 100% rename from frontend/src/views/system/pluginManager/locale/zh-CN.ts rename to frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts diff --git a/frontend/src/views/system/resourcePool/components/jobTemplateDrawer.vue b/frontend/src/views/setting/system/resourcePool/components/jobTemplateDrawer.vue similarity index 100% rename from frontend/src/views/system/resourcePool/components/jobTemplateDrawer.vue rename to frontend/src/views/setting/system/resourcePool/components/jobTemplateDrawer.vue diff --git a/frontend/src/views/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue similarity index 99% rename from frontend/src/views/system/resourcePool/detail.vue rename to frontend/src/views/setting/system/resourcePool/detail.vue index 449a111649..e617bffc13 100644 --- a/frontend/src/views/system/resourcePool/detail.vue +++ b/frontend/src/views/setting/system/resourcePool/detail.vue @@ -342,10 +342,10 @@ import { getYaml, YamlType, job } from './template'; import { downloadStringFile, sleep } from '@/utils'; import { scrollIntoView } from '@/utils/dom'; - import { addPool, getPoolInfo } from '@/api/modules/system/resourcePool'; + import { addPool, getPoolInfo } from '@/api/modules/setting/resourcePool'; import type { MsBatchFormInstance, FormItemModel } from '@/components/bussiness/ms-batch-form/types'; - import type { AddResourcePoolParams, NodesListItem } from '@/models/system/resourcePool'; + import type { AddResourcePoolParams, NodesListItem } from '@/models/setting/resourcePool'; const route = useRoute(); const router = useRouter(); @@ -795,3 +795,4 @@ } } +@/models/setting/resourcePool @/api/modules/setting/resourcePool diff --git a/frontend/src/views/system/resourcePool/index.vue b/frontend/src/views/setting/system/resourcePool/index.vue similarity index 98% rename from frontend/src/views/system/resourcePool/index.vue rename to frontend/src/views/setting/system/resourcePool/index.vue index 8908487431..b8012d0109 100644 --- a/frontend/src/views/system/resourcePool/index.vue +++ b/frontend/src/views/setting/system/resourcePool/index.vue @@ -56,7 +56,7 @@ import { useRouter } from 'vue-router'; import { Message } from '@arco-design/web-vue'; import { useI18n } from '@/hooks/useI18n'; - import { getPoolList } from '@/api/modules/system/resourcePool'; + import { getPoolList } from '@/api/modules/setting/resourcePool'; import useModal from '@/hooks/useModal'; import MsBaseTable from '@/components/pure/ms-table/base-table.vue'; import useTable from '@/components/pure/ms-table/useTable'; @@ -68,7 +68,7 @@ import type { Description } from '@/components/pure/ms-description/index.vue'; import type { MsTableColumn } from '@/components/pure/ms-table/type'; import type { ActionsItem } from '@/components/pure/ms-table-more-action/types'; - import type { ResourcePoolItem } from '@/models/system/resourcePool'; + import type { ResourcePoolItem } from '@/models/setting/resourcePool'; const { t } = useI18n(); const router = useRouter(); @@ -387,3 +387,4 @@ +@/models/setting/resourcePool @/api/modules/setting/resourcePool diff --git a/frontend/src/views/system/resourcePool/locale/en-US.ts b/frontend/src/views/setting/system/resourcePool/locale/en-US.ts similarity index 100% rename from frontend/src/views/system/resourcePool/locale/en-US.ts rename to frontend/src/views/setting/system/resourcePool/locale/en-US.ts diff --git a/frontend/src/views/system/resourcePool/locale/zh-CN.ts b/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts similarity index 100% rename from frontend/src/views/system/resourcePool/locale/zh-CN.ts rename to frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts diff --git a/frontend/src/views/system/resourcePool/template.ts b/frontend/src/views/setting/system/resourcePool/template.ts similarity index 100% rename from frontend/src/views/system/resourcePool/template.ts rename to frontend/src/views/setting/system/resourcePool/template.ts diff --git a/frontend/src/views/system/user/components/batchModal.vue b/frontend/src/views/setting/system/user/components/batchModal.vue similarity index 100% rename from frontend/src/views/system/user/components/batchModal.vue rename to frontend/src/views/setting/system/user/components/batchModal.vue diff --git a/frontend/src/views/system/user/components/inviteModal.vue b/frontend/src/views/setting/system/user/components/inviteModal.vue similarity index 100% rename from frontend/src/views/system/user/components/inviteModal.vue rename to frontend/src/views/setting/system/user/components/inviteModal.vue diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue similarity index 99% rename from frontend/src/views/system/user/index.vue rename to frontend/src/views/setting/system/user/index.vue index d077f3dbff..48928cf769 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/setting/system/user/index.vue @@ -271,7 +271,7 @@ import useTable from '@/components/pure/ms-table/useTable'; import MsButton from '@/components/pure/ms-button/index.vue'; import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue'; - import { getUserList, batchCreateUser } from '@/api/modules/system/user'; + import { getUserList, batchCreateUser } from '@/api/modules/setting/user'; import { validateEmail, validatePhone } from '@/utils/validate'; import batchModal from './components/batchModal.vue'; import inviteModal from './components/inviteModal.vue'; @@ -280,7 +280,7 @@ import type { FormInstance, ValidatedError } from '@arco-design/web-vue'; import type { MsTableColumn } from '@/components/pure/ms-table/type'; import type { ActionsItem } from '@/components/pure/ms-table-more-action/types'; - import type { UserListItem } from '@/models/system/user'; + import type { UserListItem } from '@/models/setting/user'; const { t } = useI18n(); @@ -826,3 +826,4 @@ +@/models/setting/user @/api/modules/setting/user diff --git a/frontend/src/views/system/user/locale/en-US.ts b/frontend/src/views/setting/system/user/locale/en-US.ts similarity index 100% rename from frontend/src/views/system/user/locale/en-US.ts rename to frontend/src/views/setting/system/user/locale/en-US.ts diff --git a/frontend/src/views/system/user/locale/zh-CN.ts b/frontend/src/views/setting/system/user/locale/zh-CN.ts similarity index 100% rename from frontend/src/views/system/user/locale/zh-CN.ts rename to frontend/src/views/setting/system/user/locale/zh-CN.ts diff --git a/frontend/src/views/system/usergroup/components/addUserGroupModal.vue b/frontend/src/views/setting/system/usergroup/components/addUserGroupModal.vue similarity index 96% rename from frontend/src/views/system/usergroup/components/addUserGroupModal.vue rename to frontend/src/views/setting/system/usergroup/components/addUserGroupModal.vue index c0f22839fd..780049b53e 100644 --- a/frontend/src/views/system/usergroup/components/addUserGroupModal.vue +++ b/frontend/src/views/setting/system/usergroup/components/addUserGroupModal.vue @@ -41,7 +41,7 @@ +@/models/setting/usergroup diff --git a/frontend/src/views/system/usergroup/components/addUserModal.vue b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue similarity index 97% rename from frontend/src/views/system/usergroup/components/addUserModal.vue rename to frontend/src/views/setting/system/usergroup/components/addUserModal.vue index 191d8707f8..e01730be90 100644 --- a/frontend/src/views/system/usergroup/components/addUserModal.vue +++ b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue @@ -40,7 +40,7 @@ +@/models/setting/usergroup @/api/modules/setting/usergroup diff --git a/frontend/src/views/system/usergroup/index.vue b/frontend/src/views/setting/system/usergroup/index.vue similarity index 97% rename from frontend/src/views/system/usergroup/index.vue rename to frontend/src/views/setting/system/usergroup/index.vue index 5fa526b3c1..244fa729db 100644 --- a/frontend/src/views/system/usergroup/index.vue +++ b/frontend/src/views/setting/system/usergroup/index.vue @@ -33,7 +33,7 @@