From 1c033c8f7e2726c6b5febe8ee4a4da5387381f08 Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Fri, 13 Oct 2023 16:45:26 +0800 Subject: [PATCH] =?UTF-8?q?optimization:=20=E6=B7=BB=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=B1=9E=E6=80=A7&&=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/RenderForm/tags/TagInput.vue | 1 + .../components/common/RenderForm/tags/TagTextarea.vue | 1 + frontend/desktop/src/pages/task/PeriodicList/index.vue | 3 ++- .../desktop/src/pages/task/TaskExecute/ExecuteInfo.vue | 5 +++-- .../desktop/src/pages/task/TaskExecute/TaskOperation.vue | 9 ++++++++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue index 3b772babee..b5b38ea8e5 100644 --- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue +++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue @@ -32,6 +32,7 @@ }" :contenteditable="!isDisabled" :data-placeholder="placeholder" + data-test-name="formTag_input_divInput" v-bk-clickoutside="handleClickOutSide" @mouseup="handleInputMouseUp" @focus="handleInputFocus" diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue index c3f3832971..0ec4ac324d 100644 --- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue +++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue @@ -21,6 +21,7 @@ }" :contenteditable="!isDisabled" :data-placeholder="placeholder" + data-test-name="formTag_textarea_divInput" v-bk-clickoutside="handleClickOutSide" @mouseup="handleInputMouseUp" @focus="handleInputFocus" diff --git a/frontend/desktop/src/pages/task/PeriodicList/index.vue b/frontend/desktop/src/pages/task/PeriodicList/index.vue index 5455b34667..891bdd5ff2 100644 --- a/frontend/desktop/src/pages/task/PeriodicList/index.vue +++ b/frontend/desktop/src/pages/task/PeriodicList/index.vue @@ -65,9 +65,10 @@ 'disable': collectingId === row.id, 'text-permission-disable': !hasPermission(['periodic_task_edit'], row.auth_actions) }" + :title="row.name" @click="onCollectTask(row)"> - {{row.name || '--'}} + {{row.name || '--'}}
- + @@ -107,6 +107,7 @@ :constants="pipelineData.constants" :gateways="pipelineData.gateways" :condition-data="conditionData" + :sidebar-width="sidebarWidth" @close="onCloseConfigPanel" @onRetryClick="onRetryClick" @onSkipClick="onSkipClick" @@ -488,6 +489,12 @@ }, adminView () { return this.hasAdminPerm && this.$route.query.is_admin === 'true' + }, + sidebarWidth () { + if (['viewNodeDetails', 'executeInfo'].includes(this.nodeInfoType)) { + return window.innerWidth - 340 + } + return 960 } }, mounted () {