From 65c546588927b82ee30d2cd9046fd25688870444 Mon Sep 17 00:00:00 2001 From: songxuan <1668325326@qq.com> Date: Wed, 28 Sep 2022 10:40:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0responseType=20json?= =?UTF-8?q?=20=E4=BB=A5=E5=A4=96=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=A4=84=E7=90=86=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/utils/axios.ts | 146 +++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 71 deletions(-) diff --git a/web/src/utils/axios.ts b/web/src/utils/axios.ts index 6a1a0dc7..e7c247b8 100644 --- a/web/src/utils/axios.ts +++ b/web/src/utils/axios.ts @@ -45,6 +45,7 @@ function createAxios(axiosConfig: AxiosRequestConfig, options: Options = {}, loa 'think-lang': config.lang.defaultLang, server: true, }, + responseType: 'json', }) options = Object.assign( @@ -94,88 +95,91 @@ function createAxios(axiosConfig: AxiosRequestConfig, options: Options = {}, loa removePending(response.config) options.loading && closeLoading(options) // 关闭loading - if (response.data && response.data.code !== 1) { - if (response.data.code == 409) { - if (!window.tokenRefreshing) { - window.tokenRefreshing = true - return refreshToken() - .then((res) => { - if (res.data.type == 'admin-refresh') { - adminInfo.setToken(res.data.token, 'token') - response.headers.batoken = `${res.data.token}` - window.requests.forEach((cb) => cb(res.data.token, 'admin-refresh')) - } else if (res.data.type == 'user-refresh') { - userInfo.setToken(res.data.token, 'token') - response.headers['ba-user-token'] = `${res.data.token}` - window.requests.forEach((cb) => cb(res.data.token, 'user-refresh')) - } - window.requests = [] - return Axios(response.config) - }) - .catch((err) => { - if (isAdminApp()) { - adminInfo.removeToken() - if (router.currentRoute.value.name != 'adminLogin') { - router.push({ name: 'adminLogin' }) - return Promise.reject(err) + if (response.config.responseType == 'json') { + if (response.data && response.data.code !== 1) { + if (response.data.code == 409) { + if (!window.tokenRefreshing) { + window.tokenRefreshing = true + return refreshToken() + .then((res) => { + if (res.data.type == 'admin-refresh') { + adminInfo.setToken(res.data.token, 'token') + response.headers.batoken = `${res.data.token}` + window.requests.forEach((cb) => cb(res.data.token, 'admin-refresh')) + } else if (res.data.type == 'user-refresh') { + userInfo.setToken(res.data.token, 'token') + response.headers['ba-user-token'] = `${res.data.token}` + window.requests.forEach((cb) => cb(res.data.token, 'user-refresh')) + } + window.requests = [] + return Axios(response.config) + }) + .catch((err) => { + if (isAdminApp()) { + adminInfo.removeToken() + if (router.currentRoute.value.name != 'adminLogin') { + router.push({ name: 'adminLogin' }) + return Promise.reject(err) + } else { + response.headers.batoken = '' + window.requests.forEach((cb) => cb('', 'admin-refresh')) + window.requests = [] + return Axios(response.config) + } } else { - response.headers.batoken = '' - window.requests.forEach((cb) => cb('', 'admin-refresh')) - window.requests = [] - return Axios(response.config) + userInfo.removeToken() + if (router.currentRoute.value.name != 'userLogin') { + router.push({ name: 'userLogin' }) + return Promise.reject(err) + } else { + response.headers['ba-user-token'] = '' + window.requests.forEach((cb) => cb('', 'user-refresh')) + window.requests = [] + return Axios(response.config) + } } - } else { - userInfo.removeToken() - if (router.currentRoute.value.name != 'userLogin') { - router.push({ name: 'userLogin' }) - return Promise.reject(err) + }) + .finally(() => { + window.tokenRefreshing = false + }) + } else { + return new Promise((resolve) => { + // 用函数形式将 resolve 存入，等待刷新后再执行 + window.requests.push((token: string, type: string) => { + if (type == 'admin-refresh') { + response.headers.batoken = `${token}` } else { - response.headers['ba-user-token'] = '' - window.requests.forEach((cb) => cb('', 'user-refresh')) - window.requests = [] - return Axios(response.config) + response.headers['ba-user-token'] = `${token}` } - } - }) - .finally(() => { - window.tokenRefreshing = false - }) - } else { - return new Promise((resolve) => { - // 用函数形式将 resolve 存入，等待刷新后再执行 - window.requests.push((token: string, type: string) => { - if (type == 'admin-refresh') { - response.headers.batoken = `${token}` - } else { - response.headers['ba-user-token'] = `${token}` - } - resolve(Axios(response.config)) + resolve(Axios(response.config)) + }) }) + } + } + if (options.showCodeMessage) { + ElNotification({ + type: 'error', + message: response.data.msg, }) } - } - if (options.showCodeMessage) { + // 自动跳转到路由name或path，仅限server端返回302的情况 + if (response.data.code == 302) { + if (response.data.data.routeName) { + router.push({ name: response.data.data.routeName }) + } else if (response.data.data.routePath) { + router.push({ path: response.data.data.routePath }) + } + } + // code不等于1, 页面then内的具体逻辑就不执行了 + return Promise.reject(response.data) + } else if (options.showSuccessMessage && response.data && response.data.code == 1) { ElNotification({ - type: 'error', - message: response.data.msg, + message: response.data.msg ? response.data.msg : i18n.global.t('axios.Operation successful'), + type: 'success', }) } - // 自动跳转到路由name或path，仅限server端返回302的情况 - if (response.data.code == 302) { - if (response.data.data.routeName) { - router.push({ name: response.data.data.routeName }) - } else if (response.data.data.routePath) { - router.push({ path: response.data.data.routePath }) - } - } - // code不等于1, 页面then内的具体逻辑就不执行了 - return Promise.reject(response.data) - } else if (options.showSuccessMessage && response.data && response.data.code == 1) { - ElNotification({ - message: response.data.msg ? response.data.msg : i18n.global.t('axios.Operation successful'), - type: 'success', - }) } + return options.reductDataFormat ? response.data : response }, (error) => { -- Gitee From aed673f19078d3805716e32b15f7394a33a6ad21 Mon Sep 17 00:00:00 2001 From: songxuan <1668325326@qq.com> Date: Fri, 30 Sep 2022 14:56:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/command/Crud/stubs/html/index.stub | 2 +- web/package.json | 5 +- web/src/components/table/header/index.vue | 295 ++++++++++--------- web/src/utils/baTable.ts | 11 +- web/src/utils/export.ts | 101 +++++++ 5 files changed, 273 insertions(+), 141 deletions(-) create mode 100644 web/src/utils/export.ts diff --git a/app/admin/command/Crud/stubs/html/index.stub b/app/admin/command/Crud/stubs/html/index.stub index 3bc38389..2aeb6fac 100644 --- a/app/admin/command/Crud/stubs/html/index.stub +++ b/app/admin/command/Crud/stubs/html/index.stub @@ -4,7 +4,7 @@ diff --git a/web/package.json b/web/package.json index 35b5863b..1b54a295 100644 --- a/web/package.json +++ b/web/package.json @@ -28,7 +28,10 @@ "v-code-diff": "^0.3.10", "vue": "~3.2.25", "vue-i18n": "~9.1.9", - "vue-router": "~4.0.12" + "vue-router": "~4.0.12", + "xlsx": "^0.18.5", + "file-saver": "^2.0.5", + "papaparse": "^5.3.2" }, "devDependencies": { "@types/lodash": "~4.14.180", diff --git a/web/src/components/table/header/index.vue b/web/src/components/table/header/index.vue index 973dc406..78dae5cb 100644 --- a/web/src/components/table/header/index.vue +++ b/web/src/components/table/header/index.vue @@ -24,13 +24,13 @@ {{ baTable.table.expandAll ? t('Shrink all') : t('Expand all') }} @@ -59,19 +59,19 @@
@@ -79,28 +79,45 @@ + + + + + + @@ -111,133 +128,137 @@ + const changeUnfold = () => { + emits('action', 'unfold', { unfold: !baTable.table.expandAll }) + } - diff --git a/web/src/utils/baTable.ts b/web/src/utils/baTable.ts index 5a7c0952..60af2e62 100644 --- a/web/src/utils/baTable.ts +++ b/web/src/utils/baTable.ts @@ -1,4 +1,4 @@ -import { reactive, onUnmounted, onActivated, onDeactivated } from 'vue' +import { reactive, onUnmounted, onActivated, onDeactivated, toRaw } from 'vue' import { getArrayKey } from '/@/utils/common' import useCurrentInstance from '/@/utils/useCurrentInstance' import type { baTableApi } from '/@/api/common' @@ -8,6 +8,7 @@ import { ElNotification, ElForm } from 'element-plus' import { onBeforeRouteUpdate, useRoute } from 'vue-router' import _ from 'lodash' import { i18n } from '/@/lang/index' +import { exportData } from '/@/utils/export' export default class baTable { public api @@ -352,6 +353,12 @@ export default class baTable { this.table.column[columnKey].show = data.value }, ], + [ + 'export', + () => { + exportData(toRaw(this.table), data.tag) + }, + ], [ 'default', () => { @@ -545,7 +552,7 @@ export default class baTable { } } else { form[prop + '-start'] = range[0] ?? '' - form[prop + '-end'] = range[1] ?? '' + form[prop + '-end'] = range[1] ?? '' } } else if (field[key].operator == 'NULL' || field[key].operator == 'NOT NULL') { form[prop] = queryProp ? true : false diff --git a/web/src/utils/export.ts b/web/src/utils/export.ts new file mode 100644 index 00000000..2b48ad33 --- /dev/null +++ b/web/src/utils/export.ts @@ -0,0 +1,101 @@ +import * as XLSX from 'xlsx' +import Papa from 'papaparse' +import FileSaver from 'file-saver' + +/** + * 导出 + */ +export function exportData(json: any, tag: string) { + const title = getTitle(json.column) + const list = json.data.map((item: any) => { + const obj: any = {} + for (const k in item) { + if (title[k]) { + obj[title[k]] = item[k] + } + } + return obj + }) + + switch (tag) { + case 'excell': + exportExcell(list) + break + case 'csv': + exportCsv(list) + break + case 'json': + exportJson(list) + break + default: + exportExcell(list) + } +} +/** + * 导出 json + */ +export function exportJson(list: any) { + const data = JSON.stringify(list) + const blob = new Blob([data], { type: 'application/json' }) + const name: string = getNowDate() + FileSaver.saveAs(blob, 'JSON_' + name + '.json') +} + +/** + * 导出 csv + */ +export function exportCsv(list: any) { + const csv: any = Papa.unparse(list) + const content: any = new Blob([csv]) + const urlObject: any = window.URL || window.webkitURL || window + const url: any = urlObject.createObjectURL(content) + const el: any = document.createElement('a') + el.href = url + const name: string = getNowDate() + el.download = 'CSV_' + name + '.csv' + el.click() + urlObject.revokeObjectURL(url) +} + +/** + * 导出 excell + */ +export function exportExcell(list: any) { + const data = XLSX.utils.json_to_sheet(list) + const wb = XLSX.utils.book_new() + XLSX.utils.book_append_sheet(wb, data, '') + const name: string = getNowDate() + XLSX.writeFile(wb, 'EXCELL_' + name + '.xlsx') +} + +/* + *获取标题 + */ +export function getTitle(Obj: any): any { + const label: any = [] + const prop: any = [] + Obj.map((item: any) => { + if (item.label && item.prop && item.show != false) { + label.push(item.label) + prop.push(item.prop) + } + }) + + const title: any = [] + for (let i = 0; i < prop.length; i++) { + title[prop[i]] = label[i] + } + return title +} +/** + * 获取当前年月日 + */ +export function getNowDate(): any { + const timeOne = new Date() + const year: any = timeOne.getFullYear() + let month: any = timeOne.getMonth() + 1 + let day: any = timeOne.getDate() + month = month < 10 ? '0' + month : month + day = day < 10 ? '0' + day : day + return `${year}-${month}-${day}` +} -- Gitee