- 优化 IUnitOfWork/DbContext/Repository .Orm.Ado 和 CRUD 都与自身事务保持一致；

FreeSql.DbContext/DbContext/DbContext.cs

@@ -13,6 +13,10 @@ namespace FreeSql
     {
         internal DbContextScopedFreeSql _ormScoped;
         internal IFreeSql OrmOriginal => _ormScoped?._originalFsql ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql");
+
+        /// <summary>
+        /// 该对象 Select/Delete/Insert/Update/InsertOrUpdate 与 DbContext 事务保持一致，可省略传递 WithTransaction
+        /// </summary>
         public IFreeSql Orm => _ormScoped ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql");
 
         #region Property UnitOfWork

FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs

@@ -1,8 +1,12 @@
 using FreeSql;
 using FreeSql.Internal;
+using FreeSql.Internal.CommonProvider;
+using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Text;
 
 namespace FreeSql
@@ -18,11 +22,39 @@ namespace FreeSql
         {
             if (fsql == null) return null;
             var scopedfsql = fsql as DbContextScopedFreeSql;
-            if (scopedfsql == null) return new DbContextScopedFreeSql { _originalFsql = fsql, _resolveDbContext = resolveDbContext, _resolveUnitOfWork = resolveUnitOfWork };
+            if (scopedfsql == null)
+                return new DbContextScopedFreeSql
+                {
+                    _originalFsql = fsql,
+                    _resolveDbContext = resolveDbContext,
+                    _resolveUnitOfWork = resolveUnitOfWork,
+                    Ado = new ScopeTransactionAdo(fsql.Ado as AdoProvider, () =>
+                    {
+                        var db = resolveDbContext?.Invoke();
+                        db?.FlushCommand();
+                        return resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction();
+                    })
+                };
             return Create(scopedfsql._originalFsql, resolveDbContext, resolveUnitOfWork);
         }
 
-        public IAdo Ado => _originalFsql.Ado;
+        class ScopeTransactionAdo : AdoProvider
+        {
+            AdoProvider _ado;
+            public ScopeTransactionAdo(AdoProvider ado, Func<DbTransaction> resolveTran) : base(ado.DataType, null, null)
+            {
+                _ado = ado;
+                base.ResolveTransaction = resolveTran;
+                base.ConnectionString = ado.ConnectionString;
+                base.SlaveConnectionStrings = ado.SlaveConnectionStrings;
+                base.Identifier = ado.Identifier;
+            }
+            public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) => _ado.AddslashesProcessParam(param, mapType, mapColumn);
+            public override DbCommand CreateCommand() => _ado.CreateCommand();
+            public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _ado.GetDbParamtersByObject(sql, obj);
+            public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) => _ado.ReturnConnection(pool, conn, ex);
+        }
+        public IAdo Ado { get; private set; }
         public IAop Aop => _originalFsql.Aop;
         public ICodeFirst CodeFirst => _originalFsql.CodeFirst;
         public IDbFirst DbFirst => _originalFsql.DbFirst;

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -4,6 +4,11 @@
         <name>FreeSql.DbContext</name>
     </assembly>
     <members>
+        <member name="P:FreeSql.DbContext.Orm">
+            <summary>
+            该对象 Select/Delete/Insert/Update/InsertOrUpdate 与 DbContext 事务保持一致，可省略传递 WithTransaction
+            </summary>
+        </member>
         <member name="M:FreeSql.DbContext.Add``1(``0)">
             <summary>
             添加
@@ -343,6 +348,11 @@
             工作单元
             </summary>
         </member>
+        <member name="P:FreeSql.IUnitOfWork.Orm">
+            <summary>
+            该对象 Select/Delete/Insert/Update/InsertOrUpdate 与工作单元事务保持一致，可省略传递 WithTransaction
+            </summary>
+        </member>
         <member name="M:FreeSql.IUnitOfWork.GetOrBeginTransaction(System.Boolean)">
             <summary>
             开启事务，或者返回已开启的事务
@@ -502,14 +512,5 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
-            <summary>
-            批量注入 Repository，可以参考代码自行调整
-            </summary>
-            <param name="services"></param>
-            <param name="globalDataFilter"></param>
-            <param name="assemblies"></param>
-            <returns></returns>
-        </member>
     </members>
 </doc>

FreeSql.DbContext/UnitOfWork/IUnitOfWork.cs

@@ -10,6 +10,9 @@ namespace FreeSql
     /// </summary>
     public interface IUnitOfWork : IDisposable
     {
+        /// <summary>
+        /// 该对象 Select/Delete/Insert/Update/InsertOrUpdate 与工作单元事务保持一致，可省略传递 WithTransaction
+        /// </summary>
         IFreeSql Orm { get; }
 
         /// <summary>