wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
不做码农 2022-01-05 20:47:11 +08:00
commit 071c05264f
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using ${options.ModelsNamespace}.Dto;
using ${options.ModelsNamespace}.Models;
@ -12,6 +13,9 @@ namespace ${options.DtosNamespace}.Dto
{
$foreach(item in genTable.Columns)
$if((item.IsInsert || item.IsEdit || item.IsPk || item.IsIncrement))
$if(item.IsRequired)
[Required(ErrorMessage = "${item.ColumnComment}不能为空")]
$end
public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; }
$end
$end

6
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -80,7 +80,7 @@ namespace ZR.CodeGenerator
//时间
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
sb.AppendLine($" <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetimerange\" placeholder=\"选择日期时间\"> </el-date-picker>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
@ -192,7 +192,7 @@ namespace ZR.CodeGenerator
if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
{
sb.AppendLine($" <el-form-item label=\"{labelName}\">");
sb.AppendLine($" <el-date-picker v-model=\"dateRange{dbFieldInfo.CsharpField}\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\"");
sb.AppendLine($" <el-date-picker v-model=\"dateRange{dbFieldInfo.CsharpField}\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"datetimerange\" range-separator=\"-\" start-placeholder=\"开始日期\"");
sb.AppendLine($" end-placeholder=\"结束日期\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" ></el-date-picker>");
sb.AppendLine(" </el-form-item>");
}
@ -270,6 +270,7 @@ namespace ZR.CodeGenerator
}
#endregion
//模板调用
public static string QueryExp(string propertyName, string queryType)
{
@ -303,6 +304,7 @@ namespace ZR.CodeGenerator
}
return "";
}
/// <summary>
/// 格式化字典数据显示到table
/// </summary>

4
ZR.Service/System/SysTasksLogService.cs
View File

@ -37,9 +37,5 @@ namespace ZR.Service.System
return logModel;
}
public PagedInfo<SysTasksLog> GetPages(Expression<Func<SysTasksLog, bool>> where, PagerInfo parm, Expression<Func<SysTasksLog, object>> order, string orderType)
{
throw new NotImplementedException();
}
}
}

6
ZR.Vue/src/components/FileUpload/index.vue
View File

@ -1,8 +1,7 @@
<template>
<div class="upload-file">
<el-upload :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit" :on-error="handleUploadError"
:on-exceed="handleExceed" :on-success="handleUploadSuccess" :on-progress="uploadProcess" :show-file-list="false" :data="data" :headers="headers"
class="upload-file-uploader" ref="upload">
:on-exceed="handleExceed" :on-success="handleUploadSuccess" :on-progress="uploadProcess" :show-file-list="false" :data="data" :headers="headers" ref="upload">
<!-- 上传按钮 -->
<el-button size="mini" type="primary" icon="el-icon-upload">选取文件</el-button>
<!-- 上传提示 -->
@ -190,9 +189,6 @@ export default {
</script>
<style scoped lang="scss">
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list .el-upload-list__item {
border: 1px solid #e4e7ed;
line-height: 2;

22
ZR.Vue/src/views/tool/file/index.vue
View File

@ -3,8 +3,7 @@
<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
<el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
<el-form-item label="上传时间">
<el-date-picker v-model="dateRangeCreate_time" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择上传时间"></el-date-picker>
<el-date-picker v-model="dateRangeCreate_time" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择上传时间"></el-date-picker>
</el-form-item>
<el-form-item label="存储类型" prop="storeType">
<el-select v-model="queryParams.storeType" placeholder="请选择存储类型" size="small" clearable="">
@ -36,8 +35,7 @@
<el-table-column prop="fileName" label="文件名" align="center">
<template slot-scope="scope">
<el-popover :content="scope.row.fileUrl" placement="top-start" title="路径" trigger="hover">
<a slot="reference" :href="scope.row.accessUrl" class="el-link--primary"
style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;" target="_blank">
<a slot="reference" :href="scope.row.accessUrl" class="el-link--primary" style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;" target="_blank">
{{ scope.row.fileName }}
</a>
</el-popover>
@ -70,11 +68,6 @@
<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-width="135px" label-position="left">
<el-row>
<el-col :lg="24">
<el-form-item label="文件名" prop="fileName">
<el-input v-model="form.fileName" placeholder="请输入文件名" />
</el-form-item>
</el-col>
<el-col :lg="24">
<el-form-item label="存储类型" prop="storeType">
<el-select v-model="form.storeType" placeholder="请选择存储类型" @change="handleSelectStore">
@ -94,10 +87,15 @@
<el-input v-model="form.storePath" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :lg="24">
<el-form-item label="自定文件名" prop="fileName">
<el-input v-model="form.fileName" placeholder="请输入文件名" />
</el-form-item>
</el-col>
<el-col :lg="24">
<el-form-item label="上传文件" prop="accessUrl">
<UploadFile v-model="form.accessUrl" :uploadUrl="uploadUrl" :fileType="[]" :limit="1" :fileSize="15"
:data="{ 'fileDir' : form.storePath, 'fileName': form.fileName}" column="accessUrl" @input="handleUploadSuccess" />
<UploadFile v-model="form.accessUrl" :uploadUrl="uploadUrl" :fileType="[]" :limit="1" :fileSize="15" :data="{ 'fileDir' : form.storePath, 'fileName': form.fileName}" column="accessUrl"
@input="handleUploadSuccess" />
</el-form-item>
</el-col>
@ -339,7 +337,7 @@ export default {
if (val == 1) {
this.uploadUrl = "/common/uploadFile";
} else if (val == 2) {
thiis.uploadUrl = "/common/UploadFileAliyun";
this.uploadUrl = "/common/UploadFileAliyun";
}
},
/** 提交按钮 */