This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f54b8d31fe fix offline workflow error (#16330)
f54b8d31fe is described below
commit f54b8d31fe79927f1ae02d3348b944e4532e0c54
Author: xiangzihao <[email protected]>
AuthorDate: Wed Jul 17 10:35:35 2024 +0800
fix offline workflow error (#16330)
---
dolphinscheduler-ui/src/layouts/content/use-dataList.ts | 2 +-
dolphinscheduler-ui/src/locales/en_US/about.ts | 2 +-
dolphinscheduler-ui/src/locales/en_US/index.ts | 2 +-
dolphinscheduler-ui/src/locales/zh_CN/index.ts | 2 +-
dolphinscheduler-ui/src/views/about/index.tsx | 12 +++++-------
.../projects/components/dependencies/use-dependencies.ts | 10 ++++++++--
6 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/dolphinscheduler-ui/src/layouts/content/use-dataList.ts
b/dolphinscheduler-ui/src/layouts/content/use-dataList.ts
index aee434d4ce..b6887142b3 100644
--- a/dolphinscheduler-ui/src/layouts/content/use-dataList.ts
+++ b/dolphinscheduler-ui/src/layouts/content/use-dataList.ts
@@ -364,7 +364,7 @@ export function useDataList() {
{
label: t('user_dropdown.about'),
key: 'about',
- icon: renderIcon(SelectOutlined),
+ icon: renderIcon(SelectOutlined)
},
{
label: t('user_dropdown.logout'),
diff --git a/dolphinscheduler-ui/src/locales/en_US/about.ts
b/dolphinscheduler-ui/src/locales/en_US/about.ts
index 4d8a8569e0..16313554b5 100644
--- a/dolphinscheduler-ui/src/locales/en_US/about.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/about.ts
@@ -18,4 +18,4 @@
export default {
about: 'About',
about_version: 'Product Version'
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-ui/src/locales/en_US/index.ts
b/dolphinscheduler-ui/src/locales/en_US/index.ts
index f6296d4274..ec661005af 100644
--- a/dolphinscheduler-ui/src/locales/en_US/index.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/index.ts
@@ -32,7 +32,7 @@ import security from '@/locales/en_US/security'
import theme from '@/locales/en_US/theme'
import user_dropdown from '@/locales/en_US/user-dropdown'
import ui_setting from '@/locales/en_US/ui_setting'
-import about from "@/locales/en_US/about";
+import about from '@/locales/en_US/about'
export default {
login,
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/index.ts
b/dolphinscheduler-ui/src/locales/zh_CN/index.ts
index 55209876b0..6dfce3788b 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/index.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/index.ts
@@ -32,7 +32,7 @@ import security from '@/locales/zh_CN/security'
import theme from '@/locales/zh_CN/theme'
import user_dropdown from '@/locales/zh_CN/user-dropdown'
import ui_setting from '@/locales/zh_CN/ui_setting'
-import about from "@/locales/zh_CN/about";
+import about from '@/locales/zh_CN/about'
export default {
login,
diff --git a/dolphinscheduler-ui/src/views/about/index.tsx
b/dolphinscheduler-ui/src/views/about/index.tsx
index 0bdc598236..564f5eb520 100644
--- a/dolphinscheduler-ui/src/views/about/index.tsx
+++ b/dolphinscheduler-ui/src/views/about/index.tsx
@@ -16,7 +16,7 @@
*/
import { useI18n } from 'vue-i18n'
-import { defineComponent, onMounted, ref} from 'vue'
+import { defineComponent, onMounted, ref } from 'vue'
import Card from '@/components/card'
import { NSpace } from 'naive-ui'
import { queryProductInfo } from '@/service/modules/ui-plugins'
@@ -30,7 +30,7 @@ const about = defineComponent({
if (!productInfo) throw Error()
info.value = productInfo.version
}
- onMounted( () => {
+ onMounted(() => {
queryProduct()
})
@@ -41,13 +41,11 @@ const about = defineComponent({
const { info } = this
return (
<div>
- <Card
- title={t('about.about')}
- >
+ <Card title={t('about.about')}>
<NSpace vertical>
- <NSpace align='center' >
+ <NSpace align='center'>
<span>{t('about.about_version')}</span>
- <div>{ info }</div>
+ <div>{info}</div>
</NSpace>
</NSpace>
</Card>
diff --git
a/dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts
b/dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts
index d2be5c347d..9de2bef762 100644
---
a/dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts
+++
b/dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts
@@ -110,8 +110,14 @@ export function useDependencies() {
if (workflowCode && projectCode) {
await queryDependentTasks(projectCode, dependentTaskReq).then(
(res: any) => {
- res
- .filter((item: any) => item.processDefinitionCode !== workflowCode)
+ res.data
+ .filter((item: any) => {
+ if (item.processDefinitionCode) {
+ return item.processDefinitionCode !== workflowCode
+ } else {
+ return false
+ }
+ })
.forEach((item: any) => {
dependentTaskLinks.push({
text:
