diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue3.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt similarity index 98% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue3.txt rename to ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index b3cc1b4..d1f186f 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue3.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -186,13 +186,13 @@ $elseif(column.HtmlType == "datetime") $elseif(column.HtmlType == "imageUpload") - + $elseif(column.HtmlType == "fileUpload") - + $elseif(column.HtmlType == "radio") @@ -398,7 +398,7 @@ $end }) .then(() => { handleQuery(); - proxy.msgSuccess("删除成功"); + proxy.${modal}modal.msgSuccess("删除成功"); }) .catch(() => {}); } @@ -432,7 +432,7 @@ $end if (form.value.${replaceDto.FistLowerPk} != undefined && opertype.value === 2) { update${genTable.BusinessName}(form.value) .then((res) => { - proxy.msgSuccess("修改成功"); + proxy.${modal}modal.msgSuccess("修改成功"); open.value = false; getList(); }) @@ -442,7 +442,7 @@ $end } else { add${genTable.BusinessName}(form.value) .then((res) => { - proxy.msgSuccess("新增成功"); + proxy.${modal}modal.msgSuccess("新增成功"); open.value = false; getList(); }) diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 615f964..1f8e228 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -212,16 +212,17 @@ namespace ZR.CodeGenerator string fileName = string.Empty; switch (generateDto.GenTable.TplCategory) { - case "tree": - fileName = "TplTreeVue.txt"; - break; + //case "tree": + // fileName = "TplTreeVue.txt"; + // break; case "crud": - fileName = "Vue3.txt"; - break; - case "select": - fileName = "TplVueSelect.txt"; + fileName = "Vue.txt"; break; + //case "select": + // fileName = "TplVueSelect.txt"; + // break; default: + fileName = "Vue.txt"; break; } fileName = Path.Combine("v3", fileName); @@ -512,6 +513,7 @@ namespace ZR.CodeGenerator options.OutMode = OutMode.Auto; //options.DisableeLogogram = true;//禁用简写 options.Data.Set("refs", "$");//特殊标签替换 + options.Data.Set("modal", "$");//特殊标签替换 options.Data.Set("index", "$");//特殊标签替换 options.Data.Set("confirm", "$");//特殊标签替换 options.Data.Set("nextTick", "$");