From b29c54b56162dd669e3dbd0b8782d9c6c54a4dfd Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 8 Nov 2023 11:28:07 +0800
Subject: [PATCH] =?UTF-8?q?minor:=20input=E7=B2=98=E8=B4=B4=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E6=8D=A2=E8=A1=8C&&=E6=B7=BB=E5=8A=A0=E3=80=90?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E3=80=91=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/RenderForm/tags/TagInput.vue      | 2 ++
 .../components/common/TemplateCanvas/PalettePanel/index.vue | 6 ++----
 frontend/desktop/src/config/i18n/cn.js                      | 3 ++-
 frontend/desktop/src/config/i18n/en.js                      | 3 ++-
 frontend/desktop/src/pages/task/ClockedList/index.vue       | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index a9a2711884..633be6ec53 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -484,6 +484,7 @@
                 const clp = (e.originalEvent || e).clipboardData
                 if (clp === undefined || clp === null) {
                     text = window.clipboardData.getData('text') || ''
+                    text = text.split('\n').join('')
                     if (text !== '') {
                         if (window.getSelection) {
                             const newNode = document.createElement('span')
@@ -495,6 +496,7 @@
                     }
                 } else {
                     text = clp.getData('text/plain') || ''
+                    text = text.split('\n').join('')
                     text && document.execCommand('insertText', false, text)
                 }
             }
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue b/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue
index 75cd4e75ed..1d65dc2f7b 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue
@@ -34,14 +34,12 @@
             </div>
             <div
                 :class="['palette-item', 'entry-item', 'palette-with-menu']"
-                data-type="tasknode"
-                @mousedown="onNodeMouseDown('plugin', $event)">
+                data-type="tasknode">
                 <div class="node-type-icon common-icon-node-tasknode"></div>
             </div>
             <div
                 :class="['palette-item','entry-item', 'palette-with-menu']"
-                data-type="subflow"
-                @mousedown="onNodeMouseDown('subflow', $event)">
+                data-type="subflow">
                 <div class="node-type-icon common-icon-node-subflow"></div>
             </div>
             <div class="palette-item entry-item" data-config-name="" data-type="parallelgateway">
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index b69269f734..4c470c114e 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1791,7 +1791,8 @@ const cn = {
     '节点输出型变量仅支持从节点"取消接收输出"来删除': '节点输出型变量仅支持从节点"取消接收输出"来删除',
     '刷新': '刷新',
     'exFailedText': '节点执行失败，请前往{0}查看错误原因',
-    'exFailedText_调用日志': '调用日志'
+    'exFailedText_调用日志': '调用日志',
+    '任务还未执行，暂无执行历史': '任务还未执行，暂无执行历史'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index ad57c28e8d..74d5d64406 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1825,7 +1825,8 @@ const en = {
     '节点输出型变量仅支持从节点"取消接收输出"来删除': 'Node output variables can only be deleted by the node "Cancel Receiving Output"',
     '刷新': 'Refresh',
     'exFailedText': 'Node execution failed. Please go to the {0} to check the error reason.',
-    'exFailedText_调用日志': 'call log'
+    'exFailedText_调用日志': 'call log',
+    '任务还未执行，暂无执行历史': 'Task not executed, no history available.'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/ClockedList/index.vue b/frontend/desktop/src/pages/task/ClockedList/index.vue
index b77ee61e51..61d3af4cdb 100644
--- a/frontend/desktop/src/pages/task/ClockedList/index.vue
+++ b/frontend/desktop/src/pages/task/ClockedList/index.vue
@@ -128,7 +128,7 @@
                                         {{ $t('执行历史') }}
                                     </router-link>
                                 </template>
-                                <span v-else class="empty-text">{{ $t('执行历史') }}</span>
+                                <span v-else class="empty-text" v-bk-tooltips="$t('任务还未执行，暂无执行历史')">{{ $t('执行历史') }}</span>
                             </div>
                         </bk-table-column>
                         <bk-table-column type="setting">