From 9f83a9ea293664706b5c33426210b12223642bd3 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 22 Jun 2022 15:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=87=A0=E4=B8=AA=E9=9D=9E=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E4=BE=9D=E8=B5=96xlsx=E3=80=81fullcalendar=E3=80=81lodash.get?= =?UTF-8?q?=E3=80=81lodash.pick=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 21 +-- src/components/Excel/index.ts | 8 - src/components/Excel/src/Export2Excel.ts | 48 ----- src/components/Excel/src/ExportExcelModal.vue | 81 --------- src/components/Excel/src/ImportExcel.vue | 151 ---------------- src/components/Excel/src/typing.ts | 27 --- src/router/routes/modules/demo/comp.ts | 8 - src/router/routes/modules/demo/feat.ts | 45 ----- src/views/demo/excel/ArrayExport.vue | 37 ---- src/views/demo/excel/CustomExport.vue | 44 ----- src/views/demo/excel/ImportExcel.vue | 51 ------ src/views/demo/excel/JsonExport.vue | 58 ------ src/views/demo/excel/data.ts | 59 ------- src/views/demo/fullcalendar/event-utils.ts | 21 --- src/views/demo/fullcalendar/index.vue | 166 ------------------ 15 files changed, 5 insertions(+), 820 deletions(-) delete mode 100644 src/components/Excel/index.ts delete mode 100644 src/components/Excel/src/Export2Excel.ts delete mode 100644 src/components/Excel/src/ExportExcelModal.vue delete mode 100644 src/components/Excel/src/ImportExcel.vue delete mode 100644 src/components/Excel/src/typing.ts delete mode 100644 src/views/demo/excel/ArrayExport.vue delete mode 100644 src/views/demo/excel/CustomExport.vue delete mode 100644 src/views/demo/excel/ImportExcel.vue delete mode 100644 src/views/demo/excel/JsonExport.vue delete mode 100644 src/views/demo/excel/data.ts delete mode 100644 src/views/demo/fullcalendar/event-utils.ts delete mode 100644 src/views/demo/fullcalendar/index.vue diff --git a/package.json b/package.json index 2817516..416fe85 100644 --- a/package.json +++ b/package.json @@ -36,12 +36,6 @@ "dependencies": { "@jeecg/online": "1.0.1", "@iconify/iconify": "^2.0.4", - "@fullcalendar/core": "5.10.1", - "@fullcalendar/daygrid": "5.10.1", - "@fullcalendar/interaction": "5.10.1", - "@fullcalendar/resource-timeline": "5.10.1", - "@fullcalendar/timegrid": "5.10.1", - "@fullcalendar/vue3": "5.10.1", "@vueuse/core": "^6.6.2", "@zxcvbn-ts/core": "^1.0.0-beta.0", "ant-design-vue": "2.2.8", @@ -59,8 +53,6 @@ "intro.js": "^4.2.2", "js-cookie": "^2.2.1", "lodash-es": "^4.17.21", - "lodash.get": "^4.4.2", - "lodash.pick": "^4.4.0", "md5": "^2.3.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", @@ -87,7 +79,6 @@ "vxe-table": "4.1.0", "vxe-table-plugin-antd": "^3.0.3", "xe-utils": "^3.3.1", - "xlsx": "^0.17.3", "vue-json-pretty": "^2.0.4" }, "devDependencies": { @@ -188,11 +179,6 @@ "include": [ "@ant-design/colors", "@ant-design/icons-vue", - "@fullcalendar/core/vdom", - "@fullcalendar/daygrid", - "@fullcalendar/interaction", - "@fullcalendar/timegrid", - "@fullcalendar/vue3", "@jeecg/online", "@vueuse/core", "@vueuse/shared", @@ -211,7 +197,10 @@ "codemirror/addon/hint/show-hint.js", "codemirror/addon/selection/active-line.js", "codemirror/mode/clike/clike.js", + "codemirror/mode/css/css", "codemirror/mode/css/css.js", + "codemirror/mode/htmlmixed/htmlmixed", + "codemirror/mode/javascript/javascript", "codemirror/mode/javascript/javascript.js", "codemirror/mode/markdown/markdown.js", "codemirror/mode/python/python.js", @@ -289,14 +278,14 @@ "vite-plugin-theme/es/colorUtils", "vue", "vue-i18n", + "vue-json-pretty", "vue-print-nb-jeecg/src/printarea", "vue-router", "vue-types", "vuedraggable", "vxe-table", "vxe-table-plugin-antd", - "xe-utils", - "xlsx" + "xe-utils" ] } } diff --git a/src/components/Excel/index.ts b/src/components/Excel/index.ts deleted file mode 100644 index cece07c..0000000 --- a/src/components/Excel/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { withInstall } from '/@/utils'; -import impExcel from './src/ImportExcel.vue'; -import expExcelModal from './src/ExportExcelModal.vue'; - -export const ImpExcel = withInstall(impExcel); -export const ExpExcelModal = withInstall(expExcelModal); -export * from './src/typing'; -export { jsonToSheetXlsx, aoaToSheetXlsx } from './src/Export2Excel'; diff --git a/src/components/Excel/src/Export2Excel.ts b/src/components/Excel/src/Export2Excel.ts deleted file mode 100644 index 24acd96..0000000 --- a/src/components/Excel/src/Export2Excel.ts +++ /dev/null @@ -1,48 +0,0 @@ -import xlsx from 'xlsx'; -import type { WorkBook } from 'xlsx'; -import type { JsonToSheet, AoAToSheet } from './typing'; - -const { utils, writeFile } = xlsx; - -const DEF_FILE_NAME = 'excel-list.xlsx'; - -export function jsonToSheetXlsx({ data, header, filename = DEF_FILE_NAME, json2sheetOpts = {}, write2excelOpts = { bookType: 'xlsx' } }: JsonToSheet) { - const arrData = [...data]; - if (header) { - arrData.unshift(header); - json2sheetOpts.skipHeader = true; - } - - const worksheet = utils.json_to_sheet(arrData, json2sheetOpts); - - /* add worksheet to workbook */ - const workbook: WorkBook = { - SheetNames: [filename], - Sheets: { - [filename]: worksheet, - }, - }; - /* output format determined by filename */ - writeFile(workbook, filename, write2excelOpts); - /* at this point, out.xlsb will have been downloaded */ -} - -export function aoaToSheetXlsx({ data, header, filename = DEF_FILE_NAME, write2excelOpts = { bookType: 'xlsx' } }: AoAToSheet) { - const arrData = [...data]; - if (header) { - arrData.unshift(header); - } - - const worksheet = utils.aoa_to_sheet(arrData); - - /* add worksheet to workbook */ - const workbook: WorkBook = { - SheetNames: [filename], - Sheets: { - [filename]: worksheet, - }, - }; - /* output format determined by filename */ - writeFile(workbook, filename, write2excelOpts); - /* at this point, out.xlsb will have been downloaded */ -} diff --git a/src/components/Excel/src/ExportExcelModal.vue b/src/components/Excel/src/ExportExcelModal.vue deleted file mode 100644 index d51f7c0..0000000 --- a/src/components/Excel/src/ExportExcelModal.vue +++ /dev/null @@ -1,81 +0,0 @@ - - diff --git a/src/components/Excel/src/ImportExcel.vue b/src/components/Excel/src/ImportExcel.vue deleted file mode 100644 index d72facd..0000000 --- a/src/components/Excel/src/ImportExcel.vue +++ /dev/null @@ -1,151 +0,0 @@ - - diff --git a/src/components/Excel/src/typing.ts b/src/components/Excel/src/typing.ts deleted file mode 100644 index e55e549..0000000 --- a/src/components/Excel/src/typing.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { JSON2SheetOpts, WritingOptions, BookType } from 'xlsx'; - -export interface ExcelData { - header: string[]; - results: T[]; - meta: { sheetName: string }; -} - -export interface JsonToSheet { - data: T[]; - header?: T; - filename?: string; - json2sheetOpts?: JSON2SheetOpts; - write2excelOpts?: WritingOptions; -} - -export interface AoAToSheet { - data: T[][]; - header?: T[]; - filename?: string; - write2excelOpts?: WritingOptions; -} - -export interface ExportModalResult { - filename: string; - bookType: BookType; -} diff --git a/src/router/routes/modules/demo/comp.ts b/src/router/routes/modules/demo/comp.ts index 42444e5..9e99120 100644 --- a/src/router/routes/modules/demo/comp.ts +++ b/src/router/routes/modules/demo/comp.ts @@ -466,14 +466,6 @@ const comp: AppRouteModule = { title: t('routes.demo.feat.copy'), }, }, - { - path: 'fullCalendar', - name: 'fullCalendarDemo', - component: () => import('/@/views/demo/fullcalendar/index.vue'), - meta: { - title: t('routes.demo.feat.fullCalendar'), - }, - }, { path: 'codemirror', name: 'codemirrorDemo', diff --git a/src/router/routes/modules/demo/feat.ts b/src/router/routes/modules/demo/feat.ts index 68b63af..722eca8 100644 --- a/src/router/routes/modules/demo/feat.ts +++ b/src/router/routes/modules/demo/feat.ts @@ -129,51 +129,6 @@ const feat: AppRouteModule = { title: t('routes.demo.feat.errorLog'), }, }, - { - path: 'excel', - name: 'Excel', - redirect: '/feat/excel/customExport', - component: getParentLayout('Excel'), - meta: { - // icon: 'mdi:microsoft-excel', - title: t('routes.demo.excel.excel'), - }, - - children: [ - { - path: 'customExport', - name: 'CustomExport', - component: () => import('/@/views/demo/excel/CustomExport.vue'), - meta: { - title: t('routes.demo.excel.customExport'), - }, - }, - { - path: 'jsonExport', - name: 'JsonExport', - component: () => import('/@/views/demo/excel/JsonExport.vue'), - meta: { - title: t('routes.demo.excel.jsonExport'), - }, - }, - { - path: 'arrayExport', - name: 'ArrayExport', - component: () => import('/@/views/demo/excel/ArrayExport.vue'), - meta: { - title: t('routes.demo.excel.arrayExport'), - }, - }, - { - path: 'importExcel', - name: 'ImportExcel', - component: () => import('/@/views/demo/excel/ImportExcel.vue'), - meta: { - title: t('routes.demo.excel.importExcel'), - }, - }, - ], - }, { path: 'testTab/:id', name: 'TestTab', diff --git a/src/views/demo/excel/ArrayExport.vue b/src/views/demo/excel/ArrayExport.vue deleted file mode 100644 index 676832d..0000000 --- a/src/views/demo/excel/ArrayExport.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/src/views/demo/excel/CustomExport.vue b/src/views/demo/excel/CustomExport.vue deleted file mode 100644 index 8f5980a..0000000 --- a/src/views/demo/excel/CustomExport.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/src/views/demo/excel/ImportExcel.vue b/src/views/demo/excel/ImportExcel.vue deleted file mode 100644 index a0da444..0000000 --- a/src/views/demo/excel/ImportExcel.vue +++ /dev/null @@ -1,51 +0,0 @@ - - diff --git a/src/views/demo/excel/JsonExport.vue b/src/views/demo/excel/JsonExport.vue deleted file mode 100644 index 413d9b9..0000000 --- a/src/views/demo/excel/JsonExport.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/src/views/demo/excel/data.ts b/src/views/demo/excel/data.ts deleted file mode 100644 index 3e528d4..0000000 --- a/src/views/demo/excel/data.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { BasicColumn } from '/@/components/Table'; - -export const columns: BasicColumn[] = [ - { - title: 'ID', - dataIndex: 'id', - width: 80, - }, - { - title: '姓名', - dataIndex: 'name', - width: 120, - }, - { - title: '年龄', - dataIndex: 'age', - width: 80, - }, - { - title: '编号', - dataIndex: 'no', - width: 80, - }, - { - title: '地址', - dataIndex: 'address', - }, - { - title: '开始时间', - dataIndex: 'beginTime', - }, - { - title: '结束时间', - dataIndex: 'endTime', - }, -]; - -export const data: any[] = (() => { - const arr: any[] = []; - for (let index = 0; index < 40; index++) { - arr.push({ - id: `${index}`, - name: `${index} John Brown`, - age: `${index + 10}`, - no: `${index}98678`, - address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park', - beginTime: new Date().toLocaleString(), - endTime: new Date().toLocaleString(), - }); - } - return arr; -})(); - -// ["ID", "姓名", "年龄", "编号", "地址", "开始时间", "结束时间"] -export const arrHeader = columns.map((column) => column.title); -// [["ID", "姓名", "年龄", "编号", "地址", "开始时间", "结束时间"],["0", "0 John Brown", "10", "098678"]] -export const arrData = data.map((item) => { - return Object.keys(item).map((key) => item[key]); -}); diff --git a/src/views/demo/fullcalendar/event-utils.ts b/src/views/demo/fullcalendar/event-utils.ts deleted file mode 100644 index 5efd8d7..0000000 --- a/src/views/demo/fullcalendar/event-utils.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { EventInput } from '@fullcalendar/vue3'; - -let eventGuid = 0; -let todayStr = new Date().toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today - -export const INITIAL_EVENTS: EventInput[] = [ - { - id: createEventId(), - title: 'All-day event', - start: todayStr, - }, - { - id: createEventId(), - title: 'Timed event', - start: todayStr + 'T12:00:00', - }, -]; - -export function createEventId() { - return String(eventGuid++); -} diff --git a/src/views/demo/fullcalendar/index.vue b/src/views/demo/fullcalendar/index.vue deleted file mode 100644 index c89a278..0000000 --- a/src/views/demo/fullcalendar/index.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - -