You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by mo...@apache.org on 2022/11/07 08:35:03 UTC
[incubator-streampark] branch dev updated: [Fix] Repair the content is empty when updating podTemplate and change start log api params (#1980)
This is an automated email from the ASF dual-hosted git repository.
monster 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 707393b68 [Fix] Repair the content is empty when updating podTemplate and change start log api params (#1980)
707393b68 is described below
commit 707393b68f09ced5a23f67824b29932ff5c38615
Author: Sizhu Wang <12...@qq.com>
AuthorDate: Mon Nov 7 16:34:58 2022 +0800
[Fix] Repair the content is empty when updating podTemplate and change start log api params (#1980)
---
.../streampark-console-newui/src/views/flink/app/EditFlink.vue | 7 +++++++
.../src/views/flink/app/EditStreamPark.vue | 5 +++++
.../src/views/flink/app/components/AppView/LogModal.vue | 2 +-
.../src/views/flink/app/components/PodTemplate/PomTemplateTab.vue | 4 ++++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
index 0a65ff491..a78573d1f 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
@@ -50,6 +50,7 @@
const uploadLoading = ref(false);
const uploadJar = ref('');
const programArgRef = ref();
+ const podTemplateRef = ref();
const k8sTemplate = reactive({
podTemplate: '',
@@ -112,6 +113,11 @@
}
setFieldsValue(defaultParams);
app.args && programArgRef.value?.setContent(app.args);
+ setTimeout(() => {
+ unref(podTemplateRef)?.handleChoicePodTemplate('ptVisual', app.k8sPodTemplate);
+ unref(podTemplateRef)?.handleChoicePodTemplate('jmPtVisual', app.k8sJmPodTemplate);
+ unref(podTemplateRef)?.handleChoicePodTemplate('tmPtVisual', app.k8sTmPodTemplate);
+ }, 1000);
});
}
/* Custom job upload */
@@ -181,6 +187,7 @@
<BasicForm @register="registerForm" @submit="handleAppUpdate" :schemas="getEditFlinkFormSchema">
<template #podTemplate>
<PomTemplateTab
+ ref="podTemplateRef"
v-model:podTemplate="k8sTemplate.podTemplate"
v-model:jmPodTemplate="k8sTemplate.jmPodTemplate"
v-model:tmPodTemplate="k8sTemplate.tmPodTemplate"
diff --git a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
index 4e407b5a8..aaf1f3254 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
@@ -63,6 +63,7 @@
const uploadJar = ref('');
const dependencyRef = ref();
const programArgRef = ref();
+ const podTemplateRef = ref();
const k8sTemplate = reactive({
podTemplate: '',
@@ -323,6 +324,9 @@
setTimeout(() => {
unref(dependencyRef)?.setDefaultValue(JSON.parse(res.dependency || '{}'));
+ unref(podTemplateRef)?.handleChoicePodTemplate('ptVisual', res.k8sPodTemplate);
+ unref(podTemplateRef)?.handleChoicePodTemplate('jmPtVisual', res.k8sJmPodTemplate);
+ unref(podTemplateRef)?.handleChoicePodTemplate('tmPtVisual', res.k8sTmPodTemplate);
}, 1000);
});
handleReset();
@@ -358,6 +362,7 @@
>
<template #podTemplate>
<PomTemplateTab
+ ref="podTemplateRef"
v-model:podTemplate="k8sTemplate.podTemplate"
v-model:jmPodTemplate="k8sTemplate.jmPodTemplate"
v-model:tmPodTemplate="k8sTemplate.tmPodTemplate"
diff --git a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/LogModal.vue b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/LogModal.vue
index c759c1491..d5b01e30b 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/LogModal.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/LogModal.vue
@@ -61,7 +61,7 @@
getLogLoading.value = true;
const { data } = await fetchStartLog({
namespace: app.k8sNamespace,
- jobName: app.jobName,
+ jobId: app.jobId,
limit: 100000000,
skipLineNum: 0,
});
diff --git a/streampark-console/streampark-console-newui/src/views/flink/app/components/PodTemplate/PomTemplateTab.vue b/streampark-console/streampark-console-newui/src/views/flink/app/components/PodTemplate/PomTemplateTab.vue
index 754414db2..5df520ee3 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/components/PodTemplate/PomTemplateTab.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/components/PodTemplate/PomTemplateTab.vue
@@ -266,6 +266,10 @@
}
openHistoryDrawer(false);
}
+
+ defineExpose({
+ handleChoicePodTemplate,
+ });
</script>
<template>
<Tabs type="card" v-model:activeKey="podTemplateTab" class="pom-card">