Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

docs/demo/src/WTA.Shared/Controllers/GenericController.cs

@@ -171,7 +171,7 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
     {
         try
         {
-            this.Repository.Delete(o => guids.Contains(o.Id));
+            this.Repository.Delete(guids);
             this.Repository.SaveChanges();
             return NoContent();
         }

docs/demo/src/WTA.Shared/Data/BaseDbContext.cs

@@ -80,11 +80,14 @@ public abstract class BaseDbContext<T> : DbContext where T : DbContext
                 }
                 else if (item.State == EntityState.Deleted)
                 {
-                    //if (entity is ISoftDeleteEntity)
+                    if (entity is ISoftDeleteEntity)
-                    //{
+                    {
-                    //    throw new Exception("内置数据无法删除");
+                        item.State = EntityState.Modified;
-                    //}
+                        entity.IsDeleted = true;
-                    if (entity.IsReadonly.HasValue && entity.IsReadonly.Value)
+                        entity.DeletedOn = now;
+                        entity.DeletedBy = userName;
+                    }
+                    else if (entity.IsReadonly.HasValue && entity.IsReadonly.Value)
                     {
                         throw new Exception("内置数据无法删除");
                     }

docs/demo/src/WTA.Shared/Data/EfRepository.cs

@@ -42,6 +42,11 @@ public class EfRepository<TEntity> : IRepository<TEntity> where TEntity : BaseEn
         this._dbContext.Set<TEntity>().Where(predicate).ExecuteDelete();
     }
 
+    public void Delete(Guid[] guids)
+    {
+        this._dbContext.Set<TEntity>().RemoveRange(this._dbContext.Set<TEntity>().Where(o => guids.Contains(o.Id)));
+    }
+
     public void Insert(TEntity entity)
     {
         this._dbContext.Set<TEntity>().Add(entity);
@@ -52,6 +57,11 @@ public class EfRepository<TEntity> : IRepository<TEntity> where TEntity : BaseEn
         this._dbContext.SaveChanges();
     }
 
+    public DbContext DbContext()
+    {
+        return this._dbContext;
+    }
+
     public void DisableSoftDeleteFilter()
     {
         this._dbContext.GetType().GetProperty("DisableSoftDeleteFilter")?.SetValue(this._dbContext, true);

docs/demo/src/WTA.Shared/Data/IRepository.cs

@@ -1,4 +1,5 @@
 using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 using WTA.Shared.Domain;
 
@@ -14,12 +15,16 @@ public interface IRepository<TEntity> where TEntity : BaseEntity
 
     void Update(Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setPropertyCalls, Expression<Func<TEntity, bool>> predicate);
 
+    void Delete(Guid[] guids);
+
     void Delete(Expression<Func<TEntity, bool>> predicate);
 
     void Insert(TEntity entity);
 
     void SaveChanges();
 
+    DbContext DbContext();
+
     void DisableSoftDeleteFilter();
 
     void DisableTenantFilter();

docs/demo/src/WTA/wwwroot/components/form/form-item.js

@@ -32,7 +32,7 @@ export default {
       if (props.schema.hidden) {
         return false;
       }
-      if (props.schema.readOnly && (props.mode === "query" || props.mode === "create" || props.mode === "update")) {
+      if (props.schema.readOnly && (props.mode === "create" || props.mode === "update")) {
         return false;
       }
       return true;

docs/demo/src/WTA/wwwroot/layouts/tabs.js

@@ -1,5 +1,5 @@
 import html from "html";
-import { defineAsyncComponent, ref, nextTick } from "vue";
+import { defineAsyncComponent, ref, nextTick, getCurrentInstance } from "vue";
 import { useRoute, onBeforeRouteUpdate, useRouter } from "vue-router";
 import { useAppStore } from "../store/index.js";
 
@@ -111,11 +111,17 @@ export default {
       });
     };
 
+    const deleteItem = (start, end) => {
+      appStore.routes.splice(start, end);
+      const vue = getCurrentInstance();
+      console.log(vue);
+    };
+
     const remove = (name) => {
       if (appStore.routes.length > 1) {
         const index = appStore.routes.findIndex((o) => o.fullPath === name);
         const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath);
-        appStore.routes.splice(index, 1);
+        deleteItem(index, 1);
         if (index === currentIndex) {
           if (appStore.routes[index]) {
             router.push(appStore.routes[index]);
@@ -129,7 +135,7 @@ export default {
     const removeLeft = (index) => {
       const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath);
       const route = appStore.routes[index];
-      appStore.routes.splice(0, index);
+      deleteItem(0, index);
       if (currentIndex < index) {
         router.push(route);
       }
@@ -137,7 +143,7 @@ export default {
 
     const removeRight = (index) => {
       const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath);
-      appStore.routes.splice(index + 1, appStore.routes.length - index);
+      deleteItem(index + 1, appStore.routes.length - index);
       if (currentIndex > index) {
         router.push(appStore.routes[index]);
       }