From c9ff390443afb8b1495123be6ea2f6c457aa061e Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 29 May 2023 18:45:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProTable/index.vue                   |  5 +++++
 src/components/ProTable/interface/index.ts          |  2 +-
 src/views/goverment/notice/myPosted/index.scss      | 13 +++++++++++++
 src/views/goverment/notice/myPosted/index.vue       |  5 ++++-
 src/views/goverment/notice/myReceive/index.scss     | 13 +++++++++++++
 src/views/goverment/notice/myReceive/index.vue      |  5 ++++-
 src/views/goverment/policyLows/myPosted/index.scss  | 13 +++++++++++++
 src/views/goverment/policyLows/myPosted/index.vue   |  3 +++
 src/views/goverment/policyLows/myReceive/index.scss | 13 +++++++++++++
 src/views/goverment/policyLows/myReceive/index.vue  |  5 ++++-
 10 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue
index b53b940..a933f32 100644
--- a/src/components/ProTable/index.vue
+++ b/src/components/ProTable/index.vue
@@ -54,6 +54,11 @@
 					v-if="item.type == 'selection' || item.type == 'index'"
 				>
 				</el-table-column>
+				<!-- 富文本 -->
+				<el-table-column v-bind="item" :align="item.align ?? 'center'" v-if="item.type == 'html'" v-slot="scope">
+					<component :is="item.render" :row="scope.row" v-if="item.render"> </component>
+					<slot :name="item.type" :row="scope.row" v-else></slot>
+				</el-table-column>
 				<!-- expand 支持 tsx 语法 && 作用域插槽 (tsx > slot) -->
 				<el-table-column v-bind="item" :align="item.align ?? 'center'" v-if="item.type == 'expand'" v-slot="scope">
 					<component :is="item.render" :row="scope.row" v-if="item.render"> </component>
diff --git a/src/components/ProTable/interface/index.ts b/src/components/ProTable/interface/index.ts
index c5fc2d5..b5c18eb 100644
--- a/src/components/ProTable/interface/index.ts
+++ b/src/components/ProTable/interface/index.ts
@@ -10,7 +10,7 @@ export interface EnumProps {
 	[key: string]: any;
 }
 
-export type TypeProp = "index" | "selection" | "expand";
+export type TypeProp = "index" | "selection" | "expand" | "html";
 
 export type SearchType =
 	| "input"
diff --git a/src/views/goverment/notice/myPosted/index.scss b/src/views/goverment/notice/myPosted/index.scss
index e83b9a7..c318b1e 100644
--- a/src/views/goverment/notice/myPosted/index.scss
+++ b/src/views/goverment/notice/myPosted/index.scss
@@ -18,3 +18,16 @@
 .content {
 	padding: 0 40px;
 }
