From 20d91ee4dbb805e0800d0f4f2b786fa5013e42cb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 16 Jun 2021 19:06:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=20=E3=80=90=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E3=80=91=E6=96=87=E6=9C=AC=EF=BC=8C=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      |   1 -
 .../canvas/components/Editor/index.vue        |   2 +
 .../components/canvas/components/Toolbar.vue  |   1 +
 .../canvas/custom-component/VText.vue         | 197 ++++++++++--------
 4 files changed, 117 insertions(+), 84 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 3bdf0ca834..ff5a1743bc 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -1197,7 +1197,6 @@ export default {
 
       // 如果辅助设计 需要最后调整矩阵
       if (this.canvasStyleData.auxiliaryMatrix) {
-        debugger
         this.recordMatrixCurStyle()
       }
       this.hasMove && this.$store.commit('recordSnapshot')
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index e5ac674f86..a10a64e971 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -40,6 +40,8 @@
         :prop-value="item.propValue"
         :element="item"
         :out-style="getShapeStyleInt(item.style)"
+        :edit-mode="'edit'"
+        :active="item === curComponent"
         @input="handleInput"
       />
       <component
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 6579897fff..430c970e6f 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -271,6 +271,7 @@ export default {
     float: right;
     height: 35px;
     line-height: 35px;
+    min-width: 900px;
     /*background: #fff;*/
     /*border-bottom: 1px solid #ddd;*/
 
diff --git a/frontend/src/components/canvas/custom-component/VText.vue b/frontend/src/components/canvas/custom-component/VText.vue
index 6f179ce377..7a1b979f96 100644
--- a/frontend/src/components/canvas/custom-component/VText.vue
+++ b/frontend/src/components/canvas/custom-component/VText.vue
@@ -1,99 +1,130 @@
 <template>
-    <div v-if="editMode == 'edit'" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
-        <!-- tabindex >= 0 使得双击时聚集该元素 -->
-        <div :contenteditable="canEdit" :class="{ canEdit }" @dblclick="setEdit" :tabindex="element.id" @paste="clearStyle"
-            @mousedown="handleMousedown" @blur="handleBlur" ref="text" v-html="element.propValue" @input="handleInput"
-            :style="{ verticalAlign: element.style.verticalAlign }"
-        ></div>
-    </div>
-    <div v-else class="v-text">
-        <div v-html="element.propValue" :style="{ verticalAlign: element.style.verticalAlign }"></div>
-    </div>
+  <div v-if="editMode == 'edit'" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
+    <!-- tabindex >= 0 使得双击时聚集该元素 -->
+    <div
+      ref="text"
+      :contenteditable="canEdit"
+      :class="{ canEdit }"
+      :tabindex="element.id"
+      :style="{ verticalAlign: element.style.verticalAlign }"
+      @dblclick="setEdit"
+      @paste="clearStyle"
+      @mousedown="handleMousedown"
+      @blur="handleBlur"
+      @input="handleInput"
+      v-html="element.propValue"
+    />
+  </div>
+  <div v-else class="v-text">
+    <div :style="{ verticalAlign: element.style.verticalAlign }" v-html="element.propValue" />
+  </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
 import { keycodes } from '@/components/canvas/utils/shortcutKey.js'
 
 export default {
-    props: {
-        propValue: {
-            type: String,
-            require: true,
-        },
-        element: {
-            type: Object,
-        },
+  props: {
+    propValue: {
+      type: String,
+      require: true
     },
-    data() {
-        return {
-            canEdit: false,
-            ctrlKey: 17,
-            isCtrlDown: false,
-        }
+    element: {
+      type: Object
     },
-    computed: {
-        ...mapState([
-            'editMode',
-        ]),
+    editMode: {
+      type: String,
+      require: false,
+      default: 'preview'
     },
-    methods: {
-        handleInput(e) {
-            this.$emit('input', this.element, e.target.innerHTML)
-        },
+    active: {
+      type: Boolean,
+      require: false,
+      default: false
+    }
 
-        handleKeydown(e) {
-            if (e.keyCode == this.ctrlKey) {
-                this.isCtrlDown = true
-            } else if (this.isCtrlDown && this.canEdit && keycodes.includes(e.keyCode)) {
-                e.stopPropagation()
-            } else if (e.keyCode == 46) { // deleteKey
-                e.stopPropagation()
-            }
-        },
+  },
+  data() {
+    return {
+      canEdit: false,
+      ctrlKey: 17,
+      isCtrlDown: false
+    }
+  },
+  computed: {
+  },
 
-        handleKeyup(e) {
-            if (e.keyCode == this.ctrlKey) {
-                this.isCtrlDown = false
-            }
-        },
-
-        handleMousedown(e) {
-            if (this.canEdit) {
-                e.stopPropagation()
-            }
-        },
-
-        clearStyle(e) {
-            e.preventDefault()
-            const clp = e.clipboardData
-            const text = clp.getData('text/plain') || ''
-            if (text !== '') {
-                document.execCommand('insertText', false, text)
-            }
-
-            this.$emit('input', this.element, e.target.innerHTML)
-        },
-
-        handleBlur(e) {
-            this.element.propValue = e.target.innerHTML || '&nbsp;'
-            this.canEdit = false
-        },
-
-        setEdit() {
-            this.canEdit = true
-            // 全选
-            this.selectText(this.$refs.text)
-        },
-
-        selectText(element) {
-            const selection = window.getSelection()
-            const range = document.createRange()
-            range.selectNodeContents(element)
-            selection.removeAllRanges()
-            selection.addRange(range)
-        },
+  watch: {
+    active: {
+      handler(newVal, oldVla) {
+        debugger
+        this.removeSelectText()
+      },
+      deep: true
+    }
+  },
+  methods: {
+    handleInput(e) {
+      this.$emit('input', this.element, e.target.innerHTML)
     },
+
+    handleKeydown(e) {
+      if (e.keyCode == this.ctrlKey) {
+        this.isCtrlDown = true
+      } else if (this.isCtrlDown && this.canEdit && keycodes.includes(e.keyCode)) {
+        e.stopPropagation()
+      } else if (e.keyCode == 46) { // deleteKey
+        e.stopPropagation()
+      }
+    },
+
+    handleKeyup(e) {
+      if (e.keyCode == this.ctrlKey) {
+        this.isCtrlDown = false
+      }
+    },
+
+    handleMousedown(e) {
+      if (this.canEdit) {
+        e.stopPropagation()
+      }
+    },
+
+    clearStyle(e) {
+      e.preventDefault()
+      const clp = e.clipboardData
+      const text = clp.getData('text/plain') || ''
+      if (text !== '') {
+        document.execCommand('insertText', false, text)
+      }
+
+      this.$emit('input', this.element, e.target.innerHTML)
+    },
+
+    handleBlur(e) {
+      this.element.propValue = e.target.innerHTML || '&nbsp;'
+      this.canEdit = false
+    },
+
+    setEdit() {
+      this.canEdit = true
+      // 全选
+      this.selectText(this.$refs.text)
+    },
+
+    selectText(element) {
+      const selection = window.getSelection()
+      const range = document.createRange()
+      range.selectNodeContents(element)
+      selection.removeAllRanges()
+      selection.addRange(range)
+    },
+
+    removeSelectText() {
+      const selection = window.getSelection()
+      selection.removeAllRanges()
+    }
+  }
 }
 </script>