diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 473a417e30..771ac70c14 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -709,6 +709,7 @@ } &:not(:last-child):not(:first-child):not(.arco-pagination-item-ellipsis) { border: 1px solid var(--color-text-input-border); + border-radius: 3px; } &-active { border-color: rgb(var(--primary-5)) !important; diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 04e9112288..e1533c7255 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -140,7 +140,12 @@ @blur="handleEditInputBlur(record, item.dataIndex as string, true)" @keydown.enter="handleEditInputBlur(record, item.dataIndex as string, false)" /> - +
{{ record[item.dataIndex as string] || (attrs.emptyDataShowLine ? '-' : '') }} @@ -318,6 +323,10 @@ const { selectorStatus } = props; if (selectorStatus === SelectAllEnum.CURRENT) { const { pageSize, total } = attrs.msPagination as MsPaginationI; + if (!attrs.showPagination) { + // 不展示分页时直接返回total + return total; + } if (pageSize > total) { return total; } diff --git a/frontend/src/components/pure/ms-table/columnSelector.vue b/frontend/src/components/pure/ms-table/columnSelector.vue index 1f1e29ac04..3f6d9af595 100644 --- a/frontend/src/components/pure/ms-table/columnSelector.vue +++ b/frontend/src/components/pure/ms-table/columnSelector.vue @@ -49,7 +49,7 @@
{{ t('msTable.columnSetting.header') }}
- {{ t('msTable.columnSetting.resetDefault') }} + {{ t('msTable.columnSetting.resetDefault') }}
@@ -140,6 +140,7 @@ const handleReset = () => { loadColumn(props.tableKey); + hasChange.value = false; }; const handleModeChange = (value: string | number | boolean) => { diff --git a/frontend/src/components/pure/ms-user-admin-div/index.vue b/frontend/src/components/pure/ms-user-admin-div/index.vue index e5b4428021..24f2b6139f 100644 --- a/frontend/src/components/pure/ms-user-admin-div/index.vue +++ b/frontend/src/components/pure/ms-user-admin-div/index.vue @@ -1,6 +1,8 @@