diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql index 95e8eb3579..4b08b2f571 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql @@ -50,9 +50,10 @@ 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, 'StreamPark', '/flink', 'PageView', null, 'build', '0', 1, 2, 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 (110000, 0, 'menu.system', '/system', 'PageView', null, null, '0', 1, 3, now(), now()); +insert into `t_menu` values (120000, 0, 'Apache Flink', '/flink', 'PageView', null, null, '0', 1, 1, now(), now()); +insert into `t_menu` values (130000, 0, 'menu.setting', '/setting', 'PageView', null, null, '0', 1, 2, 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()); diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql index 0becb366af..bc581ec343 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql @@ -46,9 +46,9 @@ insert into "public"."t_flink_sql" values (100000, 100000, 'eNqlUUtPhDAQvu+vmFs1 -- ---------------------------- -- Records of t_menu -- ---------------------------- -insert into "public"."t_menu" values (110000, 0, 'menu.system', '/system', 'PageView', null, 'desktop', '0', '1', 1, now(), now()); -insert into "public"."t_menu" values (120000, 0, 'StreamPark', '/flink', 'PageView', null, 'build', '0', '1', 2, now(), now()); -insert into "public"."t_menu" values (130000, 0, 'menu.setting', '/setting', 'PageView', null, 'setting', '0', '1', 5, now(), now()); +insert into "public"."t_menu" values (110000, 0, 'menu.system', '/system', 'PageView', null, null, '0', 1, 3, now(), now()); +insert into "public"."t_menu" values (120000, 0, 'Apache Flink', '/flink', 'PageView', null, null, '0', 1, 1, now(), now()); +insert into "public"."t_menu" values (130000, 0, 'menu.setting', '/setting', 'PageView', null, null, '0', 1, 2, now(), now()); insert into "public"."t_menu" values (110100, 110000, 'menu.userManagement', '/system/user', 'system/user/User', null, 'user', '0', '1', 1, now(), now()); insert into "public"."t_menu" values (110200, 110000, 'menu.roleManagement', '/system/role', 'system/role/Role', null, 'smile', '0', '1', 2, now(), now()); insert into "public"."t_menu" values (110300, 110000, 'menu.menuManagement', '/system/menu', 'system/menu/Menu', 'menu:view', 'bars', '0', '1', 3, now(), now()); diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql index eeb022f92a..176a325094 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql @@ -20,6 +20,10 @@ use streampark; set names utf8mb4; set foreign_key_checks = 0; +update `t_menu` set menu_name='Apache Flink',order_num=1 where menu_id = 120000; +update `t_menu` set order_num=3 where menu_id = 110000; +update `t_menu` set order_num=2 where menu_id = 130000; + alter table `t_flink_app` modify column `args` longtext, modify column `dynamic_properties` longtext, diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.3.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.3.sql index af18a13d2d..f5014a7379 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.3.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.3.sql @@ -17,3 +17,7 @@ alter table "public"."t_flink_project" drop column "git_credential"; + +update "public"."t_menu" set menu_name='Apache Flink',order_num=1 where menu_id = 120000; +update "public"."t_menu" set order_num=3 where menu_id = 110000; +update "public"."t_menu" set order_num=2 where menu_id = 130000; 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 e691ee3f24..9a8bd45cf8 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 @@ -45,9 +45,9 @@ 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, 'StreamPark', '/flink', 'PageView', null, 'build', '0', 1, 2, 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 (110000, 0, 'menu.system', '/system', 'PageView', null, null, '0', 1, 3, now(), now()); +insert into `t_menu` values (120000, 0, 'Apache Flink', '/flink', 'PageView', null, null, '0', 1, 1, now(), now()); +insert into `t_menu` values (130000, 0, 'menu.setting', '/setting', 'PageView', null, null, '0', 1, 2, 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()); diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/app.svg b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg new file mode 100644 index 0000000000..c04912c526 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/auth.svg b/streampark-console/streampark-console-webapp/src/assets/icons/auth.svg index 580f9c6d84..194c237018 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/auth.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/auth.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/code.svg b/streampark-console/streampark-console-webapp/src/assets/icons/code.svg index 77a20fc4ef..79249f7189 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/code.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/code.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/connector.svg b/streampark-console/streampark-console-webapp/src/assets/icons/connector.svg new file mode 100644 index 0000000000..fc97631116 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/connector.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/copy.svg b/streampark-console/streampark-console-webapp/src/assets/icons/copy.svg index a8106edab9..b1a27c10f8 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/copy.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/copy.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/deploy.svg b/streampark-console/streampark-console-webapp/src/assets/icons/deploy.svg index 397b6c186a..556a0af0e5 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/deploy.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/deploy.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/docker.svg b/streampark-console/streampark-console-webapp/src/assets/icons/docker.svg index fe7a548283..5dcf1bc954 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/docker.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/docker.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/edit.svg b/streampark-console/streampark-console-webapp/src/assets/icons/edit.svg index 8dd7d27035..2a71bf0936 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/edit.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/edit.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/flame.svg b/streampark-console/streampark-console-webapp/src/assets/icons/flame.svg index 107182c446..c243f8181b 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/flame.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/flame.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/flink2.svg b/streampark-console/streampark-console-webapp/src/assets/icons/flink2.svg index 2dc8dc3d30..0a69821248 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/flink2.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/flink2.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/flink3.svg b/streampark-console/streampark-console-webapp/src/assets/icons/flink3.svg new file mode 100644 index 0000000000..769d35b71b --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/flink3.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg b/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg index 5cac1f9e04..b9c2eafc16 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/format.svg b/streampark-console/streampark-console-webapp/src/assets/icons/format.svg index b5d087281f..a0ca8d275d 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/format.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/format.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg b/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg index fb827d1d41..961e9e1763 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/fx.svg b/streampark-console/streampark-console-webapp/src/assets/icons/fx.svg new file mode 100644 index 0000000000..54acee7e4d --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/fx.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/github.svg b/streampark-console/streampark-console-webapp/src/assets/icons/github.svg index 5abae7339c..4f7b8470c7 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/github.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/github.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/group.svg b/streampark-console/streampark-console-webapp/src/assets/icons/group.svg new file mode 100644 index 0000000000..6baaeb49af --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/group.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/host.svg b/streampark-console/streampark-console-webapp/src/assets/icons/host.svg index 1141c09245..b81584e440 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/host.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/host.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/jar.svg b/streampark-console/streampark-console-webapp/src/assets/icons/jar.svg new file mode 100644 index 0000000000..a6347b5070 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/jar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/keys.svg b/streampark-console/streampark-console-webapp/src/assets/icons/keys.svg index bdd210b08f..9efe56be9e 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/keys.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/keys.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/mail.svg b/streampark-console/streampark-console-webapp/src/assets/icons/mail.svg index b2213a76dd..5eba26eabd 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/mail.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/mail.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/management.svg b/streampark-console/streampark-console-webapp/src/assets/icons/management.svg new file mode 100644 index 0000000000..beec7d2695 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/management.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/mapping.svg b/streampark-console/streampark-console-webapp/src/assets/icons/mapping.svg index 62eaaa9268..79855fa3cb 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/mapping.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/mapping.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/mvnpass.svg b/streampark-console/streampark-console-webapp/src/assets/icons/mvnpass.svg index 6bf7ed7c73..203bbfab5d 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/mvnpass.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/mvnpass.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/net.svg b/streampark-console/streampark-console-webapp/src/assets/icons/net.svg new file mode 100644 index 0000000000..0eb64e4751 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/net.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/password.svg b/streampark-console/streampark-console-webapp/src/assets/icons/password.svg index 37db626a81..e0de503799 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/password.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/password.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/pause.svg b/streampark-console/streampark-console-webapp/src/assets/icons/pause.svg index e428c94414..420484dc19 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/pause.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/pause.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/play.svg b/streampark-console/streampark-console-webapp/src/assets/icons/play.svg index 717aad63cd..c697c89bfb 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/play.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/play.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/plus.svg b/streampark-console/streampark-console-webapp/src/assets/icons/plus.svg index 44a3b7deb9..de31050e54 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/plus.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/plus.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/port.svg b/streampark-console/streampark-console-webapp/src/assets/icons/port.svg index 0e3fda2c30..e7c8898672 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/port.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/port.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/py.svg b/streampark-console/streampark-console-webapp/src/assets/icons/py.svg new file mode 100644 index 0000000000..fd26fd9593 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/py.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/question.svg b/streampark-console/streampark-console-webapp/src/assets/icons/question.svg index 597bb55f33..13a09f42ac 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/question.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/question.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/remove.svg b/streampark-console/streampark-console-webapp/src/assets/icons/remove.svg index 0d0f8d123c..05c470b26c 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/remove.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/remove.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/resetpass.svg b/streampark-console/streampark-console-webapp/src/assets/icons/resetpass.svg index 4d5d849e3a..f11a6627a9 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/resetpass.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/resetpass.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/resource.svg b/streampark-console/streampark-console-webapp/src/assets/icons/resource.svg new file mode 100644 index 0000000000..52ebaac443 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/resource.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/rollback.svg b/streampark-console/streampark-console-webapp/src/assets/icons/rollback.svg index 5e7bc68e10..1499344d92 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/rollback.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/rollback.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/see.svg b/streampark-console/streampark-console-webapp/src/assets/icons/see.svg index e50a98ba73..955a7dba6c 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/see.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/see.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/settings.svg b/streampark-console/streampark-console-webapp/src/assets/icons/settings.svg index 5195b5399d..e9c5f4b7ed 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/settings.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/settings.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/shutdown.svg b/streampark-console/streampark-console-webapp/src/assets/icons/shutdown.svg index 579e836753..e3fcd778b6 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/shutdown.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/shutdown.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/sms.svg b/streampark-console/streampark-console-webapp/src/assets/icons/sms.svg index 2871684355..519b87b3f4 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/sms.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/sms.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg b/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg index 25fbf73674..bda79cf157 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/ssl.svg b/streampark-console/streampark-console-webapp/src/assets/icons/ssl.svg index a7e330dc9f..9a6f237fd7 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/ssl.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/ssl.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/stream.svg b/streampark-console/streampark-console-webapp/src/assets/icons/stream.svg index a6502f60bc..d560c8dee2 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/stream.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/stream.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/swap.svg b/streampark-console/streampark-console-webapp/src/assets/icons/swap.svg index 9a44c3d207..05ea6bae72 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/swap.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/swap.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/theme.svg b/streampark-console/streampark-console-webapp/src/assets/icons/theme.svg index 66f63b0f2a..b0d5e5ee86 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/theme.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/theme.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/threshold.svg b/streampark-console/streampark-console-webapp/src/assets/icons/threshold.svg index ea80cf3d28..4178c684fd 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/threshold.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/threshold.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/thunderbolt.svg b/streampark-console/streampark-console-webapp/src/assets/icons/thunderbolt.svg index 72c2d3db74..3910e3b8d5 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/thunderbolt.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/thunderbolt.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/user.svg b/streampark-console/streampark-console-webapp/src/assets/icons/user.svg index 47fd143d41..231cb80dce 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/user.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/user.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/variable.svg b/streampark-console/streampark-console-webapp/src/assets/icons/variable.svg new file mode 100644 index 0000000000..e067ddbc68 --- /dev/null +++ b/streampark-console/streampark-console-webapp/src/assets/icons/variable.svg @@ -0,0 +1 @@ + diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/workspace.svg b/streampark-console/streampark-console-webapp/src/assets/icons/workspace.svg index e44d04105e..2e5b7b5a69 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/workspace.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/workspace.svg @@ -1 +1 @@ - + diff --git a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleMenuTag.vue b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleMenuTag.vue index b7d3cb3661..59c3929af8 100644 --- a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleMenuTag.vue +++ b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleMenuTag.vue @@ -31,7 +31,9 @@ if (!tag) return false; const { dot, content } = tag; - if (!dot && !content) return false; + if (!dot && !content) { + return false; + } return true; }); 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 74a8f510e0..726a4bd359 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 @@ -3,15 +3,14 @@ :name="item.path" v-if="!menuHasChildren(item) && getShowMenu" v-bind="$props" - :class="getLevelClass" + :class="[getLevelClass, theme]" > -
{{ getI18nName }}
@@ -23,12 +22,14 @@ :collapsedShowTitle="collapsedShowTitle" >