From de4b93eb85352eb9e814fbfc9d41a7e6664640eb Mon Sep 17 00:00:00 2001
From: OBKoro1 <1677593011@qq.com>
Date: Mon, 31 Aug 2020 11:32:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B6=85=E8=BF=87=E4=B8=80=E5=AE=9A?=
 =?UTF-8?q?=E5=A4=A9=E6=95=B0=E8=8C=83=E5=9B=B4=E5=86=85=EF=BC=8C=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BA=E9=83=A8=E5=88=86=E5=A4=A9=E6=95=B0=E4=B8=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/commitHandle.ts | 25 ++++++++++++++----
 src/views/autoCommit.html  | 52 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/models/commitHandle.ts b/src/models/commitHandle.ts
index 6578837..8dd471f 100644
--- a/src/models/commitHandle.ts
+++ b/src/models/commitHandle.ts
@@ -1,9 +1,9 @@
 /*
  * Author       : OBKoro1
  * Date         : 2019-12-30 16:59:30
- * @LastEditors  : OBKoro1
- * @LastEditTime : 2020-01-15 11:46:52
- * FilePath     : /autoCommit/src/models/commitHandle.ts
+ * LastEditors  : OBKoro1
+ * LastEditTime : 2020-08-29 14:21:47
+ * FilePath     : \autoCommit\src\models\commitHandle.ts
  * Description  : commit 具体操作
  * https://github.com/OBKoro1
  */
@@ -34,11 +34,13 @@ interface dayTime {
 
 class CommitHandle {
   public paramsObj: any;
+  public moreObj: any;
   public timeArr: Array<dayTime>;
   public autoCommitView: WebView;
   private userCancel: boolean;
   constructor(message: webviewMsg) {
-    this.paramsObj = message.data;
+    this.paramsObj = message.data.form;
+    this.moreObj = message.data.moreObj;
     this.timeArr = [];
     console.log('seb',sep)
     this.timeHandle();
@@ -88,7 +90,20 @@ class CommitHandle {
         }
       }
     );
-    this.commitFn();
+    this.deleteDayArrDay()
+    this.commitFn()
+  }
+  // 随机删除日期数组中的某几天
+  deleteDayArrDay() {
+    const noCommitDay = this.moreObj.noCommitDay
+    const scopeDay = this.moreObj.scopeDay
+    if(scopeDay < 1 || noCommitDay < 1) return // 必须大于1
+    if(scopeDay > this.timeArr.length) return // 日期不够
+    // 删除
+    for(let i = 0; i < noCommitDay; i++){
+       let ranDomNum = Math.floor(Math.random() * this.timeArr.length); // 随机数
+       this.timeArr.splice(ranDomNum, 1);
+     }
   }
   async commitFn() {
     await outputLog('将要commit的日期:', JSON.stringify(this.timeArr));
diff --git a/src/views/autoCommit.html b/src/views/autoCommit.html
index fd882c7..f9a1699 100644
--- a/src/views/autoCommit.html
+++ b/src/views/autoCommit.html
@@ -43,6 +43,32 @@
             <el-input class="input_form" v-model="form.commitMsg" @change="commitMsgChange"></el-input>
             </el-input>
           </el-form-item>
+          <el-form-item class="form_item">
+            <label slot="label">
+              <el-tooltip class="item" content="更多细节设置" placement="top-start">
+                <span>更多设置 :</span>
+              </el-tooltip>
+            </label>
+            <el-switch
+              @change="switchChange"
+              v-model="more"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
+
+          <el-form-item class="form_item" v-if="more">
+            <label slot="label">
+              <el-tooltip class="item" content="间隔一定时间范围不提交commit几天，这样看起来更逼真" placement="top-start">
+                <span>间隔提交 :</span>
+              </el-tooltip>
+            </label>
+            <span>超出时间范围:</span>
+            <el-input-number v-model="moreObj.scopeDay" :step="1" :min="0"  size="mini"></el-input-number>
+            <span>超出这个范围随机不提交天数：</span>
+            <el-input-number v-model="moreObj.noCommitDay" :step="1" :min="0"  size="mini"></el-input-number>
+          </el-form-item>
+          
           <el-form-item class="form_item" prop="commitNumber">
             <label slot="label">
               <el-tooltip class="item" content="时间范围内默认每个日期是否随机commit" placement="top-start">
@@ -186,7 +212,7 @@
               commitNumber: 0
             }
           ],
-          commitNumber: 10,
+          commitNumber: 10
         },
         rules: {
           'itemSrc': [
@@ -213,6 +239,12 @@
               required: true
             }
           ]
+        },
+        // 更多设置
+        more: false,
+        moreObj: {
+         scopeDay: 0, // 多长的时间范围
+         noCommitDay: 0, // 这段时间不提交几天
         }
       };
     },
@@ -241,9 +273,25 @@
         if(isWeb){
           this.mockLog()
         }else{
-          this.postMessage('commit', this.form);
+          const params = { 
+            form: this.form,
+            moreObj: this.moreObj
+          }
+          this.postMessage('commit', params);
         }
       },
+      // 验证表单数据
+      checkData() {
+        if(this.moreObj.scopeDay !== 0 && this.moreObj.scopeDay === this.moreObj.noCommitDay){
+          this.$message({
+              type: 'error',
+              showClose: true,
+              message:  `更多设置中日期范围和不提交天数不能相同`,
+            });
+            return false
+        }
+        return true
+      },
       // 发送消息到插件
       postMessage(command, data) {
         vscode.postMessage({