fix: Log detail highlight keyword is [Object Object]

Signed-off-by: TheYoungManLi <cjl@kubesphere.io>
kubesphere · Nov 15, 2021 · d23f8a8 · d23f8a8
1 parent b9345f9
commit d23f8a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/components/Modals/LogSearch/Logging/Search/index.jsx b/src/components/Modals/LogSearch/Logging/Search/index.jsx
@@ -317,14 +317,10 @@ export default class LogSearchModal extends React.Component {
       return (
         <span
           dangerouslySetInnerHTML={{
-            __html: markedResult.map((log, index) =>
-              isString(log) ? (
-                log
-              ) : (
-                <span key={index} className={styles.hightLightMatch}>
-                  {log.hightLighted}
-                </span>
-              )
+            __html: markedResult.map(log =>
+              isString(log)
+                ? log
+                : `<span class="${styles.hightLightMatch}">${log.hightLighted}</span>`
             ),
           }}
         />

diff --git a/src/pages/clusters/containers/Gateway/Detail/GatewayLog/index.jsx b/src/pages/clusters/containers/Gateway/Detail/GatewayLog/index.jsx
@@ -194,14 +194,10 @@ export default class GatewayLog extends React.Component {
       return (
         <span
           dangerouslySetInnerHTML={{
-            __html: markedResult.map((log, index) =>
-              isString(log) ? (
-                log
-              ) : (
-                <span key={index} className={styles.hightLightMatch}>
-                  {log.hightLighted}
-                </span>
-              )
+            __html: markedResult.map(log =>
+              isString(log)
+                ? log
+                : `<span class="${styles.hightLightMatch}">${log.hightLighted}</span>`
             ),
           }}
         />