fix: 节点执行报错信息跳转链接未新开tab问题修复 --bug=119961524

# Reviewed, transaction id: 24302
TencentBlueKing · Nov 20, 2024 · 09eb0f1 · 09eb0f1
1 parent 30968c0
commit 09eb0f1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/frontend/desktop/src/main.js b/frontend/desktop/src/main.js
@@ -31,6 +31,7 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import locales from 'element-ui/lib/locale'
 import { STRING_LENGTH } from '@/constants/index.js'
 import cron from '@/assets/js/node-cron-valid/node-cron-vaild.js'
+import tools from './utils/tools'
 const config = {
     errorBagName: 'veeErrors',
     fieldsBagName: 'veeFields'
@@ -212,11 +213,13 @@ Validator.localize({
     }
 })
 
-Vue.prototype.filterXSS = input => filterXSS(input, {
-    whiteList: {
-        a: ['href']
-    }
-})
+Vue.prototype.filterXSS = (input, config = {}) => {
+    return filterXSS(input, tools.deepMerge({}, {
+        whiteList: {
+            a: ['href', 'target']
+        }
+    }, config))
+}
 
 new Vue({
     i18n,

diff --git a/frontend/desktop/src/pages/task/PeriodicList/BootRecordDialog.vue b/frontend/desktop/src/pages/task/PeriodicList/BootRecordDialog.vue
@@ -154,7 +154,6 @@
                     let info = data.replace(/\n/g, '<br>')
                     info = this.filterXSS(info, {
                         whiteList: {
-                            a: ['href'],
                             br: []
                         }
                     })

diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -1013,7 +1013,6 @@
                     let info = data.replace(/\n/g, '<br>')
                     info = this.filterXSS(info, {
                         whiteList: {
-                            a: ['href'],
                             br: []
                         }
                     })

diff --git a/frontend/desktop/src/utils/tools.js b/frontend/desktop/src/utils/tools.js
@@ -211,7 +211,28 @@ const tools = {
             }
         }
         return arr.join(':')
+    },
+    // 深合并
+    deepMerge (target, ...sources) {
+        if (!isObject(target)) return target
+
+        sources.forEach(source => {
+            if (isObject(source)) {
+                Object.keys(source).forEach(key => {
+                    if (isObject(source[key])) {
+                        if (!target[key]) Object.assign(target, { [key]: {} })
+                        tools.deepMerge(target[key], source[key])
+                    } else {
+                        Object.assign(target, { [key]: source[key] })
+                    }
+                })
+            }
+        })
+
+        return target
     }
 }
 
+const isObject = item => item && typeof item === 'object' && !Array.isArray(item)
+
 export default tools