合并分支 'hsx' 到 'master'

.gitignore

@@ -14,6 +14,7 @@ lerna-debug.log*
 
 # Dependencies
 node_modules
+*node_modules
 .pnpm
 .npm
 

src/views/home/index.vue

@@ -77,7 +77,7 @@ import { useRoute } from "vue-router";
 import AiBox from "@/components/AiBox.vue";
 import { getPersonType } from "@/api/common/index";
 // import { useDraggable } from "@vueuse/core";
-import ModuleHeader from '@/components/base/ModuleHeader/index.vue'
+import ModuleHeader from '@/components/base/moduleHeader/index.vue'
 
 import Menu1 from "@/assets/icons/overview/menu1.png";
 import Menu2 from "@/assets/icons/overview/menu2.png";
@@ -120,7 +120,7 @@ const handleGetPersonType = async () => {
 			personTypeList.value = [];
 		}
 		window.sessionStorage.setItem("personTypeList", JSON.stringify(personTypeList.value));
-	} catch (error) {}
+	} catch (error) { }
 };
 
 const isCurrentOverview = computed(() => {
@@ -298,7 +298,7 @@ body {
 	text-align: justify;
 }
 
-.el-popper[data-popper-placement^="top"] > .el-popper__arrow:before {
+.el-popper[data-popper-placement^="top"]>.el-popper__arrow:before {
 	display: none;
 }
 

src/views/newsBrief/NewsDetial.vue

@@ -110,11 +110,12 @@ onMounted(async () => {
 });
 
 async function handleHighlightEntity() {
-    if (textEntities.value.length > 0) return
-    const { result: entityDataZh } = await extractTextEntity(newsDetail.value?.contentZh ?? '');
+    if (textEntities.value.length > 0
+        || (!newsDetail.value?.contentZh && !newsDetail.value?.content)) return
+    const { result: entityDataZh } = await extractTextEntity(newsDetail.value.contentZh ?? '');
     textEntities.value = [...entityDataZh ?? []]
     if (newsDetail.value.contentZh !== newsDetail.value.content) {
-        const { result: entityData } = await extractTextEntity(newsDetail.value?.content ?? '');
+        const { result: entityData } = await extractTextEntity(newsDetail.value.content ?? '');
         textEntities.value = [...textEntities.value, ...entityData ?? []]
     }
     console.log(isHightLightEntity.value)

src/views/newsBrief/NewsMain.vue

@@ -25,18 +25,19 @@
                     <img src="@/assets/icons/subject-icon.png" />
                 </template>
                 <el-space :size="16" direction="vertical" fill class="full-width common-padding">
-                    <el-space v-for="(item, index) in subjectData.slice(0, 3)" :key="index" class="mouse-hover"
+                    <el-space v-for="(item, index) in subjectData.slice(0, 3)" :key="index"
                         @click="() => gotoNewsDetail(item.newsId)" alignment="center">
-                        <common-text class="text-bold"
+                        <common-text class="text-bold text-hover"
                             :color="index === 0 ? 'var(--color-red-100)' : (index === 1 ? 'var(--color-orange-100)' : 'var(--text-primary-65-color)')">
                             {{ `${index + 1}` }}
                         </common-text>
-                        <common-text class="text-bold" color="var(--text-primary-80-color)">{{
+                        <common-text class="text-bold text-hover" color="var(--text-primary-80-color)">{{
                             item.newsTitle
                             }}</common-text>
                     </el-space>
-                    <el-space v-for="(item, index) in subjectData.slice(3)" :key="index" class="mouse-hover">
-                        <common-text class="text-regular" color="var(--text-primary-80-color)">{{
+                    <el-space v-for="(item, index) in subjectData.slice(3)" :key="index"
+                        @click="() => gotoNewsDetail(item.newsId)">
+                        <common-text class="text-regular text-hover" color="var(--text-primary-80-color)">{{
                             "• " + item.newsTitle
                             }}</common-text>
                     </el-space>
@@ -48,6 +49,7 @@
 </template>
 <script setup>
 import { ref, onMounted } from "vue";
+import '@/styles/common.scss';
 import '@/styles/container.scss';
 import '@/styles/radio.scss';
 import { useGotoNewsModule, useGotoNewsDetail } from "@/router/modules/news";