github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Feat][UI] Add title display to the table in the security center. (#10969)

3.1.0-release
songjianet 2 years ago committed by GitHub
parent
895dca3e93
commit
89780e296d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 55 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      dolphinscheduler-ui/src/views/security/alarm-group-manage/index.tsx
  2. 12
      dolphinscheduler-ui/src/views/security/alarm-instance-manage/index.tsx
  3. 10
      dolphinscheduler-ui/src/views/security/cluster-manage/index.tsx
  4. 10
      dolphinscheduler-ui/src/views/security/environment-manage/index.tsx
  5. 10
      dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
  6. 12
      dolphinscheduler-ui/src/views/security/tenant-manage/index.tsx
  7. 10
      dolphinscheduler-ui/src/views/security/token-manage/index.tsx
  8. 16
      dolphinscheduler-ui/src/views/security/user-manage/index.tsx
  9. 10
      dolphinscheduler-ui/src/views/security/worker-group-manage/index.tsx
  10. 10
      dolphinscheduler-ui/src/views/security/yarn-queue-manage/index.tsx

10
dolphinscheduler-ui/src/views/security/alarm-group-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import AlarmGroupModal from './components/alarm-group-modal' import AlarmGroupModal from './components/alarm-group-modal'
import Card from '@/components/card'
const alarmGroupManage = defineComponent({ const alarmGroupManage = defineComponent({
name: 'alarm-group-manage', name: 'alarm-group-manage',
@ -102,7 +102,7 @@ const alarmGroupManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton size='small' type='primary' onClick={handleModalChange}> <NButton size='small' type='primary' onClick={handleModalChange}>
{t('security.alarm_group.create_alarm_group')} {t('security.alarm_group.create_alarm_group')}
@ -121,8 +121,8 @@ const alarmGroupManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.alarm_group_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -142,7 +142,7 @@ const alarmGroupManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<AlarmGroupModal <AlarmGroupModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

12
dolphinscheduler-ui/src/views/security/alarm-instance-manage/index.tsx
Unescape View File

@ -22,10 +22,10 @@ import {
NIcon, NIcon,
NDataTable, NDataTable,
NPagination, NPagination,
NSpace, NSpace
NCard
} from 'naive-ui' } from 'naive-ui'
import DetailModal from './detail' import DetailModal from './detail'
import Card from '@/components/card'
import { SearchOutlined } from '@vicons/antd' import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useUserInfo } from './use-userinfo' import { useUserInfo } from './use-userinfo'
@ -109,7 +109,7 @@ const AlarmInstanceManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
{{ {{
default: () => ( default: () => (
<NSpace justify='space-between'> <NSpace justify='space-between'>
@ -138,8 +138,8 @@ const AlarmInstanceManage = defineComponent({
</NSpace> </NSpace>
) )
}} }}
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.alarm_instance_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable columns={columns} data={list} loading={loading} striped /> <NDataTable columns={columns} data={list} loading={loading} striped />
<NSpace justify='center'> <NSpace justify='center'>
@ -153,7 +153,7 @@ const AlarmInstanceManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
{IS_ADMIN && ( {IS_ADMIN && (
<DetailModal <DetailModal
show={showDetailModal} show={showDetailModal}

10
dolphinscheduler-ui/src/views/security/cluster-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import ClusterModal from './components/cluster-modal' import ClusterModal from './components/cluster-modal'
import Card from '@/components/card'
const clusterManage = defineComponent({ const clusterManage = defineComponent({
name: 'cluster-manage', name: 'cluster-manage',
@ -102,7 +102,7 @@ const clusterManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
@ -126,8 +126,8 @@ const clusterManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.cluster_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -149,7 +149,7 @@ const clusterManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<ClusterModal <ClusterModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

10
dolphinscheduler-ui/src/views/security/environment-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import EnvironmentModal from './components/environment-modal' import EnvironmentModal from './components/environment-modal'
import Card from '@/components/card'
const environmentManage = defineComponent({ const environmentManage = defineComponent({
name: 'environment-manage', name: 'environment-manage',
@ -102,7 +102,7 @@ const environmentManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
@ -126,8 +126,8 @@ const environmentManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.environment_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -149,7 +149,7 @@ const environmentManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<EnvironmentModal <EnvironmentModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

10
dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import K8sNamespaceModal from './components/k8s-namespace-modal' import K8sNamespaceModal from './components/k8s-namespace-modal'
import Card from '@/components/card'
const k8sNamespaceManage = defineComponent({ const k8sNamespaceManage = defineComponent({
name: 'k8s-namespace-manage', name: 'k8s-namespace-manage',
@ -102,7 +102,7 @@ const k8sNamespaceManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton size='small' type='primary' onClick={handleModalChange}> <NButton size='small' type='primary' onClick={handleModalChange}>
{t('security.k8s_namespace.create_namespace')} {t('security.k8s_namespace.create_namespace')}
@ -121,8 +121,8 @@ const k8sNamespaceManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.k8s_namespace_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -143,7 +143,7 @@ const k8sNamespaceManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<K8sNamespaceModal <K8sNamespaceModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

12
dolphinscheduler-ui/src/views/security/tenant-manage/index.tsx
Unescape View File

@ -22,13 +22,13 @@ import {
NIcon, NIcon,
NDataTable, NDataTable,
NPagination, NPagination,
NCard,
NSpace NSpace
} from 'naive-ui' } from 'naive-ui'
import { useTable } from './use-table' import { useTable } from './use-table'
import { SearchOutlined } from '@vicons/antd' import { SearchOutlined } from '@vicons/antd'
import TenantModal from './components/tenant-modal'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import TenantModal from './components/tenant-modal'
import Card from '@/components/card'
const tenementManage = defineComponent({ const tenementManage = defineComponent({
name: 'tenement-manage', name: 'tenement-manage',
@ -92,7 +92,7 @@ const tenementManage = defineComponent({
const { t, loadingRef } = this const { t, loadingRef } = this
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
@ -116,8 +116,8 @@ const tenementManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.tenant_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -139,7 +139,7 @@ const tenementManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<TenantModal <TenantModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

10
dolphinscheduler-ui/src/views/security/token-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import TokenModal from './components/token-modal' import TokenModal from './components/token-modal'
import Card from '@/components/card'
const tokenManage = defineComponent({ const tokenManage = defineComponent({
name: 'token-manage', name: 'token-manage',
@ -102,7 +102,7 @@ const tokenManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
class='btn-create-token' class='btn-create-token'
@ -126,8 +126,8 @@ const tokenManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.token_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -148,7 +148,7 @@ const tokenManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<TokenModal <TokenModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

16
dolphinscheduler-ui/src/views/security/user-manage/index.tsx
Unescape View File

@ -22,15 +22,15 @@ import {
NIcon, NIcon,
NSpace, NSpace,
NDataTable, NDataTable,
NPagination, NPagination
NCard
} from 'naive-ui' } from 'naive-ui'
import UserDetailModal from './components/user-detail-modal'
import AuthorizeModal from './components/authorize-modal'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { SearchOutlined } from '@vicons/antd' import { SearchOutlined } from '@vicons/antd'
import { useColumns } from './use-columns' import { useColumns } from './use-columns'
import { useTable } from './use-table' import { useTable } from './use-table'
import UserDetailModal from './components/user-detail-modal'
import AuthorizeModal from './components/authorize-modal'
import Card from '@/components/card'
const UsersManage = defineComponent({ const UsersManage = defineComponent({
name: 'user-manage', name: 'user-manage',
@ -66,7 +66,7 @@ const UsersManage = defineComponent({
render() { render() {
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
onClick={this.onAddUser} onClick={this.onAddUser}
@ -85,8 +85,8 @@ const UsersManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={this.t('menu.user_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
row-class-name='items' row-class-name='items'
@ -108,7 +108,7 @@ const UsersManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<UserDetailModal <UserDetailModal
show={this.detailModalShow} show={this.detailModalShow}
currentRecord={this.currentRecord} currentRecord={this.currentRecord}

10
dolphinscheduler-ui/src/views/security/worker-group-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import WorkerGroupModal from './components/worker-group-modal' import WorkerGroupModal from './components/worker-group-modal'
import Card from '@/components/card'
const workerGroupManage = defineComponent({ const workerGroupManage = defineComponent({
name: 'worker-group-manage', name: 'worker-group-manage',
@ -102,7 +102,7 @@ const workerGroupManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
@ -126,8 +126,8 @@ const workerGroupManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.worker_group_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -148,7 +148,7 @@ const workerGroupManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<WorkerGroupModal <WorkerGroupModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

10
dolphinscheduler-ui/src/views/security/yarn-queue-manage/index.tsx
Unescape View File

@ -18,7 +18,6 @@
import { defineComponent, onMounted, toRefs, watch } from 'vue' import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -29,6 +28,7 @@ import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useTable } from './use-table' import { useTable } from './use-table'
import YarnQueueModal from './components/yarn-queue-modal' import YarnQueueModal from './components/yarn-queue-modal'
import Card from '@/components/card'
const yarnQueueManage = defineComponent({ const yarnQueueManage = defineComponent({
name: 'yarn-queue-manage', name: 'yarn-queue-manage',
@ -102,7 +102,7 @@ const yarnQueueManage = defineComponent({
return ( return (
<NSpace vertical> <NSpace vertical>
<NCard size='small'> <Card>
<NSpace justify='space-between'> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
@ -126,8 +126,8 @@ const yarnQueueManage = defineComponent({
</NButton> </NButton>
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<NCard size='small'> <Card title={t('menu.yarn_queue_manage')}>
<NSpace vertical> <NSpace vertical>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
@ -148,7 +148,7 @@ const yarnQueueManage = defineComponent({
/> />
</NSpace> </NSpace>
</NSpace> </NSpace>
</NCard> </Card>
<YarnQueueModal <YarnQueueModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
statusRef={this.statusRef} statusRef={this.statusRef}

Write Preview
Loading…
Cancel
Save