Merge branch 'master' into dev

This commit is contained in:
不做码农
2021-11-29 21:54:12 +08:00
14 changed files with 187 additions and 1045 deletions

View File

@@ -94,12 +94,12 @@ namespace ZR.CodeGenerator
sb2.AppendLine($" this.{FirstLowerCase(dbFieldInfo.CsharpField)}Options = response.data;");
sb2.AppendLine(" })");
}
//引用组件
if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
{
replaceDto.VueComponent += "Editor,";
replaceDto.VueComponentImport += "import Editor from '@/components/Editor';\n";
}
//引用组件 已弃用、改用前端全局注册
//if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
//{
// replaceDto.VueComponent += "Editor,";
// replaceDto.VueComponentImport += "import Editor from '@/components/Editor';\n";
//}
CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto);
replaceDto.ModelProperty += CodeGenerateTemplate.GetModelTemplate(dbFieldInfo);