-
+
diff --git a/src/components/OTableItemNew.vue b/src/components/OTableItemNew.vue
index 6626d1f7a30c4930df90eab9a30646509ca4b941..d32ba3e0ce789f1268a1515701e1ca7353069ef7 100644
--- a/src/components/OTableItemNew.vue
+++ b/src/components/OTableItemNew.vue
@@ -246,6 +246,10 @@ const onClickLink = (row: any) => {
{{ row.subPath }}
-
+
+ {{ row.openeulerVersion }}
+ -
+
diff --git a/src/components/filter/FilterHeader.vue b/src/components/filter/FilterHeader.vue
index 43a39028d82cf6ca02c70b61978f0ad135a8988a..3fc1eb0769692657d5fb39067bad1f2f55000162 100644
--- a/src/components/filter/FilterHeader.vue
+++ b/src/components/filter/FilterHeader.vue
@@ -55,17 +55,16 @@ const searchValue = ref(route.query.name as string | '');
const showPanel = ref(false);
// 搜索
-const changeSearchInput = (v: string) => {
- changePkgInput(v);
- searchValue.value = v;
+const changeSearchInput = () => {
+ changePkgInput();
replaceWinUrl();
};
-const changePkgInput = (v: string) => {
- if (v === '') {
+const changePkgInput = () => {
+ if (searchValue.value === '') {
return;
}
- if (v.length > 100) {
+ if (searchValue.value.length > 100) {
return msg.danger({
content: '文字长度不能超过100字符',
});
@@ -94,16 +93,13 @@ const replaceWinUrl = () => {
const collectDownloadData = (keyword: string) => {
const { href } = window.location;
const downloadTime = new Date();
- searchReport(
- 'search',
- {
- origin: href,
- keyword,
- filter: 'all',
- pkg: props.title,
- downloadTime,
- }
- );
+ searchReport('search', {
+ origin: href,
+ keyword,
+ filter: 'all',
+ pkg: props.title,
+ downloadTime,
+ });
};
const isTimeOrder = ref(false);
@@ -194,14 +190,15 @@ watch(
size="large"
:max-length="100"
clearable
+ round="4px"
@focus="showPanel = true"
v-model="searchValue"
- @press-enter="(v) => changeSearchInput(v)"
- @input="(v) => changePkgInput(v)"
- @clear="clearSearchData"
+ @press-enter="() => changeSearchInput('press-enter')"
+ @input="() => changePkgInput('input')"
+ @clear="() => clearSearchData('clear')"
>
-
+
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index 0da7d0290e89eb68e392b30a13e6db6aeb3661af..2407110c1133cb6d7bca8f563241f7acba88b9b0 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -182,7 +182,7 @@ watch(
position: fixed;
top: 0;
left: 0;
- z-index: 1010;
+ z-index: 99;
background: var(--o-color-fill2);
box-shadow: var(--o-shadow-1);
min-width: 1440px;
diff --git a/src/components/search/SearchFilter.vue b/src/components/search/SearchFilter.vue
index 1c675b3119fa60f4d770791ae6059b283471c597..43f6a097a19f2045df21c585e406461f8d2e19b5 100644
--- a/src/components/search/SearchFilter.vue
+++ b/src/components/search/SearchFilter.vue
@@ -43,39 +43,36 @@ const tabName = ref('all');
const fliterSelected = ref(defaultValue.value);
const reportAnalytics = (data: Record
, event = 'click') => {
- searchReport(
- event,
- {
- module: isPageHome.value ? 'home_page' : 'search_page',
- ...data,
- }
- );
+ searchReport(event, {
+ module: isPageHome.value ? 'home_page' : 'search_page',
+ ...data,
+ });
};
-const changeFilter = (v: string) => {
- fliterSelected.value = v;
+const changeFilter = () => {
+ fliterSelected.value = searchInput.value;
+
if (searchInput.value !== '') {
replaceWinUrl();
}
};
// 搜索框事件
-const changeSearchInput = (v: string) => {
- if (v === '') {
+const changeSearchInput = () => {
+ if (searchInput.value === '') {
return;
}
- if (v.length > 100) {
+ if (searchInput.value.length > 100) {
return msg.danger({
content: '文字长度不能超过100字符',
});
}
reportAnalytics({
type: 'search',
- content: v,
+ content: searchInput.value,
});
isLoading.value = false;
isFocus.value = false;
- searchInput.value = v;
replaceWinUrl();
};
@@ -101,6 +98,12 @@ const clearInput = () => {
isLoading.value = false;
};
+const clickInput = () => {
+ if (!isFocus.value) {
+ isFocus.value = true;
+ }
+};
+
const searchRecommendRef = ref();
const clickRecommend = (v: string) => {
searchInput.value = v;
@@ -171,8 +174,8 @@ const debouncedFn = useDebounceFn(() => {
queryDocsAll();
}, 350);
-const trottleSearch = (v: string) => {
- if (v.length > 100) {
+const trottleSearch = () => {
+ if (searchInput.value.length > 100) {
return msg.danger({
content: '文字长度不能超过100字符',
});
@@ -242,16 +245,17 @@ watch(
@@ -402,11 +406,21 @@ watch(
width: 680px;
}
}
-:deep(.o-input-wrap) {
- background: none;
- border: 0 none;
- padding: 0 4px 0 12px;
- align-items: center;
+:deep(.o-input) {
+ .o_box {
+ width: 100%;
+ height: 100%;
+ --box-bg-color: transparent;
+ --box-bg-color-hover: transparent;
+ --box-bd: 0 none;
+ }
+ .o-input-wrap {
+ width: 100%;
+ background: none;
+ border: 0 none;
+ padding: 0;
+ align-items: center;
+ }
}
.search-input {
diff --git a/src/utils/common.ts b/src/utils/common.ts
index a15197562a515f656c5046860a5f5bffc4027972..3d80cc45b202a2bd825d0c6f83d280d75a2d3166 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -40,7 +40,7 @@ export const formatDateTime = (v: string, isTime?: boolean) => {
return `${year}/${month}/${day}`;
}
- return '-'
+ return '-';
};
/**
@@ -138,13 +138,6 @@ export const getPkgName = (type: string) => {
return name;
};
-// 是否是搜索页面
-import { useRoute } from 'vue-router';
-const route = useRoute();
-export const isSearchPage = () => {
- return route.name === 'search';
-};
-
// 去重
export const getTarget = (data: any, key: any) => {
@@ -157,10 +150,8 @@ export const getTarget = (data: any, key: any) => {
return [...map.values()];
};
-
-
// 输入框文字校验
-export const inputValidator = new RegExp("^[\u4E00-\u9FA5A-Za-z0-9.()$\\-]+$");
+export const inputValidator = new RegExp('^[\u4E00-\u9FA5A-Za-z0-9.()$\\-]+$');
/**
* 对象转URL参数
@@ -176,19 +167,17 @@ export const generateQuery = (queries: Record): string => {
return arr;
}, [] as string[]);
if (parseResultArr?.length) {
- return `?${parseResultArr.join("&")}`;
+ return `?${parseResultArr.join('&')}`;
}
return '';
-}
-
-
+};
/**
* 获取指定时区偏移量的年份
* @param {number} offset - 时区偏移量（单位：小时）。例如，UTC+8 时区，传入 8。
* @returns {number} - 指定时区偏移量对应的年份
*/
-export const getYearByOffset = ()=> {
+export const getYearByOffset = () => {
// 获取当前时间的 UTC 时间
const now = new Date();
const utcTime = new Date(now.getTime() + now.getTimezoneOffset() * 60000);
@@ -197,4 +186,4 @@ export const getYearByOffset = ()=> {
utcTime.setHours(utcTime.getHours() + 8);
return utcTime.getFullYear();
-}
+};
diff --git a/src/views/home/HomeHeader.vue b/src/views/home/HomeHeader.vue
index 874f19e8fb17f0cca64361b4fb652b522ecc6e01..fb9e8962194b5e33f88da9e8cb57832bc55cdebd 100644
--- a/src/views/home/HomeHeader.vue
+++ b/src/views/home/HomeHeader.vue
@@ -67,7 +67,7 @@ onMounted(() => {
align-items: center;
height: 280px;
position: relative;
- z-index: 99;
+ z-index: 97;
.home-banner {
position: absolute;
inset: 0;