From c2e8eaed605ab44af5c3f960288e4c4d1b25230f Mon Sep 17 00:00:00 2001
From: Marvin <454846659@qq.com>
Date: Sat, 25 Nov 2023 22:56:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/infra/file/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
index a3aa7db6..16c2e223 100644
--- a/src/views/infra/file/index.vue
+++ b/src/views/infra/file/index.vue
@@ -50,7 +50,17 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
       <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
-      <el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
+      <el-table-column label="URL" align="center" prop="url" width="110px">
+        <template #default="{ row }">
+          <el-image
+            class="h-80px w-80px"
+            :src="row.url"
+            :preview-src-list="[row.url]"
+            preview-teleported
+            fit="cover"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="文件大小"
         align="center"

From fd266516fede26afe0d24ed3c0160ffc2cdf9ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Evol=E9=83=91=E5=A4=A9?= <jpevol@163.com>
Date: Wed, 29 Nov 2023 01:24:42 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7-=E7=B4=A0=E6=9D=90=E7=AE=A1=E7=90=86=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E7=BC=BA=E5=B0=91accountId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Evol郑天 <jpevol@163.com>
---
 src/views/mp/material/components/UploadFile.vue  | 5 ++++-
 src/views/mp/material/components/UploadVideo.vue | 5 ++++-
 src/views/mp/material/components/upload.ts       | 1 +
 src/views/mp/material/index.vue                  | 7 ++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/mp/material/components/UploadFile.vue b/src/views/mp/material/components/UploadFile.vue
index 1476917a..276a798c 100644
--- a/src/views/mp/material/components/UploadFile.vue
+++ b/src/views/mp/material/components/UploadFile.vue
@@ -33,6 +33,8 @@ const message = useMessage()
 
 const props = defineProps<{ type: UploadType }>()
 
+const accountId = inject<number>('accountId')
+
 const fileList = ref<UploadUserFile[]>([])
 const emit = defineEmits<{
   (e: 'uploaded', v: void)
@@ -41,7 +43,8 @@ const emit = defineEmits<{
 const uploadData: UploadData = reactive({
   type: UploadType.Image,
   title: '',
-  introduction: ''
+  introduction: '',
+  accountId: accountId!
 })
 
 /** 上传前检查 */
diff --git a/src/views/mp/material/components/UploadVideo.vue b/src/views/mp/material/components/UploadVideo.vue
index 28f050c0..0eda1cef 100644
--- a/src/views/mp/material/components/UploadVideo.vue
+++ b/src/views/mp/material/components/UploadVideo.vue
@@ -59,6 +59,8 @@ import { HEADERS, UploadData, UPLOAD_URL, UploadType, beforeVideoUpload } from '
 
 const message = useMessage()
 
+const accountId = inject<number>('accountId')
+
 const uploadRules: FormRules = {
   title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
   introduction: [{ required: true, message: '请输入描述', trigger: 'blur' }]
@@ -89,7 +91,8 @@ const fileList = ref<UploadUserFile[]>([])
 const uploadData: UploadData = reactive({
   type: UploadType.Video,
   title: '',
-  introduction: ''
+  introduction: '',
+  accountId: accountId!
 })
 
 const uploadFormRef = ref<FormInstance | null>(null)
diff --git a/src/views/mp/material/components/upload.ts b/src/views/mp/material/components/upload.ts
index 7158ab12..e732fe70 100644
--- a/src/views/mp/material/components/upload.ts
+++ b/src/views/mp/material/components/upload.ts
@@ -9,6 +9,7 @@ interface UploadData {
   type: UploadType
   title: string
   introduction: string
+  accountId: number
 }
 
 const beforeImageUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) =>
diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue
index b72c9ad6..de060429 100644
--- a/src/views/mp/material/index.vue
+++ b/src/views/mp/material/index.vue
@@ -99,17 +99,22 @@ const type = ref<UploadType>(UploadType.Image) // 素材类型
 const loading = ref(false) // 遮罩层
 const list = ref<any[]>([]) // 总条数
 const total = ref(0) // 数据列表
+
+const accountId = ref(-1)
+provide('accountId', accountId)
+
 // 查询参数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: -1,
+  accountId: accountId,
   permanent: true
 })
 const showCreateVideo = ref(false) // 是否新建视频的弹窗
 
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
+  accountId.value = id
   queryParams.accountId = id
   queryParams.pageNo = 1
   getList()

From 915702183d4998cd0413a7f3f917c100d61f3f3c Mon Sep 17 00:00:00 2001
From: Marvin <454846659@qq.com>
Date: Fri, 1 Dec 2023 09:50:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E9=A1=B9=EF=BC=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=B6=E5=B1=95=E7=A4=BA=EF=BC=8Cpdf=E6=97=B6=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E9=A2=84=E8=A7=88=EF=BC=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/infra/file/index.vue | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
index 16c2e223..15e4c6de 100644
--- a/src/views/infra/file/index.vue
+++ b/src/views/infra/file/index.vue
@@ -50,17 +50,7 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
       <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
-      <el-table-column label="URL" align="center" prop="url" width="110px">
-        <template #default="{ row }">
-          <el-image
-            class="h-80px w-80px"
-            :src="row.url"
-            :preview-src-list="[row.url]"
-            preview-teleported
-            fit="cover"
-          />
-        </template>
-      </el-table-column>
+      <el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
       <el-table-column
         label="文件大小"
         align="center"
