From a207cafec98461b39882f352f2bf5c7d3c21716a Mon Sep 17 00:00:00 2001
From: jq <1151176506@qq.com>
Date: Mon, 19 Oct 2020 20:37:08 +0800
Subject: [PATCH] fix(excel): update excel demo

---
 src/components/Excel/src/ExportExcelModel.vue |  3 +-
 src/router/menus/modules/demo/charts.ts       | 22 ++++++
 src/router/menus/modules/demo/comp.ts         | 14 ----
 src/router/routes/modules/demo/charts.ts      | 42 ++++++++++
 src/router/routes/modules/demo/comp.ts        | 26 ------
 src/views/demo/comp/excel/ExportToExcel.vue   | 79 -------------------
 src/views/demo/echarts/excel/ArrayExport.vue  | 36 +++++++++
 src/views/demo/echarts/excel/CustomExport.vue | 43 ++++++++++
 .../{comp => echarts}/excel/ImportExcel.vue   |  2 +-
 src/views/demo/echarts/excel/JsonExport.vue   | 56 +++++++++++++
 .../demo/{comp => echarts}/excel/data.ts      |  0
 11 files changed, 202 insertions(+), 121 deletions(-)
 delete mode 100644 src/views/demo/comp/excel/ExportToExcel.vue
 create mode 100644 src/views/demo/echarts/excel/ArrayExport.vue
 create mode 100644 src/views/demo/echarts/excel/CustomExport.vue
 rename src/views/demo/{comp => echarts}/excel/ImportExcel.vue (98%)
 create mode 100644 src/views/demo/echarts/excel/JsonExport.vue
 rename src/views/demo/{comp => echarts}/excel/data.ts (100%)

diff --git a/src/components/Excel/src/ExportExcelModel.vue b/src/components/Excel/src/ExportExcelModel.vue
index 6a28ba541..68bcb9e7b 100644
--- a/src/components/Excel/src/ExportExcelModel.vue
+++ b/src/components/Excel/src/ExportExcelModel.vue
@@ -12,6 +12,7 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { ExportModalResult } from './types';
 
   const schemas: FormSchema[] = [
     {
@@ -59,7 +60,7 @@
       const [registerModal, { closeModal }] = useModalInner();
 
       async function handleOk() {
-        const res = await validateFields();
+        const res: ExportModalResult = await validateFields();
         const { filename, bookType } = res;
 
         emit('success', {
diff --git a/src/router/menus/modules/demo/charts.ts b/src/router/menus/modules/demo/charts.ts
index 779679920..001ffb7e2 100644
--- a/src/router/menus/modules/demo/charts.ts
+++ b/src/router/menus/modules/demo/charts.ts
@@ -27,6 +27,28 @@ const menu: MenuModule = {
           },
         ],
       },
+      //   {
+      // path: '/excel',
+      // name: 'excel',
+      // children: [
+      {
+        path: '/customExport',
+        name: '选择导出格式',
+      },
+      {
+        path: '/jsonExport',
+        name: 'JSON数据导出',
+      },
+      {
+        path: '/arrayExport',
+        name: 'Array数据导出',
+      },
+      {
+        path: '/importExcel',
+        name: '导入',
+      },
+      //     ],
+      //   },
     ],
   },
 };
diff --git a/src/router/menus/modules/demo/comp.ts b/src/router/menus/modules/demo/comp.ts
index 18b7f0a9a..c60b10551 100644
--- a/src/router/menus/modules/demo/comp.ts
+++ b/src/router/menus/modules/demo/comp.ts
@@ -66,20 +66,6 @@ const menu: MenuModule = {
         path: '/strength-meter',
         name: '密码强度组件',
       },
-      {
-        path: '/excel',
-        name: 'excel',
-        children: [
-          {
-            path: '/export',
-            name: 'Export',
-          },
-          {
-            path: '/import',
-            name: 'Import',
-          },
-        ],
-      },
     ],
   },
 };
diff --git a/src/router/routes/modules/demo/charts.ts b/src/router/routes/modules/demo/charts.ts
index a86da8729..e4100da96 100644
--- a/src/router/routes/modules/demo/charts.ts
+++ b/src/router/routes/modules/demo/charts.ts
@@ -56,5 +56,47 @@ export default {
       },
       component: () => import('/@/views/demo/echarts/apex/index.vue'),
     },
