From f5e4019ac8737f3a9695e08b506dae30b3453e6a Mon Sep 17 00:00:00 2001
From: warlock <1163675107@qq.com>
Date: Fri, 20 Nov 2020 21:03:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?[delete]=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/s.png                | Bin 3722 -> 0 bytes
 src/layout/toolBar/index.vue    |   2 +-
 src/layout/trackBlock/index.vue |   2 +
 src/views/MainPage/index.vue    |  89 ++++++++++++++++++--------------
 4 files changed, 54 insertions(+), 39 deletions(-)
 delete mode 100644 src/assets/s.png

diff --git a/src/assets/s.png b/src/assets/s.png
deleted file mode 100644
index 3e26a4228d98f75fe5d7883c959631f91ee4aba2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3722
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

diff --git a/src/layout/toolBar/index.vue b/src/layout/toolBar/index.vue
index dcfe9c4..4fd18c0 100644
--- a/src/layout/toolBar/index.vue
+++ b/src/layout/toolBar/index.vue
@@ -143,7 +143,7 @@ export default {
             url: reader.result,
             name: file.name.slice(-10)
           });
-          self.$emit("events", "insert", self.imgList); //似乎没有意义
+          self.$emit("events", "insert", self.imgList);
         },
         false
       );
diff --git a/src/layout/trackBlock/index.vue b/src/layout/trackBlock/index.vue
index 86e4303..2266d67 100644
--- a/src/layout/trackBlock/index.vue
+++ b/src/layout/trackBlock/index.vue
@@ -31,8 +31,10 @@
         >
       </div>
       <div id="plusBtn" @click="addFrame">+</div>
+
     </div>
 
+
     <el-dialog :title="formData.type" :visible.sync="dialogVisible" width="30%">
       <form ref="addForm" id="addForm">
         <div class="form-item">
diff --git a/src/views/MainPage/index.vue b/src/views/MainPage/index.vue
index 1a90f22..744f738 100644
--- a/src/views/MainPage/index.vue
+++ b/src/views/MainPage/index.vue
@@ -44,35 +44,40 @@
 <script>
 import Layout from "@/layout/index";
 import drawTools from "@/utils/draw.js";
