6.5.4

dotnetcore · Jan 18, 2024 · a86a995 · a86a995
1 parent aec2162
commit a86a995
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## v6.x.x
 
+##6.5.4(2024-1-19)
+* **修改：**  修复工作流在Oracle中不能正常启动的问题
+* **修改：**  修复_workflowapi/GetMyApprove方法
+* **修改：**  修复LayUI模式下checkbox不能禁用的问题
+
+
 ##6.5.1(2023-11-19)
 * **修改：**  修复GetSelectItemList方法的bug
 * **修改：**  修复LayUI Tab页中使用按钮组会导致Tab页切换失效的问题

diff --git a/demo/WalkingTec.Mvvm.Demo/appsettings.json b/demo/WalkingTec.Mvvm.Demo/appsettings.json
@@ -25,7 +25,7 @@
   "Connections": [
     {
       "Key": "default",
-      "Value": "Server=(localdb)\\mssqllocaldb;Database=next;Trusted_Connection=True;MultipleActiveResultSets=true",
+      "Value": "Server=(localdb)\\mssqllocaldb;Database=nextdd;Trusted_Connection=True;MultipleActiveResultSets=true",
       "DBType": "sqlserver"
     }
 

diff --git a/src/WalkingTec.Mvvm.Core/DataContext.cs b/src/WalkingTec.Mvvm.Core/DataContext.cs
@@ -590,6 +590,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             if (DBType == DBTypeEnum.Oracle)
             {
                 modelBuilder.Model.SetMaxIdentifierLength(30);
+                modelBuilder.Entity<Elsa_Bookmark>().ToTable("Bookmarks");
+                modelBuilder.Entity<Elsa_Trigger>().ToTable("Triggers");
+                modelBuilder.Entity<Elsa_WorkflowDefinition>().ToTable("WorkflowDefinitions");
+                modelBuilder.Entity<Elsa_WorkflowExecutionLogRecord>().ToTable("WorkflowExecutionLogRecords");
+                modelBuilder.Entity<Elsa_WorkflowInstance>().ToTable("WorkflowInstances");
             }
         }
 

diff --git a/src/WalkingTec.Mvvm.Mvc/Helper/FrameworkServiceExtension.cs b/src/WalkingTec.Mvvm.Mvc/Helper/FrameworkServiceExtension.cs
@@ -60,6 +60,7 @@
 using System.Threading.Tasks;
 using Elsa.Activities.Http;
 using Elsa.Activities.Http.Services;
+using Elsa.Persistence.EntityFramework.Core;
 
 namespace WalkingTec.Mvvm.Mvc
 {
@@ -597,7 +598,7 @@ public static IServiceCollection AddWtmWorkflow(this IServiceCollection services
                             elsa.UseNonPooledEntityFrameworkPersistence(ef => ef.UseSqlite(cs.Value));
                             break;
                         case DBTypeEnum.Oracle:
-                            elsa.UseNonPooledEntityFrameworkPersistence(ef => ef.UseOracle(cs.Value));
+                            elsa.UseNonPooledEntityFrameworkPersistence<WtmElsaContext>(ef => ef.UseOracle(cs.Value,op=>op.UseOracleSQLCompatibility(cs.Version??"11")));
                             break;
                         case DBTypeEnum.DaMeng:
                             break;

diff --git a/src/WalkingTec.Mvvm.Mvc/Helper/WtmElsaContext.cs b/src/WalkingTec.Mvvm.Mvc/Helper/WtmElsaContext.cs
@@ -0,0 +1,27 @@
+using Elsa.Persistence.EntityFramework.Core;
+using Microsoft.EntityFrameworkCore;
+
+namespace WalkingTec.Mvvm.Mvc.Helper
+{
+    public class WtmElsaContext : ElsaContext
+    {
+        public WtmElsaContext(DbContextOptions options) : base(options)
+        {
+        }
+
+        public override string Schema
+        {
+            get
+            {
+                if (Database.IsOracle())
+                {
+                    return null;
+                }
+                else
+                {
+                    return base.Schema;
+                }
+            }
+        }
+    }
+}
diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>6.5.3</VersionPrefix>
+    <VersionPrefix>6.5.4</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">