Merge pull request #11 from xwcoder/feature/code-style

xwcoder · web-flow · commit 0b53ae09c57c · 2023-11-12T13:51:16.000+08:00
feat: optimize code display style
diff --git a/src/base/node/feed.ts b/src/base/node/feed.ts
@@ -1,8 +1,17 @@
 import { parseStringPromise } from 'xml2js'
 import get from 'lodash.get'
 import { Feed } from '@/types/reader'
+import { logger } from '@/services/logger/electron-main/logger'
 
-const trim = (s = '') => s.replaceAll('\n', '').trim()
+const trim = (s = '') => {
+  if (typeof s === 'string' || typeof s === 'number') {
+    return `${s}`.trim()
+  }
+
+  logger.warn(`[trim]: ${JSON.stringify(s)}`)
+
+  return ''
+}
 
 const gettrim = (...args: Parameters<typeof get>) => trim(get(...args))
 
@@ -18,7 +27,7 @@ const parseRss = (xml: any): Omit<Feed, 'url'> => {
       url: gettrim(v, 'link[0]'),
       content: gettrim(v, 'content:encoded[0]') || gettrim(v, 'description[0]'),
       pubTime: gettrim(v, 'pubDate[0]'),
-      author: gettrim(v, 'author[0]', '') || gettrim(v, 'dc:creator[0]', ''),
+      author: gettrim(v, 'author[0]', '') || gettrim(v, 'dc:creator[0]._', '') || gettrim(v, 'dc:creator[0]', ''),
     })),
   }
 }
diff --git a/src/ui/apps/reader/MainPanel/Article/content.tsx b/src/ui/apps/reader/MainPanel/Article/content.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/no-danger */
 import { useEffect, useRef } from 'react'
-import { makeStyles, tokens } from '@fluentui/react-components'
+import { makeStyles, tokens, shorthands } from '@fluentui/react-components'
 import { observer } from 'mobx-react-lite'
 import { store } from '@/ui/store'
 import { format as formatTime } from '@/base/common/date'
@@ -21,6 +21,11 @@ const useStyles = makeStyles({
       fontSize: tokens.fontSizeBase400,
     },
 
+    '& pre': {
+      backgroundColor: tokens.colorNeutralBackground6,
+      ...shorthands.padding(tokens.spacingVerticalXL),
+    },
+
     '& h1': {
       fontSize: tokens.fontSizeHero700,
       lineHeight: 1.2,