-import { CreateImportCode, pointShake, sayManger } from "@/utils/index.js";
+import {
+  CreateImportCode,
+  pointShake,
+  sayManger,
+} from "@/utils/index.js";
 
 export default {
   name: "",
   data() {
     return {
       resolution: [800, 400],
-      points: [
-        {
-          order: 0,
-          time: new Date(0),
-          data: [],
-          cache: [],
-          finish: false
-        }
+      tracksData: [
+        [
+          {
+            order: 0,
+            time: new Date(0),
+            data: [],
+            cache: [],
+            finish: false
+          }
+        ],
+        [
+          {
+            order: 0,
+            time: new Date(0),
+            data: [],
+            cache: [],
+            finish: false
+          }
+        ]
       ],
-      // tracksData: [
-      //   [
-      //     {
-      //       order: 0,
-      //       time: new Date(0),
-      //       data: [],
-      //       cache: [],
-      //       finish: false
-      //     }
-      //   ]
-      // ],
-      target: 0,
-      // trackTarget:0,
+      targets: [0],
+      trackTarget: 0,
+
       image: null,
       layer: 1, //1绘图层 0图片层
       imgList: null,
@@ -94,26 +99,35 @@ export default {
       } else {
         return `z-index:10`;
       }
+    },
+    curData:function(){
+      return this.curPoints[this.curTarget]
+    },
+    curTarget:function(){
+      return this.targets[this.trackTarget];
+    },
+    curPoints:function(){
+      return this.tracksData[this.trackTarget];
     }
   },
   methods: {
     draw: function(command) {
-      drawTools.draw(this.points, this.target, this.$refs.canvas, command);
+      drawTools.draw(this.curPoints, this.curTarget, this.$refs.canvas, command);
     },
     frameDelivery: function(m) {
-      this.points.push({
-        order: this.points.length,
+      this.curPoints.push({
+        order: this.curPoints.length,
         time: m,
         data: [],
         finish: false
       });
     },
     choiceTarget: function(m) {
-      this.target = m;
+      this.$set(this.targets,this.trackTarget,m);
       this.draw();
     },
     changeFrame: function(item) {
-      this.points[item.order].time = item.time;
+      this.curPoints[item.order].time = item.time;
     },
 
     importCode: function() {
@@ -134,21 +148,22 @@ export default {
     createCode: function() {
       //创建导出代码
       let cache = [];
-      for (const item of this.points) {
+      let curPoints=this.curPoints; //它是个引用类型的对象
+      for (const item of curPoints) {
         //去除最后一个点，因为它实际上是废的,clip-path不需要闭合点坐标
         cache.push(item.data.pop());
       }
-      this.points = this.points.sort((a, b) => {
+      curPoints = curPoints.sort((a, b) => {
         return a.time - b.time;
       });
-      this.points = pointShake(this.points);
+      curPoints = pointShake(curPoints);
       let result = CreateImportCode({
-        points: this.points,
+        points: this.curPoints,
         viewX: this.resolution[0],
         viewY: this.resolution[1]
       });
-      for (let index in this.points) {
-        if (cache[index]) this.points[index].data.push(cache[index]);
+      for (let index in curPoints) {
+        if (cache[index]) curPoints[index].data.push(cache[index]);
       }
       return result;
     },
@@ -160,7 +175,7 @@ export default {
     },
     controlStep: function(mode) {
       //0撤回 1前进
-      let p = this.points[this.target];
+      let p = this.curPoints[this.curTarget];
       if (mode == 0) {
         if (p.data.length != 0) {
           p.cache.push(p.data.pop());
@@ -218,14 +233,13 @@ export default {
   mounted() {
     let c = this.$refs.canvas;
     let self = this;
-
     c.addEventListener(
       "click",
       function(e) {
         if (self.layer == 0 || e.target.className == "img-item") return; //图片层则不绘画||防误触
 
-        let target = self.target;
-        let p = self.points[target]; //当前帧目标数据
+        let target = self.curTarget
+        let p = self.curData //当前帧目标数据
         p.cache = []; //下笔时清空点缓存区数据
         //绘画函数
         if (p.finish == true) return; //如果完成了则直接结束
@@ -253,7 +267,6 @@ export default {
       true
     );
     window.onresize = () => {
-      //并无软用
       let c = this.$refs.canvas;
       let db = this.$refs.drawBlock;
       let maxHeight = db.clientHeight - 15;

From 1b548c21f4f06319745848c23aa241ff9c4deec4 Mon Sep 17 00:00:00 2001
From: libenc <75132456+libenc@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:38:06 +0000
Subject: [PATCH 2/5] Add workflow for pages deployment (dev branch)

---
 .github/workflows/deploy.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..c6fd208
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,27 @@
+name: Build and Deploy (dev branch)
+on: 
+  push:
+    branches: 
+      - dev
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2.3.1 
+        with:
+          persist-credentials: false
+
+      - name: Install and Build 
+        run: |
+          npm install
+          npm run build
+
+      - name: Deploy 
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: dev-pages 
+          FOLDER: dist 
+          CLEAN: true 
+

From f1fa9b191b7f91a7f3bfa946ca4b6fb0179b4c2f Mon Sep 17 00:00:00 2001
From: libenc <75132456+libenc@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:38:59 +0000
Subject: [PATCH 3/5] Modified for pages deployment

---
 vue.config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vue.config.js b/vue.config.js
index a1743a0..081985c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,7 @@
 
 module.exports = {
   lintOnSave: false,
+  publicPath: process.env.NODE_ENV === 'production'
+    ? '/easy-animation/'
+    : '/'
 }

From dc01f4702f14b12f6379664102fac065dca51ebd Mon Sep 17 00:00:00 2001
From: libenc <75132456+libenc@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:45:46 +0000
Subject: [PATCH 4/5] Exclude the deployment workflow

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9ec7d9f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.github/workflows merge=ours

From 3f5a83239e02866fba6522e4175db0ae2b06a2ec Mon Sep 17 00:00:00 2001
From: libenc <75132456+libenc@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:45:46 +0000
Subject: [PATCH 5/5] Exclude the deployment workflow

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 9ec7d9f..25e7fbf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.github/workflows merge=ours
+.github/workflows/ merge=ours