From 05329ce9501eb899a0bbb45320e5807c83372317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= <netfan@foxmail.com>
Date: Fri, 9 Jul 2021 00:22:00 +0800
Subject: [PATCH] fix(upload):  ensure the value type is correct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复BasicUpload组件在设置null值时的问题
---
 CHANGELOG.zh_CN.md                               | 1 +
 src/components/Upload/src/BasicUpload.vue        | 3 ++-
 src/components/Upload/src/UploadPreviewModal.vue | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index e5a67d9a..2af2e648 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -6,6 +6,7 @@
   - 新增`headerTop`插槽
 - **AppSearch** 修复可能会搜索隐藏菜单的问题
 - **TableAction** 仅在 action.tooltip 存在的情况下 才包裹 Tooltip 组件
+- **BasicUpload** 修复处理非`array`值时报错的问题
 - **其它**
   - 修复菜单默认折叠的配置不起作用的问题
   - 修复`safari`浏览器报错导致网站打不开
diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue
index a8d9e12c..4d0407ac 100644
--- a/src/components/Upload/src/BasicUpload.vue
+++ b/src/components/Upload/src/BasicUpload.vue
@@ -46,6 +46,7 @@
   import { uploadContainerProps } from './props';
   import { omit } from 'lodash-es';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { isArray } from '/@/utils/is';
 
   export default defineComponent({
     name: 'BasicUpload',
@@ -77,7 +78,7 @@
       watch(
         () => props.value,
         (value = []) => {
-          fileList.value = value;
+          fileList.value = isArray(value) ? value : [];
         },
         { immediate: true }
       );
diff --git a/src/components/Upload/src/UploadPreviewModal.vue b/src/components/Upload/src/UploadPreviewModal.vue
index aa04a482..c28b9bc9 100644
--- a/src/components/Upload/src/UploadPreviewModal.vue
+++ b/src/components/Upload/src/UploadPreviewModal.vue
@@ -20,6 +20,7 @@
   import { downloadByUrl } from '/@/utils/file/download';
   import { createPreviewColumns, createPreviewActionColumn } from './data';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { isArray } from '/@/utils/is';
 
   export default defineComponent({
     components: { BasicModal, FileList },
@@ -33,6 +34,7 @@
       watch(
         () => props.value,
         (value) => {
+          if (!isArray(value)) value = [];
           fileListRef.value = value
             .filter((item) => !!item)
             .map((item) => {