From 1b7ae16fa64ae7c86c6536cdfb3a2fdd7e28f1ad Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 7 Jun 2021 10:53:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90ID1004125=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=91=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/Shape.vue    | 3 ++-
 .../src/components/widget/DeWidget/DeInputSearch.vue     | 9 +++++++--
 .../widget/serviceImpl/TextInputServiceImpl.js           | 2 +-
 frontend/src/styles/index.scss                           | 3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Shape.vue b/frontend/src/components/canvas/components/Editor/Shape.vue
index 2cc91c0502..2fdc44c1b8 100644
--- a/frontend/src/components/canvas/components/Editor/Shape.vue
+++ b/frontend/src/components/canvas/components/Editor/Shape.vue
@@ -89,6 +89,7 @@ export default {
     if (this.curComponent) {
       this.cursors = this.getCursor() // 根据旋转角度获取光标位置
     }
+    this.element.type === 'custom' && (this.pointList = ['l', 'r'])
 
     eventBus.$on('runAnimation', () => {
       if (this.element === this.curComponent) {
@@ -221,7 +222,7 @@ export default {
 
     handleMouseDownOnShape(e) {
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape') {
+      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search') {
         e.preventDefault()
       }
 
diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index 13147978b0..988dad687f 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -3,9 +3,10 @@
   <el-input
     v-if="options!== null && options.attrs!==null"
     v-model="options.value"
-    style="width: 260px"
+    resize="vertical"
     :placeholder="options.attrs.placeholder"
     @keyup.enter.native="search"
+    @dblclick="setEdit"
   >
 
     <el-button slot="append" icon="el-icon-search" @click="search" />
@@ -30,7 +31,8 @@ export default {
     return {
       options: null,
       operator: 'like',
-      values: null
+      values: null,
+      canEdit: false
     }
   },
   created() {
@@ -48,6 +50,9 @@ export default {
         operator: this.operator
       }
       this.inDraw && this.$store.dispatch('conditions/add', param)
+    },
+    setEdit() {
+      this.canEdit = true
     }
   }
 }
diff --git a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
index 763c1b54e3..ec83992aa7 100644
--- a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
@@ -22,7 +22,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 47,
+    height: 45.5,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 3885e67e20..e0802155d9 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -187,6 +187,9 @@ div:focus {
 
 .custom-component-class {
     width: 100%;
+    div.el-input-group__append {
+        width: 10% !important;
+    }
     div {
       width: 100% !important;
     }