fix(import-excel): support datetime raw data import

importExcel支持导入原始日期时间数据

fixed: #1215
This commit is contained in:
无木 2021-09-21 23:23:32 +08:00
parent 01b667facf
commit 6e0c70f415
2 changed files with 35 additions and 4 deletions

View File

@ -15,12 +15,25 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, unref } from 'vue'; import { defineComponent, ref, unref } from 'vue';
import XLSX from 'xlsx'; import XLSX from 'xlsx';
import { dateUtil } from '/@/utils/dateUtil';
import type { ExcelData } from './typing'; import type { ExcelData } from './typing';
export default defineComponent({ export default defineComponent({
name: 'ImportExcel', name: 'ImportExcel',
props: {
// Date
dateFormat: {
type: String,
},
// +08:00
// https://github.com/SheetJS/sheetjs/issues/1470#issuecomment-501108554
timeZone: {
type: Number,
default: 8,
},
},
emits: ['success', 'error'], emits: ['success', 'error'],
setup(_, { emit }) { setup(props, { emit }) {
const inputRef = ref<HTMLInputElement | null>(null); const inputRef = ref<HTMLInputElement | null>(null);
const loadingRef = ref<Boolean>(false); const loadingRef = ref<Boolean>(false);
@ -51,10 +64,28 @@
*/ */
function getExcelData(workbook: XLSX.WorkBook) { function getExcelData(workbook: XLSX.WorkBook) {
const excelData: ExcelData[] = []; const excelData: ExcelData[] = [];
const { dateFormat, timeZone } = props;
for (const sheetName of workbook.SheetNames) { for (const sheetName of workbook.SheetNames) {
const worksheet = workbook.Sheets[sheetName]; const worksheet = workbook.Sheets[sheetName];
const header: string[] = getHeaderRow(worksheet); const header: string[] = getHeaderRow(worksheet);
const results = XLSX.utils.sheet_to_json(worksheet); let results = XLSX.utils.sheet_to_json(worksheet, {
raw: true,
dateNF: dateFormat, //Not worked
}) as object[];
results = results.map((row: object) => {
for (let field in row) {
if (row[field] instanceof Date) {
if (timeZone === 8) {
row[field].setSeconds(row[field].getSeconds() + 43);
}
if (dateFormat) {
row[field] = dateUtil(row[field]).format(dateFormat);
}
}
}
return row;
});
excelData.push({ excelData.push({
header, header,
results, results,
@ -76,7 +107,7 @@
reader.onload = async (e) => { reader.onload = async (e) => {
try { try {
const data = e.target && e.target.result; const data = e.target && e.target.result;
const workbook = XLSX.read(data, { type: 'array' }); const workbook = XLSX.read(data, { type: 'array', cellDates: true });
// console.log(workbook); // console.log(workbook);
/* DO SOMETHING WITH workbook HERE */ /* DO SOMETHING WITH workbook HERE */
const excelData = getExcelData(workbook); const excelData = getExcelData(workbook);

View File

@ -1,6 +1,6 @@
<template> <template>
<PageWrapper title="excel数据导入示例"> <PageWrapper title="excel数据导入示例">
<ImpExcel @success="loadDataSuccess"> <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
<a-button class="m-3"> 导入Excel </a-button> <a-button class="m-3"> 导入Excel </a-button>
</ImpExcel> </ImpExcel>
<BasicTable <BasicTable