From de3a28fe4744a68adf377de3b9723919d5923fbe Mon Sep 17 00:00:00 2001
From: zhoujiaxing <xinggelaile@foxmail.com>
Date: Fri, 4 Dec 2020 17:49:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20todoList=E7=BC=96=E8=BE=91=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=9C=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/admin/components/TodoList/Todo.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/admin/components/TodoList/Todo.vue b/src/views/dashboard/admin/components/TodoList/Todo.vue
index c4b3cae2..2dc80d71 100644
--- a/src/views/dashboard/admin/components/TodoList/Todo.vue
+++ b/src/views/dashboard/admin/components/TodoList/Todo.vue
@@ -61,9 +61,8 @@ export default {
       const value = e.target.value.trim()
       const { todo } = this
       if (!value) {
-        this.deleteTodo({
-          todo
-        })
+        this.deleteTodo(todo)
+        this.editing = false
       } else if (this.editing) {
         this.editTodo({
           todo,

From 33b6cee015cc1c4f3e8a430cad5dc7f291fdd369 Mon Sep 17 00:00:00 2001
From: zhoujiaxing <xinggelaile@foxmail.com>
Date: Fri, 4 Dec 2020 18:47:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update:=E5=A4=8D=E7=94=A8card-panel-col?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8B=BC=E5=86=99?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=8D=95=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/admin/components/PanelGroup.vue | 101 ++++++++++--------
 src/views/dashboard/admin/index.vue           |   4 +-
 2 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/views/dashboard/admin/components/PanelGroup.vue b/src/views/dashboard/admin/components/PanelGroup.vue
index 589236ed..42473dd9 100644
--- a/src/views/dashboard/admin/components/PanelGroup.vue
+++ b/src/views/dashboard/admin/components/PanelGroup.vue
@@ -1,54 +1,15 @@
 <template>
   <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+    <el-col v-for="(panelData,index) in panelGroupData" :key="index" :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData(panelData.name)">
+        <div :class="panelData.divClass" class="card-panel-icon-wrapper">
+          <svg-icon :icon-class="panelData.iconClass" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            New Visits
+            {{ panelData.text }}
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Messages
-          </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Purchases
-          </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Shoppings
-          </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="panelData.countTo.startVal" :end-val="panelData.countTo.endVal" :duration="panelData.countTo.duration" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -62,6 +23,56 @@ export default {
   components: {
     CountTo
   },
+  data() {
+    return {
+      panelGroupData: [
+        {
+          name: 'newVisitors',
+          divClass: 'icon-people',
+          iconClass: 'peoples',
+          text: 'New Visitors',
+          countTo: {
+            startVal: 0,
+            endVal: 102400,
+            duration: 2600
+          }
+        },
+        {
+          name: 'messages',
+          divClass: 'icon-message',
+          iconClass: 'message',
+          text: 'Messages',
+          countTo: {
+            startVal: 0,
+            endVal: 81212,
+            duration: 3000
+          }
+        },
+        {
+          name: 'purchases',
+          divClass: 'icon-money',
+          iconClass: 'money',
+          text: 'Purchases',
+          countTo: {
+            startVal: 0,
+            endVal: 9280,
+            duration: 3200
+          }
+        },
+        {
+          name: 'shoppings',
+          divClass: 'icon-shopping',
+          iconClass: 'shopping',
+          text: 'Shoppings',
+          countTo: {
+            startVal: 0,
+            endVal: 13600,
+            duration: 3600
+          }
+        }
+      ]
+    }
+  },
   methods: {
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 8cb557be..9b7a45af 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -52,7 +52,7 @@ import TodoList from './components/TodoList'
 import BoxCard from './components/BoxCard'
 
 const lineChartData = {
-  newVisitis: {
+  newVisitors: {
     expectedData: [100, 120, 161, 134, 105, 160, 165],
     actualData: [120, 82, 91, 154, 162, 140, 145]
   },
@@ -85,7 +85,7 @@ export default {
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis
+      lineChartData: lineChartData.newVisitors
     }
   },
   methods: {

From 0489d9713f3d77bc5f903aca47ecc479a9702d52 Mon Sep 17 00:00:00 2001
From: zhoujiaxing <xinggelaile@foxmail.com>
Date: Fri, 4 Dec 2020 21:13:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:enter=E4=BA=8B=E4=BB=B6=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91doneEdit,=E5=8F=88=E4=BC=9A=E5=AF=BC=E8=87=B4blur?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91,=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91doneEdit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/admin/components/TodoList/Todo.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/dashboard/admin/components/TodoList/Todo.vue b/src/views/dashboard/admin/components/TodoList/Todo.vue
index 2dc80d71..181ae5c5 100644
--- a/src/views/dashboard/admin/components/TodoList/Todo.vue
+++ b/src/views/dashboard/admin/components/TodoList/Todo.vue
@@ -58,6 +58,9 @@ export default {
       this.$emit('toggleTodo', todo)
     },
     doneEdit(e) {
+      if (!this.editing) {
+        return
+      }
       const value = e.target.value.trim()
       const { todo } = this
       if (!value) {