This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
     new fbf04ba6d [Improve] project page minor improvement
fbf04ba6d is described below

commit fbf04ba6d9aa4a9289fa26cf8f7ec2e6a6034c0f
Author: benjobs <[email protected]>
AuthorDate: Sat Aug 31 22:13:32 2024 +0800

    [Improve] project page minor improvement
---
 .../src/main/assembly/bin/streampark.sh            |  5 +--
 .../src/views/flink/project/useProject.tsx         | 40 +++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
 
b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
index d74c8ca5e..e53465820 100755
--- 
a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
+++ 
b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
@@ -284,6 +284,7 @@ JAVA_OPTS=${JAVA_OPTS:-"${JVM_ARGS}"}
 JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=${APP_HOME}/logs/dump.hprof"
 JAVA_OPTS="$JAVA_OPTS -Xloggc:${APP_HOME}/logs/gc.log"
 [[ $MAJOR_VER -gt $MIN_VERSION ]] && JAVA_OPTS="$JAVA_OPTS --add-opens 
java.base/jdk.internal.loader=ALL-UNNAMED --add-opens 
jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED"
+[[ $MAJOR_VER -ge 17 ]] && JAVA_OPTS="$JAVA_OPTS -Djava.security.manager=allow"
 
 SERVER_PORT=$($_RUNJAVA -cp "$APP_LIB/*" $BASH_UTIL --get_yaml "server.port" 
"$CONFIG")
 # ----- Execute The Requested Command -----------------------------------------
@@ -415,8 +416,8 @@ start() {
   eval $NOHUP $_RUNJAVA $JAVA_OPTS \
     -classpath "$APP_CLASSPATH" \
     -Dapp.home="${APP_HOME}" \
-    -Dlogging.config="${APP_CONF}/logback-spring.xml" \
     -Djava.io.tmpdir="$APP_TMPDIR" \
+    -Dlogging.config="${APP_CONF}/logback-spring.xml" \
     $APP_MAIN "$@" >> "$APP_OUT" 2>&1 "&"
 
     local PID=$!
@@ -481,8 +482,8 @@ start_docker() {
   $_RUNJAVA $JAVA_OPTS \
     -classpath "$APP_CLASSPATH" \
     -Dapp.home="${APP_HOME}" \
-    -Dlogging.config="${APP_CONF}/logback-spring.xml" \
     -Djava.io.tmpdir="$APP_TMPDIR" \
+    -Dlogging.config="${APP_CONF}/logback-spring.xml" \
     $APP_MAIN
 
 }
diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx
 
b/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx
index 099584000..0b11863ac 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/project/useProject.tsx
@@ -123,6 +123,26 @@ export const useProject = () => {
           );
         },
       },
+      {
+        field: 'refs',
+        label: t('flink.project.form.branches'),
+        component: 'Select',
+        required: true,
+        componentProps: ({ formModel }) => {
+          return {
+            showSearch: true,
+            filterOption,
+            placeholder: t('flink.project.form.branchesPlaceholder'),
+            options: unref(branchList),
+            onDropdownVisibleChange: (open: boolean) => {
+              console.log('open', open);
+              if (open) {
+                handleBranches(formModel);
+              }
+            },
+          };
+        },
+      },
       {
         field: 'prvkeyPath',
         label: t('flink.project.form.prvkeyPath'),
@@ -151,26 +171,6 @@ export const useProject = () => {
           autocomplete: 'new-password',
         },
       },
-      {
-        field: 'refs',
-        label: t('flink.project.form.branches'),
-        component: 'Select',
-        required: true,
-        componentProps: ({ formModel }) => {
-          return {
-            showSearch: true,
-            filterOption,
-            placeholder: t('flink.project.form.branchesPlaceholder'),
-            options: unref(branchList),
-            onDropdownVisibleChange: (open: boolean) => {
-              console.log('open', open);
-              if (open) {
-                handleBranches(formModel);
-              }
-            },
-          };
-        },
-      },
       {
         field: 'pom',
         label: t('flink.project.form.pom'),

Reply via email to