From 105a4d06479b93f65270578c16558a4827a897fa Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Thu, 10 Jul 2025 15:05:02 +0800 Subject: [PATCH 01/38] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../download-center-modal/constants.ts | 38 +++ .../delete-task-modal.vue | 59 ++++ .../download-center-modal/index.vue | 213 +++++++++++++++ .../download-center-modal/style.scss | 49 ++++ .../navbar/components/navbar-menu/index.vue | 83 ++++++ .../navbar/components/navbar-menu/style.scss | 45 ++++ .../navbar/components/right-side/index.vue | 132 +++++++++ src/components/_base/navbar/index.vue | 251 +----------------- src/styles/components/checkbox.scss | 1 + 9 files changed, 634 insertions(+), 237 deletions(-) create mode 100644 src/components/_base/navbar/components/download-center-modal/constants.ts create mode 100644 src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue create mode 100644 src/components/_base/navbar/components/download-center-modal/index.vue create mode 100644 src/components/_base/navbar/components/download-center-modal/style.scss create mode 100644 src/components/_base/navbar/components/navbar-menu/index.vue create mode 100644 src/components/_base/navbar/components/navbar-menu/style.scss create mode 100644 src/components/_base/navbar/components/right-side/index.vue diff --git a/src/components/_base/navbar/components/download-center-modal/constants.ts b/src/components/_base/navbar/components/download-center-modal/constants.ts new file mode 100644 index 0000000..3fbe202 --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/constants.ts @@ -0,0 +1,38 @@ +export const INITIAL_FORM = { + search: '', + module: '', + column: undefined, + order: undefined, +}; +export const INITIAL_PAGE_INFO = { + page: 1, + pageSize: 20, + total: 0, +}; + +export const TABLE_COLUMNS = [ + { + title: '文件名称', + dataIndex: 'file_name', + width: 180, + fixed: 'left', + }, + { + title: '所属模块', + dataIndex: 'module', + width: 180, + }, + { + title: '下载时间', + dataIndex: 'time', + width: 180, + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, + { + title: '操作人员', + dataIndex: 'name', + width: 180, + }, +]; diff --git a/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue b/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue new file mode 100644 index 0000000..7a9aac2 --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/components/_base/navbar/components/download-center-modal/index.vue b/src/components/_base/navbar/components/download-center-modal/index.vue new file mode 100644 index 0000000..a361651 --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/index.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/src/components/_base/navbar/components/download-center-modal/style.scss b/src/components/_base/navbar/components/download-center-modal/style.scss new file mode 100644 index 0000000..72f458a --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/style.scss @@ -0,0 +1,49 @@ +.download-center-modal { + .arco-input-wrapper, + .arco-select-view-single, + .arco-select-view-multiple { + border-radius: 4px; + border-color: #d7d7d9; + background-color: #fff; + &:focus-within, + &.arco-input-focus, + &.arco-textarea-focus { + background-color: var(--color-bg-2); + border-color: rgb(var(--primary-6)); + box-shadow: 0 0 0 0 var(--color-primary-light-2); + } + } + .arco-modal-body { + padding: 24px 20px 40px; + .filter-row { + .filter-row-item { + &:not(:last-child) { + margin-right: 24px; + } + .label { + margin-right: 12px; + color: #211f24; + font-family: 'PuHuiTi-Regular'; + font-size: 14px; + font-style: normal; + font-weight: 400; + flex-shrink: 0; + line-height: 22px; /* 157.143% */ + } + :deep(.arco-space-item) { + width: 100%; + } + } + } + .file-table { + .cts { + color: var(--Text-1, #211f24); + font-family: 'PuHuiTi-Medium'; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + } + } +} diff --git a/src/components/_base/navbar/components/navbar-menu/index.vue b/src/components/_base/navbar/components/navbar-menu/index.vue new file mode 100644 index 0000000..0be5ffa --- /dev/null +++ b/src/components/_base/navbar/components/navbar-menu/index.vue @@ -0,0 +1,83 @@ + + + + + + diff --git a/src/components/_base/navbar/components/navbar-menu/style.scss b/src/components/_base/navbar/components/navbar-menu/style.scss new file mode 100644 index 0000000..23b52b3 --- /dev/null +++ b/src/components/_base/navbar/components/navbar-menu/style.scss @@ -0,0 +1,45 @@ +.navbar-menu { + display: flex; + align-items: center; + margin-left: 40px; + .menu-item-text { + color: var(--Text-2, #3c4043); + font-family: 'PuHuiTi-Medium'; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + :deep(.arco-menu) { + height: 100%; + .arco-menu-inner { + padding: 0 20px; + } + .arco-menu-item { + padding: 0; + position: relative; + &.arco-menu-selected { + .menu-item-text, + .arco-menu-selected-label { + color: #6d4cfe; + } + .arco-menu-selected-label { + background: var(--Brand-Brand-6, #6d4cfe); + height: 4px; + border-radius: 4px; + width: 50%; + position: absolute; + bottom: -8px; + left: 50%; + transform: translateX(-50%); + } + } + } + } + .arco-icon-down { + transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1); + } + .arco-dropdown-open .arco-icon-down { + transform: rotate(180deg); + } +} diff --git a/src/components/_base/navbar/components/right-side/index.vue b/src/components/_base/navbar/components/right-side/index.vue new file mode 100644 index 0000000..8ccd249 --- /dev/null +++ b/src/components/_base/navbar/components/right-side/index.vue @@ -0,0 +1,132 @@ + + + + + + diff --git a/src/components/_base/navbar/index.vue b/src/components/_base/navbar/index.vue index 333167b..0db9bed 100644 --- a/src/components/_base/navbar/index.vue +++ b/src/components/_base/navbar/index.vue @@ -1,257 +1,34 @@ - - + - - diff --git a/src/styles/components/checkbox.scss b/src/styles/components/checkbox.scss index 2bc38b0..9b7302c 100644 --- a/src/styles/components/checkbox.scss +++ b/src/styles/components/checkbox.scss @@ -25,6 +25,7 @@ &.arco-checkbox-indeterminate { .arco-checkbox-icon { background-color: #6D4CFE !important; + border: none; } } From 789de0150e3076e12e037ea26226543edb5bb55a Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Thu, 10 Jul 2025 17:04:34 +0800 Subject: [PATCH 02/38] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../download-center-modal/constants.ts | 2 +- .../delete-task-modal.vue | 4 ++- .../download-center-modal/index.vue | 33 +++++++++++++++---- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/components/_base/navbar/components/download-center-modal/constants.ts b/src/components/_base/navbar/components/download-center-modal/constants.ts index 3fbe202..a27052a 100644 --- a/src/components/_base/navbar/components/download-center-modal/constants.ts +++ b/src/components/_base/navbar/components/download-center-modal/constants.ts @@ -15,7 +15,7 @@ export const TABLE_COLUMNS = [ title: '文件名称', dataIndex: 'file_name', width: 180, - fixed: 'left', + // fixed: 'left', }, { title: '所属模块', diff --git a/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue b/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue index 7a9aac2..9b3ed35 100644 --- a/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue +++ b/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue @@ -11,7 +11,9 @@ diff --git a/src/components/_base/navbar/components/download-center-modal/index.vue b/src/components/_base/navbar/components/download-center-modal/index.vue index a361651..677ab00 100644 --- a/src/components/_base/navbar/components/download-center-modal/index.vue +++ b/src/components/_base/navbar/components/download-center-modal/index.vue @@ -37,6 +37,7 @@ ref="tableRef" :data="dataSource" column-resizable + row-key="id" :row-selection="{ type: 'checkbox', showCheckedAll: true, @@ -111,6 +112,8 @@ @page-size-change="onPageSizeChange" /> + + @@ -118,6 +121,7 @@ import { fetchAccountGroups } from '@/api/all/propertyMarketing'; import { INITIAL_FORM, INITIAL_PAGE_INFO, TABLE_COLUMNS } from './constants'; import { formatTableField, formatNumberShow, exactFormatTime } from '@/utils/tools'; +import DeleteTaskModal from './delete-task-modal.vue'; import icon1 from '@/assets/img/media-account/icon-delete.png'; @@ -127,6 +131,7 @@ const query = ref(cloneDeep(INITIAL_FORM)); const pageInfo = ref(cloneDeep(INITIAL_PAGE_INFO)); const selectedItems = ref([]); const groups = ref([]); +const deleteTaskModalRef = ref(null); const checkedAll = computed(() => selectedItems.value.length === dataSource.value.length); const indeterminate = computed( @@ -147,13 +152,20 @@ const onClose = () => { }; const getData = () => { - console.log('getData'); dataSource.value = [ { + id: 1, file_name: '投放指南20150701', module: '营销资产平台', time: 1752130053, - name: '张三三', + name: '张三三张三三张三三张三三张三三', + }, + { + id: 2, + file_name: '投放指南20150701', + module: '营销资产平台', + time: 1752130053, + name: '张三三张三三张三三张三三张三三', }, ]; }; @@ -171,8 +183,12 @@ const handleSorterChange = (column, order) => { const handleSearch = () => { console.log('handleSearch'); }; -const openDelete = () => { - console.log('openDelete'); +const openDelete = (record) => { + const { id, file_name } = record; + deleteTaskModalRef.value.open({ + id, + name: `“${file_name || '-'}”`, + }); }; const getGroups = async () => { const { code, data } = await fetchAccountGroups(); @@ -180,13 +196,13 @@ const getGroups = async () => { groups.value = data; } }; -const handleSelect = (selectedRowKeys) => { +const handleSelect = (selectedRowKeys, selectedRows) => { selectedItems.value = selectedRowKeys; }; const handleSelectAll = (checked) => { if (checked) { - selectedItems.value = dataSource.map((item) => item.id); + selectedItems.value = dataSource.value.map((item) => item.id); } else { selectedItems.value = []; } @@ -205,6 +221,11 @@ const onPageSizeChange = (pageSize) => { reload(); }; +const onBatchSuccess = () => { + selectedItems.value = []; + getData(); +}; + defineExpose({ open }); From c5d8568b82caf178f02597a6d10b909c1f61cd7d Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Mon, 14 Jul 2025 11:14:22 +0800 Subject: [PATCH 03/38] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../download-center-modal/constants.ts | 6 +- .../download-center-modal/index.vue | 54 +++++++++++++--- .../download-center-modal/style.scss | 61 ++++++++++++++++++- .../navbar/components/navbar-menu/style.scss | 2 +- 4 files changed, 111 insertions(+), 12 deletions(-) diff --git a/src/components/_base/navbar/components/download-center-modal/constants.ts b/src/components/_base/navbar/components/download-center-modal/constants.ts index a27052a..3b1fef8 100644 --- a/src/components/_base/navbar/components/download-center-modal/constants.ts +++ b/src/components/_base/navbar/components/download-center-modal/constants.ts @@ -20,12 +20,12 @@ export const TABLE_COLUMNS = [ { title: '所属模块', dataIndex: 'module', - width: 180, + width: 120, }, { title: '下载时间', dataIndex: 'time', - width: 180, + width: 120, sortable: { sortDirections: ['ascend', 'descend'], }, @@ -33,6 +33,6 @@ export const TABLE_COLUMNS = [ { title: '操作人员', dataIndex: 'name', - width: 180, + width: 120, }, ]; diff --git a/src/components/_base/navbar/components/download-center-modal/index.vue b/src/components/_base/navbar/components/download-center-modal/index.vue index 677ab00..1b82ad6 100644 --- a/src/components/_base/navbar/components/download-center-modal/index.vue +++ b/src/components/_base/navbar/components/download-center-modal/index.vue @@ -3,7 +3,7 @@ v-model:visible="visible" title="下载中心" modal-class="download-center-modal" - width="780px" + width="860px" :mask-closable="false" :footer="false" @close="onClose" @@ -33,6 +33,34 @@ + +
+
+
+ + + 已选 + {{ selectedItems.length }} + 个文件 + + + 批量下载 + 批量删除 +
+
+ + +
+ - + @@ -181,15 +209,20 @@ const handleSorterChange = (column, order) => { }; const handleSearch = () => { - console.log('handleSearch'); + reload(); }; -const openDelete = (record) => { +const handleDelete = (record) => { const { id, file_name } = record; deleteTaskModalRef.value.open({ id, name: `“${file_name || '-'}”`, }); }; +const handleBatchDelete = () => { + const ids = selectedItems.value.map((item) => item.id); + const names = selectedItems.value.map((item) => `"${item.name || '-'}"`).join(','); + deleteTaskModalRef.value?.open({ id: ids, name: names }); +}; const getGroups = async () => { const { code, data } = await fetchAccountGroups(); if (code === 200) { @@ -208,9 +241,16 @@ const handleSelectAll = (checked) => { } }; +const handleCloseTip = () => { + selectedItems.value = []; +}; + const handleDownload = () => { console.log('handleDownload'); }; +const handleBatchDownload = () => { + console.log('handleBatchDownload'); +}; const onPageChange = (current) => { pageInfo.value.page = current; diff --git a/src/components/_base/navbar/components/download-center-modal/style.scss b/src/components/_base/navbar/components/download-center-modal/style.scss index 72f458a..d2e5be6 100644 --- a/src/components/_base/navbar/components/download-center-modal/style.scss +++ b/src/components/_base/navbar/components/download-center-modal/style.scss @@ -13,7 +13,18 @@ box-shadow: 0 0 0 0 var(--color-primary-light-2); } } + .arco-modal-header { + .arco-modal-title { + color: var(--Text-1, #211f24); + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; + font-family: $font-family-medium; + } + } .arco-modal-body { + height: 536px; padding: 24px 20px 40px; .filter-row { .filter-row-item { @@ -35,10 +46,58 @@ } } } + .tip-row { + border-radius: 2px; + background: #f0edff; + .label { + font-family: $font-family-medium; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + &.normal { + background: #ebf7f2; + .label { + color: #211f24; + } + } + &.abnormal { + background: #ffe7e4; + .label { + color: #211f24; + } + } + .err-btn { + background-color: #f64b31 !important; + color: var(--BG-white, #fff); + font-family: 'PingFang SC'; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 20px; /* 166.667% */ + } + .operation-btn { + padding: 0; + cursor: pointer; + color: var(--Brand-Brand-6, #6d4cfe); + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; /* 157.143% */ + &:not(:last-child) { + margin-right: 16px; + } + &.red { + color: #F64B31; + } + } + } .file-table { .cts { color: var(--Text-1, #211f24); - font-family: 'PuHuiTi-Medium'; + font-family: $font-family-medium; font-size: 14px; font-style: normal; font-weight: 400; diff --git a/src/components/_base/navbar/components/navbar-menu/style.scss b/src/components/_base/navbar/components/navbar-menu/style.scss index 23b52b3..5a15e33 100644 --- a/src/components/_base/navbar/components/navbar-menu/style.scss +++ b/src/components/_base/navbar/components/navbar-menu/style.scss @@ -4,7 +4,7 @@ margin-left: 40px; .menu-item-text { color: var(--Text-2, #3c4043); - font-family: 'PuHuiTi-Medium'; + font-family: $font-family-medium; font-size: 16px; font-style: normal; font-weight: 400; From 123f2ce3dbb8e88a85ed681f07c902bd66ee5a1a Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Thu, 17 Jul 2025 09:58:49 +0800 Subject: [PATCH 04/38] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navbar/components/right-side/index.vue | 50 +------------------ .../components/management/account/index.vue | 8 +-- .../management/enterprise/index.vue | 14 ++++-- .../components/management/person/index.vue | 6 ++- 4 files changed, 19 insertions(+), 59 deletions(-) diff --git a/src/components/_base/navbar/components/right-side/index.vue b/src/components/_base/navbar/components/right-side/index.vue index 5062300..6bada4f 100644 --- a/src/components/_base/navbar/components/right-side/index.vue +++ b/src/components/_base/navbar/components/right-side/index.vue @@ -138,7 +138,7 @@ const setServerMenu = () => { font-size: 16px; font-style: normal; font-weight: 400; - line-height: 22px; /* 137.5% */ + line-height: 22px; } } .arco-dropdown-option-content { @@ -147,7 +147,6 @@ const setServerMenu = () => { &:not(.arco-dropdown-option-disabled):hover { background-color: transparent; .arco-dropdown-option-content { - // border-radius: 8px; background: var(--BG-200, #f2f3f5); } } @@ -182,51 +181,4 @@ const setServerMenu = () => { } } } - -// .layout-avatar-dropdown { -// .arco-dropdown { -// border-radius: 8px; -// border: 1px solid var(--BG-300, #e6e6e8); -// background: var(--BG-white, #fff); -// padding: 12px 0px; -// .arco-dropdown-option { -// padding: 0 12px; -// margin-bottom: 4px; -// &-content { -// display: flex; -// height: 40px; -// width: 100%; -// padding: 10px 24px; -// align-items: center; -// .menu-item-text { -// color: var(--Text-2, #3c4043); -// font-family: 'PuHuiTi-Regular'; -// font-size: 16px; -// font-style: normal; -// font-weight: 400; -// line-height: 22px; /* 137.5% */ -// } -// } -// &:not(.arco-dropdown-option-disabled):hover { -// background-color: transparent; -// .arco-dropdown-option-content { -// border-radius: 8px; -// background: var(--BG-200, #f2f3f5); -// } -// } -// } -// } -// } -// .layout-avatar-dropdown { -// width: 200px; -// .arco-dropdown { -// padding: 12px 4px; -// .arco-dropdown-option { -// padding: 0 !important; -// &-content { -// padding: 0 12px !important; -// } -// } -// } -// } diff --git a/src/views/components/management/account/index.vue b/src/views/components/management/account/index.vue index fe96f1d..d688822 100644 --- a/src/views/components/management/account/index.vue +++ b/src/views/components/management/account/index.vue @@ -99,7 +99,9 @@ const addAccountVisible = ref(false); const deleteVisible = ref(false); const deleteTitle = ref(''); -const enterpriseInfo = store.enterpriseInfo; +const enterpriseInfo = computed(() => { + return store.enterpriseInfo ?? {}; +}); const okText = computed(() => { if (!canAddAccount.value) { @@ -109,9 +111,9 @@ const okText = computed(() => { }); const customerServiceVisible = ref(false); const canAddAccount = computed(() => { - if (!enterpriseInfo) return false; + if (!enterpriseInfo.value) return false; - return enterpriseInfo.sub_account_quota > enterpriseInfo.used_sub_account_count; + return enterpriseInfo.value.sub_account_quota > enterpriseInfo.value.used_sub_account_count; }); const currentSelectAccount = ref(); diff --git a/src/views/components/management/enterprise/index.vue b/src/views/components/management/enterprise/index.vue index 6beef29..95f3b8b 100644 --- a/src/views/components/management/enterprise/index.vue +++ b/src/views/components/management/enterprise/index.vue @@ -48,7 +48,9 @@ const form = reactive({ name: '', }); -const enterpriseInfo = store.enterpriseInfo; +const enterpriseInfo = computed(() => { + return store.enterpriseInfo ?? {}; +}); const columns = [ { @@ -65,11 +67,13 @@ const infoVisible = ref(false); const customerServiceVisible = ref(false); const dataSource = computed(() => { - return enterpriseInfo ? [enterpriseInfo] : []; + return enterpriseInfo.value ? [enterpriseInfo.value] : []; }); + +console.log({ dataSource }); const canUpdate = computed(() => { - if (!enterpriseInfo) return false; - return enterpriseInfo.update_name_quota > enterpriseInfo.used_update_name_count; + if (!enterpriseInfo.value) return false; + return enterpriseInfo.value.update_name_quota > enterpriseInfo.value.used_update_name_count; }); const okText = computed(() => { @@ -81,7 +85,7 @@ const okText = computed(() => { function handleUpdate() { if (!canUpdate.value) { - form.name = enterpriseInfo!.name; + form.name = enterpriseInfo.value?.name; } infoVisible.value = true; } diff --git a/src/views/components/management/person/index.vue b/src/views/components/management/person/index.vue index e3e39b4..373d4f4 100644 --- a/src/views/components/management/person/index.vue +++ b/src/views/components/management/person/index.vue @@ -91,7 +91,9 @@ import axios from 'axios'; import { useUserStore } from '@/stores'; const store = useUserStore(); -const userInfo = store.userInfo; +const userInfo = computed(() => { + return store.userInfo ?? {}; +}); const columns = [ { @@ -115,7 +117,7 @@ const isSendCaptcha = ref(false); const uploadInputRef = ref(); const dataSource = computed(() => { - return userInfo ? [userInfo] : []; + return userInfo.value ? [userInfo.value] : []; }); // 表单校验规则 From e6a957d2d2125ebcebeced5861e060fad748bd7b Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Thu, 17 Jul 2025 11:18:36 +0800 Subject: [PATCH 05/38] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => components/export-task}/constants.ts | 0 .../export-task}/delete-task-modal.vue | 0 .../components/export-task/index.vue | 314 ++++++++++++++++++ .../components/export-task/style.scss | 50 +++ .../download-center-modal/index.vue | 248 +------------- .../download-center-modal/style.scss | 105 ++---- src/hooks/useTableSelectionWithPagination.ts | 1 + .../select-sub-account-modal/index.vue | 11 +- 8 files changed, 395 insertions(+), 334 deletions(-) rename src/components/_base/navbar/components/download-center-modal/{ => components/export-task}/constants.ts (100%) rename src/components/_base/navbar/components/download-center-modal/{ => components/export-task}/delete-task-modal.vue (100%) create mode 100644 src/components/_base/navbar/components/download-center-modal/components/export-task/index.vue create mode 100644 src/components/_base/navbar/components/download-center-modal/components/export-task/style.scss diff --git a/src/components/_base/navbar/components/download-center-modal/constants.ts b/src/components/_base/navbar/components/download-center-modal/components/export-task/constants.ts similarity index 100% rename from src/components/_base/navbar/components/download-center-modal/constants.ts rename to src/components/_base/navbar/components/download-center-modal/components/export-task/constants.ts diff --git a/src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue b/src/components/_base/navbar/components/download-center-modal/components/export-task/delete-task-modal.vue similarity index 100% rename from src/components/_base/navbar/components/download-center-modal/delete-task-modal.vue rename to src/components/_base/navbar/components/download-center-modal/components/export-task/delete-task-modal.vue diff --git a/src/components/_base/navbar/components/download-center-modal/components/export-task/index.vue b/src/components/_base/navbar/components/download-center-modal/components/export-task/index.vue new file mode 100644 index 0000000..55aec92 --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/components/export-task/index.vue @@ -0,0 +1,314 @@ + + + + + diff --git a/src/components/_base/navbar/components/download-center-modal/components/export-task/style.scss b/src/components/_base/navbar/components/download-center-modal/components/export-task/style.scss new file mode 100644 index 0000000..180bfb0 --- /dev/null +++ b/src/components/_base/navbar/components/download-center-modal/components/export-task/style.scss @@ -0,0 +1,50 @@ +.export-task-wrap { + .tip-row { + border-radius: 2px; + background: #f0edff; + .label { + font-family: $font-family-medium; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + &.normal { + background: #ebf7f2; + .label { + color: #211f24; + } + } + &.abnormal { + background: #ffe7e4; + .label { + color: #211f24; + } + } + .err-btn { + background-color: #f64b31 !important; + color: var(--BG-white, #fff); + font-family: 'PingFang SC'; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 20px; + } + .operation-btn { + padding: 0; + cursor: pointer; + color: var(--Brand-Brand-6, #6d4cfe); + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + &:not(:last-child) { + margin-right: 16px; + } + &.red { + color: #f64b31; + } + } + } +} diff --git a/src/components/_base/navbar/components/download-center-modal/index.vue b/src/components/_base/navbar/components/download-center-modal/index.vue index 1b82ad6..f4046b4 100644 --- a/src/components/_base/navbar/components/download-center-modal/index.vue +++ b/src/components/_base/navbar/components/download-center-modal/index.vue @@ -1,271 +1,29 @@ diff --git a/src/components/_base/navbar/components/download-center-modal/style.scss b/src/components/_base/navbar/components/download-center-modal/style.scss index d2e5be6..c6e9698 100644 --- a/src/components/_base/navbar/components/download-center-modal/style.scss +++ b/src/components/_base/navbar/components/download-center-modal/style.scss @@ -1,18 +1,4 @@ .download-center-modal { - .arco-input-wrapper, - .arco-select-view-single, - .arco-select-view-multiple { - border-radius: 4px; - border-color: #d7d7d9; - background-color: #fff; - &:focus-within, - &.arco-input-focus, - &.arco-textarea-focus { - background-color: var(--color-bg-2); - border-color: rgb(var(--primary-6)); - box-shadow: 0 0 0 0 var(--color-primary-light-2); - } - } .arco-modal-header { .arco-modal-title { color: var(--Text-1, #211f24); @@ -25,84 +11,35 @@ } .arco-modal-body { height: 536px; - padding: 24px 20px 40px; - .filter-row { - .filter-row-item { - &:not(:last-child) { - margin-right: 24px; - } - .label { - margin-right: 12px; - color: #211f24; - font-family: 'PuHuiTi-Regular'; - font-size: 14px; - font-style: normal; - font-weight: 400; - flex-shrink: 0; - line-height: 22px; /* 157.143% */ - } - :deep(.arco-space-item) { - width: 100%; - } + display: flex; + flex-direction: column; + } + .filter-row { + .filter-row-item { + &:not(:last-child) { + margin-right: 24px; } - } - .tip-row { - border-radius: 2px; - background: #f0edff; .label { - font-family: $font-family-medium; - font-size: 14px; - font-style: normal; - font-weight: 400; - line-height: 22px; - } - &.normal { - background: #ebf7f2; - .label { - color: #211f24; - } - } - &.abnormal { - background: #ffe7e4; - .label { - color: #211f24; - } - } - .err-btn { - background-color: #f64b31 !important; - color: var(--BG-white, #fff); - font-family: 'PingFang SC'; - font-size: 12px; - font-style: normal; - font-weight: 400; - line-height: 20px; /* 166.667% */ - } - .operation-btn { - padding: 0; - cursor: pointer; - color: var(--Brand-Brand-6, #6d4cfe); - font-family: $font-family-regular; + margin-right: 12px; + color: #211f24; + font-family: 'PuHuiTi-Regular'; font-size: 14px; font-style: normal; font-weight: 400; + flex-shrink: 0; line-height: 22px; /* 157.143% */ - &:not(:last-child) { - margin-right: 16px; - } - &.red { - color: #F64B31; - } } - } - .file-table { - .cts { - color: var(--Text-1, #211f24); - font-family: $font-family-medium; - font-size: 14px; - font-style: normal; - font-weight: 400; - line-height: 22px; + :deep(.arco-space-item) { + width: 100%; } } } + .cts { + color: var(--Text-1, #211f24); + font-family: $font-family-medium; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } } diff --git a/src/hooks/useTableSelectionWithPagination.ts b/src/hooks/useTableSelectionWithPagination.ts index ac13d17..b51a7a0 100644 --- a/src/hooks/useTableSelectionWithPagination.ts +++ b/src/hooks/useTableSelectionWithPagination.ts @@ -71,6 +71,7 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa const rowSelection = computed(() => ({ type: 'checkbox', showCheckedAll: true, + width: 48, })); return { diff --git a/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/index.vue b/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/index.vue index 032f9d4..e3762c9 100644 --- a/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/index.vue +++ b/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/index.vue @@ -100,7 +100,7 @@