!154 修复数字翻牌因未等待ui更新导致显示错误的异常,并能实时响应更新

Merge pull request !154 from dodu/dev-commet
This commit is contained in:
奔跑的面条 2023-05-14 09:09:48 +00:00 committed by Gitee
commit 0c87b9ecac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 50 additions and 16 deletions

View File

@ -1,13 +1,13 @@
<template> <template>
<div class="go-Flipper" :class="[flipType, { go: isFlipping }]"> <div class="go-flipper" :class="[flipType, { go: isFlipping }]">
<div class="digital front" :data-front="frontTextFromData"></div> <div class="digital front" :data-front="frontTextFromData"></div>
<div class="digital back" :data-back="backTextFromData"></div> <div class="digital back" :data-back="backTextFromData"></div>
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, PropType, watch } from 'vue' import { ref, PropType, watch, nextTick } from 'vue'
import { FlipType } from './index' import { FlipType } from './index'
const props = defineProps({ const props = defineProps({
flipType: { flipType: {
@ -43,6 +43,10 @@ const props = defineProps({
backColor: { backColor: {
type: String, type: String,
default: '#000000' default: '#000000'
},
borderWidth: {
type: Number,
default: 2
} }
}) })
@ -50,19 +54,27 @@ const isFlipping = ref(false)
const frontTextFromData = ref(props.count || 0) const frontTextFromData = ref(props.count || 0)
const backTextFromData = ref(props.count || 0) const backTextFromData = ref(props.count || 0)
let timeoutID: any = 0
// //
const flip = (front: string | number, back: string | number) => { const flip = async (front: string | number, back: string | number) => {
// //
if (isFlipping.value) return if (isFlipping.value) {
isFlipping.value = false //
clearTimeout(timeoutID) //
await nextTick()
await flip(front, back) //
return
}
// //
backTextFromData.value = back backTextFromData.value = back
frontTextFromData.value = front frontTextFromData.value = front
// true // true
isFlipping.value = true isFlipping.value = true
// //
setTimeout(() => { timeoutID = setTimeout(() => {
isFlipping.value = false // false isFlipping.value = false // false
frontTextFromData.value = back frontTextFromData.value = back
}, props.duration) }, props.duration)
@ -86,6 +98,7 @@ $radius: v-bind('`${props.radius}px`');
$width: v-bind('`${props.width}px`'); $width: v-bind('`${props.width}px`');
$height: v-bind('`${props.height}px`'); $height: v-bind('`${props.height}px`');
$perspective: v-bind('`${props.height * 2}px`'); $perspective: v-bind('`${props.height * 2}px`');
$borderWidth: v-bind('`${props.borderWidth * 2}px`');
$speed: v-bind('`${props.duration / 1000}s`'); $speed: v-bind('`${props.duration / 1000}s`');
$shadowColor: #000000; $shadowColor: #000000;
$lineColor: #4a9ef8; $lineColor: #4a9ef8;
@ -125,13 +138,12 @@ $lineColor: #4a9ef8;
} }
// #endregion // #endregion
.go-Flipper { .go-flipper {
display: inline-block; display: inline-block;
position: relative; position: relative;
width: $width; width: $width;
height: $height; height: $height;
line-height: $height; line-height: $height;
border: solid 1px $backColor;
border-radius: $radius; border-radius: $radius;
background: $frontColor; background: $frontColor;
font-size: $width; font-size: $width;
@ -139,6 +151,17 @@ $lineColor: #4a9ef8;
box-shadow: 0 0 6px rgba($color: $shadowColor, $alpha: 0.5); // box-shadow: 0 0 6px rgba($color: $shadowColor, $alpha: 0.5); //
text-align: center; text-align: center;
// font-family: 'Helvetica Neue'; // font-family: 'Helvetica Neue';
&::after {
content: '';
position: absolute;
z-index: 10;
left: 0;
top: 0;
right: 0;
bottom: 0;
box-shadow: inset 0 0 $borderWidth 0 $frontColor; //
border-radius: $radius;
}
.digital:before, .digital:before,
.digital:after { .digital:after {
@ -186,11 +209,13 @@ $lineColor: #4a9ef8;
&.down.go .front:before { &.down.go .front:before {
transform-origin: 50% 100%; transform-origin: 50% 100%;
animation: frontFlipDown $speed ease-in-out both; animation: frontFlipDown $speed ease-in-out both;
box-shadow: 0 -2px 6px rgba($color: $lineColor, $alpha: 0.3); box-shadow: 0 -2px $borderWidth 0 $frontColor;
backface-visibility: hidden; backface-visibility: hidden;
} }
&.down.go .back:after { &.down.go .back:after {
animation: backFlipDown $speed ease-in-out both; animation: backFlipDown $speed ease-in-out both;
box-shadow: 0 2px $borderWidth 0 $frontColor;
backface-visibility: hidden;
} }
/*向上翻*/ /*向上翻*/
&.up .front:after { &.up .front:after {
@ -208,11 +233,13 @@ $lineColor: #4a9ef8;
&.up.go .front:after { &.up.go .front:after {
transform-origin: 50% 0; transform-origin: 50% 0;
animation: frontFlipUp $speed ease-in-out both; animation: frontFlipUp $speed ease-in-out both;
box-shadow: 0 2px 6px rgba($color: $lineColor, $alpha: 0.3); box-shadow: 0 2px $borderWidth 0 $frontColor;
backface-visibility: hidden; backface-visibility: hidden;
} }
&.up.go .back:before { &.up.go .back:before {
animation: backFlipUp $speed ease-in-out both; animation: backFlipUp $speed ease-in-out both;
box-shadow: 0 -2px $borderWidth 0 $frontColor;
backface-visibility: hidden;
} }
} }
</style> </style>

View File

@ -16,6 +16,7 @@ export interface OptionType {
flipperGap: number flipperGap: number
flipperType: FlipType flipperType: FlipType
flipperSpeed: number flipperSpeed: number
flipperBorderWidth: number
} }
export const option: OptionType = { export const option: OptionType = {
@ -28,7 +29,8 @@ export const option: OptionType = {
flipperRadius: 5, flipperRadius: 5,
flipperGap: 10, flipperGap: 10,
flipperType: 'down', flipperType: 'down',
flipperSpeed: 450 flipperSpeed: 450,
flipperBorderWidth: 0,
} }
export default class Config extends PublicConfigClass implements CreateComponentType { export default class Config extends PublicConfigClass implements CreateComponentType {

View File

@ -16,12 +16,16 @@
<setting-item name="高度"> <setting-item name="高度">
<n-input-number v-model:value="optionData.flipperHeight" size="small" :min="1"></n-input-number> <n-input-number v-model:value="optionData.flipperHeight" size="small" :min="1"></n-input-number>
</setting-item> </setting-item>
<setting-item name="间隔"> <setting-item name="边框">
<n-input-number v-model:value="optionData.flipperGap" size="small" :min="0"></n-input-number> <n-input-number v-model:value="optionData.flipperBorderWidth" size="small" :min="0" :max="10"></n-input-number>
</setting-item> </setting-item>
<setting-item name="圆角"> <setting-item name="圆角">
<n-input-number v-model:value="optionData.flipperRadius" size="small" :min="0"></n-input-number> <n-input-number v-model:value="optionData.flipperRadius" size="small" :min="0"></n-input-number>
</setting-item> </setting-item>
<setting-item name="翻牌间隔">
<n-input-number v-model:value="optionData.flipperGap" size="small" :min="0"></n-input-number>
</setting-item>
<setting-item />
<setting-item name="背景色"> <setting-item name="背景色">
<n-color-picker <n-color-picker
size="small" size="small"

View File

@ -9,6 +9,7 @@
:radius="flipperRadius" :radius="flipperRadius"
:flip-type="flipperType" :flip-type="flipperType"
:duration="flipperSpeed" :duration="flipperSpeed"
:border-width="flipperBorderWidth"
v-for="(item, index) in flipperData" v-for="(item, index) in flipperData"
:key="index" :key="index"
class="go-d-block" class="go-d-block"
@ -42,7 +43,8 @@ const {
flipperRadius, flipperRadius,
flipperGap, flipperGap,
flipperType, flipperType,
flipperSpeed flipperSpeed,
flipperBorderWidth
} = toRefs(props.chartConfig.option as OptionType) } = toRefs(props.chartConfig.option as OptionType)
const flipperData = ref<string[] | number[]>([]) const flipperData = ref<string[] | number[]>([])

View File

@ -1,4 +1,3 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-nocheck // @ts-nocheck
import { import {
ArcCurve, ArcCurve,