Browse Source

fix offline workflow error (#16330)

dev
xiangzihao 4 months ago committed by GitHub
parent
commit
f54b8d31fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      dolphinscheduler-ui/src/layouts/content/use-dataList.ts
  2. 2
      dolphinscheduler-ui/src/locales/en_US/index.ts
  3. 2
      dolphinscheduler-ui/src/locales/zh_CN/index.ts
  4. 12
      dolphinscheduler-ui/src/views/about/index.tsx
  5. 10
      dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts

2
dolphinscheduler-ui/src/layouts/content/use-dataList.ts

@ -364,7 +364,7 @@ export function useDataList() {
{ {
label: t('user_dropdown.about'), label: t('user_dropdown.about'),
key: 'about', key: 'about',
icon: renderIcon(SelectOutlined), icon: renderIcon(SelectOutlined)
}, },
{ {
label: t('user_dropdown.logout'), label: t('user_dropdown.logout'),

2
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 theme from '@/locales/en_US/theme'
import user_dropdown from '@/locales/en_US/user-dropdown' import user_dropdown from '@/locales/en_US/user-dropdown'
import ui_setting from '@/locales/en_US/ui_setting' 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 { export default {
login, login,

2
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 theme from '@/locales/zh_CN/theme'
import user_dropdown from '@/locales/zh_CN/user-dropdown' import user_dropdown from '@/locales/zh_CN/user-dropdown'
import ui_setting from '@/locales/zh_CN/ui_setting' 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 { export default {
login, login,

12
dolphinscheduler-ui/src/views/about/index.tsx

@ -16,7 +16,7 @@
*/ */
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { defineComponent, onMounted, ref} from 'vue' import { defineComponent, onMounted, ref } from 'vue'
import Card from '@/components/card' import Card from '@/components/card'
import { NSpace } from 'naive-ui' import { NSpace } from 'naive-ui'
import { queryProductInfo } from '@/service/modules/ui-plugins' import { queryProductInfo } from '@/service/modules/ui-plugins'
@ -30,7 +30,7 @@ const about = defineComponent({
if (!productInfo) throw Error() if (!productInfo) throw Error()
info.value = productInfo.version info.value = productInfo.version
} }
onMounted( () => { onMounted(() => {
queryProduct() queryProduct()
}) })
@ -41,13 +41,11 @@ const about = defineComponent({
const { info } = this const { info } = this
return ( return (
<div> <div>
<Card <Card title={t('about.about')}>
title={t('about.about')}
>
<NSpace vertical> <NSpace vertical>
<NSpace align='center' > <NSpace align='center'>
<span>{t('about.about_version')}</span> <span>{t('about.about_version')}</span>
<div>{ info }</div> <div>{info}</div>
</NSpace> </NSpace>
</NSpace> </NSpace>
</Card> </Card>

10
dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts

@ -110,8 +110,14 @@ export function useDependencies() {
if (workflowCode && projectCode) { if (workflowCode && projectCode) {
await queryDependentTasks(projectCode, dependentTaskReq).then( await queryDependentTasks(projectCode, dependentTaskReq).then(
(res: any) => { (res: any) => {
res res.data
.filter((item: any) => item.processDefinitionCode !== workflowCode) .filter((item: any) => {
if (item.processDefinitionCode) {
return item.processDefinitionCode !== workflowCode
} else {
return false
}
})
.forEach((item: any) => { .forEach((item: any) => {
dependentTaskLinks.push({ dependentTaskLinks.push({
text: text:

Loading…
Cancel
Save