From ddb784fb10f6ee68b4d779df4e55b0135565969d Mon Sep 17 00:00:00 2001
From: "KyleBing(MBP14)" <kylebing@163.com>
Date: Tue, 12 Mar 2024 11:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=8E=E5=A4=B4=E9=87=8D?=
 =?UTF-8?q?=E6=89=93=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       |  4 ++++
 index.html         | 16 ++++++++++------
 js/class/Engine.js | 26 ++++++++++++++++++++++++++
 js/typepad.js      |  2 +-
 typepad-sw.js      | 34 +++++++++++++++++-----------------
 5 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47f3adf..7fbbed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### v2.67 `2024-03-12`
+- 添加从头重打按钮
+- 顶部操作按钮顺序调整
+
 ### v2.66 `2022-11-11`
 - 添加汉语词条跟打类型
 - https -> http
diff --git a/index.html b/index.html
index 40694ce..0776457 100755
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
    <title>玫枫跟打器 （Roseo Maple TypePad）</title>
    <link rel="shortcut icon" href="img/logo.png" type="image/png">
-   <link rel="stylesheet" href="scss/typepad.css?v=2.66b2">
+   <link rel="stylesheet" href="scss/typepad.css?v=2.67">
 </head>
 <body>
 
@@ -56,10 +56,10 @@
    <div class="side-menu hidden-sm">
       <div class="tool-bar jc-space-between">
          <div class="btn-group toolbar-info">
-            <div class="btn" onclick="engine.shuffleCurrent()" title="打乱当前段：⌘ + K 或 F4">打乱</div>
-            <div class="btn" onclick="engine.reset()" title="重打：⌘ + Y 或 F3">重打</div>
             <div class="btn" onclick="engine.pause()" title="离开编辑区">暂停</div>
             <div class="btn" onclick="engine.resume()" title="激活编辑区">继续</div>
+            <div class="btn" onclick="engine.shuffleCurrent()" title="打乱当前段：⌘ + K 或 F4">打乱</div>
+            <div class="btn" onclick="engine.reset()" title="重打：⌘ + Y 或 F3">重打</div>
          </div>
       </div>
 
