From 51dbe2363c85450982cff0a3fde2bc2c9ce71242 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Thu, 13 Oct 2022 16:33:51 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AF=B7=E6=B1=82modal=EF=BC=8Cesc=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=90=8E=E6=97=A0=E6=B3=95=E5=86=8D=E6=AC=A1=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=96=E6=B6=88=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ChartDataRequest/index.vue       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.vue
index 21511961..7e2d600e 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <n-modal class="go-chart-data-request" v-model:show="modelShow" :mask-closable="false">
+  <n-modal class="go-chart-data-request" v-model:show="modelShow" :mask-closable="false" @esc="closeHandle">
     <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 800px">
       <template #header></template>
       <template #header-extra> </template>
@@ -17,9 +17,14 @@
           <div>
             <n-text>「 {{ chartConfig.categoryName }} 」</n-text>
             <n-text>—— </n-text>
-            <n-tag type="primary" :bordered="false" style="border-radius: 5px"> {{ requestContentTypeObj[requestContentType] }} </n-tag>
+            <n-tag type="primary" :bordered="false" style="border-radius: 5px">
+              {{ requestContentTypeObj[requestContentType] }}
+            </n-tag>
           </div>
-          <n-button type="primary" @click="closeHandle">保存 & 发送请求</n-button>
+          <n-space>
+            <n-button size="medium" @click="closeHandle">取消</n-button>
+            <n-button size="medium" type="primary" @click="saveHandle">保存 & 发送请求</n-button>
+          </n-space>
         </n-space>
       </template>
     </n-card>
@@ -48,8 +53,14 @@ defineProps({
   modelShow: Boolean
 })
 
+// 关闭
 const closeHandle = () => {
   emit('update:modelShow', false)
+}
+
+// 保存|发送
+const saveHandle = () => {
+  emit('update:modelShow', false)
   emit('sendHandle')
 }
 </script>

