From 2412e7151f0e39e31ea18f8ca3e4a94177adf93e Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Sun, 15 Dec 2024 13:31:33 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=BB=84=E4=BB=B6=20=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/web/view/table.vue.tpl    | 11 +++++++----
 server/resource/plugin/web/view/view.vue.template | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 2ad31d83eb..acf94b9c20 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -258,6 +258,9 @@
                     {{- if eq .FieldType "pictures" }}
     <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
                     {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+    <RichView v-model="detailFrom.{{.FieldJson}}" />
+                     {{- end }}
                     {{- if eq .FieldType "file" }}
     <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
         <el-button type="primary" text bg @click="onDownloadFile(item.url)">
@@ -774,7 +777,6 @@ getDataSourceFunc()
               {{- if .Desc }}
                     <el-descriptions-item label="{{ .FieldDesc }}">
                     {{- if .CheckDataSource }}
-                   <template #default="scope">
                        {{- if eq .DataSource.Association 2}}
                        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
                             {{ "{{ item }}" }}
@@ -782,15 +784,12 @@ getDataSourceFunc()
                        {{- else }}
                        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
                        {{- end }}
-                   </template>
                  {{- else if .DictType}}
-                    <template #default="scope">
                         {{if eq .FieldType "array"}}
                         <el-tag class="mr-1" v-for="item in detailFrom.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
                         {{- else }}
                         {{"{{"}} filterDict(detailFrom.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
                         {{end}}
-                    </template>
                 {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
                         {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
                 {{- else }}
@@ -803,6 +802,9 @@ getDataSourceFunc()
                     {{- if eq .FieldType "pictures" }}
                             <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
                     {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+                            <RichView v-model="detailFrom.{{.FieldJson}}" />
+                    {{- end }}
                     {{- if eq .FieldType "file" }}
                             <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
                               <el-button type="primary" text bg @click="onDownloadFile(item.url)">
@@ -845,6 +847,7 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- if .HasRichText }}
 // 富文本组件
 import RichEdit from '@/components/richtext/rich-edit.vue'
+import RichView from '@/components/richtext/rich-view.vue'
 {{- end }}
 
 {{- if .HasFile }}
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index f4e437ef30..f45fb8e505 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -258,6 +258,9 @@
                     {{- if eq .FieldType "pictures" }}
     <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
                     {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+    <RichView v-model="detailFrom.{{.FieldJson}}" />
+                     {{- end }}
                     {{- if eq .FieldType "file" }}
     <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
         <el-button type="primary" text bg @click="onDownloadFile(item.url)">
@@ -774,7 +777,6 @@ getDataSourceFunc()
               {{- if .Desc }}
                     <el-descriptions-item label="{{ .FieldDesc }}">
                     {{- if .CheckDataSource }}
-                   <template #default="scope">
                        {{- if eq .DataSource.Association 2}}
                        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
                             {{ "{{ item }}" }}
@@ -782,15 +784,12 @@ getDataSourceFunc()
                        {{- else }}
                        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
                        {{- end }}
-                   </template>
                  {{- else if .DictType}}
-                    <template #default="scope">
                         {{if eq .FieldType "array"}}
                         <el-tag class="mr-1" v-for="item in detailFrom.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
                         {{- else }}
                         {{"{{"}} filterDict(detailFrom.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
                         {{end}}
-                    </template>
                 {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
                         {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
                 {{- else }}
@@ -800,6 +799,9 @@ getDataSourceFunc()
                     {{- if eq .FieldType "array" }}
                             <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
                     {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+                            <RichView v-model="detailFrom.{{.FieldJson}}" />
+                    {{- end }}
                     {{- if eq .FieldType "pictures" }}
                             <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
                     {{- end }}
@@ -845,6 +847,7 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- if .HasRichText }}
 // 富文本组件
 import RichEdit from '@/components/richtext/rich-edit.vue'
+import RichView from '@/components/richtext/rich-view.vue'
 {{- end }}
 
 {{- if .HasFile }}