You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2022/03/29 15:57:16 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Alpha] Fix the floating full-name display needed for menu bar. (#9264)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie 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 08af021 [Fix][UI Next][V1.0.0-Alpha] Fix the floating full-name display needed for menu bar. (#9264)
08af021 is described below
commit 08af02151b6323072479b12e1011bd23aac6eff5
Author: songjianet <17...@qq.com>
AuthorDate: Tue Mar 29 23:57:09 2022 +0800
[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 ++++++-
dolphinscheduler-ui-next/src/views/home/index.tsx | 11 +++++++--
.../src/views/home/use-process-state.ts | 4 ++--
.../src/views/monitor/servers/master/index.tsx | 10 ++------
.../views/monitor/statistics/audit-log/index.tsx | 6 ++++-
.../projects/overview/components/state-card.tsx | 9 ++++++-
.../src/views/projects/overview/index.tsx | 11 +++++++--
.../task/definition/components/version-modal.tsx | 6 ++++-
.../src/views/projects/task/definition/index.tsx | 11 +++++++--
.../src/views/projects/task/instance/index.tsx | 10 ++++++--
.../views/security/alarm-group-manage/index.tsx | 6 ++++-
.../src/views/security/tenant-manage/use-table.ts | 2 +-
.../user-manage/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 7f18b70..e2d8d08 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 fdeeb8a..070c3fe 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({
</NSpace>
</NCard>
<Card class={styles['table-card']}>
- <NDataTable loading={loadingRef} columns={columns} data={this.tableData} />
+ <NDataTable
+ loading={loadingRef}
+ columns={columns}
+ data={this.tableData}
+ />
<div class={styles.pagination}>
<NPagination
v-model:page={this.page}
diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts
index cb488ff..a8ff4b3 100644
--- a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts
+++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts
@@ -132,7 +132,6 @@ export function useTable(viewRuleEntry = (unusedRuleJson: string): void => {}) {
'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 d3dda37..d2a0145 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 (
<Card title={title}>
diff --git a/dolphinscheduler-ui-next/src/views/home/index.tsx b/dolphinscheduler-ui-next/src/views/home/index.tsx
index 4287905..145f29b 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 (
<div>
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 18c287e..0c0fb7f 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 68a31c1..78563bc 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 07a996c..6999321 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({
</NSpace>
</NCard>
<Card class={styles['table-card']}>
- <NDataTable loading={loadingRef} columns={this.columns} data={this.tableData} />
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ />
<div class={styles.pagination}>
<NPagination
v-model:page={this.page}
diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/components/state-card.tsx b/dolphinscheduler-ui-next/src/views/projects/overview/components/state-card.tsx
index d3dda37..d2a0145 100644
--- a/dolphinscheduler-ui-next/src/views/projects/overview/components/state-card.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/overview/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 (
<Card title={title}>
diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx b/dolphinscheduler-ui-next/src/views/projects/overview/index.tsx
index f71aed4..22bd6dd 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 (
<div>
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 3fd657f..4040818 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}
>
- <NDataTable loading={loadingRef} columns={this.columns} data={this.tableData} />
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ />
<div class={styles.pagination}>
<NPagination
v-model:page={this.page}
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx b/dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx
index 9e573d1..d7f9027 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx
@@ -114,8 +114,15 @@ const TaskDefinition = defineComponent({
}
},
render() {
- const { t, onSearch, requestData, onUpdatePageSize, onRefresh, onCreate, loadingRef } =
- this
+ const {
+ t,
+ onSearch,
+ requestData,
+ onUpdatePageSize,
+ onRefresh,
+ onCreate,
+ loadingRef
+ } = this
return (
<>
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 382d0b2..0390cb0 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 975a4f6..1b9ce2a 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({
</div>
</NCard>
<Card class={styles['table-card']}>
- <NDataTable loading={loadingRef} columns={this.columns} data={this.tableData} />
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ />
<div class={styles.pagination}>
<NPagination
v-model:page={this.page}
diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts
index 30b0f3e..a3fc2d7 100644
--- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts
+++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts
@@ -190,7 +190,7 @@ export function useTable() {
variables.loadingRef = false
}),
{}
- )
+ )
return state
}
diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx b/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
index e693fbf..d2e4ab3 100644
--- a/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
@@ -112,21 +112,19 @@ export const UserModal = defineComponent({
placeholder={t('security.user.username_tips')}
/>
</NFormItem>
- {
- !this.currentRecord?.id && (
- <NFormItem
- label={t('security.user.user_password')}
- path='userPassword'
- >
- <NInput
- class='input-password'
- type='password'
- v-model:value={this.formData.userPassword}
- placeholder={t('security.user.user_password_tips')}
- />
- </NFormItem>
- )
- }
+ {!this.currentRecord?.id && (
+ <NFormItem
+ label={t('security.user.user_password')}
+ path='userPassword'
+ >
+ <NInput
+ class='input-password'
+ type='password'
+ v-model:value={this.formData.userPassword}
+ placeholder={t('security.user.user_password_tips')}
+ />
+ </NFormItem>
+ )}
{this.IS_ADMIN && (
<NFormItem label={t('security.user.tenant_code')} path='tenantId'>
<NSelect