Skip to content

[3.0.0-alpha-prepare]3.0.0 alpha prepare 9481 9476 #9482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhuangchong merged 2 commits into from
Apr 13, 2022
Merged

[3.0.0-alpha-prepare]3.0.0 alpha prepare 9481 9476 #9482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602d0f5
[Fix][UI Next] Fix the problem of disabling owned user input during p…
Amy0104 Apr 13, 2022
ebe5454
[Bug][Next UI] Fix the branch flow options of the switch task is not …
Amy0104 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dolphinscheduler-ui-next/src/views/projects/list/components/project-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const ProjectModal = defineComponent({
</NFormItem>
<NFormItem label={t('project.list.owned_users')} path='userName'>
<NInput
disabled={this.statusRef === 0}
disabled={true}
v-model={[this.model.userName, 'value']}
placeholder={t('project.list.username_tips')}
/>
Expand Down
8 changes: 4 additions & 4 deletions dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-switch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
*/
import { ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import type { IJsonItem } from '../types'
import { useTaskNodeStore } from '@/store/project/task-node'
import { queryProcessDefinitionByCode } from '@/service/modules/process-definition'
import type { IJsonItem } from '../types'

export function useSwitch(
model: { [field: string]: any },
projectCode: number
): IJsonItem[] {
const { t } = useI18n()
const branchFlowOptions = ref([] as any)

const taskStore = useTaskNodeStore()
const branchFlowOptions = ref(taskStore.postTaskOptions as any)
const loading = ref(false)

const getOtherTaskDefinitionList = async () => {
if (loading.value) return
loading.value = true
Expand Down