From de381654c3cc41eb35a3a774fa7a350675886fd8 Mon Sep 17 00:00:00 2001
From: zjl <xx@163.com>
Date: Thu, 19 Sep 2024 10:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E7=AB=A0=E5=9B=BE?=
 =?UTF-8?q?=E9=9B=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/article/edit.vue | 32 +++++++++++++++++++-
 src/views/data/config/editItem.vue | 48 +++++++++++++++---------------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/views/content/article/edit.vue b/src/views/content/article/edit.vue
index d7d898e..cd6c905 100644
--- a/src/views/content/article/edit.vue
+++ b/src/views/content/article/edit.vue
@@ -50,6 +50,14 @@
               <template v-slot:tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
             </UploadImg>
         </el-form-item>
+        <el-form-item
+            label="文章图集"
+            prop="imagesList"
+            :rules="{ required: true,message: '请上传文章图集', trigger: 'change' }"
+          >
+          <UploadImgs @upload="fileUploads" file-type=".jpeg,.png,.jpg,.gif" name="article" 
+          :fileSize="200" :multiple="true" :fileList="formData.fileList"/>
+        </el-form-item>
         <el-form-item label="导读" prop="intro" :rules="{ required: true, message: '请输入导读', trigger: 'blur' }">
           <el-input  placeholder="请输入" v-model="formData.intro" type="textarea"></el-input>
         </el-form-item>
@@ -81,6 +89,7 @@ import {computed, onMounted,ref,shallowRef,reactive  } from "vue";
 import {FormInstance} from "element-plus";
 const formRef = shallowRef<FormInstance>();
 import UploadImg from "@/components/Upload/Image.vue";
+import UploadImgs from '@/components/Upload/Images.vue';
 import {useLockFn} from "@/utils/useLockFn";
 import Editor from '@/components/Editor/tinymce.vue'
 import {message,buildTree} from "@/utils/auth";
@@ -116,11 +125,15 @@ const formData = reactive({
   title: "",
   author: "",
   cover:'',
+  images: '',
   intro:'',
   content:'',
   status:0,
   click:'',
-  sort:0
+  sort:0,
+  imagesList:[],
+  filePath:'',
+  fileList:[],
 });
 
 const dialogClose = () => {
@@ -135,12 +148,29 @@ const setFormData = async (row: any) => {
     }
   }
   editorRef.value.myValue=formData.content
+  // 文章图集
+  if (formData.imagesList) {
+    formData.imagesList.map(item=>{
+      formData.fileList.push({
+        filePath:item
+      })
+    })
+  }
 };
 
 const editorRef=ref()
 
+const fileUploads = (list: any) => {
+  formData.fileList = list
+};
+
 const handleSubmit = async () => {
   await formRef.value?.validate();
+  // 文章图集处理，多个图片逗号分割
+  formData.images =''
+  formData.fileList.map((item,index)=>{
+    formData.images+=`${item.filePath}${index<formData.fileList.length-1?',':''}`
+  })
   let ruleForm = JSON.parse(JSON.stringify(formData));
   ruleForm.content=editorRef.value.myValue
   if (!ruleForm.content) {
diff --git a/src/views/data/config/editItem.vue b/src/views/data/config/editItem.vue
index 99ec310..6454d59 100644
--- a/src/views/data/config/editItem.vue
+++ b/src/views/data/config/editItem.vue
@@ -68,30 +68,30 @@
           :format="formData.type == 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'" />
         </template>
         <template v-else-if="formData.type  == 'image'">
-              <UploadImg
-                      @changeFileName="(name)=>formData.fileName=name"
-                        :fileType=" ['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
-                        name="config"
-                        :fileSize="200"
-                        v-model:image-url="formData.filePath">
-                <template v-slot:tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
-              </UploadImg>
-            </template>
-            <template v-else-if="formData.type  == 'images'">
-              <UploadImgs @upload="fileUploads" file-type=".jpeg,.png,.jpg,.gif" name="config" 
-              :fileSize="200" :multiple="true" :fileList="formData.fileList"/>
-            </template>
-            <template v-else-if="formData.type  == 'file'">
-              <UploadFile @upload="fileUploadFile" file-type=".xlsx.xls.doc.docx" name="config"
-              :file-list="formData.filePath?[{name:formData.fileName,url:formData.filePath}]:[]"/>
-            </template>
-            <template v-else-if="formData.type  == 'files'">
-              <UploadFile @upload="fileUploads" file-type=".xlsx.xls.doc.docx" name="config" :multiple="true"
-              :file-list="formData.fileList"/>
-            </template>
-            <template v-else-if="formData.type  == 'ueditor'">
-              <Editor ref="editorRef" :height="fwbHeight" class="flex-1" name="config"/>
-            </template>
+          <UploadImg
+                  @changeFileName="(name)=>formData.fileName=name"
+                    :fileType=" ['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+                    name="config"
+                    :fileSize="200"
+                    v-model:image-url="formData.filePath">
+            <template v-slot:tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
+          </UploadImg>
+        </template>
+        <template v-else-if="formData.type  == 'images'">
+          <UploadImgs @upload="fileUploads" file-type=".jpeg,.png,.jpg,.gif" name="config" 
+          :fileSize="200" :multiple="true" :fileList="formData.fileList"/>
+        </template>
+        <template v-else-if="formData.type  == 'file'">
+          <UploadFile @upload="fileUploadFile" file-type=".xlsx.xls.doc.docx" name="config"
+          :file-list="formData.filePath?[{name:formData.fileName,url:formData.filePath}]:[]"/>
+        </template>
+        <template v-else-if="formData.type  == 'files'">
+          <UploadFile @upload="fileUploads" file-type=".xlsx.xls.doc.docx" name="config" :multiple="true"
+          :file-list="formData.fileList"/>
+        </template>
+        <template v-else-if="formData.type  == 'ueditor'">
+          <Editor ref="editorRef" :height="fwbHeight" class="flex-1" name="config"/>
+        </template>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
         <el-input-number v-model="formData.sort" />