diff --git a/components.d.ts b/components.d.ts index 92cc3670361b6e78017446902f12cd49435039f5..677ad841cb3859174fc8a9279f9c50174faa7fef 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,9 +11,9 @@ declare module 'vue' { AppFeedback: typeof import('./src/components/AppFeedback.vue')['default'] AppFooter: typeof import('./src/components/AppFooter.vue')['default'] AppHeader: typeof import('./src/components/AppHeader.vue')['default'] + AppPagination: typeof import('./src/components/AppPagination.vue')['default'] AppSection: typeof import('./src/components/AppSection.vue')['default'] ContentWrapper: typeof import('./src/components/ContentWrapper.vue')['default'] - ElPagination: typeof import('element-plus/es')['ElPagination'] ExternalLink: typeof import('./src/components/ExternalLink.vue')['default'] FilterCheckbox: typeof import('./src/components/filter/FilterCheckbox.vue')['default'] FilterHeader: typeof import('./src/components/filter/FilterHeader.vue')['default'] @@ -22,6 +22,7 @@ declare module 'vue' { OCardItem: typeof import('./src/components/OCardItem.vue')['default'] OCodeCopy: typeof import('./src/components/OCodeCopy.vue')['default'] OTableItemNew: typeof import('./src/components/OTableItemNew.vue')['default'] + ResultNotApp: typeof import('./src/components/ResultNotApp.vue')['default'] ResultNotFound: typeof import('./src/components/ResultNotFound.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/src/App.vue b/src/App.vue index a9f82b7915a2a6254d3b9771825ad9be4131f9d9..ede132694dbd1827582473f5ceb72eedf137745f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,13 +6,14 @@ import { OScroller, OConfigProvider } from '@opensig/opendesign'; import zhCN from '@opensig/opendesign/es/locale/lang/zh-cn'; import enUS from '@opensig/opendesign/es/locale/lang/en-us'; -import { useLangStore } from '@/stores/'; +import { useLangStore, useViewStore } from '@/stores/common'; import { useLocale } from '@/composables/useLocale'; import AppHeader from '@/components/AppHeader.vue'; import AppFooter from '@/components/AppFooter.vue'; const langStore = useLangStore(); +const viewState = useViewStore(); const { locale } = useI18n(); watch( @@ -30,7 +31,10 @@ const { isZh } = useLocale(); -
+
+ + +
@@ -79,3 +83,4 @@ const { isZh } = useLocale(); padding-top: var(--layout-header-height); } +@/stores/common diff --git a/src/assets/banner/search-banner.jpg b/src/assets/banner/search-banner.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8ab7cb7c9017bec8b5006b3d144bd988c5a4874b Binary files /dev/null and b/src/assets/banner/search-banner.jpg differ diff --git a/src/assets/default-logo-cover.png b/src/assets/default-logo-cover.png new file mode 100644 index 0000000000000000000000000000000000000000..3ef2e64012b1ea590329d3db2a9d02f9f880322e Binary files /dev/null and b/src/assets/default-logo-cover.png differ diff --git a/src/assets/default-logo.png b/src/assets/default-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..609acc2321a6580679d1f626e773ff785e588ea1 Binary files /dev/null and b/src/assets/default-logo.png differ diff --git a/src/assets/icon/icon-home.svg b/src/assets/icon/icon-home.svg new file mode 100644 index 0000000000000000000000000000000000000000..bda3274de0c0db95ff58e91a18540dadc33a621d --- /dev/null +++ b/src/assets/icon/icon-home.svg @@ -0,0 +1,10 @@ + + + icon/01公共图标/鲲鹏/24px/转发当前链接 + + + + + + + \ No newline at end of file diff --git a/src/assets/style/category/content/index.scss b/src/assets/style/category/content/index.scss index 4e4f970d05d27109d8eaaa578cd0088323dee5d1..f3d74a3490710d285707db750f840d24c250dcc5 100644 --- a/src/assets/style/category/content/index.scss +++ b/src/assets/style/category/content/index.scss @@ -9,7 +9,10 @@ display: flex; flex-direction: column; } - + .pkg-panel, + .result-tips { + margin-top: 24px; + } .filter-sidebar { padding-right: 32px; position: relative; @@ -33,10 +36,10 @@ } } .search-result { - margin-bottom: 24px; .text { @include tip1; color: var(--o-color-info3); + margin-top: 24px; .total { color: var(--o-color-info1); font-weight: 600; diff --git a/src/assets/style/detail/index.scss b/src/assets/style/detail/index.scss index 4b4650e49e02a2a371bc4ffc72722b98ead5f561..a75f796949c05b4613839e9673db22ae81eb455d 100644 --- a/src/assets/style/detail/index.scss +++ b/src/assets/style/detail/index.scss @@ -3,6 +3,9 @@ justify-content: space-between; .detail-row-main { width: 936px; + &.tags { + width: 100%; + } } .detail-row-side { padding-left: 32px; @@ -36,7 +39,6 @@ justify-content: space-between; } - :deep(.domain-tabs) { .o-tab-navs { --tab-nav-justify: left; @@ -47,6 +49,31 @@ word-break: break-word; --table-edge-padding: 24px; } + // 容器镜像样式 + &.switch { + .o-tab-nav-list { + background: #ededf0; + border-radius: 8px; + height: 40px; + padding: 4px; + .o-tab-nav { + margin: 0 !important; + position: relative; + padding: 2px 12px; + z-index: 3; + } + } + .o-tab-nav-anchor { + top: 0; + padding: 4px 0; + .o-tab-nav-anchor-line { + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1); + border-radius: 4px; + height: 100%; + background: var(--o-color-fill2); + } + } + } } .code-box { @@ -55,17 +82,16 @@ .basic-info { margin-top: 26px; - background: linear-gradient(to right, rgba(0, 47, 167, 0.05) 10%, white 15%); + background: linear-gradient(to right, rgba(0, 47, 167, 0.05) 10%, white 15%); li { - padding: 12px 24px; @include tip1; color: var(--o-color-info2); display: flex; align-items: top; - border: 1px solid rgba(0,0,0,0.10); - border-left:4px solid #002FA7; + border: 1px solid rgba(0, 0, 0, 0.1); + border-left: 4px solid #002fa7; .label { min-width: 100px; } @@ -132,3 +158,12 @@ justify-content: space-between; @include h3; } + +.ver{ + background: #F2F4FA; +border: 1px solid rgba(0,47,167,0.20); +border-radius: 4px; +font-size: 18px; +color: #002FA7; +padding: 6px 24px; +} diff --git a/src/assets/style/global.scss b/src/assets/style/global.scss index 32dd8cf2c97fdc63aef5fa3c7796b4396f0c2546..9966e5d16671d972aec120da53a4132ea2d00601 100644 --- a/src/assets/style/global.scss +++ b/src/assets/style/global.scss @@ -43,7 +43,7 @@ html { } .o-table { - --table-head-bg: var(--o-color-primary1-light); + --table-head-bg: var(--o-color-control3-light); } // tag diff --git a/src/assets/style/theme/dark.token.css b/src/assets/style/theme/dark.token.css index a948fb9eb6098cb97466336cf46f261ea4c4c990..97800f351e7e94a6f7215c6ccf8000fee9fbe0e6 100644 --- a/src/assets/style/theme/dark.token.css +++ b/src/assets/style/theme/dark.token.css @@ -874,7 +874,7 @@ * @group mixedgray * @description */ - --o-mixedgray-3: 28, 26, 28; + --o-mixedgray-3: 26, 26, 28; /** * @name * @type palette diff --git a/src/assets/style/theme/default-light.token.css b/src/assets/style/theme/default-light.token.css index 4c91801f0459894c5ac0b11a5ef41b3dca66c059..6091486b973c08861249f74a9a9ee03c8623da0c 100644 --- a/src/assets/style/theme/default-light.token.css +++ b/src/assets/style/theme/default-light.token.css @@ -867,7 +867,7 @@ * @group mixedgray * @description */ - --o-mixedgray-2: 240, 243, 245; + --o-mixedgray-2: 243, 243, 245; /** * @name * @type palette @@ -1532,14 +1532,14 @@ * @group control * @description 悬浮-浅,常用于背景 */ - --o-color-control2-light: rgb(var(--o-mixedgray-3), 1); + --o-color-control2-light: rgba(var(--o-kleinblue-1), 1); /** * @name * @type color * @group control * @description 激活-浅,常用于背景 */ - --o-color-control3-light: rgb(var(--o-mixedgray-4), 1); + --o-color-control3-light: rgba(var(--o-kleinblue-2), 1); /** * @name * @type color diff --git a/src/components/AppFeedback.vue b/src/components/AppFeedback.vue index 8750879e2e067d7f692195f2300cee1a2ad9b19c..d7cb97db63b8d48eba3f8fa8b1b1af3a55f16d16 100644 --- a/src/components/AppFeedback.vue +++ b/src/components/AppFeedback.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/components/OCardItem.vue b/src/components/OCardItem.vue index eeff39dc4f833616a1f65a378a4bd2fc21798c83..afb3f57f9c7e6697bdaf39dfaf13e5e7ad9e5fa5 100644 --- a/src/components/OCardItem.vue +++ b/src/components/OCardItem.vue @@ -6,7 +6,7 @@ import { getTagsIcon, xssAllTag } from '@/utils/common'; import { useLocale } from '@/composables/useLocale'; import { useI18n } from 'vue-i18n'; -import defaultImg from '@/assets/default.png'; +import defaultImg from '@/assets/default-logo.png'; defineProps({ data: { diff --git a/src/components/ResultNotApp.vue b/src/components/ResultNotApp.vue new file mode 100644 index 0000000000000000000000000000000000000000..e3ee50b8f9f4d7ec470554e899a3968d9c942886 --- /dev/null +++ b/src/components/ResultNotApp.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/components/ResultNotFound.vue b/src/components/ResultNotFound.vue index e3ee50b8f9f4d7ec470554e899a3968d9c942886..230c59ddf6b4241a0aca73cdfb4493b51dc0d0cb 100644 --- a/src/components/ResultNotFound.vue +++ b/src/components/ResultNotFound.vue @@ -1,92 +1,42 @@ - diff --git a/src/components/filter/FilterCheckbox.vue b/src/components/filter/FilterCheckbox.vue index e03cabf175d2526337efdcaa6938be6eb96392c1..6ac84d91fae229831969d9b2ed0c7cc89ddb02fe 100644 --- a/src/components/filter/FilterCheckbox.vue +++ b/src/components/filter/FilterCheckbox.vue @@ -30,7 +30,7 @@ const onChange = (option: string[]) => { emits('change', option); }; -const DEFAULT_NUM = 8; +const DEFAULT_NUM = 5; const showLen = ref(DEFAULT_NUM); const filterList = ref(props.options); const isAll = ref(false); diff --git a/src/components/filter/FilterHeader.vue b/src/components/filter/FilterHeader.vue index 5d4d51dc0e63111c99602594755d1e492c37af50..5d0c5462709cf90d48c195d7bcbef275d6e20064 100644 --- a/src/components/filter/FilterHeader.vue +++ b/src/components/filter/FilterHeader.vue @@ -1,5 +1,5 @@