@@ -69,6 +59,21 @@
         :formatter="fileSizeFormatter"
       />
       <el-table-column label="文件类型" align="center" prop="type" width="180px" />
+      <el-table-column label="文件内容" align="center" prop="url" width="110px">
+        <template #default="{ row }">
+          <el-image
+            v-if="row.type.includes('image')"
+            class="h-80px w-80px"
+            lazy
+            :src="row.url"
+            :preview-src-list="[row.url]"
+            preview-teleported
+            fit="cover"
+          />
+          <el-link v-else-if="row.type.includes('pdf')" type="primary" :href="row.url" :underline="false">预览</el-link>
+          <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank">下载</el-link>
+        </template>
+      </el-table-column>
       <el-table-column
         label="上传时间"
         align="center"

From a711e96b23d8b3cf4945a395e6dda6b4084a10ef Mon Sep 17 00:00:00 2001
From: Marvin <454846659@qq.com>
Date: Fri, 1 Dec 2023 09:53:41 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E4=BE=8B=E5=A4=96=E4=B8=80=E4=B8=AA=E6=A0=87=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/infra/file/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
index 15e4c6de..36e521ac 100644
--- a/src/views/infra/file/index.vue
+++ b/src/views/infra/file/index.vue
@@ -70,7 +70,7 @@
             preview-teleported
             fit="cover"
           />
-          <el-link v-else-if="row.type.includes('pdf')" type="primary" :href="row.url" :underline="false">预览</el-link>
+          <el-link v-else-if="row.type.includes('pdf')" type="primary" :href="row.url" :underline="false" target="_blank">预览</el-link>
           <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank">下载</el-link>
         </template>
       </el-table-column>

From f3e89c0c553cf48ed59cf91b9425efbc97ad652b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 3 Dec 2023 00:14:04 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=20UploadImg=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=A2=84=E8=A7=88=E5=9B=BE=E7=89=87=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=BA=20createImageViewer=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=9F=8E=E5=88=97=E8=A1=A8=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=9B=BE=E7=89=87=E5=B1=82=E7=BA=A7=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadImg.vue | 37 +++++++++++----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/UploadFile/src/UploadImg.vue b/src/components/UploadFile/src/UploadImg.vue
index 996fe40b..101801e6 100644
--- a/src/components/UploadFile/src/UploadImg.vue
+++ b/src/components/UploadFile/src/UploadImg.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="upload-box">
     <el-upload
-      :action="updateUrl"
       :id="uuid"
-      :class="['upload', drag ? 'no-border' : '']"
-      :multiple="false"
-      :show-file-list="false"
-      :headers="uploadHeaders"
-      :before-upload="beforeUpload"
-      :on-success="uploadSuccess"
-      :on-error="uploadError"
-      :drag="drag"
       :accept="fileType.join(',')"
+      :action="updateUrl"
+      :before-upload="beforeUpload"
+      :class="['upload', drag ? 'no-border' : '']"
+      :drag="drag"
+      :headers="uploadHeaders"
+      :multiple="false"
+      :on-error="uploadError"
+      :on-success="uploadSuccess"
+      :show-file-list="false"
     >
       <template v-if="modelValue">
         <img :src="modelValue" class="upload-image" />
@@ -20,11 +20,11 @@
             <Icon icon="ep:edit" />
             <span v-if="showBtnText">{{ t('action.edit') }}</span>
           </div>
-          <div class="handle-icon" @click="imgViewVisible = true">
+          <div class="handle-icon" @click="imagePreview(modelValue)">
             <Icon icon="ep:zoom-in" />
             <span v-if="showBtnText">{{ t('action.detail') }}</span>
           </div>
-          <div class="handle-icon" @click="deleteImg" v-if="showDelete">
+          <div v-if="showDelete" class="handle-icon" @click="deleteImg">
             <Icon icon="ep:delete" />
             <span v-if="showBtnText">{{ t('action.del') }}</span>
           </div>
@@ -42,11 +42,6 @@
     <div class="el-upload__tip">
       <slot name="tip"></slot>
     </div>
-    <el-image-viewer
-      v-if="imgViewVisible"
-      @close="imgViewVisible = false"
-      :url-list="[modelValue]"
-    />
   </div>
 </template>
 
@@ -56,6 +51,7 @@ import type { UploadProps } from 'element-plus'
 import { generateUUID } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
+import { createImageViewer } from '@/components/ImageViewer'
 
 defineOptions({ name: 'UploadImg' })
 
@@ -92,7 +88,12 @@ const message = useMessage() // 消息弹窗
 // 生成组件唯一id
 const uuid = ref('id-' + generateUUID())
 // 查看图片
-const imgViewVisible = ref(false)
+const imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    zIndex: 9999999,
+    urlList: [imgUrl]
+  })
+}
 
 const emit = defineEmits(['update:modelValue'])
 
@@ -130,7 +131,7 @@ const uploadError = () => {
   message.notifyError('图片上传失败，请您重新上传！')
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .is-error {
   .upload {
     :deep(.el-upload),