Skip to content
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.

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

[Fix][UI Next][V1.0.0-Beta] Add the 'startNodeList' field to the 'sta… #9769

Merged
merged 1 commit into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/store/project/task-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const useTaskNodeStore = defineStore({
},
updateDependentResult(dependentResult: BDependentResultType) {
const result = {} as DependentResultType
for (let [key, value] of Object.entries(dependentResult)) {
for (const [key, value] of Object.entries(dependentResult)) {
result[key] = value === 'FAILED' ? 'FAILURE' : value
}
this.dependentResult = result
Expand Down
2 changes: 1 addition & 1 deletion dolphinscheduler-ui-next/src/utils/truncate-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ const truncateText = (text: string, n: number) => {
return res
}

export default truncateText
export default truncateText
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default defineComponent({
}

const startRunning = () => {
ctx.emit('start')
ctx.emit('start', Number(props.cell?.id))
}

const handleEdit = () => {
Expand Down Expand Up @@ -156,7 +156,10 @@ export default defineComponent({
{t('project.node.delete')}
</NButton>
{this.taskInstance && (
<NButton class={`${styles['menu-item']}`} onClick={this.handleViewLog}>
<NButton
class={`${styles['menu-item']}`}
onClick={this.handleViewLog}
>
{t('project.node.view_log')}
</NButton>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ export default defineComponent({
<StartModal
v-model:row={props.definition.processDefinition}
v-model:show={nodeVariables.startModalShow}
taskCode={nodeVariables.taskCode}
/>
)}
{!!props.instance && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export function useNodeMenu(options: Options) {
logRef: '',
logLoadingRef: ref(true),
skipLineNum: ref(0),
limit: ref(1000)
limit: ref(1000),
taskCode: ''
})

const menuHide = () => {
Expand All @@ -52,8 +53,9 @@ export function useNodeMenu(options: Options) {
graph.value?.unlockScroller()
}

const menuStart = () => {
const menuStart = (code: number) => {
nodeVariables.startModalShow = true
nodeVariables.taskCode = String(code)
}

const viewLog = (taskId: number, taskType: string) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ const props = {
show: {
type: Boolean as PropType<boolean>,
default: false
},
taskCode: {
type: String
}
}

Expand Down Expand Up @@ -190,6 +193,8 @@ export default defineComponent({
() => {
if (props.show) {
getStartParamsList(props.row.code)
if (props.taskCode)
startState.startForm.startNodeList = props.taskCode
}
}
)
Expand Down