From 41ad4b186980238061d9bf2f9ccf25b76c9588b2 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <1171051090@qq.com>
Date: Fri, 25 Dec 2020 09:49:10 +0800
Subject: [PATCH] update

---
 .../_common/_element/ImageElement/index.vue     | 12 ++----------
 .../_common/_element/TextElement/index.vue      | 17 ++++-------------
 .../_common/_element/hooks/useElementShadow.ts  |  2 +-
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/views/_common/_element/ImageElement/index.vue b/src/views/_common/_element/ImageElement/index.vue
index c5633e60..63c6f72b 100644
--- a/src/views/_common/_element/ImageElement/index.vue
+++ b/src/views/_common/_element/ImageElement/index.vue
@@ -9,7 +9,7 @@
       height: elementInfo.height + 'px',
       transform: `rotate(${elementInfo.rotate}deg)`,
     }"
-    @mousedown="handleSelectElement($event)" 
+    @mousedown="$event => handleSelectElement($event)" 
   >
     <ImageClip
       v-if="isCliping"
@@ -94,7 +94,7 @@
           :key="point.direction"
           :type="point.direction"
           :style="point.style"
-          @mousedown.stop="scaleElement($event, elementInfo, point.direction)"
+          @mousedown.stop="$event => scaleElement($event, elementInfo, point.direction)"
         />
         <RotateHandler
           class="operate-rotate-handler" 
@@ -294,14 +294,6 @@ export default defineComponent({
 .editable-element-image {
   position: absolute;
 
-  &.lock .operate-border-line {
-    border-color: #888;
-  }
-
-  &:hover .operate-border-line {
-    display: block;
-  }
-
   &.lock .element-content {
     cursor: default;
   }
diff --git a/src/views/_common/_element/TextElement/index.vue b/src/views/_common/_element/TextElement/index.vue
index 4c899a22..218a9176 100644
--- a/src/views/_common/_element/TextElement/index.vue
+++ b/src/views/_common/_element/TextElement/index.vue
@@ -8,7 +8,7 @@
       width: elementInfo.width + 'px',
       transform: `rotate(${elementInfo.rotate}deg)`,
     }"
-    @mousedown="handleSelectElement($event, false)" 
+    @mousedown="$event => handleSelectElement($event)"
   >
     <div class="element-content"
       :style="{
@@ -26,6 +26,7 @@
       <div class="text"
         v-html="elementInfo.content" 
         :contenteditable="isActive && !elementInfo.lock"
+        @mousedown="$event => handleSelectElement($event, false)"
       ></div>
     </div>
 
@@ -37,7 +38,6 @@
         'active': isActive,
       }" 
       :style="{ transform: `scale(${1 / canvasScale})` }"
-      v-contextmenu="contextmenus"
     >
       <BorderLine 
         class="operate-border-line"
@@ -45,8 +45,6 @@
         :key="line.type" 
         :type="line.type" 
         :style="line.style"
-        :isWide="true"
-        @mousedown="handleSelectElement($event)"
       />
       <template v-if="!elementInfo.lock && (isActiveGroupElement || !isMultiSelect)">
         <ResizeHandler
@@ -55,7 +53,7 @@
           :key="point.direction"
           :type="point.direction"
           :style="point.style"
-          @mousedown.stop="scaleElement($event, elementInfo, point.direction)"
+          @mousedown.stop="$event => scaleElement($event, elementInfo, point.direction)"
         />
         <RotateHandler
           class="operate-rotate-handler" 
@@ -168,14 +166,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .editable-element-text {
   position: absolute;
-
-  &.lock .operate-border-line {
-    border-color: #888;
-  }
-
-  &:hover .operate-border-line {
-    display: block;
-  }
+  cursor: move;
 
   &.lock .element-content {
     cursor: default;
diff --git a/src/views/_common/_element/hooks/useElementShadow.ts b/src/views/_common/_element/hooks/useElementShadow.ts
index 3d62aef8..3d0207e0 100644
--- a/src/views/_common/_element/hooks/useElementShadow.ts
+++ b/src/views/_common/_element/hooks/useElementShadow.ts
@@ -5,7 +5,7 @@ export default (shadow: Ref<PPTElementShadow | undefined>) => {
   let shadowStyle = ''
   if(shadow.value) {
     const { h, v, blur, color } = shadow.value
-    shadowStyle = `${h} ${v} ${blur} ${color}`
+    shadowStyle = `${h}px ${v}px ${blur}px ${color}`
   }
 
   return {