+
+.html-div:first-child {
+	display: block !important;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.html-div:not(:first-child) {
+	display: none;
+}
diff --git a/src/views/goverment/notice/myPosted/index.vue b/src/views/goverment/notice/myPosted/index.vue
index bdb4992..bdf2f62 100644
--- a/src/views/goverment/notice/myPosted/index.vue
+++ b/src/views/goverment/notice/myPosted/index.vue
@@ -11,6 +11,9 @@
 			background
 			:isShowSearch="false"
 		>
+			<template #html="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="onLook(row)">
 					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@@ -139,7 +142,7 @@ const columns: ColumnProps[] = [
 
 	// 多级 prop
 	{ prop: "title", label: "通知标题", search: { el: "input" } },
-	{ prop: "content", label: "通知内容", search: { el: "input" } },
+	{ prop: "content", label: "通知内容", search: { el: "input" }, type: "html" },
 	{ prop: "createTime", label: "发布时间" },
 	{ prop: "operation", label: "操作", fixed: "right" }
 ];
diff --git a/src/views/goverment/notice/myReceive/index.scss b/src/views/goverment/notice/myReceive/index.scss
index ff81205..f7d96d6 100644
--- a/src/views/goverment/notice/myReceive/index.scss
+++ b/src/views/goverment/notice/myReceive/index.scss
@@ -15,3 +15,16 @@
 .content {
 	padding: 0 40px;
 }
+
+.html-div:first-child {
+	display: block !important;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.html-div:not(:first-child) {
+	display: none;
+}
diff --git a/src/views/goverment/notice/myReceive/index.vue b/src/views/goverment/notice/myReceive/index.vue
index 5f368a1..65e57c0 100644
--- a/src/views/goverment/notice/myReceive/index.vue
+++ b/src/views/goverment/notice/myReceive/index.vue
@@ -11,6 +11,9 @@
 			background
 			:isShowSearch="false"
 		>
+			<template #html="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="onLook(row)">
 					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@@ -128,7 +131,7 @@ const columns: ColumnProps[] = [
 
 	// 多级 prop
 	{ prop: "title", label: "通知标题", search: { el: "input" } },
-	{ prop: "content", label: "通知内容", search: { el: "input" } },
+	{ prop: "content", label: "通知内容", search: { el: "input" }, type: "html" },
 	{ prop: "createByName", label: "发布人名称" },
 	{ prop: "createTime", label: "发布时间" },
 	{
diff --git a/src/views/goverment/policyLows/myPosted/index.scss b/src/views/goverment/policyLows/myPosted/index.scss
index 6f261ca..1cca37f 100644
--- a/src/views/goverment/policyLows/myPosted/index.scss
+++ b/src/views/goverment/policyLows/myPosted/index.scss
@@ -18,3 +18,16 @@
 .content :deep(.ql-align-left) {
 	text-align: left;
 }
+
+.html-div:first-child {
+	display: block !important;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.html-div:not(:first-child) {
+	display: none;
+}
diff --git a/src/views/goverment/policyLows/myPosted/index.vue b/src/views/goverment/policyLows/myPosted/index.vue
index 00a6993..a5742c2 100644
--- a/src/views/goverment/policyLows/myPosted/index.vue
+++ b/src/views/goverment/policyLows/myPosted/index.vue
@@ -12,6 +12,9 @@
 			:isShowSearch="false"
 			@row-click="rowClick"
 		>
+			<template #html="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="ondownLoad(row)">
 					<img src="@/assets/images/tableIcon/下载附件.png" alt="" class="configureIcon" />
diff --git a/src/views/goverment/policyLows/myReceive/index.scss b/src/views/goverment/policyLows/myReceive/index.scss
index 6f261ca..1cca37f 100644
--- a/src/views/goverment/policyLows/myReceive/index.scss
+++ b/src/views/goverment/policyLows/myReceive/index.scss
@@ -18,3 +18,16 @@
 .content :deep(.ql-align-left) {
 	text-align: left;
 }
+
+.html-div:first-child {
+	display: block !important;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.html-div:not(:first-child) {
+	display: none;
+}
diff --git a/src/views/goverment/policyLows/myReceive/index.vue b/src/views/goverment/policyLows/myReceive/index.vue
index d79e0aa..166e5e6 100644
--- a/src/views/goverment/policyLows/myReceive/index.vue
+++ b/src/views/goverment/policyLows/myReceive/index.vue
@@ -11,6 +11,9 @@
 			background
 			@row-click="rowClick"
 		>
+			<template #html="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="ondownLoad(row)">
 					<img src="@/assets/images/tableIcon/下载附件.png" alt="" class="configureIcon" />
@@ -62,7 +65,7 @@ const columns: ColumnProps[] = [
 
 	// 多级 prop
 	{ prop: "title", label: "文件标题", search: { el: "input" } },
-	{ prop: "content", label: "文件内容", search: { el: "input" } },
+	{ prop: "content", label: "文件内容", search: { el: "input" }, type: "html" },
 	{ prop: "createByName", label: "发布人名称" },
 	{ prop: "createTime", label: "发布时间" },
 	{ prop: "operation", label: "操作", fixed: "right", width: 150 }