From 815250ed341ccaec23e7ea34db6cc478a47ad065 Mon Sep 17 00:00:00 2001
From: jq <1151176506@qq.com>
Date: Wed, 18 Nov 2020 22:08:20 +0800
Subject: [PATCH] fix: update upload component

---
 src/components/Upload/src/FileList.less       | 34 +++++++++++
 src/components/Upload/src/FileList.tsx        | 57 +++++++++++++++++
 src/components/Upload/src/UploadModal.vue     | 61 ++++++++++++-------
 .../Upload/src/UploadPreviewModal.vue         | 17 +++---
 src/components/Upload/src/data.tsx            |  2 +-
 src/components/Upload/src/props.ts            | 16 +++++
 src/components/Upload/src/types.ts            | 30 +++++++++
 7 files changed, 183 insertions(+), 34 deletions(-)
 create mode 100644 src/components/Upload/src/FileList.less
 create mode 100644 src/components/Upload/src/FileList.tsx

diff --git a/src/components/Upload/src/FileList.less b/src/components/Upload/src/FileList.less
new file mode 100644
index 00000000..88788b93
--- /dev/null
+++ b/src/components/Upload/src/FileList.less
@@ -0,0 +1,34 @@
+@import (reference) '../../../design/index.less';
+
+.file-table {
+  width: 100%;
+  border-collapse: collapse;
+  //   border: 1px solid @border-color-light;
+
+  .center {
+    text-align: center;
+  }
+
+  .left {
+    text-align: left;
+  }
+
+  .right {
+    text-align: right;
+  }
+
+  &-th,
+  &-td {
+    padding: 12px 8px;
+  }
+
+  thead {
+    background-color: @background-color-dark;
+  }
+
+  table,
+  td,
+  th {
+    border: 1px solid @border-color-light;
+  }
+}
diff --git a/src/components/Upload/src/FileList.tsx b/src/components/Upload/src/FileList.tsx
new file mode 100644
index 00000000..9c831b1d
--- /dev/null
+++ b/src/components/Upload/src/FileList.tsx
@@ -0,0 +1,57 @@
+import { defineComponent } from 'vue';
+import { fileListProps } from './props';
+import { isFunction } from '/@/utils/is';
+import './FileList.less';
+
+export default defineComponent({
+  name: 'FileList',
+  props: fileListProps,
+  setup(props) {
+    return () => {
+      const { columns, actionColumn, dataSource } = props;
+
+      return (
+        <table class="file-table">
+          <colgroup>
+            {[...columns, actionColumn].map((item) => {
+              const { width = 0 } = item;
+              return width ? (
+                <col style={'width:' + width + 'px;min-width:' + width + 'px;'} />
+              ) : (
+                <col />
+              );
+            })}
+          </colgroup>
+          <thead>
+            <tr class="file-table-tr">
+              {[...columns, actionColumn].map((item) => {
+                const { title = '', align = 'center' } = item;
+                return <th class={['file-table-th', align]}>{title}</th>;
+              })}
+            </tr>
+          </thead>
+          <tbody>
+            {dataSource.map((record = {}) => {
+              return (
+                <tr class="file-table-tr">
+                  {[...columns, actionColumn].map((item) => {
+                    const { dataIndex = '', customRender, align = 'center' } = item;
+                    if (customRender && isFunction(customRender)) {
+                      return (
+                        <td class={['file-table-td', align]}>
+                          {customRender({ text: record[dataIndex], record })}
+                        </td>
+                      );
+                    } else {
+                      return <td class={['file-table-td', align]}>{record[dataIndex]}</td>;
+                    }
+                  })}
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      );
+    };
+  },
+});
diff --git a/src/components/Upload/src/UploadModal.vue b/src/components/Upload/src/UploadModal.vue
index 6eb320e6..d5803262 100644
--- a/src/components/Upload/src/UploadModal.vue
+++ b/src/components/Upload/src/UploadModal.vue
@@ -23,24 +23,25 @@
         {{ getUploadBtnText }}
       </a-button>
     </template>
-
-    <BasicTable @register="registerTable" :dataSource="fileListRef">
-      <template #toolbar>
-        <Upload :accept="getStringAccept" :multiple="multiple" :before-upload="beforeUpload">
-          <a-button type="primary"> 选择文件 </a-button>
-        </Upload>
-      </template>
-      <template #tableTitle>
-        <Alert :message="getHelpText" type="info" banner></Alert>
-      </template>
-    </BasicTable>
+    <div class="upload-modal-toolbar">
+      <Alert :message="getHelpText" type="info" banner class="upload-modal-toolbar__text"></Alert>
+      <Upload
+        :accept="getStringAccept"
+        :multiple="multiple"
+        :before-upload="beforeUpload"
+        class="upload-modal-toolbar__btn"
+      >
+        <a-button type="primary"> 选择文件 </a-button>
+      </Upload>
+    </div>
+    <FileList :dataSource="fileListRef" :columns="columns" :actionColumn="actionColumn" />
   </BasicModal>
 </template>
 <script lang="ts">
   import { defineComponent, reactive, ref, toRefs, unref, computed } from 'vue';
   import { Upload, Alert } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicTable, useTable } from '/@/components/Table';
+  //   import { BasicTable, useTable } from '/@/components/Table';
   // hooks
   import { useUploadType } from './useUpload';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -55,9 +56,9 @@
   import { uploadApi } from '/@/api/sys/upload';
   import { isFunction } from '/@/utils/is';
   import { warn } from '/@/utils/log';
-
+  import FileList from './FileList';
   export default defineComponent({
-    components: { BasicModal, Upload, BasicTable, Alert },
+    components: { BasicModal, Upload, Alert, FileList },
     props: basicProps,
     setup(props, { emit }) {
       //   是否正在上传
@@ -257,23 +258,25 @@
         }
       }
 
-      const [registerTable] = useTable({
+      //   const [registerTable] = useTable({
+      //     columns: createTableColumns(),
+      //     actionColumn: createActionColumn(handleRemove, handlePreview),
+      //     pagination: false,
+      //     inset: true,
+      //     scroll: {
+      //       y: 3000,
+      //     },
+      //   });
+      return {
         columns: createTableColumns(),
         actionColumn: createActionColumn(handleRemove, handlePreview),
-        pagination: false,
-        inset: true,
-        scroll: {
-          y: 3000,
-        },
-      });
-      return {
         register,
         closeModal,
         getHelpText,
         getStringAccept,
         getOkButtonProps,
         beforeUpload,
-        registerTable,
+        // registerTable,
         fileListRef,
         state,
         isUploadingRef,
@@ -295,5 +298,17 @@
     .ant-table-wrapper .ant-spin-nested-loading {
       padding: 0;
     }
+
+    &-toolbar {
+      display: flex;
+      align-items: center;
+      margin-bottom: 8px;
+
+      &__btn {
+        margin-left: 8px;
+        text-align: right;
+        flex: 1;
+      }
+    }
   }
 </style>
diff --git a/src/components/Upload/src/UploadPreviewModal.vue b/src/components/Upload/src/UploadPreviewModal.vue
index a50448d5..70aafd20 100644
--- a/src/components/Upload/src/UploadPreviewModal.vue
+++ b/src/components/Upload/src/UploadPreviewModal.vue
@@ -7,13 +7,15 @@
     @register="register"
     :showOkBtn="false"
   >
-    <BasicTable @register="registerTable" :dataSource="fileListRef" />
+    <FileList :dataSource="fileListRef" :columns="columns" :actionColumn="actionColumn" />
   </BasicModal>
 </template>
 <script lang="ts">
   import { defineComponent, watch, ref, unref } from 'vue';
 
-  import { BasicTable, useTable } from '/@/components/Table';
+  //   import { BasicTable, useTable } from '/@/components/Table';
+  import FileList from './FileList';
+
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { previewProps } from './props';
   import { PreviewFileItem } from './types';
@@ -22,7 +24,7 @@
 
   import { createPreviewColumns, createPreviewActionColumn } from './data';
   export default defineComponent({
-    components: { BasicModal, BasicTable },
+    components: { BasicModal, FileList },
     props: previewProps,
     setup(props, { emit }) {
       const [register, { closeModal }] = useModalInner();
@@ -71,17 +73,12 @@
         downloadByUrl({ url });
       }
 
-      const [registerTable] = useTable({
-        columns: createPreviewColumns(),
-        pagination: false,
-        actionColumn: createPreviewActionColumn({ handleRemove, handlePreview, handleDownload }),
-      });
-
       return {
         register,
         closeModal,
         fileListRef,
-        registerTable,
+        columns: createPreviewColumns(),
+        actionColumn: createPreviewActionColumn({ handleRemove, handlePreview, handleDownload }),
       };
     },
   });
diff --git a/src/components/Upload/src/data.tsx b/src/components/Upload/src/data.tsx
index e27e337e..32abe9b4 100644
--- a/src/components/Upload/src/data.tsx
+++ b/src/components/Upload/src/data.tsx
@@ -12,7 +12,7 @@ export function createTableColumns(): BasicColumn[] {
       width: 100,
       customRender: ({ record }) => {
         const { thumbUrl, type } = (record as FileItem) || {};
-        return <span>{thumbUrl ? <img style={{ maxWidth: '60px' }} src={thumbUrl} /> : type}</span>;
+        return <span>{thumbUrl ? <img style={{ maxWidth: '100%' }} src={thumbUrl} /> : type}</span>;
       },
     },
     {
diff --git a/src/components/Upload/src/props.ts b/src/components/Upload/src/props.ts
index 4d236d01..1095ceb2 100644
--- a/src/components/Upload/src/props.ts
+++ b/src/components/Upload/src/props.ts
@@ -1,4 +1,5 @@
 import type { PropType } from 'vue';
+import { FileBasicColumn } from './types';
 
 export const basicProps = {
   helpText: {
@@ -57,3 +58,18 @@ export const previewProps = {
     default: () => [],
   },
 };
+
+export const fileListProps = {
+  columns: {
+    type: [Array] as PropType<FileBasicColumn[]>,
+    default: null,
+  },
+  actionColumn: {
+    type: Object as PropType<FileBasicColumn>,
+    default: null,
+  },
+  dataSource: {
+    type: Array as PropType<any[]>,
+    default: null,
+  },
+};
diff --git a/src/components/Upload/src/types.ts b/src/components/Upload/src/types.ts
index 7bd633ea..c6301100 100644
--- a/src/components/Upload/src/types.ts
+++ b/src/components/Upload/src/types.ts
@@ -23,3 +23,33 @@ export interface PreviewFileItem {
   name: string;
   type: string;
 }
+
+export interface FileBasicColumn {
+  /**
+   * Renderer of the table cell. The return value should be a VNode, or an object for colSpan/rowSpan config
+   * @type Function | ScopedSlot
+   */
+  customRender?: Function;
+  /**
+   * Title of this column
+   * @type any (string | slot)
+   */
+  title: string;
+
+  /**
+   * Width of this column
+   * @type string | number
+   */
+  width?: number;
+  /**
+   * Display field of the data record, could be set like a.b.c
+   * @type string
+   */
+  dataIndex: string;
+  /**
+   * specify how content is aligned
+   * @default 'left'
+   * @type string
+   */
+  align?: 'left' | 'right' | 'center';
+}