From 8cd45782f4b262908a27519f8646b0cf07b3c7a9 Mon Sep 17 00:00:00 2001
From: walon <taojingjian@gmail.com>
Date: Mon, 22 Nov 2021 16:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96type=E7=9A=84attr=E8=A7=A3=E6=9E=90=EF=BC=8C=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E7=94=A8()=E6=9D=A5=E7=95=8C=E5=AE=9A=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E5=AE=9A=E4=B9=89=E8=8C=83=E5=9B=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82int#(set=3D1,2,3)=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=8F=AF=E4=BB=A5=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87assembly=E5=B1=9E=E6=80=A7=E8=8E=B7=E5=BE=97DefAssembl?=
 =?UTF-8?q?y=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Luban.Job.Cfg/Source/RenderExtension.cs  | 4 +++-
 src/Luban.Job.Common/Source/Utils/DefUtil.cs | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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", "<br/>");
+                return System.Web.HttpUtility.HtmlEncode(comment).Replace("\n", "<br/>");
 #else
                     throw new NotSupportedException();
 #endif