Browse Source

[Feature][UI Next] Add e2e to security tenant manage page. (#8440)

3.0.0/version-upgrade
songjianet 2 years ago committed by GitHub
parent
commit
8d4f191ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      dolphinscheduler-ui-next/docs/e2e/security.md
  2. 5
      dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
  3. 4
      dolphinscheduler-ui-next/src/views/security/tenant-manage/index.module.scss
  4. 28
      dolphinscheduler-ui-next/src/views/security/tenant-manage/index.tsx
  5. 7
      dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts

31
dolphinscheduler-ui-next/docs/e2e/security.md

@ -11,23 +11,20 @@ class:
#### tenant manage #### tenant manage
class: | check | class |
| ------------------ |--------------------|
- [ ] items | :white_check_mark: | items |
- [ ] el-popconfirm | | el-popconfirm |
- [ ] el-button--primary | | el-button--primary |
- [ ] tenantCode | :white_check_mark: | tenant-code |
- [ ] edit | :white_check_mark: | edit |
- [ ] delete | :white_check_mark: | delete |
| :white_check_mark: | btn-create-tenant |
id: | :white_check_mark: | input-tenant-code |
| :white_check_mark: | select-queue |
- [ ] btnCreateTenant | :white_check_mark: | input-description |
- [ ] inputTenantCode | :white_check_mark: | btn-submit |
- [ ] selectQueue | :white_check_mark: | btn-cancel |
- [ ] inputDescription
- [ ] btnSubmit
- [ ] btnCancel
#### user manage #### user manage

5
dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx

@ -101,6 +101,8 @@ const TenantModal = defineComponent({
show={this.showModalRef} show={this.showModalRef}
onCancel={this.cancelModal} onCancel={this.cancelModal}
onConfirm={this.confirmModal} onConfirm={this.confirmModal}
confirmClassName='btn-submit'
cancelClassName='btn-cancel'
> >
{{ {{
default: () => ( default: () => (
@ -119,6 +121,7 @@ const TenantModal = defineComponent({
path='tenantCode' path='tenantCode'
> >
<NInput <NInput
class='input-tenant-code'
disabled={this.statusRef === 1} disabled={this.statusRef === 1}
placeholder={t('security.tenant.tenant_code_tips')} placeholder={t('security.tenant.tenant_code_tips')}
v-model={[this.model.tenantCode, 'value']} v-model={[this.model.tenantCode, 'value']}
@ -129,6 +132,7 @@ const TenantModal = defineComponent({
path='queueId' path='queueId'
> >
<NSelect <NSelect
class='select-queue'
placeholder={t('security.tenant.queue_name_tips')} placeholder={t('security.tenant.queue_name_tips')}
options={this.model.generalOptions} options={this.model.generalOptions}
v-model={[this.model.queueId, 'value']} v-model={[this.model.queueId, 'value']}
@ -139,6 +143,7 @@ const TenantModal = defineComponent({
path='description' path='description'
> >
<NInput <NInput
class='input-description'
placeholder={t('security.tenant.description_tips')} placeholder={t('security.tenant.description_tips')}
v-model={[this.model.description, 'value']} v-model={[this.model.description, 'value']}
type='textarea' type='textarea'

4
dolphinscheduler-ui-next/src/views/security/tenant-manage/index.module.scss

@ -21,10 +21,6 @@
.header { .header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.search {
display: flex;
}
} }
.table-card { .table-card {

28
dolphinscheduler-ui-next/src/views/security/tenant-manage/index.tsx

@ -22,7 +22,8 @@ import {
NIcon, NIcon,
NDataTable, NDataTable,
NPagination, NPagination,
NCard NCard,
NSpace
} from 'naive-ui' } from 'naive-ui'
import styles from './index.module.scss' import styles from './index.module.scss'
import { useTable } from './use-table' import { useTable } from './use-table'
@ -95,31 +96,38 @@ const tenementManage = defineComponent({
<div class={styles.container}> <div class={styles.container}>
<NCard> <NCard>
<div class={styles.header}> <div class={styles.header}>
<div> <NButton
<NButton size='small' onClick={this.handleModalChange}> size='small'
{t('security.tenant.create_tenant')} onClick={this.handleModalChange}
</NButton> type='primary'
</div> class='btn-create-tenant'
<div class={styles.search}> >
{t('security.tenant.create_tenant')}
</NButton>
<NSpace>
<NInput <NInput
size='small' size='small'
v-model={[this.searchVal, 'value']} v-model={[this.searchVal, 'value']}
placeholder={t('security.tenant.search_tips')} placeholder={t('security.tenant.search_tips')}
clearable clearable
/> />
<NButton size='small' onClick={this.handleSearch}> <NButton size='small' type='primary' onClick={this.handleSearch}>
<NIcon> <NIcon>
<SearchOutlined /> <SearchOutlined />
</NIcon> </NIcon>
</NButton> </NButton>
</div> </NSpace>
</div> </div>
</NCard> </NCard>
<Card <Card
title={t('security.tenant.tenant_manage')} title={t('security.tenant.tenant_manage')}
class={styles['table-card']} class={styles['table-card']}
> >
<NDataTable columns={this.columns} data={this.tableData} /> <NDataTable
columns={this.columns}
data={this.tableData}
row-class-name='items'
/>
<div class={styles.pagination}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

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

@ -55,7 +55,8 @@ export function useTable() {
}, },
{ {
title: t('security.tenant.tenant_code'), title: t('security.tenant.tenant_code'),
key: 'tenantCode' key: 'tenantCode',
className: 'tenant-code'
}, },
{ {
title: t('security.tenant.description'), title: t('security.tenant.description'),
@ -90,6 +91,7 @@ export function useTable() {
circle: true, circle: true,
type: 'info', type: 'info',
size: 'small', size: 'small',
class: 'edit',
onClick: () => { onClick: () => {
handleEdit(row) handleEdit(row)
} }
@ -120,7 +122,8 @@ export function useTable() {
{ {
circle: true, circle: true,
type: 'error', type: 'error',
size: 'small' size: 'small',
class: 'delete'
}, },
{ {
icon: () => h(DeleteOutlined) icon: () => h(DeleteOutlined)

Loading…
Cancel
Save