+    // {
+    //   path: '/excel',
+    //   name: 'ExcelDemo',
+    //   redirect: '/charts/excel/export',
+    //   meta: {
+    //     title: 'excel',
+    //   },
+    //   children: [
+    {
+      path: '/customExport',
+      name: 'CustomExport',
+      component: () => import('/@/views/demo/echarts/excel/CustomExport.vue'),
+      meta: {
+        title: '选择导出格式',
+      },
+    },
+    {
+      path: '/jsonExport',
+      name: 'JsonExport',
+      component: () => import('/@/views/demo/echarts/excel/JsonExport.vue'),
+      meta: {
+        title: 'JSON数据导出',
+      },
+    },
+    {
+      path: '/arrayExport',
+      name: 'ArrayExport',
+      component: () => import('/@/views/demo/echarts/excel/ArrayExport.vue'),
+      meta: {
+        title: 'Array数据导出',
+      },
+    },
+    {
+      path: '/importExcel',
+      name: 'ImportExcel',
+      component: () => import('/@/views/demo/echarts/excel/ImportExcel.vue'),
+      meta: {
+        title: '导入',
+      },
+    },
+    //   ],
+    // },
   ],
 } as AppRouteModule;
diff --git a/src/router/routes/modules/demo/comp.ts b/src/router/routes/modules/demo/comp.ts
index 0eb60a4bd..dc7c687e5 100644
--- a/src/router/routes/modules/demo/comp.ts
+++ b/src/router/routes/modules/demo/comp.ts
@@ -136,31 +136,5 @@ export default {
         title: '密码强度组件',
       },
     },
-    {
-      path: '/excel',
-      name: 'ExcelDemo',
-      redirect: '/comp/excel/export',
-      meta: {
-        title: 'excel',
-      },
-      children: [
-        {
-          path: 'export',
-          name: 'Export2Excel',
-          component: () => import('/@/views/demo/comp/excel/ExportToExcel.vue'),
-          meta: {
-            title: 'Export2Excel',
-          },
-        },
-        {
-          path: 'import',
-          name: 'ImportExcel',
-          component: () => import('/@/views/demo/comp/excel/ImportExcel.vue'),
-          meta: {
-            title: 'ImportExcel',
-          },
-        },
-      ],
-    },
   ],
 } as AppRouteModule;
