From 5bce7e04643a517a79c4ec39053d08847c721f62 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: Fri, 24 Dec 2021 21:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CodeGenTemplate/TplControllers.txt | 19 ++++++++++ .../wwwroot/CodeGenTemplate/TplVue.txt | 37 ++++++++++++------- .../wwwroot/CodeGenTemplate/TplVueApi.txt | 2 +- ZR.CodeGenerator/CodeGenerateTemplate.cs | 14 +++---- ZR.CodeGenerator/CodeGeneratorTool.cs | 2 + ZR.CodeGenerator/GenConstants.cs | 4 ++ ZR.Vue/src/views/tool/gen/editTable.vue | 3 +- 7 files changed, 59 insertions(+), 22 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index 03b1ebc..0f7fd0a 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -176,5 +176,24 @@ $if(replaceDto.ShowBtnExport) return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); } $end + +$if(showCustomInput) + /// + /// 保存排序 + /// + /// + /// + /// + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")] + [HttpGet("ChangeSort")] + [Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)] + public IActionResult ChangeSort(int id = 0, int value = 0) + { + if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } + bool result = false;//TODO 自行实现; + + return SUCCESS(result); + } +$end } } \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index 60d5550..badd608 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -23,11 +23,6 @@ $if(replaceDto.ShowBtnExport) 导出 -$end -$if(genTable.SortField != "" && 1 == 2) - - 修改排序 - $end @@ -54,7 +49,7 @@ ${VueViewListContent} ${VueViewFormContent} -
+
确 定 取 消
@@ -72,7 +67,7 @@ import { $if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end -$if(genTable.SortField != "" && genTable.SortField != null) +$if(showCustomInput) changeSort $end } from '@/api/${genTable.ModuleName}/${lowerBusinessName}.js'; @@ -124,13 +119,8 @@ $elseif(item.HtmlType == "datetime" && item.IsQuery == true) //${item.ColumnComment}时间范围 dateRange${item.CsharpField}: [], $elseif(item.HtmlType == "customInput") - editIndex = -1; //不加editIndex,整个列都会一块变成可编辑 - showEditSort = false; + editIndex: -1, $end -$end -$if(genTable.SortField != "" && genTable.SortField != null) - // 是否显示编辑排序 - showEditSort: false, $end // 数据列表 dataList: [], @@ -286,6 +276,27 @@ $if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == " return this.selectDictLabel(this.${item.CsharpFieldFl}Options, row.${item.CsharpFieldFl}); }, $end +$if(item.HtmlType == "customInput") + // 显示编辑排序 + editCurrRow(rowId, str) { + this.editIndex = rowId; + let id = rowId + str; + + setTimeout(() => { + document.getElementById(id).focus(); + }, 100); + }, + // 保存排序 + handleChangeSort(info) { + this.editIndex = -1; + changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} }).then( + (response) => { + this.msgSuccess("修改成功"); + this.getList(); + } + ); + }, +$end $end /** 提交按钮 */ submitForm: function () { diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt index b517972..840d3be 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt @@ -67,7 +67,7 @@ export function export${genTable.BusinessName}(query) { }) } -$if(genTable.SortField != "" && genTable.SortField != null) +$if(showCustomInput) //排序 export function changeSort(data) { return request({ diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index f5389e8..6e6933e 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -186,10 +186,9 @@ namespace ZR.CodeGenerator sb.AppendLine($" end-placeholder=\"结束日期\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" >"); sb.AppendLine(" "); } - else if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)) + else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) { - //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -220,12 +219,13 @@ namespace ZR.CodeGenerator string formatter = GetFormatter(dbFieldInfo.HtmlType, columnName); StringBuilder sb = new StringBuilder(); //自定义排序字段 - if (GenConstants.HTML_SORT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk && CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType)) + if (GenConstants.HTML_CUSTOM_INPUT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk) { sb.AppendLine($@" "); sb.AppendLine(@" "); sb.AppendLine(@" "); } @@ -239,7 +239,7 @@ namespace ZR.CodeGenerator sb.AppendLine(" "); sb.AppendLine(" "); } - else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(dbFieldInfo.DictType)) + else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(formatter)) { sb.AppendLine($@" "); sb.AppendLine(@" @@ -157,7 +158,7 @@ export default { getGenTable(tableId).then((res) => { this.columns = res.data.columns; this.info = res.data.info; - this.tables = res.data.tables;//子表 + this.tables = res.data.tables; //子表 }); /** 查询字典下拉列表 */ listType({ pageSize: 100 }).then((response) => {