fix OfficialRazorTemplates/SqlMap

Author: Ahoo-Wang

src/SmartCode.CLI/OfficialRazorTemplates/SqlMap-Oracle.cshtml

@@ -47,10 +47,6 @@
                 }
             }
             );
-            @if (autoIncrement)
-            {
-                <text>Select Scope_Identity();</text>
-            }
         </Statement>
 
         <!--删除-->
@@ -59,7 +55,6 @@
             Where @pkCol.Name=@pkCol.ConvertedName
         </Statement>
 
-
         <!--更新-->
         <Statement Id="Update">
             UPDATE @table.Name

src/SmartCode.CLI/OfficialRazorTemplates/SqlMap-PostgreSql.cshtml

@@ -36,7 +36,7 @@
                 var col = table.Columns.ElementAt(i);
                 @if (!col.AutoIncrement)
                 {
-                    @col.Name@(i == table.Columns.Count() - 1 ? "\r\n" : "\r\n" + this.PadLeft(6) + ",")
+                    @col.Name@(i == table.Columns.Count() - 1 ? Html.NewLine() : Html.NewLine(","))
                 }
             }
             )
@@ -47,7 +47,7 @@
                 var col = table.Columns.ElementAt(i);
                 @if (!col.AutoIncrement)
                 {
-                    @[email protected]@(i == table.Columns.Count() - 1 ? "\r\n" : "\r\n" + this.PadLeft(6) + ",")
+                    @[email protected]@(i == table.Columns.Count() - 1 ? Html.NewLine() : Html.NewLine(","))
                 }
             }
             );
@@ -77,14 +77,14 @@
         </Statement>
 
         <!--获取数据列-->
-        <Statement Id="Query" @queryStatementResultMap=queryStatementResultMap>
+        <Statement Id="Query" @queryStatementResultMap>
             SELECT T.* From @table.Name T
             <Include RefId="QueryParams" />
             Order By T.@pkCol.Name Desc
         </Statement>
 
         <!--获取分页数据-->
-        <Statement Id="QueryByPage" @queryStatementResultMap=queryStatementResultMap>
+        <Statement Id="QueryByPage" @queryStatementResultMap>
             Select T.* From @table.Name As T
             <Include RefId="QueryParams" />
             <Switch Prepend="Order By" Property="OrderBy">
@@ -102,7 +102,7 @@
         </Statement>
 
         <!--获取表映射实体-->
-        <Statement Id="GetEntity" @queryStatementResultMap=queryStatementResultMap>
+        <Statement Id="GetEntity" @queryStatementResultMap>
             Select Top 1 T.* From @table.Name T
             <Where>
                 <IsNotEmpty Prepend="And" Property="@pkCol.ConvertedName">

src/SmartCode.TemplateEngine/Impl/OfficialRazorTemplateEngine.cs

@@ -68,20 +68,6 @@ private IServiceCollection ConfigureDefaultServices()
                 ApplicationName = Assembly.GetEntryAssembly().GetName().Name,
                 WebRootFileProvider = fileProvider,
             });
-            //services.Configure<WebEncoderOptions>(options =>
-            //      {
-            //          var txtEncoderSettings = new TextEncoderSettings(UnicodeRanges.All);
-            //          //txtEncoderSettings.Clear();
-            //          txtEncoderSettings.AllowCharacter('<');
-            //          txtEncoderSettings.AllowCharacter('>');
-            //          txtEncoderSettings.AllowCharacter('&');
-            //          txtEncoderSettings.AllowCharacter('\''); // can be used to escape attributes
-            //          txtEncoderSettings.AllowCharacter('\"'); // can be used to escape attributes
-            //          txtEncoderSettings.AllowCharacter('+');
-            //          options.TextEncoderSettings = txtEncoderSettings;
-            //      }
-            //    );
-
             services.Configure<RazorViewEngineOptions>(options =>
             {
                 options.FileProviders.Clear();

src/SmartCode.TemplateEngine/OfficialRazorExtensions.cs

@@ -12,6 +12,10 @@ public static IHtmlContent NewLine(this IHtmlHelper htmlHelper)
         {
             return htmlHelper.Raw(Environment.NewLine);
         }
+        public static IHtmlContent NewLine(this IHtmlHelper htmlHelper, string appendStr)
+        {
+            return htmlHelper.Raw(Environment.NewLine + appendStr);
+        }
 
         public static IHtmlContent PadLeft(this IHtmlHelper htmlHelper, int totalWidth)
         {