diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index a5ffedf6..b99d4643 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -167,9 +167,9 @@ $if(genTable.SortField != "")
//////
//////
//////
- ///[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
- ///[HttpGet("ChangeSort")]
- //[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
+ /////[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
+ //////[HttpGet("ChangeSort")]
+ /////[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
//public IActionResult ChangeSort(int id = 0, int orderNum = 0)
//{
// if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 49fc6e63..d0581902 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -20,6 +20,9 @@ ${vueQueryFormHtml}
删除
+
+ 导出
+
$if(genTable.SortField != "" && 1 == 2)
修改排序
@@ -266,6 +269,7 @@ $end
}
});
},
+ handleExport() {},
},
};
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index c70b6780..ec612d39 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -57,6 +57,7 @@ export function del${genTable.BusinessName}(pid) {
method: 'delete'
})
}
+
// 导出${genTable.functionName}
export function export${replaceDto.ModelTypeName}(query) {
return request({
@@ -75,5 +76,4 @@ export function changeSort(data) {
params: data
})
}
-
$end
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 38db3e1b..605277da 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -162,6 +162,17 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine(" ");
}
+ else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
+ {
+ string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
+ sb.AppendLine(" ");
+ sb.AppendLine($" ");
+ sb.AppendLine($" ");
+ sb.AppendLine($" ");
+ sb.AppendLine(" ");
+ sb.AppendLine(" ");
+ sb.AppendLine(" ");
+ }
else
{
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
@@ -201,6 +212,15 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine(" ");
}
+ else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
+ {
+ //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
+ sb.AppendLine($" ");
+ sb.AppendLine($" ");
+ sb.AppendLine($" ");
+ sb.AppendLine(" ");
+ sb.AppendLine(" ");
+ }
else
{
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";