You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/04/16 08:09:25 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details. (#9526)
This is an automated email from the ASF dual-hosted git repository.
songjian 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 26726bb887 [Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details. (#9526)
26726bb887 is described below
commit 26726bb887289d9013f32e92ecee2a8f608c0091
Author: songjianet <17...@qq.com>
AuthorDate: Sat Apr 16 16:09:15 2022 +0800
[Fix][UI Next][V1.0.0-Beta] Fix the resource Center dark mode display exception when viewing the file details. (#9526)
* [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.
---
.../src/components/modal/index.tsx | 5 +++-
.../src/components/monaco-editor/index.tsx | 2 +-
.../projects/task/components/node/detail-modal.tsx | 28 ++++++++++++----------
.../src/views/resource/file/edit/index.tsx | 10 +++-----
.../src/views/resource/file/index.module.scss | 1 -
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/components/modal/index.tsx b/dolphinscheduler-ui-next/src/components/modal/index.tsx
index e4ba40ad8f..6b1dc0d3a6 100644
--- a/dolphinscheduler-ui-next/src/components/modal/index.tsx
+++ b/dolphinscheduler-ui-next/src/components/modal/index.tsx
@@ -109,7 +109,10 @@ const Modal = defineComponent({
.filter((item: any) => item.show)
.map((item: any) => {
return (
- <ButtonLink onClick={item.action} disabled={item.disabled}>
+ <ButtonLink
+ onClick={item.action}
+ disabled={item.disabled}
+ >
{{
default: () => item.text,
icon: () => item.icon()
diff --git a/dolphinscheduler-ui-next/src/components/monaco-editor/index.tsx b/dolphinscheduler-ui-next/src/components/monaco-editor/index.tsx
index 8fbb40ce35..7dd637f749 100644
--- a/dolphinscheduler-ui-next/src/components/monaco-editor/index.tsx
+++ b/dolphinscheduler-ui-next/src/components/monaco-editor/index.tsx
@@ -25,7 +25,7 @@ import {
} from 'vue'
import { useFormItem } from 'naive-ui/es/_mixins'
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 editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
index b3e5241547..257fc4ea01 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
@@ -46,9 +46,7 @@ import type {
IWorkflowTaskInstance,
WorkflowInstance
} from './types'
-import {
- querySubProcessInstanceByTaskCode
-} from '@/service/modules/process-instances'
+import { querySubProcessInstanceByTaskCode } from '@/service/modules/process-instances'
const props = {
show: {
@@ -156,18 +154,22 @@ const NodeDetailModal = defineComponent({
{
text: t('project.node.enter_this_child_node'),
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: () => {
if (router.currentRoute.value.name === 'workflow-instance-detail') {
- querySubProcessInstanceByTaskCode({ taskId: props.taskInstance?.id }, { projectCode: props.projectCode }).then(
- (res: any) => {
- router.push({
- name: 'workflow-instance-detail',
- params: { id: res.subProcessInstanceId },
- query: { code: props.data.taskParams?.processDefinitionCode }
- })
- }
- )
+ querySubProcessInstanceByTaskCode(
+ { taskId: props.taskInstance?.id },
+ { projectCode: props.projectCode }
+ ).then((res: any) => {
+ router.push({
+ name: 'workflow-instance-detail',
+ params: { id: res.subProcessInstanceId },
+ query: { code: props.data.taskParams?.processDefinitionCode }
+ })
+ })
} else {
router.push({
name: 'workflow-definition-detail',
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/edit/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/edit/index.tsx
index dea3875aa2..96466448a3 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/edit/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/edit/index.tsx
@@ -19,10 +19,10 @@ import { useRoute, useRouter } from 'vue-router'
import { defineComponent, toRefs, watch } from 'vue'
import { NButton, NForm, NFormItem, NSpace } from 'naive-ui'
import { useI18n } from 'vue-i18n'
-import Card from '@/components/card'
-import MonacoEditor from '@/components/monaco-editor'
import { useForm } from './use-form'
import { useEdit } from './use-edit'
+import Card from '@/components/card'
+import MonacoEditor from '@/components/monaco-editor'
import styles from '../index.module.scss'
export default defineComponent({
@@ -75,11 +75,7 @@ export default defineComponent({
class={styles['form-content']}
>
<NFormItem path='content'>
- <div style={{ width: '90%' }}>
- <MonacoEditor
- v-model={[this.resourceViewRef.content, 'value']}
- />
- </div>
+ <MonacoEditor v-model={[this.resourceViewRef.content, 'value']} />
</NFormItem>
{this.componentName === 'resource-file-edit' && (
<NSpace>
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/index.module.scss b/dolphinscheduler-ui-next/src/views/resource/file/index.module.scss
index c878dbece5..80c4938dbe 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/index.module.scss
+++ b/dolphinscheduler-ui-next/src/views/resource/file/index.module.scss
@@ -17,7 +17,6 @@
.file-edit-content {
width: 100%;
- background: #fff;
padding-bottom: 20px;
> h2 {
line-height: 60px;