diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
index 9525bb7..10b772e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
@@ -46,13 +46,13 @@ ${VueViewListContent}
-
+
${VueViewFormContent}
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index dc56444..af71c5a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -45,13 +45,13 @@ ${VueViewListContent}
-
+
${VueViewFormContent}
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
new file mode 100644
index 0000000..64812dd
--- /dev/null
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
@@ -0,0 +1,262 @@
+
+
+
+
+${vueQueryFormHtml}
+
+ 搜索
+ 重置
+
+
+
+
+
+ 删除
+
+$if(replaceDto.ShowBtnExport)
+
+ 导出
+
+$end
+
+
+
+
+
+
+${VueViewListContent}
+
+
+
+
+
+
+
+
+
+
+
+$foreach(item in genTable.Columns)
+
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
+
+$elseif(item.HtmlType == "imageUpload")
+
+
+
+$else
+ {{form.${item.CsharpFieldFl}}}
+$end
+
+$end
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 16d6611..3542a6f 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -108,10 +108,6 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine($" ");
sb.AppendLine($" ");
- //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
- //{
- // sb.AppendLine(" 请选择字典生成");
- //}
sb.AppendLine($" {{{{item.dictLabel}}}}");
sb.AppendLine(" ");
sb.AppendLine(" ");
@@ -141,10 +137,6 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine($" ");
sb.AppendLine($" ");
- //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
- //{
- // sb.AppendLine($" ");
- //}
sb.AppendLine($" ");
sb.AppendLine(" ");
sb.AppendLine(" ");
@@ -156,10 +148,6 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine($" ");
sb.AppendLine($" ");
- //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
- //{
- // sb.AppendLine($" 请选择字典生成");
- //}
sb.AppendLine($" {{{{item.dictLabel}}}}");
sb.AppendLine(" ");
sb.AppendLine(" ");
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 9278285..427823d 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -181,6 +181,9 @@ namespace ZR.CodeGenerator
case "crud":
fileName = "TplVue.txt";
break;
+ case "select":
+ fileName = "TplVueSelect.txt";
+ break;
default:
break;
}
@@ -189,7 +192,6 @@ namespace ZR.CodeGenerator
tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单
tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列
- //tpl.Set("lowerBusinessName", FirstLowerCase(generateDto.GenTable.BusinessName));
var result = tpl.Render();
var fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
diff --git a/ZR.Vue/src/views/system/dept/index.vue b/ZR.Vue/src/views/system/dept/index.vue
index 952e9c6..2fe0289 100644
--- a/ZR.Vue/src/views/system/dept/index.vue
+++ b/ZR.Vue/src/views/system/dept/index.vue
@@ -26,7 +26,8 @@
-
+
@@ -44,7 +45,8 @@
修改
新增
- 删除
+ 删除
@@ -52,7 +54,7 @@
-
+
@@ -93,8 +95,8 @@
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 8abe17e..970dcdf 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -36,12 +36,12 @@
-
+
-
+
diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue
index 2975ce2..e95184a 100644
--- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue
+++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue
@@ -6,7 +6,7 @@
生成模板
-
+
@@ -125,7 +125,7 @@
-
+
diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
index f88d6d2..7cd9614 100644
--- a/ZR.Vue/src/views/tool/gen/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -7,7 +7,6 @@
查询
- 重置
@@ -36,7 +35,7 @@
-
+
预览
编辑