From 91e004e21148c38e572cfbb6b75f0a6f353c15b6 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Fri, 5 Feb 2021 23:27:42 +0800
Subject: [PATCH] fix(upload): fix maxNumber not work #240

---
 CHANGELOG.zh_CN.md                        |  1 +
 build/config/themeConfig.ts               |  1 +
 src/components/Upload/src/BasicUpload.vue |  7 ++++++-
 src/components/Upload/src/UploadModal.vue | 12 +++++++++---
 src/components/Upload/src/data.tsx        |  2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index cf054cf9..0cbe5a71 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -3,6 +3,7 @@
 ### 🐛 Bug Fixes
 
 - 修复菜单在 hmr 时数据被置空
+- 修复 Upload 组件 maxNumber 失效问题
 
 ## 2.0.0-rc.18 (2021-02-05)
 
diff --git a/build/config/themeConfig.ts b/build/config/themeConfig.ts
index f09ee707..40b96bc5 100644
--- a/build/config/themeConfig.ts
+++ b/build/config/themeConfig.ts
@@ -1,4 +1,5 @@
 import { generate } from '@ant-design/colors';
+
 export const primaryColor = '#0084f4';
 
 export const themeMode = 'light';
diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue
index 28f86392..bc6cb198 100644
--- a/src/components/Upload/src/BasicUpload.vue
+++ b/src/components/Upload/src/BasicUpload.vue
@@ -20,7 +20,12 @@
       </Tooltip>
     </a-button-group>
 
-    <UploadModal v-bind="bindValue" @register="registerUploadModal" @change="handleChange" />
+    <UploadModal
+      v-bind="bindValue"
+      :previewFileList="fileListRef"
+      @register="registerUploadModal"
+      @change="handleChange"
+    />
 
     <UploadPreviewModal
       :value="fileListRef"
diff --git a/src/components/Upload/src/UploadModal.vue b/src/components/Upload/src/UploadModal.vue
index fe399692..5e1faba1 100644
--- a/src/components/Upload/src/UploadModal.vue
+++ b/src/components/Upload/src/UploadModal.vue
@@ -42,7 +42,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, ref, toRefs, unref, computed } from 'vue';
+  import { defineComponent, reactive, ref, toRefs, unref, computed, PropType } from 'vue';
   import { Upload, Alert } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   //   import { BasicTable, useTable } from '/@/components/Table';
@@ -63,7 +63,13 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   export default defineComponent({
     components: { BasicModal, Upload, Alert, FileList },
-    props: basicProps,
+    props: {
+      ...basicProps,
+      previewFileList: {
+        type: Array as PropType<string[]>,
+        default: () => [],
+      },
+    },
     emits: ['change', 'register'],
     setup(props, { emit }) {
       const { t } = useI18n();
@@ -206,7 +212,7 @@
       // 点击开始上传
       async function handleStartUpload() {
         const { maxNumber } = props;
-        if (fileListRef.value.length > maxNumber) {
+        if ((fileListRef.value.length + props.previewFileList?.length ?? 0) > maxNumber) {
           return createMessage.warning(t('component.upload.maxNumber', [maxNumber]));
         }
         try {
diff --git a/src/components/Upload/src/data.tsx b/src/components/Upload/src/data.tsx
index f14362e7..168d6a5d 100644
--- a/src/components/Upload/src/data.tsx
+++ b/src/components/Upload/src/data.tsx
@@ -156,7 +156,7 @@ export function createPreviewActionColumn({
       //     onClick: handlePreview.bind(null, record),
       //   });
       // }
-      return <TableAction actions={actions} />;
+      return <TableAction actions={actions} outside={true} />;
     },
   };
 }
-- 
GitLab