diff --git a/src/@types/app.ts b/src/@types/app.ts index 17064e9d39867862d11ef5ae620a1cb68397a7ef..557550cb16e719c1827a7b9c51c4c828605c8621 100644 --- a/src/@types/app.ts +++ b/src/@types/app.ts @@ -29,9 +29,10 @@ export interface AppInfoT { version: string; repository: string; size: string | null; - source_code: string; - bin_code: string; + srcDownloadUrl: string; + binDownloadUrl: string; security?: string; + description?: string; } export interface MaintainerT { @@ -66,4 +67,4 @@ export interface MoreMessgeItemT { epoch: string; } -export type PkgTypeT = 'RPM' | 'IMAGE' | 'EPKG' | 'OEPKG'; +export type PkgTypeT = 'RPM' | 'IMAGE' | 'EPKG' | 'OEPKG' | 'CONDA'; diff --git a/src/@types/detail.ts b/src/@types/detail.ts index 57f7c400837b91b75f4a0199886c8a8494e77113..41c672cfe801f5059253c86376b7c241de17adfb 100644 --- a/src/@types/detail.ts +++ b/src/@types/detail.ts @@ -77,3 +77,10 @@ export interface ParamsKeyT { epkgPkgId: string | null; rpmPkgId: string | null; } + +export interface ImageTagsT { + appVer: string; + arch: string; + dockerStr: string; + pkgId: string; +} diff --git a/src/assets/style/category/detail/index.scss b/src/assets/style/category/detail/index.scss index fab304ad91feeef62cf00504739bf351f3e241a2..18f223e1707f6ff0b0a671b0798e9cf5051644e9 100644 --- a/src/assets/style/category/detail/index.scss +++ b/src/assets/style/category/detail/index.scss @@ -27,27 +27,40 @@ } } +.version-title { + display: flex; + align-items: center; + h2 { + font-weight: 500; + color: var(--o-color-info1); + margin-right: 12px; + @include h2; + } + .software-version { + margin-left: auto; + display: flex; + align-items: center; + gap: 8px; + } + + .o-tab { + margin-top: 24px; + } +} + .code-box { position: relative; } .basic-info { - border-left: 4px solid var(--o-color-primary1); p, .basic-info-item { @include text1; color: var(--o-color-info1); display: flex; - align-items: top; - border-bottom: 1px solid var(--o-color-control4); - border-right: 1px solid var(--o-color-control4); + align-items: center; word-break: break-word; - &:first-child { - border-top: 1px solid var(--o-color-control4); - } + margin: 24px 0; .label { - background: var(--o-color-control2-light); - padding: 16px 24px; color: var(--o-color-info2); min-width: 150px; } @@ -57,7 +70,8 @@ } .basic-item-box { flex: 1; - padding: 16px 24px; + display: flex; + justify-content: flex-end; } } diff --git a/src/assets/style/theme/table.scss b/src/assets/style/theme/table.scss index 54aa764a3250753c7fc7758d239340366ec75756..51a47757e3c1ed6ce333dba186a150362fc07de6 100644 --- a/src/assets/style/theme/table.scss +++ b/src/assets/style/theme/table.scss @@ -1,6 +1,6 @@ @use '../mixin/font.scss' as *; .o-table { - --table-edge-padding: 24px; + --table-edge-padding: 16px; --table-cell-padding: 16px 10px; --table-head-cell-padding: 12px 10px; --table-head-bg: var(--o-color-control3-light); @@ -34,9 +34,10 @@ } &.o-table-small { --table-cell-height: auto; - --table-edge-padding: 24px; - --table-cell-padding: 8px; - --table-head-cell-padding: 8px; + --table-edge-padding: 16px; + --table-head-cell-padding: 8px 16px; + --table-cell-padding: 8px 16px; + td, th { @include tip1; diff --git a/src/components/AppPagination.vue b/src/components/AppPagination.vue index 79053503392cac0da27b806b8dc09551397072a6..819c4542fd70bab1832f26d6d270e25486d1803c 100644 --- a/src/components/AppPagination.vue +++ b/src/components/AppPagination.vue @@ -22,9 +22,13 @@ const route = useRoute(); const emit = defineEmits(['size-change', 'current-change']); -const onChange = (newValue: { page: number; pageSize: number }) => { - emit('size-change', newValue.pageSize); - emit('current-change', newValue.page); +const onChange = (newValue: { page: number; pageSize: number }, oldValue: { page: number; pageSize: number }) => { + if (newValue.pageSize !== oldValue.pageSize) { + emit('size-change', newValue.pageSize); + } + if (newValue.page !== oldValue.page) { + emit('current-change', newValue.page); + } }; // 如果是领域应用 分页数量为12条,否则为20条 diff --git a/src/components/AppSection.vue b/src/components/AppSection.vue index 55ae5c699106e5c0320eb9c5a3015a4091ec3621..56878044d3fca2bb8763df87bf8c31567d6984c1 100644 --- a/src/components/AppSection.vue +++ b/src/components/AppSection.vue @@ -4,12 +4,16 @@ defineProps({ type: String, default: '', }, + line: { + type: Boolean, + default: true, + }, });