Browse Source

[Fix-13802][UI] Display english column name in resource center (#13806)

3.2.0-release
Aaron Wang 2 years ago committed by GitHub
parent
commit
16b743c777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      dolphinscheduler-ui/src/views/resource/components/resource/index.tsx
  2. 176
      dolphinscheduler-ui/src/views/resource/components/resource/table/use-table.ts

17
dolphinscheduler-ui/src/views/resource/components/resource/index.tsx

@ -22,7 +22,8 @@ import {
ref, ref,
getCurrentInstance, getCurrentInstance,
PropType, PropType,
toRefs toRefs,
watch
} from 'vue' } from 'vue'
import { import {
NIcon, NIcon,
@ -65,10 +66,10 @@ export default defineComponent({
const { const {
variables, variables,
columnsRef,
tableWidth, tableWidth,
requestData, requestData,
updateList, updateList,
createColumns,
handleCreateFile, handleCreateFile,
} = useTable() } = useTable()
@ -130,9 +131,16 @@ export default defineComponent({
} }
} }
onMounted(() => {
createColumns(variables)
requestData()
})
watch(useI18n().locale, () => {
createColumns(variables)
})
return { return {
breadListRef, breadListRef,
columnsRef,
tableWidth, tableWidth,
updateList, updateList,
handleConditions, handleConditions,
@ -155,7 +163,6 @@ export default defineComponent({
handleCreateFolder, handleCreateFolder,
handleCreateFile, handleCreateFile,
handleUploadFile, handleUploadFile,
columnsRef,
tableWidth, tableWidth,
} = this } = this
const manageTitle = this.resourceType === 'UDF' const manageTitle = this.resourceType === 'UDF'
@ -220,7 +227,7 @@ export default defineComponent({
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
remote remote
columns={columnsRef} columns={this.columns}
data={this.resourceList?.table} data={this.resourceList?.table}
striped striped
size={'small'} size={'small'}

176
dolphinscheduler-ui/src/views/resource/components/resource/table/use-table.ts

@ -20,7 +20,7 @@ import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { bytesToSize } from '@/common/common' import { bytesToSize } from '@/common/common'
import TableAction from './table-action' import TableAction from './table-action'
import { IRenameResource, IReuploadResource, ResourceFileTableData, ResourceType } from '../types' import { IRenameResource, IReuploadResource, ResourceType } from '../types'
import ButtonLink from '@/components/button-link' import ButtonLink from '@/components/button-link'
import { NEllipsis } from 'naive-ui' import { NEllipsis } from 'naive-ui'
import { import {
@ -29,10 +29,9 @@ import {
DefaultTableWidth DefaultTableWidth
} from '@/common/column-width-config' } from '@/common/column-width-config'
import type { Router } from 'vue-router' import type { Router } from 'vue-router'
import type { TableColumns } from 'naive-ui/es/data-table/src/interface'
import { useFileState } from "@/views/resource/components/resource/use-file"; import { useFileState } from "@/views/resource/components/resource/use-file";
const goSubFolder = (router: Router, item: ResourceFileTableData) => { const goSubFolder = (router: Router, item: any) => {
if (item.directory) { if (item.directory) {
router.push({ router.push({
name: item.type === 'UDF' ? 'resource-sub-manage' : 'resource-file-subdirectory', name: item.type === 'UDF' ? 'resource-sub-manage' : 'resource-file-subdirectory',
@ -49,6 +48,7 @@ export function useTable() {
const router: Router = useRouter() const router: Router = useRouter()
const variables = reactive({ const variables = reactive({
columns: [],
fullName: ref(String(router.currentRoute.value.query.prefix || "")), fullName: ref(String(router.currentRoute.value.query.prefix || "")),
tenantCode: ref(String(router.currentRoute.value.query.tenantCode || "")), tenantCode: ref(String(router.currentRoute.value.query.tenantCode || "")),
resourceType: ref<ResourceType>(), resourceType: ref<ResourceType>(),
@ -79,89 +79,91 @@ export function useTable() {
}) })
}) })
const columnsRef: TableColumns<any> = [ const createColumns = (variables: any) => {
{ variables.columns = [
title: '#', {
key: 'id', title: '#',
...COLUMN_WIDTH_CONFIG['index'], key: 'id',
render: (_row, index) => index + 1 ...COLUMN_WIDTH_CONFIG['index'],
}, render: (_row: any, index: number) => index + 1
{ },
title: t('resource.file.name'), {
key: 'name', title: t('resource.file.name'),
...COLUMN_WIDTH_CONFIG['linkName'], key: 'name',
render: (row) => { ...COLUMN_WIDTH_CONFIG['linkName'],
return !row.directory render: (row: any) => {
? row.alias return !row.directory
: h( ? row.alias
ButtonLink, : h(
{ ButtonLink,
onClick: () => goSubFolder(router, row) {
}, onClick: () => goSubFolder(router, row)
{ },
default: () => {
h( default: () =>
NEllipsis, h(
COLUMN_WIDTH_CONFIG['linkEllipsis'], NEllipsis,
() => row.alias COLUMN_WIDTH_CONFIG['linkEllipsis'],
) () => row.alias
} )
) }
)
}
},
{
title: t('resource.file.tenant_name'),
...COLUMN_WIDTH_CONFIG['userName'],
key: 'user_name'
},
{
title: t('resource.file.whether_directory'),
key: 'whether_directory',
...COLUMN_WIDTH_CONFIG['yesOrNo'],
render: (row: any) =>
row.directory ? t('resource.file.yes') : t('resource.file.no')
},
{
title: t('resource.file.file_name'),
...COLUMN_WIDTH_CONFIG['name'],
key: 'file_name'
},
{
title: t('resource.file.description'),
...COLUMN_WIDTH_CONFIG['note'],
key: 'description'
},
{
title: t('resource.file.size'),
key: 'size',
...COLUMN_WIDTH_CONFIG['size'],
render: (row: any) => bytesToSize(row.size)
},
{
title: t('resource.file.create_time'),
...COLUMN_WIDTH_CONFIG['time'],
key: 'create_time'
},
{
title: t('resource.file.update_time'),
...COLUMN_WIDTH_CONFIG['time'],
key: 'update_time'
},
{
title: t('resource.file.operation'),
key: 'operation',
render: (row: any) =>
h(TableAction, {
row,
onReuploadResource: ( name, description, fullName, user_name ) =>
reuploadResource( name, description, fullName, user_name ),
onRenameResource: ( name, description, fullName, user_name ) =>
renameResource( name, description, fullName, user_name ),
onUpdateList: () => updateList()
}),
...COLUMN_WIDTH_CONFIG['operation'](variables.resourceType === 'UDF' ? 4 : 5)
} }
}, ]
{ }
title: t('resource.file.tenant_name'),
...COLUMN_WIDTH_CONFIG['userName'],
key: 'user_name'
},
{
title: t('resource.file.whether_directory'),
key: 'whether_directory',
...COLUMN_WIDTH_CONFIG['yesOrNo'],
render: (row) =>
row.directory ? t('resource.file.yes') : t('resource.file.no')
},
{
title: t('resource.file.file_name'),
...COLUMN_WIDTH_CONFIG['name'],
key: 'file_name'
},
{
title: t('resource.file.description'),
...COLUMN_WIDTH_CONFIG['note'],
key: 'description'
},
{
title: t('resource.file.size'),
key: 'size',
...COLUMN_WIDTH_CONFIG['size'],
render: (row) => bytesToSize(row.size)
},
{
title: t('resource.file.create_time'),
...COLUMN_WIDTH_CONFIG['time'],
key: 'create_time'
},
{
title: t('resource.file.update_time'),
...COLUMN_WIDTH_CONFIG['time'],
key: 'update_time'
},
{
title: t('resource.file.operation'),
key: 'operation',
render: (row) =>
h(TableAction, {
row,
onReuploadResource: ( name, description, fullName, user_name ) =>
reuploadResource( name, description, fullName, user_name ),
onRenameResource: ( name, description, fullName, user_name ) =>
renameResource( name, description, fullName, user_name ),
onUpdateList: () => updateList()
}),
...COLUMN_WIDTH_CONFIG['operation'](variables.resourceType === 'UDF' ? 4 : 5)
}
]
const createFile = () => { const createFile = () => {
const { fullName } = variables const { fullName } = variables
@ -220,10 +222,10 @@ export function useTable() {
return { return {
variables, variables,
columnsRef, tableWidth: calculateTableWidth(variables.columns) || DefaultTableWidth,
tableWidth: calculateTableWidth(columnsRef) || DefaultTableWidth,
requestData, requestData,
updateList, updateList,
createColumns,
handleCreateFile: createFile, handleCreateFile: createFile,
} }
} }

Loading…
Cancel
Save