-
将文件拖到此处，或
@@ -209,13 +221,12 @@ import {
exportUser,
resetUserPwd,
changeUserStatus,
- // importTemplate,
+ importTemplate,
} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { downloadFile } from "@/utils/zipdownload.js";
export default {
name: "User",
@@ -273,7 +284,7 @@ export default {
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
- headers: { Authorization: 'Bearer ' + getToken() },
+ headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "system/user/importData",
},
@@ -548,14 +559,10 @@ export default {
type: "warning",
}).then(() => {
exportUser(queryParams).then((response) => {
- console.log(JSON.stringify(response));
const { code, data } = response;
if (code == 200) {
this.msgSuccess("导出成功");
- downloadFile(
- process.env.VUE_APP_BASE_API + data.path,
- data.fileName
- );
+ this.download(data.fileName);
} else {
this.msgError("导出失败");
}
@@ -569,9 +576,7 @@ export default {
},
/** 下载模板操作 */
importTemplate() {
- // importTemplate().then((response) => {
- downLoadExcel("system/user/importTemplate", "用户数据导入模板");
- // });
+ this.download("/system/user/importTemplate", "用户数据导入模板");
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
index edfc8ec..fcf8662 100644
--- a/ZR.Vue/src/views/tool/gen/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -95,7 +95,6 @@ import {
delTable,
previewTable,
} from "@/api/tool/gen";
-import { downloadFile } from "@/utils/zipdownload.js";
import importTable from "./importTable";
import { Loading } from "element-ui";
import hljs from "highlight.js";
@@ -230,10 +229,7 @@ export default {
if (code == 200) {
this.showGenerate = false;
this.msgSuccess("恭喜你，代码生成完成！");
- downloadFile(
- process.env.VUE_APP_BASE_API + data.zipPath,
- data.fileName
- );
+ this.download(data.fileName);
} else {
this.msgError(res.msg);
}
From 8f1fc2677d4119ac0d1ce9d1c6480fb4d1380d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 13:34:47 +0800
Subject: [PATCH 02/24] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/DateRangePicker/index.vue | 45 ----
ZR.Vue/src/utils/datetime.js | 216 ------------------
ZR.Vue/src/utils/shortcuts.js | 108 ---------
3 files changed, 369 deletions(-)
delete mode 100644 ZR.Vue/src/components/DateRangePicker/index.vue
delete mode 100644 ZR.Vue/src/utils/datetime.js
delete mode 100644 ZR.Vue/src/utils/shortcuts.js
diff --git a/ZR.Vue/src/components/DateRangePicker/index.vue b/ZR.Vue/src/components/DateRangePicker/index.vue
deleted file mode 100644
index eef79bd..0000000
--- a/ZR.Vue/src/components/DateRangePicker/index.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
diff --git a/ZR.Vue/src/utils/datetime.js b/ZR.Vue/src/utils/datetime.js
deleted file mode 100644
index 67f808a..0000000
--- a/ZR.Vue/src/utils/datetime.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/* eslint-disable */
-
-/**
- * Date对象的补充函数，包括类似Python中的strftime()
- * 阿债 https://gitee.com/azhai/datetime.js
- */
-
-Date.prototype.toMidnight = function() {
- this.setHours(0)
- this.setMinutes(0)
- this.setSeconds(0)
- this.setMilliseconds(0)
- return this
-}
-
-Date.prototype.daysAgo = function(days, midnight) {
- days = days ? days - 0 : 0
- const date = new Date(this.getTime() - days * 8.64E7)
- return midnight ? date.toMidnight() : date
-}
-
-Date.prototype.monthBegin = function(offset) {
- offset = offset ? offset - 0 : 0
- const days = this.getDate() - 1 - offset
- return this.daysAgo(days, true)
-}
-
-Date.prototype.quarterBegin = function() {
- const month = this.getMonth() - this.getMonth() % 3
- return new Date(this.getFullYear(), month, 1).toMidnight()
-}
-
-Date.prototype.yearBegin = function() {
- return new Date(this.getFullYear(), 0, 1).toMidnight()
-}
-
-Date.prototype.strftime = function(format, local) {
- if (!format) {
- const str = new Date(this.getTime() + 2.88E7).toISOString()
- return str.substr(0, 16).replace('T', ' ')
- }
- local = local && local.startsWith('zh') ? 'zh' : 'en'
- const padZero = function(str, len) {
- const pads = len - str.toString().length
- return (pads && pads > 0 ? '0'.repeat(pads) : '') + str
- }
- format = format.replace('%F', '%Y-%m-%d')
- format = format.replace(/%D|%x/, '%m/%d/%y')
- format = format.replace(/%T|%X/, '%H:%M:%S')
- format = format.replace('%R', '%H:%M')
- format = format.replace('%r', '%H:%M:%S %p')
- format = format.replace('%c', '%a %b %e %H:%M:%S %Y')
- const _this = this
- return format.replace(/%[A-Za-z%]/g, function(f) {
- let ans = f
- switch (f) {
- case '%%':
- ans = '%'
- break
-
- case '%Y':
- case '%G':
- ans = _this.getFullYear()
- break
-
- case '%y':
- ans = _this.getFullYear() % 100
- break
-
- case '%C':
- ans = _this.getFullYear() / 100
- break
-
- case '%m':
- case '%n':
- ans = _this.getMonth() + 1
- break
-
- case '%B':
- local = local.startsWith('en') ? 'english' : local
-
- case '%b':
- const m = _this.getMonth()
- ans = local_labels.monthes[local][m]
- break
-
- case '%d':
- case '%e':
- ans = _this.getDate()
- break
-
- case '%j':
- ans = _this.getDaysOfYear()
- break
-
- case '%U':
- case '%W':
- const ws = _this.getWeeksOfYear(f === '%W')
- ans = padZero(ws, 2)
- break
-
- case '%w':
- ans = _this.getDay()
-
- case '%u':
- ans = ans === 0 ? 7 : ans
- break
-
- case '%A':
- local = local.startsWith('en') ? 'english' : local
-
- case '%a':
- const d = _this.getDay()
- ans = local_labels.weekdays[local][d]
- break
-
- case '%H':
- case '%k':
- ans = _this.getHours()
- break
-
- case '%I':
- case '%l':
- ans = _this.getHours()
- ans = ans % 12
- break
-
- case '%M':
- ans = _this.getMinutes()
- break
-
- case '%S':
- ans = _this.getSeconds()
- break
-
- case '%s':
- ans = parseInt(_this.getTime() / 1E3)
- break
-
- case '%f':
- const ms = _this.getMilliseconds()
- ans = padZero(ms * 1E3, 6)
- break
-
- case '%P':
- local = local.startsWith('en') ? 'english' : local
-
- case '%p':
- const h = _this.getHours()
- ans = local_labels.meridians[local][h < 12 ? 0 : 1]
- break
-
- case '%z':
- let tzo = _this.getTimezoneOffset()
- const sign = tzo < 0 ? '-' : '+'
- tzo = Math.abs(tzo)
- const ho = padZero(tzo / 60, 2)
- const mo = padZero(tzo % 60, 2)
- ans = sign + ho + mo
- break
-
- default:
- break
- }
- if (f === '%C' || f === '%y' || f === '%m' || f === '%d' || f === '%H' || f === '%M' || f === '%S') {
- ans = padZero(ans, 2)
- }
- return ans.toString()
- })
-}
-
-Date.prototype.humanize = function(local) {
- local = local && local.startsWith('zh') ? 'zh' : 'en'
- const result = this.strftime('', local)
- const days = (Date.today() - this.toMidnight().getTime()) / 8.64E7
- if (days <= -10 || days >= 10) {
- return result
- }
- const labels = local_labels.dayagos[local]
- let lbl = ''
- if (days === 0 || days === 1) {
- lbl = labels[days]
- } else if (days === -1) {
- lbl = labels[2]
- } else if (days >= 2) {
- lbl = days + labels[3]
- } else {
- lbl = days + labels[4]
- }
- return lbl + result.substr(10, 6)
-}
-
-const local_labels = {
- monthes: {
- english: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
- en: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- zh: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
- },
- weekdays: {
- english: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- en: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- zh: ['日', '一', '二', '三', '四', '五', '六']
- },
- meridians: {
- english: ['a.m.', 'p.m.'],
- en: ['AM', 'PM'],
- zh: ['上午', '下午']
- },
- dayagos: {
- english: ['Today', 'Yesterday', 'Tomorrow', ' days ago', ' days late'],
- en: ['Today', 'Yesterday', 'Tomorrow', ' days ago', ' days late'],
- zh: ['今天', '昨天', '明天', '天前', '天后']
- }
-}
-
-export default Date
diff --git a/ZR.Vue/src/utils/shortcuts.js b/ZR.Vue/src/utils/shortcuts.js
deleted file mode 100644
index eff6686..0000000
--- a/ZR.Vue/src/utils/shortcuts.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import Date from './datetime.js'
-
-export const calendarBaseShortcuts = [{
- text: '今天',
- onClick(picker) {
- const startTime = new Date(new Date().setHours(0, 0, 0))
- const endTime = new Date(new Date().setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '昨天',
- onClick(picker) {
- const startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0))
- const endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '最近一周',
- onClick(picker) {
- const startTime = new Date(new Date().daysAgo(7).setHours(0, 0, 0))
- const endTime = new Date(new Date().setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '最近30天',
- onClick(picker) {
- const startTime = new Date(new Date().daysAgo(30).setHours(0, 0, 0))
- const endTime = new Date(new Date().setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '这个月',
- onClick(picker) {
- const startTime = new Date(new Date().monthBegin().setHours(0, 0, 0))
- const endTime = new Date(new Date().setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '本季度',
- onClick(picker) {
- const startTime = new Date(new Date().quarterBegin().setHours(0, 0, 0))
- const endTime = new Date(new Date().setHours(23, 59, 59))
- picker.$emit('pick', [startTime, endTime])
- }
-}]
-
-export const calendarMoveShortcuts = [{
- text: '‹ 往前一天 ',
- onClick(picker) {
- let startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0))
- let endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59))
- if (!picker.value) {
- picker.value = [startTime, endTime]
- }
- startTime = picker.value[0].daysAgo(1)
- endTime = picker.value[1].daysAgo(1)
- picker.$emit('pick', [startTime, picker])
- }
-}, {
- text: ' 往后一天 ›',
- onClick(picker) {
- let startTime = new Date(new Date().setHours(0, 0, 0))
- let endTime = new Date(new Date().setHours(23, 59, 59))
- if (!picker.value) {
- picker.value = [startTime, endTime]
- }
- startTime = picker.value[0].daysAgo(-1)
- endTime = picker.value[1].daysAgo(-1)
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: '« 往前一周 ',
- onClick(picker) {
- let startTime = new Date(new Date().setHours(0, 0, 0))
- let endTime = new Date(new Date().setHours(23, 59, 59))
- if (!picker.value) {
- picker.value = [startTime.daysAgo(new Date().getDay()),
- endTime.daysAgo(new Date().getDay() + 1)]
- } else {
- picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()),
- picker.value[1].daysAgo(picker.value[1].getDay() + 1)]
- }
- startTime = picker.value[0].daysAgo(7)
- endTime = picker.value[1]
- picker.$emit('pick', [startTime, endTime])
- }
-}, {
- text: ' 往后一周 »',
- onClick(picker) {
- let startTime = new Date(new Date().setHours(0, 0, 0))
- let endTime = new Date(new Date().setHours(23, 59, 59))
- if (!picker.value) {
- picker.value = [startTime.daysAgo(new Date().getDay() - 7),
- endTime.daysAgo(new Date().getDay() - 6)]
- } else {
- picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7),
- picker.value[1].daysAgo(picker.value[1].getDay() - 6)]
- }
- startTime = picker.value[0]
- endTime = picker.value[1].daysAgo(-7)
- picker.$emit('pick', [startTime, endTime])
- }
-}]
-
-export const calendarShortcuts = [
- ...calendarBaseShortcuts,
- ...calendarMoveShortcuts
-]
From 377fa0aadfe985782545177aee4ff312aa81bed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 13:35:16 +0800
Subject: [PATCH 03/24] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/System/SysRoleController.cs | 15 +++++++++------
ZR.Service/System/IService/ISysRoleService.cs | 6 +++---
ZR.Service/System/SysRoleService.cs | 6 +++---
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
index 5c1859a..800ad0f 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
@@ -129,15 +129,18 @@ namespace ZR.Admin.WebApi.Controllers.System
if (sysRoleDto == null || sysRoleDto.RoleId <= 0) return ToResponse(ApiResult.Error(101, "请求参数错误"));
sysRoleDto.Create_by = HttpContext.GetName();
- //删除角色菜单
- sysRoleService.DeleteRoleMenuByRoleId(sysRoleDto.RoleId);
- sysRoleService.InsertRoleMenu(sysRoleDto);
+ bool result = sysRoleService.UseTran2(() =>
+ {
+ //删除角色菜单
+ sysRoleService.DeleteRoleMenuByRoleId(sysRoleDto.RoleId);
+ sysRoleService.InsertRoleMenu(sysRoleDto);
+ });
- return SUCCESS(true);
+ return SUCCESS(result);
}
///
- /// 角色删除 √
+ /// 角色删除
///
///
///
- /// 修改角色状态 √
+ /// 修改角色状态
///
/// 角色对象
///
{
///
/// 根据条件分页查询角色数据
@@ -12,7 +12,7 @@ namespace ZR.Service.System.IService
/// 角色信息
///
/// 角色数据集合信息
- public PagedInfo SelectRoleList(SysRole role, Model.PagerInfo pager);
+ public PagedInfo SelectRoleList(SysRole role, PagerInfo pager);
///
/// 查询所有角色
@@ -113,7 +113,7 @@ namespace ZR.Service.System.IService
///
/// SelectUserRoles(long userId);
-
+
///
/// 获取用户权限字符串集合
///
diff --git a/ZR.Service/System/SysRoleService.cs b/ZR.Service/System/SysRoleService.cs
index f0df631..d04a820 100644
--- a/ZR.Service/System/SysRoleService.cs
+++ b/ZR.Service/System/SysRoleService.cs
@@ -17,14 +17,14 @@ namespace ZR.Service
/// 角色
///
[AppService(ServiceType = typeof(ISysRoleService), ServiceLifetime = LifeTime.Transient)]
- public class SysRoleService: ISysRoleService
+ public class SysRoleService : BaseService, ISysRoleService
{
private SysRoleRepository SysRoleRepository;
private ISysUserRoleService SysUserRoleService;
public SysRoleService(
- SysRoleRepository sysRoleRepository,
- ISysUserRoleService sysUserRoleService)
+ SysRoleRepository sysRoleRepository,
+ ISysUserRoleService sysUserRoleService) : base(sysRoleRepository)
{
SysRoleRepository = sysRoleRepository;
SysUserRoleService = sysUserRoleService;
From b40cd33abbb18da13b98ccb9ffdbe3bd56ffdb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 13:35:44 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E5=8A=A0table=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 76d6a07..bcdd903 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -33,7 +33,7 @@ $end
-
+
@@ -166,10 +166,12 @@ $if(item.HtmlType == "datetime" && item.IsQuery == true)
$end
$end
console.log(JSON.stringify(this.queryParams));
+ this.loading = true;
list${genTable.BusinessName}(this.queryParams).then(res => {
if (res.code == 200) {
this.dataList = res.data.result;
this.total = res.data.totalNum;
+ this.loading = false;
}
})
},
From 77aec2ed3d9b9f7b11d6cd404d8a62711bc395b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 13:37:43 +0800
Subject: [PATCH 05/24] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Vue/src/views/system/user/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index baf5db7..52b4239 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -562,7 +562,7 @@ export default {
const { code, data } = response;
if (code == 200) {
this.msgSuccess("导出成功");
- this.download(data.fileName);
+ this.download(data.path);
} else {
this.msgError("导出失败");
}
From 1e1e494d5bc0506884b9acee7067cd277a443dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 16:37:52 +0800
Subject: [PATCH 06/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E6=88=90=E5=8A=9F=E6=96=B9=E6=B3=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Vue/src/components/FileUpload/index.vue | 6 ++++--
ZR.Vue/src/components/UploadImage/index.vue | 9 +++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ZR.Vue/src/components/FileUpload/index.vue b/ZR.Vue/src/components/FileUpload/index.vue
index ad5d6e5..9617600 100644
--- a/ZR.Vue/src/components/FileUpload/index.vue
+++ b/ZR.Vue/src/components/FileUpload/index.vue
@@ -144,10 +144,12 @@ export default {
},
// 上传成功回调
handleUploadSuccess(res, file) {
+ if (res.code != 200) {
+ this.msgError(`上传失败，原因:${res.msg}!`);
+ return;
+ }
this.msgSuccess("上传成功");
- console.log(res.data.fileName, res.data.url);
this.fileList.push({ name: res.data.fileName, url: res.data.url });
-
this.$emit("input", this.column, this.listToString(this.fileList));
},
// 删除文件
diff --git a/ZR.Vue/src/components/UploadImage/index.vue b/ZR.Vue/src/components/UploadImage/index.vue
index 72aafdb..d2fc509 100644
--- a/ZR.Vue/src/components/UploadImage/index.vue
+++ b/ZR.Vue/src/components/UploadImage/index.vue
@@ -111,9 +111,14 @@ export default {
},
//上传成功回调
handleUploadSuccess(res) {
+ console.log(res);
+ this.loading.close();
+ if (res.code != 200) {
+ this.msgError(`上传失败，原因:${res.msg}!`);
+ return;
+ }
this.fileList.push({ name: res.data.fileName, url: res.data.url });
this.$emit(`input`, this.column, this.listToString(this.fileList));
- this.loading.close();
},
// 上传前loading加载
handleBeforeUpload(file) {
@@ -167,7 +172,7 @@ export default {
for (let i in list) {
strs += list[i].url.replace(this.baseUrl, "") + separator;
}
- return strs != '' ? strs.substr(0, strs.length - 1) : '';
+ return strs != "" ? strs.substr(0, strs.length - 1) : "";
},
handleUploadError() {
this.$message({
From b84e8b677412c8b4daa7318fcdfd07d4594d664b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 16:39:33 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Admin.WebApi/Controllers/CommonController.cs | 4 ++--
ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs
index 7e3424c..1f3ba07 100644
--- a/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/ZR.Admin.WebApi/Controllers/CommonController.cs
@@ -79,7 +79,7 @@ namespace ZR.Admin.WebApi.Controllers
///
+ /// 下载导入模板
+ ///
+ /// (List list, Stream stream, string fileName)
+ {
+ IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
+ string sFileName = $"{fileName}模板.xlsx";
+ string newFileName = Path.Combine(webHostEnvironment.WebRootPath, "importTemplate", sFileName);
+ //调试模式需要加上
+ ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+ if (!Directory.Exists(newFileName))
+ {
+ Directory.CreateDirectory(Path.GetDirectoryName(newFileName));
+ }
+ using (ExcelPackage package = new(new FileInfo(newFileName)))
+ {
+ // 添加worksheet
+ ExcelWorksheet worksheet = package.Workbook.Worksheets.Add(fileName);
+
+ //全部字段导出
+ worksheet.Cells.LoadFromCollection(list, true, OfficeOpenXml.Table.TableStyles.Light13);
+ package.SaveAs(stream);
+ }
+
+ return sFileName;
+ }
}
}
diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
index fd2242e..ff92959 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
@@ -1,6 +1,7 @@
using Infrastructure.Attribute;
using Infrastructure.Enums;
using Infrastructure.Model;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -8,7 +9,9 @@ using OfficeOpenXml;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Reflection;
using ZR.Admin.WebApi.Filters;
+using ZR.Common;
using ZR.Model;
using ZR.Model.System;
using ZR.Service;
@@ -170,43 +173,37 @@ namespace ZR.Admin.WebApi.Controllers.System
return ToResponse(ToJson(result));
}
- /////
- ///// 导入 ok
- /////
- ///// 使用IFromFile必须使用name属性否则获取不到文件
- ///// (0);
- // foreach (var item in rows)
- // {
- // SysUser u = item.Value;
- // }
- // //TODO 业务逻辑
- // return SUCCESS(1);
- //}
+ ///
+ /// 导入
+ ///
+ /// 使用IFromFile必须使用name属性否则获取不到文件
+ /// users = ExcelHelper.ImportData(formFile.OpenReadStream());
- /////
- ///// 用户模板 ok
- /////
- ///// user = new List();
- // var mapper = new Mapper();
- // MemoryStream stream = new MemoryStream();
- // mapper.Save(stream, user, "sheel1", overwrite: true, xlsx: true);
- // //Response.Headers.Append("content-disposition", "attachment;filename=sysUser.xlsx");
- // return File(stream.ToArray(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "sysUser.xlsx");
- //}
+ //TODO 业务逻辑,自行插入数据到db
+ return SUCCESS(users);
+ }
+
+ ///
+ /// 用户导入模板下载
+ ///
+ /// user = new List();
+ MemoryStream stream = new MemoryStream();
+
+ string sFileName = DownloadImportTemplate(user, stream, "用户列表");
+ return File(stream.ToArray(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"{sFileName}");
+ }
///
/// 用户导出
diff --git a/ZR.Common/ExcelHelper.cs b/ZR.Common/ExcelHelper.cs
new file mode 100644
index 0000000..d40a98a
--- /dev/null
+++ b/ZR.Common/ExcelHelper.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using OfficeOpenXml;
+namespace ZR.Common
+{
+ public class ExcelHelper where T : new()
+ {
+ ///
+ /// 导入数据
+ ///
+ ///
+ /// ImportData(Stream stream)
+ {
+ using ExcelPackage package = new(stream);
+ ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+ ExcelWorksheet worksheet = package.Workbook.Worksheets[0];//读取第1个sheet
+ //获取表格的列数和行数
+
+ int colStart = worksheet.Dimension.Start.Column;
+ int colEnd = worksheet.Dimension.End.Column;
+ int rowStart = worksheet.Dimension.Start.Row;
+ int rowEnd = worksheet.Dimension.End.Row;
+ //int rowCount = worksheet.Dimension.Rows;
+ //int ColCount = worksheet.Dimension.Columns;
+
+ List resultList = new();
+ List propertyInfos = new();// new(typeof(T).GetProperties());
+ Dictionary dictHeader = new();
+ for (int i = colStart; i < colEnd; i++)
+ {
+ var name = worksheet.Cells[rowStart, i].Value.ToString();
+ dictHeader[name] = i;
+
+ PropertyInfo propertyInfo = MapPropertyInfo(name);
+ if (propertyInfo != null)
+ {
+ propertyInfos.Add(propertyInfo);
+ }
+ }
+ for (int row = rowStart + 1; row <= rowEnd; row++)
+ {
+ T result = new();
+
+ foreach (PropertyInfo p in propertyInfos)
+ {
+ try
+ {
+ ExcelRange cell = worksheet.Cells[row, dictHeader[p.Name]];
+ if (cell.Value == null)
+ {
+ continue;
+ }
+ switch (p.PropertyType.Name.ToLower())
+ {
+ case "string":
+ p.SetValue(result, cell.GetValue());
+ break;
+ case "int16":
+ p.SetValue(result, cell.GetValue()); break;
+ case "int32":
+ p.SetValue(result, cell.GetValue()); break;
+ case "int64":
+ p.SetValue(result, cell.GetValue()); break;
+ case "decimal":
+ p.SetValue(result, cell.GetValue());
+ break;
+ case "double":
+ p.SetValue(result, cell.GetValue()); break;
+ case "datetime":
+ p.SetValue(result, cell.GetValue()); break;
+ case "boolean":
+ p.SetValue(result, cell.GetValue()); break;
+ case "char":
+ p.SetValue(result, cell.GetValue()); break;
+ default:
+ break;
+ }
+ }
+ catch (KeyNotFoundException ex)
+ {
+ Console.WriteLine("未找到该列将继续循环，" + ex.Message);
+ continue;
+ }
+ }
+ resultList.Add(result);
+ }
+
+ return resultList;
+ }
+
+ ///
+ /// 查找Excel列名对应的实体属性
+ ///
+ ///
+ ///
+ /// 得到类里面的属性集合
+ ///
+ ///
+ ///
+ /// ();
+ foreach (var column in columns)
+ {
+ var columnProperty = properties.Where(p => p.Name == column).FirstOrDefault();
+ if (columnProperty != null)
+ {
+ columnPropertyList.Add(columnProperty);
+ }
+ }
+ return columnPropertyList.ToArray();
+ }
+ else
+ {
+ return properties;
+ }
+ }
+ }
+}
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index 52b4239..30a4ea8 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -191,16 +191,13 @@
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess" :auto-upload="false" drag>
-
- 将文件拖到此处，或
- 点击上传
-
-
- 下载模板
-
-
- 提示：仅允许导入“xls”或“xlsx”格式文件！
+
将文件拖到此处，或点击上传
+
+ 下载模板
+
+ 仅允许导入xls、xlsx格式文件。
+
@@ -221,7 +218,6 @@ import {
exportUser,
resetUserPwd,
changeUserStatus,
- importTemplate,
} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
From f14a6627cb5652c182c1312a6b7d6b8424660c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 16:41:55 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E5=BC=95=E7=94=A8EPPlus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Common/ZR.Common.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/ZR.Common/ZR.Common.csproj b/ZR.Common/ZR.Common.csproj
index 1bffb47..9d290da 100644
--- a/ZR.Common/ZR.Common.csproj
+++ b/ZR.Common/ZR.Common.csproj
@@ -6,6 +6,7 @@
From 4d373da260457686aa6ac2e2b2a85e674178ecbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Dec 2021 17:40:19 +0800
Subject: [PATCH 10/24] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=BC=94=E7=A4=BA?=
=?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 4 +++-
document/images/12.png | Bin 295928 -> 68090 bytes
document/images/16.png | Bin 499880 -> 95857 bytes
document/images/18.png | Bin 0 -> 82284 bytes
document/images/3.png | Bin 79771 -> 94644 bytes
5 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 document/images/18.png
diff --git a/README.md b/README.md
index 4300583..dd1dd81 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
@@ -123,4 +124,5 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
源码地址
-https://gitee.com/izory/ZrAdminNetCore
\ No newline at end of file
+[Gitee](https://gitee.com/izory/ZrAdminNetCore/)https://gitee.com/izory/ZrAdminNetCore
+[Github](https://github.com/izhaorui/ZrAdmin.NET/)https://github.com/izhaorui/ZrAdmin.NET
\ No newline at end of file
diff --git a/document/images/12.png b/document/images/12.png
index 06c4c1cd3044c75edc05d0ee0be5f28ce0db84d1..b55aaca7e961ec6f9432b31eda3c7edee84cd934 100644
GIT binary patch
literal 68090
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
源码地址
-https://gitee.com/izory/ZrAdminNetCore
\ No newline at end of file
+[Gitee](https://gitee.com/izory/ZrAdminNetCore/)https://gitee.com/izory/ZrAdminNetCore
+[Github](https://github.com/izhaorui/ZrAdmin.NET/)https://github.com/izhaorui/ZrAdmin.NET
\ No newline at end of file
diff --git a/document/images/12.png b/document/images/12.png
index 06c4c1cd3044c75edc05d0ee0be5f28ce0db84d1..b55aaca7e961ec6f9432b31eda3c7edee84cd934 100644
GIT binary patch
literal 68090
zcmZ5{by$>J^sWL5g0ys_h>`-*B_Yy1bje6FbT=ZRba!_RIYF0nN)0eWHw**PC3-pc
zKKGvUyZg_1zUNze&ED%