From 6e2da909b0966ea3a8d2bacf7c5e0b22c397ffb0 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Fri, 26 Sep 2025 11:28:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E4=BB=8E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=BA=93/=E6=94=B6=E8=97=8F=E9=80=89=E6=8B=A9=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=BB=84=E4=BB=B6=E7=9A=84=E5=B7=B2=E9=80=89=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon/selected.png | Bin 0 -> 582 bytes .../Canvas/ExistsImageList/index.vue | 9 ++++-- src/component/common/SelectImages.vue | 27 +++++++++++------- 3 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/assets/images/icon/selected.png diff --git a/src/assets/images/icon/selected.png b/src/assets/images/icon/selected.png new file mode 100644 index 0000000000000000000000000000000000000000..149bc06a180fab411f477a190e0a642de3e735af GIT binary patch literal 582 zcmV-M0=fN(P)E{bT~OVj$;IC0>%8EeBFI;C=?2dJa8e)vM9(K zXX#H;sZ{Rrf;GAXQ}bXJ!M>U+88cO@)kKt(pJFL+D*q^JmI7X@)e^FPzpw5&)*awB z54_Q6FnACINvTv~&!l}fx&S>HR4f*^_t>)9%%dnuJkQg0Tu(raeY;+-VK^MZcszzM z45_==^Lo7wv)K&dI0np|tzjV5J<$c2tGfn+0W_OUm`o;sr2s4oOsCT{xRynBA|F#6 zyW8!ua*ReJc15VEEV2&4U`zRB2}q~Y*}{F_-v_7TtT^jOo6>`}>Lg&TRx2r&%UMRq zr73&yJ{Hn!*>;b7H7GtjM31l*{_JQ)b zZv+`kWN`tTmuAYG=1yDj`DRv15RnbF-8pPNnPk-G52#1Zups9rGiws5AN@bKFAvIB Ukn%WdrvLx|07*qoM6N<$f&dx&NdN!< literal 0 HcmV?d00001 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; } } From ac6f8ea34178cdf3c6f4881c7bb998d784cc987a Mon Sep 17 00:00:00 2001 From: zhangyh Date: Fri, 26 Sep 2025 13:08:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E5=8E=86=E5=8F=B2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/common/TableSearchBar.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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; } } } From 2f2e8277d5495ace229050ed6752acacd6163216 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Fri, 26 Sep 2025 13:21:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=95=8C=E9=9D=A2=E7=9A=84=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/HomeMain.vue | 4 ++++ 1 file changed, 4 insertions(+) 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