This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch menu in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 8592a250ce5b335587dacb3e7850b457a5a3132a Author: benjobs <[email protected]> AuthorDate: Sun Oct 8 23:35:13 2023 +0800 [WIP][Improve] reorganize the menus --- .../src/main/resources/db/data-h2.sql | 45 +++++++++++----------- .../src/assets/icons/app.svg | 2 +- .../components/SimpleMenu/src/SimpleSubMenu.vue | 4 +- .../{views/flink/app/hooks => hooks/web}/useLog.ts | 0 .../src/locales/lang/en/menu.ts | 18 +++++---- .../src/locales/lang/zh-CN/menu.ts | 8 ++-- .../flink/app/components/AppView/LogModal.vue | 2 +- .../src/views/{flink => }/project/Add.vue | 0 .../src/views/{flink => }/project/Edit.vue | 0 .../src/views/{flink => }/project/View.vue | 2 +- .../{flink => }/project/components/ListItem.vue | 2 +- .../{flink => }/project/components/LogModal.vue | 2 +- .../project/components/RepositoryGroup.tsx | 0 .../src/views/{flink => }/project/project.data.ts | 0 .../src/views/{flink => }/project/useProject.tsx | 6 ++- 15 files changed, 50 insertions(+), 41 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql index 5d486f344..a9128b2d9 100644 --- a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql +++ b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql @@ -46,24 +46,25 @@ insert into `t_flink_sql` values (100000, 100000, 'eNqlUUtPhDAQvu+vmFs1AYIHT5s94 -- Records of t_menu -- ---------------------------- insert into `t_menu` values (110000, 0, 'menu.system', '/system', 'PageView', null, 'desktop', '0', 1, 1, now(), now()); -insert into `t_menu` values (120000, 0, 'Apache Flink', '/flink', 'PageView', null, 'build', '0', 1, 2, now(), now()); +insert into `t_menu` values (120000, 0, 'Apache Flink', '/flink', 'PageView', null, null, '0', 1, 3, now(), now()); insert into `t_menu` values (130000, 0, 'menu.setting', '/setting', 'PageView', null, 'setting', '0', 1, 5, now(), now()); -insert into `t_menu` values (110100, 110000, 'menu.userManagement', '/system/user', 'system/user/User', null, 'user', '0', 1, 1, now(), now()); -insert into `t_menu` values (110200, 110000, 'menu.roleManagement', '/system/role', 'system/role/Role', null, 'smile', '0', 1, 2, now(), now()); -insert into `t_menu` values (110300, 110000, 'menu.menuManagement', '/system/menu', 'system/menu/Menu', 'menu:view', 'bars', '0', 1, 3, now(), now()); -insert into `t_menu` values (110400, 110000, 'menu.tokenManagement', '/system/token', 'system/token/Token', null, 'lock', '0', 1, 1, now(), now()); -insert into `t_menu` values (110500, 110000, 'menu.teamManagement', '/system/team', 'system/team/Team', null, 'team', '0', 1, 2, now(), now()); -insert into `t_menu` values (110600, 110000, 'menu.memberManagement', '/system/member', 'system/member/Member', null, 'usergroup-add', '0', 1, 2, now(), now()); -insert into `t_menu` values (120100, 120000, 'menu.project', '/flink/project', 'flink/project/View', null, 'github', '0', 1, 1, now(), now()); -insert into `t_menu` values (120200, 120000, 'menu.application', '/flink/app', 'flink/app/View', null, 'mobile', '0', 1, 2, now(), now()); -insert into `t_menu` values (120300, 120000, 'menu.variable', '/flink/variable', 'flink/variable/View', null, 'code', '0', 1, 3, now(), now()); -insert into `t_menu` values (120400, 120000, 'menu.resource', '/flink/resource', 'flink/resource/View', null, 'apartment', '0', 1, 3, now(), now()); -insert into `t_menu` values (130100, 130000, 'setting.system', '/setting/system', 'setting/System/index', null, 'database', '0', 1, 1, now(), now()); -insert into `t_menu` values (130200, 130000, 'setting.alarm', '/setting/alarm', 'setting/Alarm/index', null, 'alert', '0', 1, 2, now(), now()); -insert into `t_menu` values (130300, 130000, 'setting.flinkHome', '/setting/flinkHome', 'setting/FlinkHome/index', null, 'desktop', '0', 1, 3, now(), now()); -insert into `t_menu` values (130400, 130000, 'setting.flinkCluster', '/setting/flinkCluster', 'setting/FlinkCluster/index', 'menu:view', 'cluster', '0', 1, 4, now(), now()); -insert into `t_menu` values (130500, 130000, 'setting.externalLink', '/setting/externalLink', 'setting/ExternalLink/index', 'menu:view', 'link', '0', 1, 5, now(), now()); -insert into `t_menu` values (130600, 130000, 'setting.yarnQueue', '/setting/yarnQueue', 'setting/YarnQueue/index', 'menu:view', 'bars', '0', 1, 6, now(), now()); +insert into `t_menu` values (140000, 0, 'menu.project', '/project', 'project/View', null, 'github', '0', 1, 2, now(), now()); +insert into `t_menu` values (150000, 0, 'Apache Spark', '/spark', 'PageView', null, null, '0', 1, 4, now(), now()); +insert into `t_menu` values (110100, 110000, 'menu.userManagement', '/system/user', 'system/user/User', null, null, '0', 1, 1, now(), now()); +insert into `t_menu` values (110200, 110000, 'menu.roleManagement', '/system/role', 'system/role/Role', null, null, '0', 1, 2, now(), now()); +insert into `t_menu` values (110300, 110000, 'menu.menuManagement', '/system/menu', 'system/menu/Menu', 'menu:view', null, '0', 1, 3, now(), now()); +insert into `t_menu` values (110400, 110000, 'menu.tokenManagement', '/system/token', 'system/token/Token', null, null, '0', 1, 1, now(), now()); +insert into `t_menu` values (110500, 110000, 'menu.teamManagement', '/system/team', 'system/team/Team', null, null, '0', 1, 2, now(), now()); +insert into `t_menu` values (110600, 110000, 'menu.memberManagement', '/system/member', 'system/member/Member', null, null, '0', 1, 2, now(), now()); +insert into `t_menu` values (120200, 120000, 'menu.application', '/flink/app', 'flink/app/View', null, null, '0', 1, 2, now(), now()); +insert into `t_menu` values (120300, 120000, 'menu.variable', '/flink/variable', 'flink/variable/View', null, null, '0', 1, 3, now(), now()); +insert into `t_menu` values (120400, 120000, 'menu.resource', '/flink/resource', 'flink/resource/View', null, null, '0', 1, 3, now(), now()); +insert into `t_menu` values (120500, 120000, 'flink.flinkHome', '/setting/flinkHome', 'setting/FlinkHome/index', null, null, '0', 1, 3, now(), now()); +insert into `t_menu` values (120600, 120000, 'flink.flinkCluster', '/setting/flinkCluster', 'setting/FlinkCluster/index', 'menu:view', null, '0', 1, 4, now(), now()); +insert into `t_menu` values (130100, 130000, 'setting.system', '/setting/system', 'setting/System/index', null, null, '0', 1, 1, now(), now()); +insert into `t_menu` values (130200, 130000, 'setting.alarm', '/setting/alarm', 'setting/Alarm/index', null, null, '0', 1, 2, now(), now()); +insert into `t_menu` values (130500, 130000, 'setting.externalLink', '/setting/externalLink', 'setting/ExternalLink/index', 'menu:view', null, '0', 1, 5, now(), now()); +insert into `t_menu` values (130600, 130000, 'setting.yarnQueue', '/setting/yarnQueue', 'setting/YarnQueue/index', 'menu:view', null, '0', 1, 6, now(), now()); insert into `t_menu` values (110101, 110100, 'add', null, null, 'user:add', null, '1', 1, null, now(), now()); insert into `t_menu` values (110102, 110100, 'update', null, null, 'user:update', null, '1', 1, null, now(), now()); insert into `t_menu` values (110103, 110100, 'delete', null, null, 'user:delete', null, '1', 1, null, now(), now()); @@ -86,11 +87,11 @@ insert into `t_menu` values (110602, 110600, 'update', null, null, 'member:updat insert into `t_menu` values (110603, 110600, 'delete', null, null, 'member:delete', null, '1', 1, null, now(), now()); insert into `t_menu` values (110604, 110600, 'role view', null, null, 'role:view', null, '1', 1, null, now(), now()); insert into `t_menu` values (110605, 110600, 'view', null, null, 'member:view', null, '1', 1, null, now(), now()); -insert into `t_menu` values (120101, 120100, 'add', '/flink/project/add', 'flink/project/Add', 'project:create', '', '0', 0, null, now(), now()); -insert into `t_menu` values (120102, 120100, 'build', null, null, 'project:build', null, '1', 1, null, now(), now()); -insert into `t_menu` values (120103, 120100, 'delete', null, null, 'project:delete', null, '1', 1, null, now(), now()); -insert into `t_menu` values (120104, 120100, 'edit', '/flink/project/edit', 'flink/project/Edit', 'project:update', null, '0', 0, null, now(), now()); -insert into `t_menu` values (120105, 120100, 'view', null, null, 'project:view', null, '1', 1, null, now(), now()); +insert into `t_menu` values (120101, 140000, 'add', '/project/add', 'project/Add', 'project:create', '', '0', 0, null, now(), now()); +insert into `t_menu` values (120102, 140000, 'build', null, null, 'project:build', null, '1', 1, null, now(), now()); +insert into `t_menu` values (120103, 140000, 'delete', null, null, 'project:delete', null, '1', 1, null, now(), now()); +insert into `t_menu` values (120104, 140000, 'edit', '/project/edit', 'project/Edit', 'project:update', null, '0', 0, null, now(), now()); +insert into `t_menu` values (120105, 140000, 'view', null, null, 'project:view', null, '1', 1, null, now(), now()); insert into `t_menu` values (120201, 120200, 'add', '/flink/app/add', 'flink/app/Add', 'app:create', '', '0', 0, null, now(), now()); insert into `t_menu` values (120202, 120200, 'detail app', '/flink/app/detail', 'flink/app/Detail', 'app:detail', '', '0', 0, null, now(), now()); insert into `t_menu` values (120203, 120200, 'edit flink', '/flink/app/edit_flink', 'flink/app/EditFlink', 'app:update', '', '0', 0, null, now(), now()); diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/app.svg b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg index d663174fa..c04912c52 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/app.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg @@ -1 +1 @@ -<svg t="1694652889725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"; p-id="15332" width="200" height="200"><path d="M284.804 360.254L462.757 255.48a7.676 7.676 0 0 0 0-13.241L283.589 137.334a7.484 7.484 0 0 0-7.548 0L98.153 242.238a7.676 7.676 0 0 0 0 13.24l179.103 104.84a7.484 7.484 0 0 0 7.548 0z m464.39 0L927.148 255.48a7.676 7.676 0 0 0 0-13.241L748.043 137.334a7.484 7.484 0 0 0-7.612 0L562.543 242.238a7.676 7.676 0 0 0 0 13.24l179.104 104.84a7 [...] +<svg t="1694652889725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"; p-id="15332" width="200" height="200"><path d="M284.804 360.254L462.757 255.48a7.676 7.676 0 0 0 0-13.241L283.589 137.334a7.484 7.484 0 0 0-7.548 0L98.153 242.238a7.676 7.676 0 0 0 0 13.24l179.103 104.84a7.484 7.484 0 0 0 7.548 0z m464.39 0L927.148 255.48a7.676 7.676 0 0 0 0-13.241L748.043 137.334a7.484 7.484 0 0 0-7.612 0L562.543 242.238a7.676 7.676 0 0 0 0 13.24l179.104 104.84a7 [...] diff --git a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue index 581cd32a9..faeee0356 100644 --- a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue +++ b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue @@ -21,7 +21,8 @@ v-bind="$props" :class="getLevelClass" > - <Icon v-if="getIcon" :icon="getIcon" :size="20" /> + <SvgIcon v-if="item.path === '/project'" name="app" size="25" /> + <SvgIcon v-if="item.path === '/spark'" name="spark" size="30" /> <div v-if="collapsedShowTitle && getIsCollapseParent" class="mt-1 collapse-title"> {{ getI18nName }} </div> @@ -42,7 +43,6 @@ <span> <SvgIcon v-if="item.path === '/system'" name="management" size="25" /> <SvgIcon v-if="item.path === '/flink'" name="flink3" size="25" /> - <SvgIcon v-if="item.path === '/spark'" name="spark" size="25" /> <SvgIcon v-if="item.path === '/setting'" name="settings" size="25" /> </span> <div v-if="collapsedShowTitle && getIsCollapseParent" class="mt-2 collapse-title"> diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useLog.ts b/streampark-console/streampark-console-webapp/src/hooks/web/useLog.ts similarity index 100% rename from streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useLog.ts rename to streampark-console/streampark-console-webapp/src/hooks/web/useLog.ts diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts index b161b7145..4b4458f86 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts +++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts @@ -23,17 +23,19 @@ export default { tokenManagement: 'Token Management', teamManagement: 'Team Management', memberManagement: 'Member Management', - project: 'Project', - application: 'Application', - variable: 'Variable', - resource: 'Resource', + project: 'Projects', + application: 'Applications', + variable: 'Variables', + resource: 'Resources', setting: 'Settings', }, - setting: { - system: 'System Setting', - alarm: 'Alarm Setting', + flink: { flinkHome: 'Flink Home', - flinkCluster: 'Flink Cluster', + flinkCluster: 'Clusters', + }, + setting: { + system: 'Environment Settings', + alarm: 'Alarm Settings', externalLink: 'External Link', yarnQueue: 'Yarn Queue', flinkGateway: 'FLink Gateway', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts index 330fe9f7d..34557cbc2 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts +++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts @@ -23,17 +23,19 @@ export default { tokenManagement: 'Token 管理', teamManagement: '团队管理', memberManagement: '成员管理', - project: '项目管理', + project: '项目', application: '作业管理', variable: '变量管理', resource: '资源管理', setting: '设置中心', }, + flink: { + flinkHome: 'Flink版本', + flinkCluster: '集群', + }, setting: { system: '系统设置', alarm: '告警设置', - flinkHome: 'Flink 版本', - flinkCluster: 'Flink 集群', externalLink: '扩展链接', yarnQueue: 'Yarn 队列', flinkGateway: 'FLink 网关', diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/LogModal.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/LogModal.vue index 29cd70417..a196020c4 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/LogModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/LogModal.vue @@ -17,7 +17,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { useI18n } from '/@/hooks/web/useI18n'; - import { useLog } from '../../hooks/useLog'; + import { useLog } from '/@/hooks/web/useLog'; export default defineComponent({ name: 'LogModal', }); diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue b/streampark-console/streampark-console-webapp/src/views/project/Add.vue similarity index 100% rename from streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue rename to streampark-console/streampark-console-webapp/src/views/project/Add.vue diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/Edit.vue b/streampark-console/streampark-console-webapp/src/views/project/Edit.vue similarity index 100% rename from streampark-console/streampark-console-webapp/src/views/flink/project/Edit.vue rename to streampark-console/streampark-console-webapp/src/views/project/Edit.vue diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue b/streampark-console/streampark-console-webapp/src/views/project/View.vue similarity index 99% rename from streampark-console/streampark-console-webapp/src/views/flink/project/View.vue rename to streampark-console/streampark-console-webapp/src/views/project/View.vue index 6c2ebc2e9..36e689cbb 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/project/View.vue @@ -121,7 +121,7 @@ let projectDataSource = ref<Array<ProjectRecord>>([]); function onAdd() { - go(`/flink/project/add`); + go(`/project/add`); } function handleSearch(value: string) { diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue b/streampark-console/streampark-console-webapp/src/views/project/components/ListItem.vue similarity index 99% rename from streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue rename to streampark-console/streampark-console-webapp/src/views/project/components/ListItem.vue index 0368c992f..2177006a9 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue +++ b/streampark-console/streampark-console-webapp/src/views/project/components/ListItem.vue @@ -172,7 +172,7 @@ } const handleEdit = function () { - go(`/flink/project/edit?id=${props.item.id}`); + go(`/project/edit?id=${props.item.id}`); }; async function handleDelete() { diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/components/LogModal.vue b/streampark-console/streampark-console-webapp/src/views/project/components/LogModal.vue similarity index 98% rename from streampark-console/streampark-console-webapp/src/views/flink/project/components/LogModal.vue rename to streampark-console/streampark-console-webapp/src/views/project/components/LogModal.vue index b706af38e..bf73bc90c 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/project/components/LogModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/project/components/LogModal.vue @@ -21,7 +21,7 @@ </script> <script setup lang="ts" name="BuildLogModal"> import { useI18n } from '/@/hooks/web/useI18n'; - import { useLog } from '../../app/hooks/useLog'; + import { useLog } from '/@/hooks/web/useLog'; import { buildLog } from '/@/api/flink/project'; import { reactive, ref, unref } from 'vue'; import { BasicModal, useModalInner } from '/@/components/Modal'; diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/components/RepositoryGroup.tsx b/streampark-console/streampark-console-webapp/src/views/project/components/RepositoryGroup.tsx similarity index 100% rename from streampark-console/streampark-console-webapp/src/views/flink/project/components/RepositoryGroup.tsx rename to streampark-console/streampark-console-webapp/src/views/project/components/RepositoryGroup.tsx diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/project.data.ts b/streampark-console/streampark-console-webapp/src/views/project/project.data.ts similarity index 100% rename from streampark-console/streampark-console-webapp/src/views/flink/project/project.data.ts rename to streampark-console/streampark-console-webapp/src/views/project/project.data.ts diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx b/streampark-console/streampark-console-webapp/src/views/project/useProject.tsx similarity index 98% rename from streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx rename to streampark-console/streampark-console-webapp/src/views/project/useProject.tsx index 61d319282..08ab64747 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx +++ b/streampark-console/streampark-console-webapp/src/views/project/useProject.tsx @@ -22,13 +22,17 @@ import { useForm } from '/@/components/Form'; import { useMessage } from '/@/hooks/web/useMessage'; import { useRoute } from 'vue-router'; import { ProjectRecord } from '/@/api/flink/project/model/projectModel'; -import { filterOption } from '../app/utils'; import { useI18n } from '/@/hooks/web/useI18n'; import { GitCredentialEnum, ProjectTypeEnum, CVSTypeEnum } from '/@/enums/projectEnum'; import RepositoryGroup from './components/RepositoryGroup'; import { Form } from 'ant-design-vue'; const { t } = useI18n(); + +export const filterOption = (input: string, options: Recordable) => { + return options.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; +}; + export const useProject = () => { const route = useRoute(); const { createMessage, createErrorSwal } = useMessage();
