From 54209e9cc6ae1137d4b0263cdc647b2521ec9f6f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 22 Feb 2021 11:35:37 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js      | 10 +++++++
 .../src/components/common/language/en.js      | 10 +++++++
 .../common/project/L5/CanvasProps.vue         | 30 ++++++++-----------
 .../common/project/L5/services/canvas.js      | 27 +++++++++++++++++
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 4a1599773..25f2d13ee 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1053,6 +1053,16 @@ const cn = {
       fontColor:'字体颜色',
       align:'对齐',
       opacity:'透明度',
+      bounce:"上下跳动",
+      shakeX:'左右跳动',
+      swing:'摇摆',
+      heartBeat:'心跳',
+      flash:'闪烁',
+      fade:'若隐若现',
+      flow:'水流',
+      beads:'水珠流动',
+      dot:'圆点',
+      comet:'彗星',
     },
   },
   date:{
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 8b498e8b2..426bdd66e 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1058,6 +1058,16 @@ const en = {
       fontColor:'Font Color',
       align:'Align',
       opacity:'Opacity',
+      bounce:'bounce',
+      shakeX:'shakeX',
+      swing:'swing',
+      heartBeat:'heartBeat',
+      flash:'flash',
+      fade:'fade',
+      flow:'flow',
+      beads:'beads',
+      dot:'dot',
+      comet:'comet',
     },
   },
   date:{
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 78b1db293..85db33449 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1137,40 +1137,36 @@
           {d:'M5 14 l85 0',fill:'#ffffff',stroke:"#000000",'stroke-width':"1",cx:"10",cy:"14",r:"5",name:'circle'},
         ],
         lineAnimateOptions:[
-          {id:1,name:'水流'},
-          {id:'beads',name:'水珠流动'},
-          {id:'dot',name:'圆点'},
-          {id:'comet',name:'彗星'},
+          {id:1,name:this.$t("project.topology.flow")},
+          {id:'beads',name:this.$t("project.topology.beads")},
+          {id:'dot',name:this.$t("project.topology.dot")},
+          {id:'comet',name:this.$t("project.topology.comet")},
         ],
         nodeAnimateOptions:[
           {
             id:'upDown',
-            name:'上下跳动'
+            name:this.$t("project.topology.bounce")
           },
           {
             id:'leftRight',
-            name:'左右跳动'
+            name:this.$t("project.topology.shakeX")
           },
           {
             id:'heart',
-            name:'心跳'
-          },
-          {
-            id:'success',
-            name:'成功'
+            name:this.$t("project.topology.heartBeat")
           },
           {
             id:'warning',
-            name:'警告'
-          },
-          {
-            id:'error',
-            name:'错误'
+            name:this.$t("project.topology.flash")
           },
           {
             id:'show',
-            name:'炫耀'
+            name:this.$t("project.topology.swing")
           },
+          {
+            id:'fade',
+            name:this.$t("project.topology.fade")
+          }
         ],
       }
     },
diff --git a/nezha-fronted/src/components/common/project/L5/services/canvas.js b/nezha-fronted/src/components/common/project/L5/services/canvas.js
index 32aaaf110..ffdffcd79 100644
--- a/nezha-fronted/src/components/common/project/L5/services/canvas.js
+++ b/nezha-fronted/src/components/common/project/L5/services/canvas.js
@@ -502,6 +502,33 @@ export function onChangeAnimate(node,animateType,fillStyle,strokeStyle) {
         state: Node.cloneState(state)
       });
       break;
+    case 'fade':
+      state.strokeStyle = strokeStyle?strokeStyle: '#fa541c';
+      state.globalAlpha = 0.3;
+      node.animateFrames.push({
+        duration: 300,
+        linear: true,
+        state: Node.cloneState(state)
+      });
+      state.globalAlpha = 0.5;
+      node.animateFrames.push({
+        duration: 300,
+        linear: true,
+        state: Node.cloneState(state)
+      });
+      state.globalAlpha = 0.8;
+      node.animateFrames.push({
+        duration: 300,
+        linear: true,
+        state: Node.cloneState(state)
+      });
+      state.globalAlpha = 1;
+      node.animateFrames.push({
+        duration: 300,
+        linear: true,
+        state: Node.cloneState(state)
+      });
+      break;
   }
   node.animatePlay=true;
 }