diff --git a/src/Luban.Job.Cfg/Source/RenderExtension.cs b/src/Luban.Job.Cfg/Source/RenderExtension.cs
index 42a8192..2de71a0 100644
--- a/src/Luban.Job.Cfg/Source/RenderExtension.cs
+++ b/src/Luban.Job.Cfg/Source/RenderExtension.cs
@@ -13,7 +13,8 @@ namespace Luban.Job.Cfg
var ctx = new TemplateContext();
var env = new TTypeTemplateExtends
{
- ["x"] = model
+ ["x"] = model,
+ ["assembly"] = DefAssembly.LocalAssebmly,
};
if (extraModels != null)
{
@@ -34,6 +35,7 @@ namespace Luban.Job.Cfg
{
["table"] = table,
["datas"] = exportDatas,
+ ["assembly"] = DefAssembly.LocalAssebmly,
};
if (extraModels != null)
{
diff --git a/src/Luban.Job.Common/Source/Utils/DefUtil.cs b/src/Luban.Job.Common/Source/Utils/DefUtil.cs
index b291c77..ade78c7 100644
--- a/src/Luban.Job.Common/Source/Utils/DefUtil.cs
+++ b/src/Luban.Job.Common/Source/Utils/DefUtil.cs
@@ -19,8 +19,9 @@ namespace Luban.Job.Common.Utils
{
return am;
}
- foreach (var pair in tags.Split(s_attrSep))
+ foreach (var rawPair in tags.Split(s_attrSep))
{
+ var pair = TrimBracePairs(rawPair);
int sepIndex = pair.IndexOfAny(s_attrKeyValueSep);
if (sepIndex >= 0)
{
@@ -173,7 +174,7 @@ namespace Luban.Job.Common.Utils
case ELanguage.PYTHON:
case ELanguage.RUST:
#if !LUBAN_LITE
- return System.Web.HttpUtility.HtmlEncode(comment).Replace("\n", "
");
+ return System.Web.HttpUtility.HtmlEncode(comment).Replace("\n", "
");
#else
throw new NotSupportedException();
#endif