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 @@ @@ -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; }