From 08af02151b6323072479b12e1011bd23aac6eff5 Mon Sep 17 00:00:00 2001 From: songjianet <1778651752@qq.com> Date: Tue, 29 Mar 2022 23:57:09 +0800 Subject: [PATCH] [Fix][UI Next][V1.0.0-Alpha] Fix the floating full-name display needed for menu bar. (#9264) --- .../src/layouts/content/use-dataList.ts | 18 ++++++------ .../src/views/data-quality/rule/index.tsx | 6 +++- .../src/views/data-quality/rule/use-table.ts | 1 - .../src/views/home/components/state-card.tsx | 9 +++++- .../src/views/home/index.tsx | 11 ++++++-- .../src/views/home/use-process-state.ts | 4 +-- .../views/monitor/servers/master/index.tsx | 10 ++----- .../monitor/statistics/audit-log/index.tsx | 6 +++- .../overview/components/state-card.tsx | 9 +++++- .../src/views/projects/overview/index.tsx | 11 ++++++-- .../definition/components/version-modal.tsx | 6 +++- .../views/projects/task/definition/index.tsx | 11 ++++++-- .../views/projects/task/instance/index.tsx | 10 +++++-- .../security/alarm-group-manage/index.tsx | 6 +++- .../views/security/tenant-manage/use-table.ts | 2 +- .../components/user-detail-modal.tsx | 28 +++++++++---------- 16 files changed, 99 insertions(+), 49 deletions(-) diff --git a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts index 7f18b700f1..e2d8d084fe 100644 --- a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts +++ b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts @@ -16,7 +16,7 @@ */ import { reactive, h } from 'vue' -import { NIcon } from 'naive-ui' +import { NEllipsis, NIcon } from 'naive-ui' import { useI18n } from 'vue-i18n' import { HomeOutlined, @@ -90,12 +90,12 @@ export function useDataList() { const projectCode = route.params.projectCode || '' state.menuOptions = [ { - label: t('menu.home'), + label: () => h(NEllipsis, null, { default: () => t('menu.home') }), key: 'home', icon: renderIcon(HomeOutlined) }, { - label: t('menu.project'), + label: () => h(NEllipsis, null, { default: () => t('menu.project') }), key: 'projects', icon: renderIcon(ProfileOutlined), children: [ @@ -141,7 +141,7 @@ export function useDataList() { ] }, { - label: t('menu.resources'), + label: () => h(NEllipsis, null, { default: () => t('menu.resources') }), key: 'resource', icon: renderIcon(FolderOutlined), children: [ @@ -183,7 +183,8 @@ export function useDataList() { ] }, { - label: t('menu.data_quality'), + label: () => + h(NEllipsis, null, { default: () => t('menu.data_quality') }), key: 'data-quality', icon: renderIcon(ContainerOutlined), children: [ @@ -200,13 +201,14 @@ export function useDataList() { ] }, { - label: t('menu.datasource'), + label: () => + h(NEllipsis, null, { default: () => t('menu.datasource') }), key: 'datasource', icon: renderIcon(DatabaseOutlined), children: [] }, { - label: t('menu.monitor'), + label: () => h(NEllipsis, null, { default: () => t('menu.monitor') }), key: 'monitor', icon: renderIcon(DesktopOutlined), children: [ @@ -247,7 +249,7 @@ export function useDataList() { ] }, { - label: t('menu.security'), + label: () => h(NEllipsis, null, { default: () => t('menu.security') }), key: 'security', icon: renderIcon(SafetyCertificateOutlined), children: diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx b/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx index fdeeb8a309..070c3fe16b 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx +++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx @@ -128,7 +128,11 @@ const TaskResult = defineComponent({ - +
{}) { 'yyyy-MM-dd HH:mm:ss' ) - return { ...item, ruleName: ruleNameLocale, diff --git a/dolphinscheduler-ui-next/src/views/home/components/state-card.tsx b/dolphinscheduler-ui-next/src/views/home/components/state-card.tsx index d3dda37d2c..d2a014561c 100644 --- a/dolphinscheduler-ui-next/src/views/home/components/state-card.tsx +++ b/dolphinscheduler-ui-next/src/views/home/components/state-card.tsx @@ -55,7 +55,14 @@ const StateCard = defineComponent({ return { onUpdateDatePickerValue } }, render() { - const { title, date, tableData, chartData, onUpdateDatePickerValue, loadingRef } = this + const { + title, + date, + tableData, + chartData, + onUpdateDatePickerValue, + loadingRef + } = this const { columnsRef } = useTable() return ( diff --git a/dolphinscheduler-ui-next/src/views/home/index.tsx b/dolphinscheduler-ui-next/src/views/home/index.tsx index 4287905eeb..145f29b05c 100644 --- a/dolphinscheduler-ui-next/src/views/home/index.tsx +++ b/dolphinscheduler-ui-next/src/views/home/index.tsx @@ -64,11 +64,18 @@ export default defineComponent({ taskStateRef, processStateRef, ...toRefs(taskVariables), - ...toRefs(processVariables), + ...toRefs(processVariables) } }, render() { - const { t, dateRef, handleTaskDate, handleProcessDate, taskLoadingRef, processLoadingRef } = this + const { + t, + dateRef, + handleTaskDate, + handleProcessDate, + taskLoadingRef, + processLoadingRef + } = this return (
diff --git a/dolphinscheduler-ui-next/src/views/home/use-process-state.ts b/dolphinscheduler-ui-next/src/views/home/use-process-state.ts index 18c287e07b..0c0fb7f383 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-process-state.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-process-state.ts @@ -52,12 +52,12 @@ export function useProcessState() { name: t('home.' + toLower(item.taskStateType)) } }) - + processVariables.processLoadingRef = false return { table, chart } }), { table: [], chart: [] } - ) + ) return state } diff --git a/dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx b/dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx index 68a31c1fdf..78563bc514 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx +++ b/dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx @@ -16,18 +16,12 @@ */ import { defineComponent, onMounted, ref, toRefs } from 'vue' -import { - NGrid, - NGi, - NCard, - NNumberAnimation, - NSpace -} from 'naive-ui' +import { NGrid, NGi, NCard, NNumberAnimation, NSpace } from 'naive-ui' import { useI18n } from 'vue-i18n' import { useMaster } from './use-master' import styles from './index.module.scss' import Card from '@/components/card' -import Result from "@/components/result"; +import Result from '@/components/result' import Gauge from '@/components/chart/modules/Gauge' import MasterModal from './master-modal' import type { Ref } from 'vue' diff --git a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx index 07a996c02c..6999321f9a 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx +++ b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx @@ -139,7 +139,11 @@ const AuditLog = defineComponent({ - +
diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx b/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx index f71aed44e4..22bd6dda5a 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx @@ -64,11 +64,18 @@ const workflowMonitor = defineComponent({ taskStateRef, processStateRef, ...toRefs(taskVariables), - ...toRefs(processVariables), + ...toRefs(processVariables) } }, render() { - const { t, dateRef, handleTaskDate, handleProcessDate, taskLoadingRef, processLoadingRef } = this + const { + t, + dateRef, + handleTaskDate, + handleProcessDate, + taskLoadingRef, + processLoadingRef + } = this return (
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx index 3fd657fe2f..4040818eff 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx @@ -86,7 +86,11 @@ const VersionModal = defineComponent({ cancelShow={false} onConfirm={onConfirm} > - +
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx index 382d0b2301..0390cb0a03 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx @@ -86,8 +86,14 @@ const TaskInstance = defineComponent({ } }, render() { - const { t, requestTableData, onUpdatePageSize, onSearch, onConfirmModal, loadingRef } = - this + const { + t, + requestTableData, + onUpdatePageSize, + onSearch, + onConfirmModal, + loadingRef + } = this return ( <> diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx index 975a4f6ded..1b9ce2a1e1 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx +++ b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx @@ -130,7 +130,11 @@ const alarmGroupManage = defineComponent({
- +
- { - !this.currentRecord?.id && ( - - - - ) - } + {!this.currentRecord?.id && ( + + + + )} {this.IS_ADMIN && (