diff --git a/src/views/demo/comp/excel/ExportToExcel.vue b/src/views/demo/comp/excel/ExportToExcel.vue
deleted file mode 100644
index 5030d3ef9..000000000
--- a/src/views/demo/comp/excel/ExportToExcel.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div>
-    <BasicTable title="基础表格" :columns="columns" :dataSource="data">
-      <template #toolbar>
-        <a-button @click="openModal">JSON格式导出：默认头部</a-button>
-        <a-button @click="customHeader">JSON格式导出：自定义头部</a-button>
-        <a-button @click="aoaToExcel">二维数组格式导出</a-button>
-      </template>
-    </BasicTable>
-    <ExportExcelModel @register="register" @success="defaultHeader" />
-  </div>
-</template>
-
-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicTable } from '/@/components/Table';
-  import {
-    jsonToSheetXlsx,
-    aoaToSheetXlsx,
-    ExportExcelModel,
-    ExportModalResult,
-  } from '/@/components/Excel';
-  import { columns, data, arrHeader, arrData } from './data';
-  import { useModal } from '/@/components/Modal';
-
-  export default defineComponent({
-    components: { BasicTable, ExportExcelModel },
-    setup() {
-      function defaultHeader({ filename, bookType }: ExportModalResult) {
-        // 默认Object.keys(data[0])作为header
-        jsonToSheetXlsx({
-          data,
-          filename,
-          write2excelOpts: {
-            bookType,
-          },
-        });
-      }
-      function customHeader() {
-        jsonToSheetXlsx({
-          data,
-          header: {
-            id: 'ID',
-            name: '姓名',
-            age: '年龄',
-            no: '编号',
-            address: '地址',
-            beginTime: '开始时间',
-            endTime: '结束时间',
-          },
-          filename: '文件名头部修改.xlsx',
-          json2sheetOpts: {
-            // 指定顺序
-            header: ['name', 'id'],
-          },
-        });
-      }
-      function aoaToExcel() {
-        // 保证data顺序与header一致
-        aoaToSheetXlsx({
-          data: arrData,
-          header: arrHeader,
-          filename: '数组方式导出excel.xlsx',
-        });
-      }
-      const [register, { openModal }] = useModal();
-
-      return {
-        defaultHeader,
-        customHeader,
-        aoaToExcel,
-        columns,
-        data,
-        register,
-        openModal,
-      };
-    },
-  });
-</script>
diff --git a/src/views/demo/echarts/excel/ArrayExport.vue b/src/views/demo/echarts/excel/ArrayExport.vue
new file mode 100644
index 000000000..0b383f7a4
--- /dev/null
+++ b/src/views/demo/echarts/excel/ArrayExport.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="m-4">
+    <BasicTable title="基础表格" :columns="columns" :dataSource="data">
+      <template #toolbar>
+        <a-button @click="aoaToExcel">导出</a-button>
+      </template>
+    </BasicTable>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import { aoaToSheetXlsx, ExportExcelModel } from '/@/components/Excel';
+  import { arrHeader, arrData, columns, data } from './data';
+
+  export default defineComponent({
+    components: { BasicTable, ExportExcelModel },
+    setup() {
+      function aoaToExcel() {
+        // 保证data顺序与header一致
+        aoaToSheetXlsx({
+          data: arrData,
+          header: arrHeader,
+          filename: '二维数组方式导出excel.xlsx',
+        });
+      }
+
+      return {
+        aoaToExcel,
+        columns,
+        data,
+      };
+    },
+  });
+</script>
diff --git a/src/views/demo/echarts/excel/CustomExport.vue b/src/views/demo/echarts/excel/CustomExport.vue
new file mode 100644
index 000000000..99038c05c
--- /dev/null
+++ b/src/views/demo/echarts/excel/CustomExport.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="m-4">
+    <BasicTable title="基础表格" :columns="columns" :dataSource="data">
+      <template #toolbar>
+        <a-button @click="openModal">导出</a-button>
+      </template>
+    </BasicTable>
+    <ExportExcelModel @register="register" @success="defaultHeader" />
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import { jsonToSheetXlsx, ExportExcelModel, ExportModalResult } from '/@/components/Excel';
+  import { columns, data } from './data';
+  import { useModal } from '/@/components/Modal';
+
+  export default defineComponent({
+    components: { BasicTable, ExportExcelModel },
+    setup() {
+      function defaultHeader({ filename, bookType }: ExportModalResult) {
+        // 默认Object.keys(data[0])作为header
+        jsonToSheetXlsx({
+          data,
+          filename,
+          write2excelOpts: {
+            bookType,
+          },
+        });
+      }
+      const [register, { openModal }] = useModal();
+
+      return {
+        defaultHeader,
+        columns,
+        data,
+        register,
+        openModal,
+      };
+    },
+  });
+</script>
diff --git a/src/views/demo/comp/excel/ImportExcel.vue b/src/views/demo/echarts/excel/ImportExcel.vue
similarity index 98%
rename from src/views/demo/comp/excel/ImportExcel.vue
rename to src/views/demo/echarts/excel/ImportExcel.vue
index ebfca0285..1e65fc701 100644
--- a/src/views/demo/comp/excel/ImportExcel.vue
+++ b/src/views/demo/echarts/excel/ImportExcel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="m-4">
     <ImportExcel @success="loadDataSuccess">
       <a-button class="m-3">导入Excel</a-button>
     </ImportExcel>
diff --git a/src/views/demo/echarts/excel/JsonExport.vue b/src/views/demo/echarts/excel/JsonExport.vue
new file mode 100644
index 000000000..de010d1ba
--- /dev/null
+++ b/src/views/demo/echarts/excel/JsonExport.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="m-4">
+    <BasicTable title="基础表格" :columns="columns" :dataSource="data">
+      <template #toolbar>
+        <a-button @click="defaultHeader">导出：默认头部</a-button>
+        <a-button @click="customHeader">导出：自定义头部</a-button>
+      </template>
+    </BasicTable>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import { jsonToSheetXlsx, ExportExcelModel } from '/@/components/Excel';
+  import { columns, data } from './data';
+
+  export default defineComponent({
+    components: { BasicTable, ExportExcelModel },
+    setup() {
+      function defaultHeader() {
+        // 默认Object.keys(data[0])作为header
+        jsonToSheetXlsx({
+          data,
+          filename: '使用key作为默认头部.xlsx',
+        });
+      }
+      function customHeader() {
+        jsonToSheetXlsx({
+          data,
+          header: {
+            id: 'ID',
+            name: '姓名',
+            age: '年龄',
+            no: '编号',
+            address: '地址',
+            beginTime: '开始时间',
+            endTime: '结束时间',
+          },
+          filename: '自定义头部.xlsx',
+          json2sheetOpts: {
+            // 指定顺序
+            header: ['name', 'id'],
+          },
+        });
+      }
+
+      return {
+        defaultHeader,
+        customHeader,
+        columns,
+        data,
+      };
+    },
+  });
+</script>
diff --git a/src/views/demo/comp/excel/data.ts b/src/views/demo/echarts/excel/data.ts
similarity index 100%
rename from src/views/demo/comp/excel/data.ts
rename to src/views/demo/echarts/excel/data.ts