diff --git a/src/assets/images/icon/selected.png b/src/assets/images/icon/selected.png new file mode 100644 index 00000000..149bc06a Binary files /dev/null and b/src/assets/images/icon/selected.png differ diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue index 2e6e2d3c..1473e5f8 100644 --- a/src/component/Canvas/ExistsImageList/index.vue +++ b/src/component/Canvas/ExistsImageList/index.vue @@ -56,9 +56,14 @@ {{ item.name || "未命名" }} -
+ +
diff --git a/src/component/common/SelectImages.vue b/src/component/common/SelectImages.vue index c4641cc3..68795f15 100644 --- a/src/component/common/SelectImages.vue +++ b/src/component/common/SelectImages.vue @@ -38,9 +38,10 @@ {{ item.name || '未命名' }} -
+ +
@@ -242,8 +243,8 @@ const resetAndLoad = (category = selectedCategory.value) => { list.value = [] hasMore.value = true currentPage.value = 0 - console.log('默认选择----',getDefaultCategory()) - selectedCategory.value = getDefaultCategory() + // console.log('默认选择----',getDefaultCategory()) + selectedCategory.value =category || getDefaultCategory() fetchImages(1, category, true) // 检查是否需要自动加载更多数据 @@ -280,6 +281,7 @@ const handleImageClick = item => { // 处理分类切换 const handleChangeCategory = category => { + // console.log('handleChangeCategory',category) selectedCategory.value = category // 如果提供了API,则重新加载数据 @@ -508,8 +510,9 @@ defineExpose({ overflow-y: auto; grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr)); gap: 16px; - min-height: 20rem; + min-height: 22rem; max-height: 50rem; + padding-bottom: 2rem; @media screen and (max-width: 768px) { grid-template-columns: repeat(auto-fill, minmax(15rem, 1fr)); @@ -574,12 +577,16 @@ defineExpose({ .image-select { position: absolute; - bottom: 0; - right: 0; + bottom: -1.25rem; + right: -1.25rem; z-index: 2; - transform: translate(50%, 50%); - i { - font-size: 2.5rem; + // transform: translate(50%, 50%); + // i { + // font-size: 2.5rem; + // } + &.selected-icon{ + width:2.5rem; + height: 2.5rem; } } diff --git a/src/component/common/TableSearchBar.vue b/src/component/common/TableSearchBar.vue index 00fc3884..5cae4c2f 100644 --- a/src/component/common/TableSearchBar.vue +++ b/src/component/common/TableSearchBar.vue @@ -1,6 +1,6 @@ @@ -36,6 +36,7 @@ interface ButtonItem { interface Props { buttonList: ButtonItem[] placeholder?: string + inputWidth?: string } interface SearchParams { @@ -91,11 +92,13 @@ const handleSearch = () => { line-height: 4rem; min-width: 10rem; font-weight: normal; + border-width: 0.1rem; } } .search_input { height: 4rem; + width: 23rem; // 默认宽度 background-color: #fff; border: 0.1rem solid #000; border-radius: 43rem; @@ -106,6 +109,10 @@ const handleSearch = () => { height: 100%; padding-left: 3rem; border-radius: 4rem; + width: calc(100% - 2rem); + } + .search_input_icon { + font-size: 2rem; } } } diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index ca3e155f..26f3be5b 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -403,6 +403,10 @@ export default defineComponent({ homeMainData.openType = Object.keys(query)[0] homeMainData.openTypeChild = query[Object.keys(query)[0]] } + if(homeMainData.openType === 'history' && route.path !== '/home/history'){ + homeMainData.openTypeChild = '' + homeMainData.openType = '' + } if((query?.id || query?.history) && !await getIdExistToHistory()){ router.push('/home') return