Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the floating full-name display needed for menu bar. (#9264)

3.0.0/version-upgrade
songjianet 2 years ago committed by GitHub
parent
commit
08af02151b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts
  2. 6
      dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx
  3. 1
      dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts
  4. 9
      dolphinscheduler-ui-next/src/views/home/components/state-card.tsx
  5. 11
      dolphinscheduler-ui-next/src/views/home/index.tsx
  6. 4
      dolphinscheduler-ui-next/src/views/home/use-process-state.ts
  7. 10
      dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx
  8. 6
      dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx
  9. 9
      dolphinscheduler-ui-next/src/views/projects/overview/components/state-card.tsx
  10. 11
      dolphinscheduler-ui-next/src/views/projects/overview/index.tsx
  11. 6
      dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx
  12. 11
      dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx
  13. 10
      dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
  14. 6
      dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx
  15. 2
      dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts
  16. 28
      dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx

18
dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts

@ -16,7 +16,7 @@
*/ */
import { reactive, h } from 'vue' import { reactive, h } from 'vue'
import { NIcon } from 'naive-ui' import { NEllipsis, NIcon } from 'naive-ui'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { import {
HomeOutlined, HomeOutlined,
@ -90,12 +90,12 @@ export function useDataList() {
const projectCode = route.params.projectCode || '' const projectCode = route.params.projectCode || ''
state.menuOptions = [ state.menuOptions = [
{ {
label: t('menu.home'), label: () => h(NEllipsis, null, { default: () => t('menu.home') }),
key: 'home', key: 'home',
icon: renderIcon(HomeOutlined) icon: renderIcon(HomeOutlined)
}, },
{ {
label: t('menu.project'), label: () => h(NEllipsis, null, { default: () => t('menu.project') }),
key: 'projects', key: 'projects',
icon: renderIcon(ProfileOutlined), icon: renderIcon(ProfileOutlined),
children: [ children: [
@ -141,7 +141,7 @@ export function useDataList() {
] ]
}, },
{ {
label: t('menu.resources'), label: () => h(NEllipsis, null, { default: () => t('menu.resources') }),
key: 'resource', key: 'resource',
icon: renderIcon(FolderOutlined), icon: renderIcon(FolderOutlined),
children: [ 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', key: 'data-quality',
icon: renderIcon(ContainerOutlined), icon: renderIcon(ContainerOutlined),
children: [ children: [
@ -200,13 +201,14 @@ export function useDataList() {
] ]
}, },
{ {
label: t('menu.datasource'), label: () =>
h(NEllipsis, null, { default: () => t('menu.datasource') }),
key: 'datasource', key: 'datasource',
icon: renderIcon(DatabaseOutlined), icon: renderIcon(DatabaseOutlined),
children: [] children: []
}, },
{ {
label: t('menu.monitor'), label: () => h(NEllipsis, null, { default: () => t('menu.monitor') }),
key: 'monitor', key: 'monitor',
icon: renderIcon(DesktopOutlined), icon: renderIcon(DesktopOutlined),
children: [ children: [
@ -247,7 +249,7 @@ export function useDataList() {
] ]
}, },
{ {
label: t('menu.security'), label: () => h(NEllipsis, null, { default: () => t('menu.security') }),
key: 'security', key: 'security',
icon: renderIcon(SafetyCertificateOutlined), icon: renderIcon(SafetyCertificateOutlined),
children: children:

6
dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx

@ -128,7 +128,11 @@ const TaskResult = defineComponent({
</NSpace> </NSpace>
</NCard> </NCard>
<Card class={styles['table-card']}> <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}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

1
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' 'yyyy-MM-dd HH:mm:ss'
) )
return { return {
...item, ...item,
ruleName: ruleNameLocale, ruleName: ruleNameLocale,

9
dolphinscheduler-ui-next/src/views/home/components/state-card.tsx

@ -55,7 +55,14 @@ const StateCard = defineComponent({
return { onUpdateDatePickerValue } return { onUpdateDatePickerValue }
}, },
render() { render() {
const { title, date, tableData, chartData, onUpdateDatePickerValue, loadingRef } = this const {
title,
date,
tableData,
chartData,
onUpdateDatePickerValue,
loadingRef
} = this
const { columnsRef } = useTable() const { columnsRef } = useTable()
return ( return (
<Card title={title}> <Card title={title}>

11
dolphinscheduler-ui-next/src/views/home/index.tsx

@ -64,11 +64,18 @@ export default defineComponent({
taskStateRef, taskStateRef,
processStateRef, processStateRef,
...toRefs(taskVariables), ...toRefs(taskVariables),
...toRefs(processVariables), ...toRefs(processVariables)
} }
}, },
render() { render() {
const { t, dateRef, handleTaskDate, handleProcessDate, taskLoadingRef, processLoadingRef } = this const {
t,
dateRef,
handleTaskDate,
handleProcessDate,
taskLoadingRef,
processLoadingRef
} = this
return ( return (
<div> <div>

4
dolphinscheduler-ui-next/src/views/home/use-process-state.ts

@ -52,12 +52,12 @@ export function useProcessState() {
name: t('home.' + toLower(item.taskStateType)) name: t('home.' + toLower(item.taskStateType))
} }
}) })
processVariables.processLoadingRef = false processVariables.processLoadingRef = false
return { table, chart } return { table, chart }
}), }),
{ table: [], chart: [] } { table: [], chart: [] }
) )
return state return state
} }

10
dolphinscheduler-ui-next/src/views/monitor/servers/master/index.tsx

@ -16,18 +16,12 @@
*/ */
import { defineComponent, onMounted, ref, toRefs } from 'vue' import { defineComponent, onMounted, ref, toRefs } from 'vue'
import { import { NGrid, NGi, NCard, NNumberAnimation, NSpace } from 'naive-ui'
NGrid,
NGi,
NCard,
NNumberAnimation,
NSpace
} from 'naive-ui'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useMaster } from './use-master' import { useMaster } from './use-master'
import styles from './index.module.scss' import styles from './index.module.scss'
import Card from '@/components/card' import Card from '@/components/card'
import Result from "@/components/result"; import Result from '@/components/result'
import Gauge from '@/components/chart/modules/Gauge' import Gauge from '@/components/chart/modules/Gauge'
import MasterModal from './master-modal' import MasterModal from './master-modal'
import type { Ref } from 'vue' import type { Ref } from 'vue'

6
dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/index.tsx

@ -139,7 +139,11 @@ const AuditLog = defineComponent({
</NSpace> </NSpace>
</NCard> </NCard>
<Card class={styles['table-card']}> <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}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

9
dolphinscheduler-ui-next/src/views/projects/overview/components/state-card.tsx

@ -55,7 +55,14 @@ const StateCard = defineComponent({
return { onUpdateDatePickerValue } return { onUpdateDatePickerValue }
}, },
render() { render() {
const { title, date, tableData, chartData, onUpdateDatePickerValue, loadingRef } = this const {
title,
date,
tableData,
chartData,
onUpdateDatePickerValue,
loadingRef
} = this
const { columnsRef } = useTable() const { columnsRef } = useTable()
return ( return (
<Card title={title}> <Card title={title}>

11
dolphinscheduler-ui-next/src/views/projects/overview/index.tsx

@ -64,11 +64,18 @@ const workflowMonitor = defineComponent({
taskStateRef, taskStateRef,
processStateRef, processStateRef,
...toRefs(taskVariables), ...toRefs(taskVariables),
...toRefs(processVariables), ...toRefs(processVariables)
} }
}, },
render() { render() {
const { t, dateRef, handleTaskDate, handleProcessDate, taskLoadingRef, processLoadingRef } = this const {
t,
dateRef,
handleTaskDate,
handleProcessDate,
taskLoadingRef,
processLoadingRef
} = this
return ( return (
<div> <div>

6
dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx

@ -86,7 +86,11 @@ const VersionModal = defineComponent({
cancelShow={false} cancelShow={false}
onConfirm={onConfirm} onConfirm={onConfirm}
> >
<NDataTable loading={loadingRef} columns={this.columns} data={this.tableData} /> <NDataTable
loading={loadingRef}
columns={this.columns}
data={this.tableData}
/>
<div class={styles.pagination}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

11
dolphinscheduler-ui-next/src/views/projects/task/definition/index.tsx

@ -114,8 +114,15 @@ const TaskDefinition = defineComponent({
} }
}, },
render() { render() {
const { t, onSearch, requestData, onUpdatePageSize, onRefresh, onCreate, loadingRef } = const {
this t,
onSearch,
requestData,
onUpdatePageSize,
onRefresh,
onCreate,
loadingRef
} = this
return ( return (
<> <>

10
dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx

@ -86,8 +86,14 @@ const TaskInstance = defineComponent({
} }
}, },
render() { render() {
const { t, requestTableData, onUpdatePageSize, onSearch, onConfirmModal, loadingRef } = const {
this t,
requestTableData,
onUpdatePageSize,
onSearch,
onConfirmModal,
loadingRef
} = this
return ( return (
<> <>

6
dolphinscheduler-ui-next/src/views/security/alarm-group-manage/index.tsx

@ -130,7 +130,11 @@ const alarmGroupManage = defineComponent({
</div> </div>
</NCard> </NCard>
<Card class={styles['table-card']}> <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}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

2
dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts

@ -190,7 +190,7 @@ export function useTable() {
variables.loadingRef = false variables.loadingRef = false
}), }),
{} {}
) )
return state return state
} }

28
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')} placeholder={t('security.user.username_tips')}
/> />
</NFormItem> </NFormItem>
{ {!this.currentRecord?.id && (
!this.currentRecord?.id && ( <NFormItem
<NFormItem label={t('security.user.user_password')}
label={t('security.user.user_password')} path='userPassword'
path='userPassword' >
> <NInput
<NInput class='input-password'
class='input-password' type='password'
type='password' v-model:value={this.formData.userPassword}
v-model:value={this.formData.userPassword} placeholder={t('security.user.user_password_tips')}
placeholder={t('security.user.user_password_tips')} />
/> </NFormItem>
</NFormItem> )}
)
}
{this.IS_ADMIN && ( {this.IS_ADMIN && (
<NFormItem label={t('security.user.tenant_code')} path='tenantId'> <NFormItem label={t('security.user.tenant_code')} path='tenantId'>
<NSelect <NSelect

Loading…
Cancel
Save