From fecf0da65a8362e9ff95c895dafddaba4a7ae157 Mon Sep 17 00:00:00 2001 From: YCA001 <2915341988@qq.com> Date: Sat, 25 May 2024 16:05:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/detail/index.ts | 2 +- src/i18n/detail/detail-en.ts | 6 ++++++ src/i18n/detail/detail-zh.ts | 6 ++++++ src/i18n/detail/index.ts | 7 +++++++ src/i18n/index.ts | 4 +++- src/views/apppkg/TheNewDetail.vue | 29 +++++++++-------------------- src/views/epkg/TheDetail.vue | 2 +- src/views/image/TheDetail.vue | 18 ++++++++++-------- src/views/package/TheDetail.vue | 5 +++-- 9 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 src/i18n/detail/detail-en.ts create mode 100644 src/i18n/detail/detail-zh.ts create mode 100644 src/i18n/detail/index.ts diff --git a/src/data/detail/index.ts b/src/data/detail/index.ts index efeac3e..64dd989 100644 --- a/src/data/detail/index.ts +++ b/src/data/detail/index.ts @@ -6,7 +6,7 @@ export const columnTags = [ ]; // 容器镜像tab分类 -export const tabList = ['概览', 'Tags']; +export const tagList = [{lable:'概览'},{lable:'Tags'}] // RPM更多信息表头 export const moreColumns = [ diff --git a/src/i18n/detail/detail-en.ts b/src/i18n/detail/detail-en.ts new file mode 100644 index 0000000..e5fb885 --- /dev/null +++ b/src/i18n/detail/detail-en.ts @@ -0,0 +1,6 @@ +export default { + imgList: ['OverView', 'Tags'], + support: 'Version Support', + warehouse: 'Owned warehouse', + source:'RepoSource' +}; \ No newline at end of file diff --git a/src/i18n/detail/detail-zh.ts b/src/i18n/detail/detail-zh.ts new file mode 100644 index 0000000..1ea4041 --- /dev/null +++ b/src/i18n/detail/detail-zh.ts @@ -0,0 +1,6 @@ +export default { + imgList: ['概览', 'Tags'], + support: '版本支持情况', + warehouse: '所属仓库', + source:'Repo源' +}; diff --git a/src/i18n/detail/index.ts b/src/i18n/detail/index.ts new file mode 100644 index 0000000..a5e0ecf --- /dev/null +++ b/src/i18n/detail/index.ts @@ -0,0 +1,7 @@ +import zh from './detail-zh'; +import en from './detail-en'; + +export default { + zh, + en, +}; diff --git a/src/i18n/index.ts b/src/i18n/index.ts index 8f5f15f..6ef845a 100644 --- a/src/i18n/index.ts +++ b/src/i18n/index.ts @@ -3,7 +3,7 @@ import { createI18n } from 'vue-i18n'; import common from './common'; import software from './software'; import upstream from './upstream'; - +import detail from '@/i18n/detail'; import { getCurrentLocale } from '@/utils/locale'; const messages = { @@ -11,11 +11,13 @@ const messages = { common: common.zh, software: software.zh, upstream: upstream.zh, + detail: detail.zh, }, en: { common: common.en, software: software.en, upstream: upstream.en, + detail: detail.en, }, }; diff --git a/src/views/apppkg/TheNewDetail.vue b/src/views/apppkg/TheNewDetail.vue index 0d71ff9..8ad963d 100644 --- a/src/views/apppkg/TheNewDetail.vue +++ b/src/views/apppkg/TheNewDetail.vue @@ -2,10 +2,9 @@ import { ref, onMounted } from 'vue'; import { OTab, OTabPane, OTable, OLink, OIcon, OTag, isString } from '@opensig/opendesign'; import { useRoute } from 'vue-router'; -import { getDetails, getDetail, getTags, getVer } from '@/api/api-domain'; +import { getDetail, getTags, getVer } from '@/api/api-domain'; import { useMarkdown } from '@/composables/useMarkdown'; import type { AppInfoT, MaintainerT, DetailItemT, MoreMessgeT, PkgTypeT } from '@/@types/app'; - import { OPENEULER_CONTACT } from '@/data/config'; import AppFeedback from '@/components/AppFeedback.vue'; import DetailHead from '@/components/DetailHeader.vue'; @@ -15,7 +14,7 @@ import defaultImg from '@/assets/default-logo.png'; import IconEpkg from '~icons/pkg/epkg.svg'; import IconImage from '~icons/pkg/image.svg'; import IconRpm from '~icons/pkg/rpm.svg'; -import { columnTags } from '@/data/detail/index'; +import { columnTags, tagList } from '@/data/detail/index'; import { useI18n } from 'vue-i18n'; import { useViewStore } from '@/stores/common'; import { getDetailRules } from '@/utils/common'; @@ -129,7 +128,6 @@ const getDetailValue = (data: any) => { } else if (typePkg.value === 'EPKG') { basicInfo.value = [ { name: '详细描述', value: data?.description }, - { name: '版本号', value: data.version }, { name: '版本支持情况', value: data.osSupport }, { name: '架构', value: data.arch }, { name: '软件包分类', value: data.epkgCategory || '其他' }, @@ -198,8 +196,7 @@ const moreColumns = [ { label: 'Epoch', key: 'epoch' }, ]; // 获取img分类 -const imgList = ref(['概览', 'Tags']); -const imgName = ref('概览'); +const imgName = ref(tagList[0].lable); const tagsValue = ref([]); const queryTags = () => { getTags(encodeURIComponent(pkgId.value)).then((res) => { @@ -264,7 +261,7 @@ const repeatTags = (v: string) => { { - -
+ +