From fe1f8a973666c1a9fde4f3350810037e570a8425 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Thu, 13 Oct 2022 18:41:00 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20eslint=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=88=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?eslint=E6=B3=A8=E9=87=8A=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts b/src/packages/components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts
index 76db98fc..cc328529 100644
--- a/src/packages/components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts
+++ b/src/packages/components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import {
   ArcCurve,

From d5708546b769dc26b2563dc639b0bc3af4740020 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Sun, 14 May 2023 12:09:38 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E7=BF=BB?=
 =?UTF-8?q?=E7=89=8C=E5=80=BC=E5=8F=98=E5=8C=96=E5=A4=AA=E5=BF=AB=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pages/Flipper/index.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Pages/Flipper/index.vue b/src/components/Pages/Flipper/index.vue
index 9b2c6282..122f6d59 100644
--- a/src/components/Pages/Flipper/index.vue
+++ b/src/components/Pages/Flipper/index.vue
@@ -1,5 +1,5 @@
 <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 back" :data-back="backTextFromData"></div>
   </div>
@@ -7,7 +7,7 @@
 
 <script lang="ts" setup>
 import { ref, PropType, watch } from 'vue'
-import { FlipType }  from './index'
+import { FlipType } from './index'
 
 const props = defineProps({
   flipType: {
@@ -50,19 +50,26 @@ const isFlipping = ref(false)
 const frontTextFromData = ref(props.count || 0)
 const backTextFromData = ref(props.count || 0)
 
+let timeoutID: any = 0
+
 // 翻牌
 const flip = (front: string | number, back: string | number) => {
-  // 如果处于翻转中，则不执行
-  if (isFlipping.value) return
   // 设置翻盘前后数据
   backTextFromData.value = back
   frontTextFromData.value = front
 
+  // 如果处于翻转中，则不执行
+  if (isFlipping.value) {
+    isFlipping.value = false // 立即结束此次动画
+    clearTimeout(timeoutID) // 清除上一个计时器任务
+    flip(front, back) // 开始最后一次翻牌任务
+    return
+  }
   // 设置翻转状态为true
   isFlipping.value = true
 
   // 翻牌结束的行为
-  setTimeout(() => {
+  timeoutID = setTimeout(() => {
     isFlipping.value = false // 设置翻转状态为false
     frontTextFromData.value = back
   }, props.duration)
@@ -125,7 +132,7 @@ $lineColor: #4a9ef8;
 }
 // #endregion
 
-.go-Flipper {
+.go-flipper {
   display: inline-block;
   position: relative;
   width: $width;

From 02c1bd30e38bf1ad0ceb7d20001fdaeb992b3f27 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Sun, 14 May 2023 12:12:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E7=BF=BB=E7=89=8C=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=A2=9E=E5=8A=A0=E5=86=85=E9=98=B4=E5=BD=B1=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E5=B1=9E=E6=80=A7=E5=8F=8A=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pages/Flipper/index.vue          | 17 ++++++++++++++++-
 .../Decorates/Mores/FlipperNumber/config.ts     |  4 +++-
 .../Decorates/Mores/FlipperNumber/config.vue    |  8 ++++++--
 .../Decorates/Mores/FlipperNumber/index.vue     |  4 +++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/Pages/Flipper/index.vue b/src/components/Pages/Flipper/index.vue
index 122f6d59..0ba14435 100644
--- a/src/components/Pages/Flipper/index.vue
+++ b/src/components/Pages/Flipper/index.vue
@@ -43,6 +43,10 @@ const props = defineProps({
   backColor: {
     type: String,
     default: '#000000'
+  },
+  borderWidth: {
+    type: Number,
+    default: 2
   }
 })
 
@@ -93,6 +97,7 @@ $radius: v-bind('`${props.radius}px`');
 $width: v-bind('`${props.width}px`');
 $height: v-bind('`${props.height}px`');
 $perspective: v-bind('`${props.height * 2}px`');
+$borderWidth: v-bind('`${props.borderWidth * 2}px`');
 $speed: v-bind('`${props.duration / 1000}s`');
 $shadowColor: #000000;
 $lineColor: #4a9ef8;
@@ -138,7 +143,6 @@ $lineColor: #4a9ef8;
   width: $width;
   height: $height;
   line-height: $height;
-  border: solid 1px $backColor;
   border-radius: $radius;
   background: $frontColor;
   font-size: $width;
@@ -146,6 +150,17 @@ $lineColor: #4a9ef8;
   box-shadow: 0 0 6px rgba($color: $shadowColor, $alpha: 0.5); // 阴影部分
   text-align: center;
   // 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:after {
diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.ts b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts
index 36a04377..44856128 100644
--- a/src/packages/components/Decorates/Mores/FlipperNumber/config.ts
+++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts
@@ -16,6 +16,7 @@ export interface OptionType {
   flipperGap: number
   flipperType: FlipType
   flipperSpeed: number
+  flipperBorderWidth: number
 }
 
 export const option: OptionType = {
@@ -28,7 +29,8 @@ export const option: OptionType = {
   flipperRadius: 5,
   flipperGap: 10,
   flipperType: 'down',
-  flipperSpeed: 450
+  flipperSpeed: 450,
+  flipperBorderWidth: 0,
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.vue b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue
index f2c65a96..91d4450a 100644
--- a/src/packages/components/Decorates/Mores/FlipperNumber/config.vue
+++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue
@@ -16,12 +16,16 @@
       <setting-item name="高度">
         <n-input-number v-model:value="optionData.flipperHeight" size="small" :min="1"></n-input-number>
       </setting-item>
-      <setting-item name="间隔">
-        <n-input-number v-model:value="optionData.flipperGap" size="small" :min="0"></n-input-number>
+      <setting-item name="边框">
+        <n-input-number v-model:value="optionData.flipperBorderWidth" size="small" :min="0" :max="10"></n-input-number>
       </setting-item>
       <setting-item name="圆角">
         <n-input-number v-model:value="optionData.flipperRadius" size="small" :min="0"></n-input-number>
       </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="背景色">
         <n-color-picker
           size="small"
diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/index.vue b/src/packages/components/Decorates/Mores/FlipperNumber/index.vue
index 8743fdbd..9e5c0ca2 100644
--- a/src/packages/components/Decorates/Mores/FlipperNumber/index.vue
+++ b/src/packages/components/Decorates/Mores/FlipperNumber/index.vue
@@ -9,6 +9,7 @@
       :radius="flipperRadius"
       :flip-type="flipperType"
       :duration="flipperSpeed"
+      :border-width="flipperBorderWidth"
       v-for="(item, index) in flipperData"
       :key="index"
       class="go-d-block"
@@ -42,7 +43,8 @@ const {
   flipperRadius,
   flipperGap,
   flipperType,
-  flipperSpeed
+  flipperSpeed,
+  flipperBorderWidth
 } = toRefs(props.chartConfig.option as OptionType)
 
 const flipperData = ref<string[] | number[]>([])

From f9c3d978f059898e3d0646516de1af5b4f2d36c7 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Sun, 14 May 2023 12:34:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E5=BF=AB=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E5=8F=8D?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pages/Flipper/index.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/Pages/Flipper/index.vue b/src/components/Pages/Flipper/index.vue
index 0ba14435..9de9c0d1 100644
--- a/src/components/Pages/Flipper/index.vue
+++ b/src/components/Pages/Flipper/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, PropType, watch } from 'vue'
+import { ref, PropType, watch, nextTick } from 'vue'
 import { FlipType } from './index'
 
 const props = defineProps({
@@ -57,18 +57,19 @@ const backTextFromData = ref(props.count || 0)
 let timeoutID: any = 0
 
 // 翻牌
-const flip = (front: string | number, back: string | number) => {
-  // 设置翻盘前后数据
-  backTextFromData.value = back
-  frontTextFromData.value = front
-
+const flip = async (front: string | number, back: string | number) => {
   // 如果处于翻转中，则不执行
   if (isFlipping.value) {
     isFlipping.value = false // 立即结束此次动画
     clearTimeout(timeoutID) // 清除上一个计时器任务
-    flip(front, back) // 开始最后一次翻牌任务
+    await nextTick()
+    await flip(front, back) // 开始最后一次翻牌任务
     return
   }
+
+  // 设置翻盘前后数据
+  backTextFromData.value = back
+  frontTextFromData.value = front
   // 设置翻转状态为true
   isFlipping.value = true
 

From 5094c178316cb85c9621196846ade0ac297935c4 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Sun, 14 May 2023 13:03:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?style:=20=E5=8A=A0=E9=87=8D=E7=BF=BB?=
 =?UTF-8?q?=E7=89=8C=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pages/Flipper/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Pages/Flipper/index.vue b/src/components/Pages/Flipper/index.vue
index 9de9c0d1..1bd23996 100644
--- a/src/components/Pages/Flipper/index.vue
+++ b/src/components/Pages/Flipper/index.vue
@@ -209,11 +209,13 @@ $lineColor: #4a9ef8;
   &.down.go .front:before {
     transform-origin: 50% 100%;
     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;
   }
   &.down.go .back:after {
     animation: backFlipDown $speed ease-in-out both;
+    box-shadow: 0 2px $borderWidth 0 $frontColor;
+    backface-visibility: hidden;
   }
   /*向上翻*/
   &.up .front:after {
@@ -231,11 +233,13 @@ $lineColor: #4a9ef8;
   &.up.go .front:after {
     transform-origin: 50% 0;
     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;
   }
   &.up.go .back:before {
     animation: backFlipUp $speed ease-in-out both;
+    box-shadow: 0 -2px $borderWidth 0 $frontColor;
+    backface-visibility: hidden;
   }
 }
 </style>