@@ -331,8 +331,8 @@ <h1>玫枫跟打器<br>(<a target="_blank" href="https://github.com/KyleBing/typ
          </div>
          <div class="copyright">
             <a target="_blank" href="http://kylebing.cn" class="link">KyleBing</a>
-            <p>v2.66</p>
-            <p>2022.11.25</p>
+            <p>v2.67</p>
+            <p>2024.03.12</p>
          </div>
       </div>
 
@@ -414,6 +414,10 @@ <h1>玫枫跟打器<br>(<a target="_blank" href="https://github.com/KyleBing/typ
             <div class="btn" onclick="engine.prevChapter()" title="上一段：⌘ + U 或 F1">《</div>
             <div class="btn" onclick="engine.nextChapter()" title="下一段：⌘ + J 或 F2">》</div>
          </div>
+         <div class="btn-group">
+            <div class="btn" onclick="engine.toTopChapter()" title="至第一段">|《</div>
+            <div class="btn" onclick="engine.toEndChapter()" title="至最后一段">》|</div>
+         </div>
          <div class="btn-group hidden" id="panelRepeatController">
             <div id="repeatMonitor" class="btn no-action number" onclick="engine.reset()" title="⌘ + K">
                <span id="repeatCountCurrent" class="chapter-current bold current number" title="当前重打次数">1</span> /
@@ -527,7 +531,7 @@ <h1>玫枫跟打器<br>(<a target="_blank" href="https://github.com/KyleBing/typ
 </div>
 
 <script src="js/require_v2.3.6.js"></script>
-<script src="js/typepad.js?v=2.66b2"></script>
+<script src="js/typepad.js?v=2.67"></script>
 
 <script>
    setTimeout(() => {
diff --git a/js/class/Engine.js b/js/class/Engine.js
index 68df494..8655289 100755
--- a/js/class/Engine.js
+++ b/js/class/Engine.js
@@ -294,6 +294,32 @@ define(
          }
       }
 
+      toTopChapter(){
+         this.config.repeatCountCurrent = 1;
+         this.config.chapter = 1;
+         if (this.config.articleType === ArticleType.word)  // 1. ArticleType.word
+         {
+            this.arrayWordDisplaying = this.arrayWordAll.slice(0, this.config.count * this.config.chapter); // 截取当前需要显示的数组段
+            let arrayCurrentWord = this.arrayWordDisplaying.map(item => {
+               return item.word
+            }); // 取到英文，数组
+            this.currentWords = arrayCurrentWord.join(' ');
+         } else if (this.config.articleType === ArticleType.phrase) // 2. ArticleType.phrase
+         {
+            this.arrayWordDisplaying = this.arrayWordAll.slice(0, this.config.count * this.config.chapter); // 截取当前需要显示的数组段
+            this.currentWords = this.arrayWordDisplaying.join(' ');
+         } else  // 3. ArticleType.others
+         {
+            this.currentWords = this.currentOriginWords.slice(0, this.config.count * this.config.chapter).join('');
+         }
+         this.reset();
+         this.config.save();
+      }
+      toEndChapter(){
+         this.config.chapter = this.config.chapterTotal - 1
+         this.nextChapter()
+      }
+
       // 自定义文章
       customizeArticle(){
          $('#app').style.overflow = 'hidden'
diff --git a/js/typepad.js b/js/typepad.js
index 3645a45..9d9b8cc 100755
--- a/js/typepad.js
+++ b/js/typepad.js
@@ -73,7 +73,7 @@ require(['ArticleType', 'Article', 'Engine', 'Editor'],
       // Service Worker
       if ('serviceWorker' in navigator){
          navigator.serviceWorker
-            .register('/tools/typepad/typepad-sw.js?v=2.66b2')
+            .register('/tools/typepad/typepad-sw.js?v=2.67')
             .then(()=>{
                console.log('Server Worker has registered');
             })
diff --git a/typepad-sw.js b/typepad-sw.js
index c89c420..d1b01cb 100644
--- a/typepad-sw.js
+++ b/typepad-sw.js
@@ -1,5 +1,5 @@
 const preFix = 'typepad'
-const version = '2.66b2';
+const version = '2.67';
 
 self.addEventListener('install', event => {
    self.skipWaiting();
@@ -7,28 +7,28 @@ self.addEventListener('install', event => {
       caches.open(preFix + version).then(cache => {
          return cache.addAll([
             '/tools/typepad',
-            '/tools/typepad/index.html?v=2.66b2',
-            '/tools/typepad/scss/typepad.css?v=2.66b2',
+            '/tools/typepad/index.html?v=2.67',
+            '/tools/typepad/scss/typepad.css?v=2.67',
 
             // 英文单词
-            '/tools/typepad/js/class/english-vocabulary/CET4mini.js?v=2.66b2',
+            '/tools/typepad/js/class/english-vocabulary/CET4mini.js?v=2.67',
 
             // 汉语单词
-            '/tools/typepad/js/class/phrase/Phrase.js?v=2.66b2',
+            '/tools/typepad/js/class/phrase/Phrase.js?v=2.67',
 
-            '/tools/typepad/js/class/Database.js?v=2.66b2',
-            '/tools/typepad/js/class/Utility.js?v=2.66b2',
-            '/tools/typepad/js/class/KeyCount.js?v=2.66b2',
-            '/tools/typepad/js/class/Config.js?v=2.66b2',
-            '/tools/typepad/js/class/Editor.js?v=2.66b2',
-            '/tools/typepad/js/class/Article.js?v=2.66b2',
-            '/tools/typepad/js/class/ArticleType.js?v=2.66b2',
-            '/tools/typepad/js/class/Reg.js?v=2.66b2',
-            '/tools/typepad/js/class/Engine.js?v=2.66b2',
-            '/tools/typepad/js/class/Record.js?v=2.66b2',
-            '/tools/typepad/js/class/CETWord.js?v=2.66b2',
+            '/tools/typepad/js/class/Database.js?v=2.67',
+            '/tools/typepad/js/class/Utility.js?v=2.67',
+            '/tools/typepad/js/class/KeyCount.js?v=2.67',
+            '/tools/typepad/js/class/Config.js?v=2.67',
+            '/tools/typepad/js/class/Editor.js?v=2.67',
+            '/tools/typepad/js/class/Article.js?v=2.67',
+            '/tools/typepad/js/class/ArticleType.js?v=2.67',
+            '/tools/typepad/js/class/Reg.js?v=2.67',
+            '/tools/typepad/js/class/Engine.js?v=2.67',
+            '/tools/typepad/js/class/Record.js?v=2.67',
+            '/tools/typepad/js/class/CETWord.js?v=2.67',
             '/tools/typepad/js/require_v2.3.6.js',
-            '/tools/typepad/js/typepad.js?v=2.66b2',
+            '/tools/typepad/js/typepad.js?v=2.67',
             '/tools/typepad/img/logo.png',
             '/tools/typepad/scss/font/DSDigital.ttf',
             '/tools/typepad/scss/font/Galvji.ttf',
