Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
不做码农
2021-11-29 21:54:12 +08:00
parent 6772266b95 5e65941e15
commit e83550aa9c
14 changed files with 187 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@@ -98,7 +98,8 @@ namespace ZR.CodeGenerator
{
sb.AppendLine($" //文件上传成功方法");
sb.AppendLine($" handleUpload{dbFieldInfo.CsharpField}Success(res, file) {{");
sb.AppendLine($" this.form.{columnName} = URL.createObjectURL(file.raw);");
sb.AppendLine($" this.form.{columnName} = res.data;");
sb.AppendLine($" // this.form.{columnName} = URL.createObjectURL(file.raw);");
sb.AppendLine($" // this.$refs.upload.clearFiles();");
sb.AppendLine($" }},");
replaceDto.VueBeforeUpload = TplJsBeforeUpload();
@@ -346,7 +347,7 @@ namespace ZR.CodeGenerator
{
StringBuilder sb = new StringBuilder();
sb.AppendLine(@" //文件上传前判断方法");
sb.AppendLine(@" uploadUrl: process.env.VUE_APP_BASE_API + ""/upload/SaveFile/"",");
sb.AppendLine(@" uploadUrl: process.env.VUE_APP_BASE_API + ""upload/SaveFile"",");
return sb.ToString();
}

12
ZR.CodeGenerator/CodeGeneratorTool.cs
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);