> 基本信息

版本号：{{ version }}

@@ -301,17 +298,9 @@ const repeatTags = (v: string) => {

{{ item.name }} - {{ item.type }} - - 最新版本 + + {{ item.value }} + 最新版本

diff --git a/src/views/epkg/TheDetail.vue b/src/views/epkg/TheDetail.vue index 960515e..6c46ada 100644 --- a/src/views/epkg/TheDetail.vue +++ b/src/views/epkg/TheDetail.vue @@ -152,7 +152,7 @@ const queryVer = () => { ([]); const version = ref(); const installation = ref(''); @@ -135,8 +136,8 @@ const queryVer = () => {
- -
+ +

> 基本信息

版本号：{{ version }}

@@ -144,9 +145,10 @@ const queryVer = () => {

{{ item.name }} - {{ item.type }} - - 最新版本 + + + {{ item.value }} + 最新版本

diff --git a/src/views/package/TheDetail.vue b/src/views/package/TheDetail.vue index ba7b396..b5a17dc 100644 --- a/src/views/package/TheDetail.vue +++ b/src/views/package/TheDetail.vue @@ -13,7 +13,8 @@ import DetailAside from '@/components/DetailAside.vue'; import ExternalLink from '@/components/ExternalLink.vue'; import { moreColumns } from '@/data/detail/index'; import { useViewStore } from '@/stores/common'; - +import { useI18n } from 'vue-i18n'; +const { t } = useI18n(); const route = useRoute(); const { mkit } = useMarkdown(); const tabValue = ref('rpmpkg'); @@ -137,7 +138,7 @@ const queryVer = () => { Date: Sat, 25 May 2024 16:53:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=A3=80=E8=A7=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailAside.vue | 2 +- src/components/DetailHeader.vue | 12 ++-- src/components/OCardItem.vue | 6 +- src/components/OTableItemNew.vue | 3 +- src/components/search/SearchFilter.vue | 25 +------- src/data/query.ts | 29 +++++++++ src/utils/os.ts | 86 -------------------------- src/utils/query.ts | 42 +++++++++++++ src/views/apppkg/APkgContent.vue | 24 ++++--- src/views/apppkg/TheNewDetail.vue | 25 +++++--- src/views/epkg/EpkgContent.vue | 25 +++++--- src/views/image/ImageContent.vue | 22 ++++--- src/views/image/TheDetail.vue | 50 +++++++-------- src/views/package/RpmContent.vue | 22 ++++--- src/views/search/TheSearch.vue | 59 +++++++++--------- src/views/upstream/UpstreamContent.vue | 1 + 16 files changed, 214 insertions(+), 219 deletions(-) create mode 100644 src/data/query.ts delete mode 100644 src/utils/os.ts create mode 100644 src/utils/query.ts diff --git a/src/components/DetailAside.vue b/src/components/DetailAside.vue index 5214c45..e4b333b 100644 --- a/src/components/DetailAside.vue +++ b/src/components/DetailAside.vue @@ -156,7 +156,7 @@ const { locale } = useLocale(); const jumpTo = (id: string) => { if (props.type) { const detailType = props.type === 'IMAGE' ? 'image' : props.type === 'RPM' ? 'package' : 'epkg'; - const newHref = `/${locale.value}/${detailType}/detail?type=${props.type}&pkgId=${encodeURIComponent(id)}`; + const newHref = `/${locale.value}/${detailType}/detail?pkgId=${encodeURIComponent(id)}`; return newHref; } }; diff --git a/src/components/DetailHeader.vue b/src/components/DetailHeader.vue index 56eb7f3..5f59d3d 100644 --- a/src/components/DetailHeader.vue +++ b/src/components/DetailHeader.vue @@ -50,24 +50,24 @@ const onExternalDialog = (href: string) => {

{{ data.name }} - 主页 + 主页

-

{{ basicInfo }}

+

{{ basicInfo }}

维护者信息

-

维护者：{{ maintainer.maintainerId }}

-

+

维护者：{{ maintainer.maintainerId }}

+

-

+

{{ `${GITEE}/${maintainer.maintainerGiteeId}` }} diff --git a/src/components/OCardItem.vue b/src/components/OCardItem.vue index 60d6324..4454240 100644 --- a/src/components/OCardItem.vue +++ b/src/components/OCardItem.vue @@ -17,8 +17,8 @@ defineProps({ const { locale } = useLocale(); const { t } = useI18n(); -const jumpTo = (id: PkgIdsT, type: PkgTypeT) => { - return `/${locale.value}/apppkg/detail?type=${type}${id.IMAGE ? `&appPkgId=${encodeURIComponent(id.IMAGE)}` : ''}${ +const jumpTo = (id: PkgIdsT, type?: PkgTypeT) => { + return `/${locale.value}/apppkg/detail?${type ? `type=${type}` : ''}${id.IMAGE ? `&appPkgId=${encodeURIComponent(id.IMAGE)}` : ''}${ id.EPKG ? `&epkgPkgId=${encodeURIComponent(id.EPKG)}` : '' }${id.RPM ? `&rpmPkgId=${encodeURIComponent(id.RPM)}` : ''}`; }; @@ -38,7 +38,7 @@ const repeatTags = (v: string) => { >