From 95c00b58dc0b7b7b93133a8a5a305f5510f34da5 Mon Sep 17 00:00:00 2001 From: LOG1997 <2694233102@qq.com> Date: Mon, 13 Jan 2025 23:04:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useElement.ts | 124 +++++++++++++++++++-------------------- src/views/Home/index.vue | 119 ++++++++++++++++++++++++++----------- 2 files changed, 148 insertions(+), 95 deletions(-) diff --git a/src/hooks/useElement.ts b/src/hooks/useElement.ts index 359ddf3..4322c9a 100644 --- a/src/hooks/useElement.ts +++ b/src/hooks/useElement.ts @@ -1,41 +1,42 @@ import type { IPersonConfig } from '@/types/storeType' import { rgba } from '@/utils/color' -export const useElementStyle = (element: any, person: IPersonConfig, index: number, patternList: number[], patternColor: string, cardColor: string, cardSize: { width: number, height: number }, textSize: number, mod: 'default' | 'lucky' | 'sphere' = 'default') => { - if (patternList.includes(index + 1) && mod == 'default') { - element.style.backgroundColor = rgba(patternColor, Math.random() * 0.2 + 0.8) - } - else if (mod == 'sphere' || mod == 'default') { - element.style.backgroundColor = rgba(cardColor, Math.random() * 0.5 + 0.25) - } - else if (mod == 'lucky') { - element.style.backgroundColor = rgba(cardColor, 0.8) - } - element.style.border = `1px solid ${rgba(cardColor, 0.25)}` - element.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.5)}` - element.style.width = `${cardSize.width}px`; - element.style.height = `${cardSize.height}px`; - if (mod == 'lucky') { - element.className = 'lucky-element-card' - } - else { - element.className = 'element-card' - } - // 等比放大 +export function useElementStyle(element: any, person: IPersonConfig, index: number, patternList: number[], patternColor: string, cardColor: string, cardSize: { width: number, height: number }, textSize: number, mod: 'default' | 'lucky' | 'sphere' = 'default', type: 'add' | 'change' = 'add') { + if (patternList.includes(index + 1) && mod === 'default') { + element.style.backgroundColor = rgba(patternColor, Math.random() * 0.2 + 0.8) + } + else if (mod === 'sphere' || mod === 'default') { + element.style.backgroundColor = rgba(cardColor, Math.random() * 0.5 + 0.25) + } + else if (mod === 'lucky') { + element.style.backgroundColor = rgba(cardColor, 0.8) + } + element.style.border = `1px solid ${rgba(cardColor, 0.25)}` + element.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.5)}` + element.style.width = `${cardSize.width}px` + element.style.height = `${cardSize.height}px` + if (mod === 'lucky') { + element.className = 'lucky-element-card' + } + else { + element.className = 'element-card' + } + if (type === 'add') { element.addEventListener('mouseenter', (ev: MouseEvent) => { - const target = ev.target as HTMLElement - target.style.border = `1px solid ${rgba(cardColor, 0.75)}` - target.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.75)}` + const target = ev.target as HTMLElement + target.style.border = `1px solid ${rgba(cardColor, 0.75)}` + target.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.75)}` }) element.addEventListener('mouseleave', (ev: MouseEvent) => { - const target = ev.target as HTMLElement - target.style.border = `1px solid ${rgba(cardColor, 0.25)}` - target.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.5)}` + const target = ev.target as HTMLElement + target.style.border = `1px solid ${rgba(cardColor, 0.25)}` + target.style.boxShadow = `0 0 12px ${rgba(cardColor, 0.5)}` }) - element.children[0].style.fontSize = textSize * 0.5 + 'px'; - if (person.uid) { - element.children[0].textContent = person.uid; - } + } + element.children[0].style.fontSize = `${textSize * 0.5}px` + if (person.uid) { + element.children[0].textContent = person.uid + } element.children[1].style.fontSize = `${textSize}px` element.children[1].style.lineHeight = `${textSize * 3}px` @@ -43,7 +44,6 @@ export const useElementStyle = (element: any, person: IPersonConfig, index: numb if (person.name) { element.children[1].textContent = person.name } - element.children[2].style.fontSize = `${textSize * 0.5}px` if (person.department || person.identity) { element.children[2].innerHTML = `${person.department ? person.department : ''}
${person.identity ? person.identity : ''}` @@ -57,37 +57,37 @@ export const useElementStyle = (element: any, person: IPersonConfig, index: numb * 最少一个,最大十个 */ // TODO:不超过5个时:单行排列;超过5个时,6:上3下3;7:上3下4;8:上3下5;9:上4下5;10:上5下5 -export const useElementPosition = (element: any, count: number, totalCount: number, cardSize: { width: number, height: number }, windowSize: { width: number, height: number }, cardIndex: number) => { - let xTable = 0 - let yTable = 0 - const centerPosition = { - x: 0, - y: windowSize.height / 2 - cardSize.height / 2 - } - // 有一行为偶数的特殊数量 - const specialPosition = [2, 4, 7, 9] - // 不包含特殊值的 和 分两行中第一行为奇数值的 - if (!specialPosition.includes(totalCount) || (totalCount > 5 && cardIndex < 5)) { - const index = cardIndex % 5 - if (index == 0) { - xTable = centerPosition.x - yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) - } - else { - xTable = index % 2 === 0 ? Math.ceil(index / 2) * (cardSize.width + 100) : -Math.ceil(index / 2) * (cardSize.width + 100) - yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) - } +export function useElementPosition(element: any, count: number, totalCount: number, cardSize: { width: number, height: number }, windowSize: { width: number, height: number }, cardIndex: number) { + let xTable = 0 + let yTable = 0 + const centerPosition = { + x: 0, + y: windowSize.height / 2 - cardSize.height / 2, + } + // 有一行为偶数的特殊数量 + const specialPosition = [2, 4, 7, 9] + // 不包含特殊值的 和 分两行中第一行为奇数值的 + if (!specialPosition.includes(totalCount) || (totalCount > 5 && cardIndex < 5)) { + const index = cardIndex % 5 + if (index === 0) { + xTable = centerPosition.x + yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) } else { - const index = cardIndex % 5 - if (index == 0) { - xTable = centerPosition.x + (cardSize.width + 100) / 2 - yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) - } - else { - xTable = index % 2 === 0 ? Math.ceil(index / 2) * (cardSize.width + 100) + (cardSize.width + 100) / 2 : -(Math.ceil(index / 2) * (cardSize.width + 100)) + (cardSize.width + 100) / 2 - yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) - } + xTable = index % 2 === 0 ? Math.ceil(index / 2) * (cardSize.width + 100) : -Math.ceil(index / 2) * (cardSize.width + 100) + yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) } - return { xTable, yTable } + } + else { + const index = cardIndex % 5 + if (index === 0) { + xTable = centerPosition.x + (cardSize.width + 100) / 2 + yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) + } + else { + xTable = index % 2 === 0 ? Math.ceil(index / 2) * (cardSize.width + 100) + (cardSize.width + 100) / 2 : -(Math.ceil(index / 2) * (cardSize.width + 100)) + (cardSize.width + 100) / 2 + yTable = centerPosition.y - Math.floor(cardIndex / 5) * (cardSize.height + 60) + } + } + return { xTable, yTable } } diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index bd7e2b0..154c6f3 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -1,5 +1,6 @@