You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/11/08 16:32:23 UTC
[incubator-streampark] branch dev updated: [Fix] Modify role menu initialization sql,Role menu verification (#1987)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 4c1311b21 [Fix] Modify role menu initialization sql,Role menu verification (#1987)
4c1311b21 is described below
commit 4c1311b21dcffaf492b806ff59c2f8d6b3b3bf54
Author: Sizhu Wang <12...@qq.com>
AuthorDate: Wed Nov 9 00:32:17 2022 +0800
[Fix] Modify role menu initialization sql,Role menu verification (#1987)
* [Fix] Modify role menu initialization sql,Role menu verification
* [Fix]: application permission
---
.../src/views/flink/app/hooks/useAppTableAction.ts | 1 -
.../src/views/system/role/components/RoleDrawer.vue | 18 ++++++++++++++++--
.../src/assembly/script/data/mysql-data.sql | 15 +++++++++------
.../src/assembly/script/data/pgsql-data.sql | 15 +++++++++------
.../src/main/resources/db/data-h2.sql | 14 +++++++++-----
5 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useAppTableAction.ts b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useAppTableAction.ts
index e0083ffbd..7d7a13f60 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useAppTableAction.ts
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useAppTableAction.ts
@@ -74,7 +74,6 @@ export const useAppTableAction = (
{
tooltip: { title: 'Launching Progress Detail' },
ifShow: [-1, 2].includes(record.launch) || record['optionState'] === 1,
- auth: 'app:update',
icon: 'ant-design:container-outlined',
onClick: () => openBuildDrawer(true, { appId: record.id }),
},
diff --git a/streampark-console/streampark-console-newui/src/views/system/role/components/RoleDrawer.vue b/streampark-console/streampark-console-newui/src/views/system/role/components/RoleDrawer.vue
index 984033493..b21b1f6dc 100644
--- a/streampark-console/streampark-console-newui/src/views/system/role/components/RoleDrawer.vue
+++ b/streampark-console/streampark-console-newui/src/views/system/role/components/RoleDrawer.vue
@@ -49,6 +49,7 @@
import { fetchRoleCreate, fetchRoleUpdate } from '/@/api/system/role';
import { getMenuList, getRoleMenu } from '/@/api/base/system';
import { FormTypeEnum } from '/@/enums/formEnum';
+ import { useMessage } from '/@/hooks/web/useMessage';
const handleTreeIcon = (treeData: TreeItem[]): TreeItem[] => {
if (!treeData?.length) {
@@ -70,6 +71,8 @@
const treeData = ref<TreeItem[]>([]);
let singleNodeKeys: string[] = [];
let selectedKeysAndHalfCheckedKeys = ref<string[]>([]);
+
+ const { createMessage } = useMessage();
const isCreate = computed(() => unref(formType) === FormTypeEnum.Create);
const formSchemas = computed((): FormSchema[] => {
@@ -152,9 +155,20 @@
async function handleSubmit() {
try {
const values = await validate();
+ // First, a simple judgment, does not contain app:view (home) this permission, the error is reported
+ if (selectedKeysAndHalfCheckedKeys.value.indexOf('100067') < 0) {
+ createMessage.warning('Must include app:view permission');
+ return;
+ }
+ console.log(
+ "selectedKeysAndHalfCheckedKeys.value.indexOf('100067')",
+ selectedKeysAndHalfCheckedKeys.value.indexOf('100067'),
+ );
setDrawerProps({ confirmLoading: true });
- const params = { ...values };
- params.menuId = selectedKeysAndHalfCheckedKeys.value.join(',');
+ const params = Object.assign({}, values, {
+ menuId: selectedKeysAndHalfCheckedKeys.value.join(','),
+ });
+
!unref(isCreate) ? await fetchRoleUpdate(params) : await fetchRoleCreate(params);
closeDrawer();
emit('success');
diff --git a/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
index cb4e67753..884603ec0 100644
--- a/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
+++ b/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
@@ -53,15 +53,13 @@ insert into `t_flink_sql` values (100000, 100000, 'eNqlUUtPhDAQvu+vmFs1AYIHT5s94
insert into `t_menu` values (100000, 0, 'System', '/system', 'PageView', null, 'desktop', '0', 1, 1, now(), now());
insert into `t_menu` values (100001, 100000, 'User Management', '/system/user', 'system/user/User', null, 'user', '0', 1, 1, now(), now());
insert into `t_menu` values (100002, 100000, 'Role Management', '/system/role', 'system/role/Role', null, 'smile', '0', 1, 2, now(), now());
-insert into `t_menu` values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', null, 'bars', '0', 1, 3, now(), now());
+insert into `t_menu` values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', 'menu:view', 'bars', '0', 1, 3, now(), now());
insert into `t_menu` values (100004, 100001, 'add', null, null, 'user:add', null, '1', 1, null, now(), now());
insert into `t_menu` values (100005, 100001, 'update', null, null, 'user:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100006, 100001, 'delete', null, null, 'user:delete', null, '1', 1, null, now(), now());
insert into `t_menu` values (100007, 100002, 'add', null, null, 'role:add', null, '1', 1, null, now(), now());
insert into `t_menu` values (100008, 100002, 'update', null, null, 'role:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100009, 100002, 'delete', null, null, 'role:delete', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100010, 100003, 'add', null, null, 'menu:add', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100011, 100003, 'update', null, null, 'menu:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100012, 100001, 'reset', null, null, 'user:reset', null, '1', 1, null, now(), now());
insert into `t_menu` values (100013, 0, 'StreamPark', '/flink', 'PageView', null, 'build', '0', 1, 2, now(), now());
insert into `t_menu` values (100014, 100013, 'Project', '/flink/project', 'flink/project/View', null, 'github', '0', 1, 1, now(), now());
@@ -115,12 +113,11 @@ insert into `t_menu` values (100061, 100038, 'view', null, null, 'token:view', n
insert into `t_menu` values (100062, 100002, 'view', null, null, 'role:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100063, 100044, 'view', null, null, 'team:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100064, 100048, 'view', null, null, 'member:view', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100065, 100003, 'view', null, null, 'menu:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100066, 100014, 'view', null, null, 'project:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100067, 100015, 'view', null, null, 'app:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100068, 100054, 'view', NULL, NULL, 'variable:view', NULL, '1', 1, null, now(), now());
insert into `t_menu` values (100069, 100034, 'view', null, null, 'setting:view', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100070, 100054, 'view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
+insert into `t_menu` values (100070, 100054, 'depend view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
-- ----------------------------
-- Records of t_role
@@ -181,7 +178,13 @@ insert into `t_role_menu` values (100088, 100002, 100054);
insert into `t_role_menu` values (100089, 100002, 100055);
insert into `t_role_menu` values (100090, 100002, 100056);
insert into `t_role_menu` values (100091, 100002, 100057);
-
+insert into `t_role_menu` values (100092, 100001, 100066);
+insert into `t_role_menu` values (100093, 100002, 100066);
+insert into `t_role_menu` values (100094, 100001, 100067);
+insert into `t_role_menu` values (100095, 100002, 100067);
+insert into `t_role_menu` values (100096, 100002, 100064);
+insert into `t_role_menu` values (100097, 100002, 100060);
+insert into `t_role_menu` values (100098, 100002, 100068);
-- ----------------------------
-- Records of t_setting
diff --git a/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql b/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
index 55388c5a4..1269a05fc 100644
--- a/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
+++ b/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
@@ -49,15 +49,13 @@ insert into "public"."t_flink_sql" values (100000, 100000, 'eNqlUUtPhDAQvu+vmFs1
insert into "public"."t_menu" values (100000, 0, 'System', '/system', 'PageView', null, 'desktop', '0', 1, 1, now(), now());
insert into "public"."t_menu" values (100001, 100000, 'User Management', '/system/user', 'system/user/User', null, 'user', '0', 1, 1, now(), now());
insert into "public"."t_menu" values (100002, 100000, 'Role Management', '/system/role', 'system/role/Role', null, 'smile', '0', 1, 2, now(), now());
-insert into "public"."t_menu" values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', null, 'bars', '0', 1, 3, now(), now());
+insert into "public"."t_menu" values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', 'menu:view', 'bars', '0', 1, 3, now(), now());
insert into "public"."t_menu" values (100004, 100001, 'add', null, null, 'user:add', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100005, 100001, 'update', null, null, 'user:update', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100006, 100001, 'delete', null, null, 'user:delete', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100007, 100002, 'add', null, null, 'role:add', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100008, 100002, 'update', null, null, 'role:update', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100009, 100002, 'delete', null, null, 'role:delete', null, '1', 1, null, now(), now());
-insert into "public"."t_menu" values (100010, 100003, 'add', null, null, 'menu:add', null, '1', 1, null, now(), now());
-insert into "public"."t_menu" values (100011, 100003, 'update', null, null, 'menu:update', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100012, 100001, 'reset', null, null, 'user:reset', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100013, 0, 'StreamPark', '/flink', 'PageView', null, 'build', '0', 1, 2, now(), now());
insert into "public"."t_menu" values (100014, 100013, 'Project', '/flink/project', 'flink/project/View', null, 'github', '0', 1, 1, now(), now());
@@ -111,12 +109,11 @@ insert into "public"."t_menu" values (100061, 100038, 'view', null, null, 'token
insert into "public"."t_menu" values (100062, 100002, 'view', null, null, 'role:view', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100063, 100044, 'view', null, null, 'team:view', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100064, 100048, 'view', null, null, 'member:view', null, '1', 1, null, now(), now());
-insert into "public"."t_menu" values (100065, 100003, 'view', null, null, 'menu:view', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100066, 100014, 'view', null, null, 'project:view', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100067, 100015, 'view', null, null, 'app:view', null, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100068, 100054, 'view', NULL, NULL, 'variable:view', NULL, '1', 1, null, now(), now());
insert into "public"."t_menu" values (100069, 100034, 'view', null, null, 'setting:view', null, '1', 1, null, now(), now());
-insert into "public"."t_menu" values (100070, 100054, 'view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
+insert into "public"."t_menu" values (100070, 100054, 'depend view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
@@ -179,7 +176,13 @@ insert into "public"."t_role_menu" values (100088, 100002, 100054);
insert into "public"."t_role_menu" values (100089, 100002, 100055);
insert into "public"."t_role_menu" values (100090, 100002, 100056);
insert into "public"."t_role_menu" values (100091, 100002, 100057);
-
+insert into "public"."t_role_menu" values (100092, 100001, 100066);
+insert into "public"."t_role_menu" values (100093, 100002, 100066);
+insert into "public"."t_role_menu" values (100094, 100001, 100067);
+insert into "public"."t_role_menu" values (100095, 100002, 100067);
+insert into "public"."t_role_menu" values (100096, 100002, 100064);
+insert into "public"."t_role_menu" values (100097, 100002, 100060);
+insert into "public"."t_role_menu" values (100098, 100002, 100068);
-- ----------------------------
-- Records of t_setting
-- ----------------------------
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 4740e9d93..9e2d666e2 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
@@ -48,15 +48,13 @@ insert into `t_flink_sql` values (100000, 100000, 'eNqlUUtPhDAQvu+vmFs1AYIHT5s94
insert into `t_menu` values (100000, 0, 'System', '/system', 'PageView', null, 'desktop', '0', 1, 1, now(), now());
insert into `t_menu` values (100001, 100000, 'User Management', '/system/user', 'system/user/User', null, 'user', '0', 1, 1, now(), now());
insert into `t_menu` values (100002, 100000, 'Role Management', '/system/role', 'system/role/Role', null, 'smile', '0', 1, 2, now(), now());
-insert into `t_menu` values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', null, 'bars', '0', 1, 3, now(), now());
+insert into `t_menu` values (100003, 100000, 'Menu Management', '/system/menu', 'system/menu/Menu', 'menu:view', 'bars', '0', 1, 3, now(), now());
insert into `t_menu` values (100004, 100001, 'add', null, null, 'user:add', null, '1', 1, null, now(), now());
insert into `t_menu` values (100005, 100001, 'update', null, null, 'user:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100006, 100001, 'delete', null, null, 'user:delete', null, '1', 1, null, now(), now());
insert into `t_menu` values (100007, 100002, 'add', null, null, 'role:add', null, '1', 1, null, now(), now());
insert into `t_menu` values (100008, 100002, 'update', null, null, 'role:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100009, 100002, 'delete', null, null, 'role:delete', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100010, 100003, 'add', null, null, 'menu:add', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100011, 100003, 'update', null, null, 'menu:update', null, '1', 1, null, now(), now());
insert into `t_menu` values (100012, 100001, 'reset', null, null, 'user:reset', null, '1', 1, null, now(), now());
insert into `t_menu` values (100013, 0, 'StreamPark', '/flink', 'PageView', null, 'build', '0', 1, 2, now(), now());
insert into `t_menu` values (100014, 100013, 'Project', '/flink/project', 'flink/project/View', null, 'github', '0', 1, 1, now(), now());
@@ -110,12 +108,11 @@ insert into `t_menu` values (100061, 100038, 'view', null, null, 'token:view', n
insert into `t_menu` values (100062, 100002, 'view', null, null, 'role:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100063, 100044, 'view', null, null, 'team:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100064, 100048, 'view', null, null, 'member:view', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100065, 100003, 'view', null, null, 'menu:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100066, 100014, 'view', null, null, 'project:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100067, 100015, 'view', null, null, 'app:view', null, '1', 1, null, now(), now());
insert into `t_menu` values (100068, 100054, 'view', NULL, NULL, 'variable:view', NULL, '1', 1, null, now(), now());
insert into `t_menu` values (100069, 100034, 'view', null, null, 'setting:view', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100070, 100054, 'view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
+insert into `t_menu` values (100070, 100054, 'depend view', null, null, 'variable:depend_apps', null, '1', 1, NULL, now(), now());
-- ----------------------------
-- Records of t_role
@@ -176,6 +173,13 @@ insert into `t_role_menu` values (100088, 100002, 100054);
insert into `t_role_menu` values (100089, 100002, 100055);
insert into `t_role_menu` values (100090, 100002, 100056);
insert into `t_role_menu` values (100091, 100002, 100057);
+insert into `t_role_menu` values (100092, 100001, 100066);
+insert into `t_role_menu` values (100093, 100002, 100066);
+insert into `t_role_menu` values (100094, 100001, 100067);
+insert into `t_role_menu` values (100095, 100002, 100067);
+insert into `t_role_menu` values (100096, 100002, 100064);
+insert into `t_role_menu` values (100097, 100002, 100060);
+insert into `t_role_menu` values (100098, 100002, 100068);
-- ----------------------------
-- Records of t_setting