From 9a99a144fb916b1b692831ef212fd98d5ecadebc Mon Sep 17 00:00:00 2001
From: Souma-Sumire <553469159@qq.com>
Date: Fri, 29 Nov 2024 06:42:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(timeline):=20=E7=94=A8=E6=88=B7=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=BF=87=E5=BF=AB=E6=97=B6=E6=96=87=E6=9C=AC=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=20&=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20&=20=E7=94=9F=E6=88=90=E5=90=8E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=9C=AA=E5=9B=9E=E5=88=B0=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/timeline/FflogsImport.vue | 24 ++++++++++++++----------
 src/resources/actionChinese.json         |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/timeline/FflogsImport.vue b/src/components/timeline/FflogsImport.vue
index d7ab15f3..ca3c2d33 100644
--- a/src/components/timeline/FflogsImport.vue
+++ b/src/components/timeline/FflogsImport.vue
@@ -2,7 +2,7 @@
 import axios from 'axios'
 import '@sweetalert2/theme-bootstrap-4/bootstrap-4.scss'
 import type { Job } from 'cactbot/types/job'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessageBox } from 'element-plus'
 import { factory } from '@/utils/timelineSpecialRules'
 import type {
   FFlogsApiV1ReportEvents,
@@ -49,6 +49,7 @@ const inputUrl = ref('')
 const addTTS = ref(false)
 const isLoading = ref(false)
 const currentStep = ref(0)
+const confirmEnabled = ref(false)
 
 const fflogsQueryConfig = reactive({} as FFlogsQuery)
 claerFFlogsQueryConfig()
@@ -158,6 +159,7 @@ async function handleFFlogsQueryResultFriendliesList(player: Friendlies) {
 
 // fflogs导入第3步：通过API获取选定玩家所有casts
 async function queryFFlogsReportEvents() {
+  confirmEnabled.value = false
   const resEvents: FFlogsApiV1ReportEvents[] = []
   fflogsQueryConfig.abilityFilterEvents.length = 0
   async function queryFriendly(startTime: number) {
@@ -236,6 +238,7 @@ async function queryFFlogsReportEvents() {
     fflogsQueryConfig.abilityFilterSelected
       = props.filters[fflogsQueryConfig.player.icon]
   }
+  confirmEnabled.value = true
 }
 
 // fflogs导入第4步：用户选好了过滤器
@@ -298,12 +301,7 @@ function handeleFFlogsQueryResultFriendiesListFilter() {
   )
   claerFFlogsQueryConfig()
   emits('showFFlogsToggle')
-  ElMessage({
-    message: '已生成新时间轴',
-    type: 'success',
-    duration: 1500,
-  })
-  currentStep.value = 1
+  currentStep.value = 0
   isLoading.value = false
 }
 
@@ -329,13 +327,19 @@ function openFFLogsProfile() {
 </script>
 
 <template>
+  <el-button
+    position-absolute
+    z-999
+    :style="currentStep > 0 ? {} : { visibility: 'hidden', pointerEvent: 'none' }" type="primary" text class="guide" @click="currentStep--"
+  >
+    上一步
+  </el-button>
   <el-steps :active="currentStep" class="steps-guide" align-center>
     <el-step title="输入链接" />
     <el-step title="选择玩家" />
     <el-step title="过滤技能" />
     <el-step title="生成时间轴" />
   </el-steps>
-
   <el-card v-if="currentStep === 0" class="input-section">
     <el-form label-width="150px" class="fflogs-form">
       <el-form-item label="FF logs 战斗链接">
@@ -431,8 +435,8 @@ function openFFLogsProfile() {
             <span>{{ rule.actionName }}</span>
           </el-option>
         </el-select>
-        <el-button type="success" class="filter-confirm-btn" @click="handeleFFlogsQueryResultFriendiesListFilter">
-          生成时间轴
+        <el-button type="success" class="filter-confirm-btn" :disabled="!confirmEnabled" @click="handeleFFlogsQueryResultFriendiesListFilter">
+          {{ confirmEnabled ? '生成时间轴' : '加载中...' }}
         </el-button>
       </div>
     </el-card>
diff --git a/src/resources/actionChinese.json b/src/resources/actionChinese.json
index 50201bd7..e322951f 100644
--- a/src/resources/actionChinese.json
+++ b/src/resources/actionChinese.json
@@ -36395,10 +36395,10 @@
   "40134": "雷燃爆",
   "40135": "爆炸",
   "40136": "大爆炸",
-  "40137": "罪土之刃",
+  "40137": "罪裁断",
   "40138": "急冲刺",
   "40139": "罪炎",
-  "40140": "罪土之刃",
+  "40140": "罪裁断",
   "40141": "急冲刺",
   "40142": "罪雷",
   "40143": "弓形冲波",