diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts b/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts index 1134c9a..33af223 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts @@ -20,7 +20,7 @@ export const TABLE_COLUMNS = [ { title: '状态', dataIndex: 'status', - width: 100, + width: 80, }, { title: '创建时间', diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue index da31b73..e171ab3 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue @@ -4,6 +4,8 @@ import { Button, Checkbox, Input, Table, Pagination, message, notification } fro import SvgIcon from '@/components/svg-icon/index.vue'; import NoData from '@/components/no-data'; +import TextOverTips from '@/components/text-over-tips/index.vue'; + import { getTask, postRedoTask, postBatchDownload, batchQueryTaskStatus } from '@/api/all/common'; import { INITIAL_FORM, TABLE_COLUMNS } from './constants'; import { EXPORT_TASK_STATUS, enumTaskStatus } from '../../constants'; @@ -213,7 +215,7 @@ export default { allowClear onChange={handleSearch} v-slots={{ - prefix: () => , + prefix: () => , }} /> @@ -227,7 +229,7 @@ export default { allowClear onChange={handleSearch} v-slots={{ - prefix: () => , + prefix: () => , }} /> @@ -308,8 +310,10 @@ export default { {EXPORT_TASK_STATUS.find((v) => v.value === record.status)?.label} ); + } else if (column.dataIndex === 'name') { + return ; } else if (column.dataIndex === 'operator.name') { - return record.operator?.name || record.operator?.mobile; + return {record.operator?.name || record.operator?.mobile}; } else if (column.dataIndex === 'created_at') { return exactFormatTime(record.created_at, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm:ss'); } else { @@ -320,7 +324,7 @@ export default { ))} record.status !== enumTaskStatus.Exporting) ? 120 : 60} + width={dataSource.value.some((record) => record.status !== enumTaskStatus.Exporting) ? 120 : 80} fixed="right" title="操作" customRender={({ record }) => ( diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss index 6fe18d5..977f002 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss @@ -83,4 +83,17 @@ } } } + :deep(.ant-table) { + .ant-table-container { + display: flex; + flex-direction: column; + .ant-table-header { + flex-shrink: 0; + } + .ant-table-body { + // flex: 1; + // overflow: hidden; + } + } + } } diff --git a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue index 43ec333..b898022 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue @@ -3,6 +3,7 @@ import { ref, computed } from 'vue'; import { Button, Table, Pagination } from 'ant-design-vue'; import NoData from '@/components/no-data'; import DeleteTaskModal from './delete-task-modal.vue'; +import TextOverTips from '@/components/text-over-tips/index.vue'; import { getTask } from '@/api/all/common'; import { INITIAL_FORM, TABLE_COLUMNS } from './constants'; @@ -156,6 +157,8 @@ export default { {IMPORT_TASK_STATUS.find((v) => v.value === record.status)?.label} ); + } else if (column.dataIndex === 'name') { + return ; } else if (column.dataIndex === 'operator.name') { return {record.operator?.name || record.operator?.mobile}; } else if (column.dataIndex === 'created_at') { @@ -168,7 +171,7 @@ export default { ))} record.status === enumTaskStatus.Failed) ? 180 : 60} + width={dataSource.value.some((record) => record.status === enumTaskStatus.Failed) ? 180 : 80} fixed="right" title="操作" customRender={({ record }) => ( diff --git a/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss index 216880a..b49a423 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss +++ b/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss @@ -83,4 +83,17 @@ } } } + :deep(.ant-table) { + .ant-table-container { + display: flex; + flex-direction: column; + .ant-table-header { + flex-shrink: 0; + } + .ant-table-body { + // flex: 1; + // overflow: hidden; + } + } + } } diff --git a/src/styles/components/ant-modal.scss b/src/styles/components/ant-modal.scss index 7ac72de..7c6be94 100644 --- a/src/styles/components/ant-modal.scss +++ b/src/styles/components/ant-modal.scss @@ -4,7 +4,7 @@ .ant-modal-header { border-bottom: 1px solid var(--Border-1, #d7d7d9); height: 56px; - padding: 0 20px; + padding: 0 24px; margin-bottom: 0; color: inherit; display: flex; @@ -22,13 +22,13 @@ } } .ant-modal-body { - padding: 20px 24px; + padding: 24px; } .ant-modal-footer { margin-top: 0; display: flex; height: 64px; - padding: 0px 20px; + padding: 0px 24px; justify-content: flex-end; align-items: center; border-top: 1px solid var(--Border-1, #d7d7d9); diff --git a/src/styles/components/ant-pagination.scss b/src/styles/components/ant-pagination.scss index 90757bc..fc5623a 100644 --- a/src/styles/components/ant-pagination.scss +++ b/src/styles/components/ant-pagination.scss @@ -4,4 +4,92 @@ padding: 12px 24px 0; justify-content: flex-end; align-items: center; + $border-radius: 2px; + $border-color: var(--Border-1, #d7d7d9); + @mixin cts { + color: var(--Text-2, #55585f); + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + @mixin cts2 { + color: var(--Text-2, #55585f); + font-family: $font-family-regular; + font-size: 12px; + font-style: normal; + font-weight: 400; + } + .ant-pagination { + .ant-pagination-total-text { + @include cts; + margin-right: 12px; + } + .ant-pagination-prev, + .ant-pagination-next { + border-radius: $border-radius; + border: 1px solid $border-color; + margin-right: 12px; + .ant-pagination-item-link { + border-radius: $border-radius; + color: #737478; + } + } + .ant-pagination-jump-next { + margin-right: 12px; + min-width: 24px; + .ant-pagination-item-ellipsis { + font-family: $font-family-regular; + color: #737478; + letter-spacing: 0 !important; + text-indent: 0 !important; + font-size: 12px; + } + } + .ant-pagination-item { + border-radius: $border-radius; + border: 1px solid $border-color !important; + a { + @include cts2; + } + &:not(:last-child) { + margin-right: 12px; + } + &.ant-pagination-item-active { + border-color: $color-primary !important; + } + } + .ant-pagination-options { + .ant-select { + border: 1px solid $border-color; + border-radius: $border-radius !important; + &:hover, + &:focus, + &-focused { + border-color: $color-primary !important; + } + .ant-select-selector { + height: 24px !important; + border: none !important; + border: none !important; + @include cts2; + } + } + .ant-pagination-options-quick-jumper { + margin-left: 12px; + @include cts; + input { + margin: 0 12px; + border-radius: $border-radius; + border: 1px solid $border-color; + &:hover, + &:focus, + &-focused { + border-color: $color-primary !important; + } + } + } + } + } } diff --git a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue index 21f911c..cdf564f 100644 --- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue +++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue @@ -63,7 +63,7 @@ {{ column.title }} - + diff --git a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue index 6ed27e3..17436a0 100644 --- a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue +++ b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue @@ -68,7 +68,7 @@