test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-11-30 03:08:01 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details. (#9526)

Browse Source 
* [Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details.

* [Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details.
This commit is contained in:
songjianet 2022-04-16 16:09:15 +08:00 committed by GitHub
parent 0972610204
commit 26726bb887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dolphinscheduler-ui-next/src/components/modal/index.tsx
View File

@ -109,7 +109,10 @@ const Modal = defineComponent({
.filter((item: any) => item.show) .filter((item: any) => item.show)
.map((item: any) => { .map((item: any) => {
return ( return (
<ButtonLink onClick={item.action} disabled={item.disabled}> <ButtonLink
onClick={item.action}
disabled={item.disabled}
>
{{ {{
default: () => item.text, default: () => item.text,
icon: () => item.icon() icon: () => item.icon()

2
dolphinscheduler-ui-next/src/components/monaco-editor/index.tsx
View File

@ -25,7 +25,7 @@ import {
} from 'vue' } from 'vue'
import { useFormItem } from 'naive-ui/es/_mixins' import { useFormItem } from 'naive-ui/es/_mixins'
import { call } from 'naive-ui/es/_utils' import { call } from 'naive-ui/es/_utils'
import {useThemeStore} from "@/store/theme/theme"; import { useThemeStore } from '@/store/theme/theme'
import * as monaco from 'monaco-editor' import * as monaco from 'monaco-editor'
import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker' import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker' import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'

28
dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
View File

@ -46,9 +46,7 @@ import type {
IWorkflowTaskInstance, IWorkflowTaskInstance,
WorkflowInstance WorkflowInstance
} from './types' } from './types'
import { import { querySubProcessInstanceByTaskCode } from '@/service/modules/process-instances'
querySubProcessInstanceByTaskCode
} from '@/service/modules/process-instances'
const props = { const props = {
show: { show: {
@ -156,18 +154,22 @@ const NodeDetailModal = defineComponent({
{ {
text: t('project.node.enter_this_child_node'), text: t('project.node.enter_this_child_node'),
show: props.data.taskType === 'SUB_PROCESS', show: props.data.taskType === 'SUB_PROCESS',
disabled: !props.data.id || (router.currentRoute.value.name === 'workflow-instance-detail' && !props.taskInstance), disabled:
!props.data.id ||
(router.currentRoute.value.name === 'workflow-instance-detail' &&
!props.taskInstance),
action: () => { action: () => {
if (router.currentRoute.value.name === 'workflow-instance-detail') { if (router.currentRoute.value.name === 'workflow-instance-detail') {
querySubProcessInstanceByTaskCode({ taskId: props.taskInstance?.id }, { projectCode: props.projectCode }).then( querySubProcessInstanceByTaskCode(
(res: any) => { { taskId: props.taskInstance?.id },
router.push({ { projectCode: props.projectCode }
name: 'workflow-instance-detail', ).then((res: any) => {
params: { id: res.subProcessInstanceId }, router.push({
query: { code: props.data.taskParams?.processDefinitionCode } name: 'workflow-instance-detail',
}) params: { id: res.subProcessInstanceId },
} query: { code: props.data.taskParams?.processDefinitionCode }
) })
})
} else { } else {
router.push({ router.push({
name: 'workflow-definition-detail', name: 'workflow-definition-detail',

10
dolphinscheduler-ui-next/src/views/resource/file/edit/index.tsx
View File

@ -19,10 +19,10 @@ import { useRoute, useRouter } from 'vue-router'
import { defineComponent, toRefs, watch } from 'vue' import { defineComponent, toRefs, watch } from 'vue'
import { NButton, NForm, NFormItem, NSpace } from 'naive-ui' import { NButton, NForm, NFormItem, NSpace } from 'naive-ui'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import Card from '@/components/card'
import MonacoEditor from '@/components/monaco-editor'
import { useForm } from './use-form' import { useForm } from './use-form'
import { useEdit } from './use-edit' import { useEdit } from './use-edit'
import Card from '@/components/card'
import MonacoEditor from '@/components/monaco-editor'
import styles from '../index.module.scss' import styles from '../index.module.scss'
export default defineComponent({ export default defineComponent({
@ -75,11 +75,7 @@ export default defineComponent({
class={styles['form-content']} class={styles['form-content']}
> >
<NFormItem path='content'> <NFormItem path='content'>
<div style={{ width: '90%' }}> <MonacoEditor v-model={[this.resourceViewRef.content, 'value']} />
<MonacoEditor
v-model={[this.resourceViewRef.content, 'value']}
/>
</div>
</NFormItem> </NFormItem>
{this.componentName === 'resource-file-edit' && ( {this.componentName === 'resource-file-edit' && (
<NSpace> <NSpace>

1
dolphinscheduler-ui-next/src/views/resource/file/index.module.scss
View File

@ -17,7 +17,6 @@
.file-edit-content { .file-edit-content {
width: 100%; width: 100%;
background: #fff;
padding-bottom: 20px; padding-bottom: 20px;
> h2 { > h2 {
line-height: 60px; line-height: 60px;