ow

CloudBuilder/CloudBuilder.Master.Service/FamilyTreeService.auto.cs

@@ -1,4 +1,4 @@
-
+
 using CloudBuilder.Core.DatabaseAccessor;
 using CloudBuilder.Core.DatabaseAccessor.Entity;
 using CloudBuilder.Core.Service;
@@ -6,7 +6,13 @@ using CloudBuilder.Master.Data;
 using CloudBuilder.Master.Entity;
 using CloudBuilder.Master.Policy;
 using CloudBuilder.Master.SearchCriteria;
+using CloudBuilder.Security.Data;
+using CloudBuilder.Security.Entity;
+using CloudBuilder.Security.Service;
+using CloudBuilder.Security.Utility;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using Microsoft.Extensions.DependencyInjection;
 namespace CloudBuilder.Master.Service
 {
     public class FamilyTreeService : IFamilyTreeService
@@ -19,19 +25,62 @@ namespace CloudBuilder.Master.Service
             this.service = service;
             repository = service.GetRepository<IRepository<FamilyTreeEntity>>();
         }
-
         [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
         public FamilyTreeData FindByKey(string key)
+        {
+            return FindByCurrentPerson(key, null);
+        }
+
+        [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
+        public FamilyTreeData FindByCurrentPerson(string key, string personId)
         {
             FamilyTreeData data = new FamilyTreeData();
-            return data;// repository.DetachedEntities.Where(x => x.TreeId == key).FirstOrDefault()!;
+            if (string.IsNullOrEmpty(key)) return data;
+
+            FamilyTreeEntity d = repository.DetachedEntities.Where(x => x.TreeId == key).FirstOrDefault();
+
+            if (d == null) return data;
+
+            data.FamilyTree = new FamilyTreeDisplayData(d);
+            data.CurrentPerson = new FamilyPersonData();
+
+            IRepository<FamilyPersonEntity> repositoryFamilyPerson = repository.GetRepository<IRepository<FamilyPersonEntity>>();
+
+            var currentPerson = personId;
+            if (string.IsNullOrEmpty(personId))
+            {
+                currentPerson = d.AncestorPersonId;
+
+                data.CurrentPerson.FamilyPerson = new FamilyPersonDisplayData(repositoryFamilyPerson.DetachedEntities.Where(x => x.PersonId == currentPerson).FirstOrDefault()!);
+
+                data.FamilyTree.AncestorPersonGenealogyName = data.CurrentPerson.FamilyPerson.GenealogyName;
+            }
+            else
+            {
+                data.CurrentPerson.FamilyPerson = new FamilyPersonDisplayData(repositoryFamilyPerson.DetachedEntities.Where(x => x.PersonId == d.AncestorPersonId).FirstOrDefault()!);
+
+                data.FamilyTree.AncestorPersonGenealogyName = data.CurrentPerson.FamilyPerson.GenealogyName;
+
+                data.CurrentPerson.FamilyPerson = new FamilyPersonDisplayData(repositoryFamilyPerson.DetachedEntities.Where(x => x.PersonId == personId).FirstOrDefault()!);
+            }
+
+            IRepository<FamilyTreeChildrenMapViewEntity> repositoryChildrenMap = repository.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>();
+
+            IRepository<FamilyTreeSpouseMapViewEntity> repositorySpouseMap = repository.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>();
+
+            data.CurrentPerson.FamilyTreeSpouseMaps = repositorySpouseMap.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson).OrderBy(x => x.Orderby).ToArray();
+
+            //data.CurrentPerson.FamilyTreeParentMaps = repositoryChildrenMap.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>().DetachedEntities.Where(x => x.ChildrenId == key).OrderBy(x => x.Orderby).ToArray();
+            data.CurrentPerson.FamilyTreeChildrenMaps = repositoryChildrenMap.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson).OrderBy(x => x.Orderby).ToArray();
+
+            return data;
         }
 
         [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
         public FamilyTreeResultData FindBySearchCriteria(FamilyTreeSearchCriteria criteria)
         {
             FamilyTreeResultData data = new FamilyTreeResultData();
-            FamilyTreeEntity[] list = null;
+            FamilyTreeViewEntity[] list = null;
 
             int count = 0;
 
@@ -42,13 +91,15 @@ namespace CloudBuilder.Master.Service
                 sqlWhere = SearchFilter.ComposeWhereClause(criteria.Filter);
             }
 
-            FamilyTreeEntity entity = FamilyTreeEntity.GetInstance(repository.GetDbContext().Database.ProviderName);
+            FamilyTreeViewEntity entity = FamilyTreeViewEntity.GetInstance(repository.GetDbContext().Database.ProviderName);
             string sql = entity.GetSelectTopFrom(criteria.limit, criteria.page, criteria.orderby.StringToDbField(), criteria.orderbytag, sqlWhere);
 
+            IRepository<FamilyTreeViewEntity> repositoryView = repository.GetRepository<IRepository<FamilyTreeViewEntity>>();
+
             string err = null;
             try
             {
-                list = repository.FromSql(sql).ToArray();
+                list = repositoryView.FromSql(sql).ToArray();
             }
             catch (System.Exception ex)
             {
@@ -81,14 +132,192 @@ namespace CloudBuilder.Master.Service
         [UnitOfWork]
         public FamilyTreeData Insert(FamilyTreeData data)
         {
-            throw new NotImplementedException();
+            FamilyTreeEntity d = repository.DetachedEntities.Where(x => x.TreeName == data.FamilyTree.TreeName).FirstOrDefault();
+            if (d != null)
+            {
+                throw new ValidatedException("家族名称已存在.");
             }
 
+            Validate(data.FamilyTree);
+
+            d = new FamilyTreeEntity();
+            ObjectCopyHelper.Copy(data.FamilyTree, d);
+
+
+            ISecurityGeneratorNumberService securityGeneratorNumberService = service.ServiceProvider.GetService<ISecurityGeneratorNumberService>()!;
+
+            d.TreeId = securityGeneratorNumberService.GetNo(MasterPrefixPolicy.FAMILY_TREE, MasterPrefixPolicy.FAMILY_TREE_TREE_ID, MasterPrefixPolicy.FAMILY_TREE_PREFIX, YesNoPolicy.NO, MasterPrefixPolicy.FAMILY_TREE_FORMAT);
+
+            repository.InsertNow(d);
+
+            var currentPerson = d.AncestorPersonId;
+
+            if (data.CurrentPerson != null && data.CurrentPerson.FamilyPerson != null && !string.IsNullOrEmpty(data.CurrentPerson.FamilyPerson.PersonId))
+            {
+                currentPerson = data.CurrentPerson.FamilyPerson.PersonId;
+            }
+
+            if (data.CurrentPerson != null && data.CurrentPerson.FamilyTreeSpouseMaps != null && data.CurrentPerson.FamilyTreeSpouseMaps.Length > 0)
+                data.CurrentPerson.FamilyTreeSpouseMaps.ToLookup(x => x.TreeId = d.TreeId);
+
+            if (data.CurrentPerson != null && data.CurrentPerson.FamilyTreeChildrenMaps != null && data.CurrentPerson.FamilyTreeChildrenMaps.Length > 0)
+                data.CurrentPerson.FamilyTreeChildrenMaps.ToLookup(x => x.TreeId = d.TreeId);
+
+            SaveSpouseMaps(currentPerson, data.CurrentPerson.FamilyTreeSpouseMaps);
+            //SaveParentMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeParentMaps);
+            SaveSonMaps(currentPerson, data.CurrentPerson.FamilyTreeChildrenMaps);
+
+            return FindByCurrentPerson(d.TreeId, currentPerson);
+        }
+
+        private void SaveSpouseMaps(string personId, FamilyTreeSpouseMapViewEntity[] maps)
+        {
+            IRepository<FamilyTreeSpouseMapViewEntity> repositoryMapView = repository.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>();
+            IRepository<FamilyTreeSpouseMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeSpouseMapEntity>>();
+
+            FamilyTreeSpouseMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.PersonId == personId).ToArray();
+            if (olds != null && olds.Length > 0)
+            {
+                foreach (FamilyTreeSpouseMapViewEntity old in olds)
+                {
+                    repositoryMap.DeleteNow(new FamilyTreeSpouseMapEntity()
+                    {
+                        TreeId = old.TreeId,
+                        PersonId = personId,
+                        SpouseId = old.SpouseId
+                    });
+                }
+            }
+
+            if (maps == null || maps.Length == 0) return;
+            int i = 1;
+            foreach (FamilyTreeSpouseMapViewEntity map in maps.OrderBy(x => x.Orderby).ToArray())
+            {
+                repositoryMap.InsertNow(new FamilyTreeSpouseMapEntity()
+                {
+                    TreeId = map.TreeId,
+                    PersonId = personId,
+                    SpouseId = map.SpouseId,
+
+                    MarryDateText = map.MarryDateText,
+                    MarryDate = map.MarryDate,
+                    DivorceDateText = map.DivorceDateText,
+                    DivorceDate = map.DivorceDate,
+                    MarryType = map.MarryType,
+                    IsCurrent = map.IsCurrent,
+                    Remark = map.Remark,
+                    Orderby = i++
+                });
+            }
+        }
+
+        private void SaveParentMaps(string personId, FamilyTreeChildrenMapViewEntity[] maps)
+        {
+            IRepository<FamilyTreeChildrenMapViewEntity> repositoryMapView = repository.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>();
+            IRepository<FamilyTreeChildrenMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeChildrenMapEntity>>();
+            FamilyTreeChildrenMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.ChildrenId == personId).ToArray();
+            if (olds != null && olds.Length > 0)
+            {
+                foreach (FamilyTreeChildrenMapViewEntity old in olds)
+                {
+                    repositoryMap.DeleteNow(new FamilyTreeChildrenMapEntity()
+                    {
+                        TreeId = old.TreeId,
+                        ChildrenId = personId,
+                        PersonId = old.PersonId
+                    });
+                }
+            }
+
+            if (maps == null || maps.Length == 0) return;
+
+            int maxOrderBy = 0;
+            foreach (FamilyTreeChildrenMapViewEntity map in maps)
+            {
+                FamilyTreeChildrenMapViewEntity[] oldMaps = repositoryMapView.Entities.Where(x => x.PersonId == map.PersonId).ToArray();
+
+                if (oldMaps != null && oldMaps.Count() > 0) maxOrderBy = oldMaps.Max(x => x.Orderby);
+
+                repositoryMap.InsertNow(new FamilyTreeChildrenMapEntity()
+                {
+                    TreeId = map.TreeId,
+                    ChildrenId = personId,
+                    PersonId = map.PersonId,
+                    Orderby = oldMaps == null ? 1 : maxOrderBy + 1
+                });
+            }
+
+        }
+
+
+        private void SaveSonMaps(string personId, FamilyTreeChildrenMapViewEntity[] maps)
+        {
+            IRepository<FamilyTreeChildrenMapViewEntity> repositoryMapView = repository.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>();
+            IRepository<FamilyTreeChildrenMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeChildrenMapEntity>>();
+
+            FamilyTreeChildrenMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.PersonId == personId).ToArray();
+            if (olds != null && olds.Length > 0)
+            {
+                foreach (FamilyTreeChildrenMapViewEntity old in olds)
+                {
+                    repositoryMap.DeleteNow(new FamilyTreeChildrenMapEntity()
+                    {
+                        TreeId = old.TreeId,
+                        PersonId = personId,
+                        ChildrenId = old.ChildrenId
+                    });
+                }
+            }
+
+            if (maps == null || maps.Length == 0) return;
+            int i = 1;
+            foreach (FamilyTreeChildrenMapViewEntity map in maps.OrderBy(x => x.Orderby).ToArray())
+            {
+                repositoryMap.InsertNow(new FamilyTreeChildrenMapEntity()
+                {
+                    TreeId = map.TreeId,
+                    PersonId = personId,
+                    SpouseId = map.SpouseId,
+
+                    ChildrenId = map.ChildrenId,
+                    RelationType = map.RelationType,
+                    Remark = map.Remark,
+                    Orderby = i++
+                });
+            }
+        }
+
+        private void Validate(FamilyTreeEntity d)
+        {
+            List<SysTableSchemaViewEntity> sysTableSchemas = service.ServiceProvider.GetRequiredService<ISysTableSchemaViewService>().FindByTableName(FamilyTreeEntity.DB_NAME_FAMILY_TREE);
+            ValidateHelper.ValidateString(d, sysTableSchemas.ToArray());
+        }
+
+
         [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Update)]
         [UnitOfWork]
         public FamilyTreeData Update(FamilyTreeData data)
         {
-            throw new NotImplementedException();
+            FamilyTreeEntity d = repository.DetachedEntities.Where(x => x.TreeName == data.FamilyTree.TreeName).FirstOrDefault();
+            if (d == null)
+            {
+                throw new ValidatedException("家族名称不存在.");
+            }
+
+            Validate(data.FamilyTree);
+
+            ObjectCopyHelper.Copy(data.FamilyTree, d);
+
+            repository.UpdateNow(d);
+
+            var currentPerson = data.CurrentPerson != null ? data.CurrentPerson.FamilyPerson.PersonId : null;
+            if (string.IsNullOrEmpty(currentPerson)) currentPerson = d.AncestorPersonId;
+
+            SaveSpouseMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeSpouseMaps);
+            //SaveParentMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeParentMaps);
+            SaveSonMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeChildrenMaps);
+
+            return FindByCurrentPerson(data.FamilyTree.TreeId, currentPerson);
         }
 
 
@@ -97,7 +326,42 @@ namespace CloudBuilder.Master.Service
         public void Delete(string key)
         {
             var ent = repository.DetachedEntities.Where(x => x.TreeId == key).FirstOrDefault()!;
-            if (ent != null) { repository.DeleteNow(ent); }
+            if (ent == null) return;
+            repository.DeleteNow(ent);
+
+            DeleteSpouses(ent.AncestorPersonId);
+            DeleteChildrens(ent.AncestorPersonId);
+        }
+
+        private void DeleteSpouses(string personId)
+        {
+            IRepository<FamilyTreeSpouseMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeSpouseMapEntity>>();
+
+            FamilyTreeSpouseMapEntity[] olds = repositoryMap.Entities.Where(x => x.PersonId == personId).ToArray();
+
+            if (olds != null && olds.Length > 0)
+            {
+                repositoryMap.DeleteNow(olds);
+            }
+        }
+
+        private void DeleteChildrens(string personId)
+        {
+            IRepository<FamilyTreeChildrenMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeChildrenMapEntity>>();
+
+            FamilyTreeChildrenMapEntity[] olds = repositoryMap.Entities.Where(x => x.PersonId == personId).ToArray();
+
+            if (olds != null && olds.Length > 0)
+            {
+                repositoryMap.DeleteNow(olds);
+            }
+
+            foreach (FamilyTreeChildrenMapEntity old in olds)
+            {
+                DeleteChildrens(old.ChildrenId);
+
+                DeleteSpouses(old.ChildrenId);
+            }
         }
 
         [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Delete)]

CloudBuilder/CloudBuilder.Master/Data/FamilyPersonData.cs

@@ -1,4 +1,5 @@
 using CloudBuilder.Core.Authorization;
+using CloudBuilder.Master.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,5 +12,11 @@ namespace CloudBuilder.Master.Data
     public class FamilyPersonData
     {
         public FamilyPersonDisplayData? FamilyPerson { get; set; }
+
+        public FamilyTreeSpouseMapViewEntity[]? FamilyTreeSpouseMaps { get; set; }
+
+        public FamilyTreeChildrenMapViewEntity[]? FamilyTreeParentMaps { get; set; }
+
+        public FamilyTreeChildrenMapViewEntity[]? FamilyTreeChildrenMaps { get; set; }
     }
 }

CloudBuilder/CloudBuilder.Master/Data/FamilyTreeData.cs

@@ -1,4 +1,5 @@
 using CloudBuilder.Core.Authorization;
+using CloudBuilder.Master.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,5 +13,8 @@ namespace CloudBuilder.Master.Data
     public class FamilyTreeData
     {
         public FamilyTreeDisplayData? FamilyTree { get; set; }
+
+        public FamilyPersonData? CurrentPerson { get; set; }
+        
     }
 }

CloudBuilder/CloudBuilder.Master/Data/FamilyTreeDisplayData.cs

@@ -14,14 +14,17 @@ namespace CloudBuilder.Master.Data
     /// </summary>
     [NotMapped]
     [TypeScript]
-    public class FamilyTreeDisplayData : FamilyPersonEntity
+    public class FamilyTreeDisplayData : FamilyTreeEntity
     {
         public FamilyTreeDisplayData()
         {
         }
-        public FamilyTreeDisplayData(FamilyPersonEntity entity)
+        public FamilyTreeDisplayData(FamilyTreeEntity entity)
         {
             CopyFrom(entity);
         }
+
+        public string? AncestorPersonGenealogyName { get; set; }
+        
     }
 }

CloudBuilder/CloudBuilder.Master/Data/FamilyTreeResultData.cs

@@ -12,6 +12,6 @@ namespace CloudBuilder.Master.Data
     [TypeScript]
     public class FamilyTreeResultData : SearchCriteriaResultData
     {
-        public FamilyTreeEntity[]? Datas { get; set; }
+        public FamilyTreeViewEntity[]? Datas { get; set; }
     }
 }

CloudBuilder/CloudBuilder.Master/Entity/CloudBuilderMasterRegistEntity.auto.cs

@@ -41,6 +41,16 @@ builder.Entity<FamilyTreeSpouseMapEntity>().HasKey(c => new {c.TreeId,c.PersonId
 
 
 
+
+builder.Entity<FamilyTreeChildrenMapViewEntity>(eb => { eb.HasNoKey(); });
+            
+builder.Entity<FamilyTreeSpouseMapViewEntity>(eb => { eb.HasNoKey(); });
+            
+builder.Entity<FamilyTreeViewEntity>(eb => { eb.HasNoKey(); });
+            
+builder.Entity<FamilyTreeChildrenMapViewEntity>(eb => { eb.HasNoKey(); });
+            
+builder.Entity<FamilyTreeSpouseMapViewEntity>(eb => { eb.HasNoKey(); });
             //***END***
         }
     }

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeChildrenMapEntity.auto.cs

@@ -14,51 +14,55 @@ namespace CloudBuilder.Master.Entity
     {
     }
 
-    [Column("created_datetime")]
-    public DateTime CreatedDatetime  { get; set; }
-    [Column("created_by")]
-    public string CreatedBy  { get; set; }
-    [Column("updated_datetime")]
-    public DateTime UpdatedDatetime  { get; set; }
-    [Column("updated_by")]
-    public string UpdatedBy  { get; set; }
-    [Column("tree_id")]
-    public string TreeId  { get; set; }
-    [Column("person_id")]
-    public string PersonId  { get; set; }
-    [Column("spouse_id")]
-    public string SpouseId  { get; set; }
     [Column("children_id")]
     public string ChildrenId  { get; set; }
+    [Column("created_by")]
+    public string CreatedBy  { get; set; }
+    [Column("created_datetime")]
+    public DateTime CreatedDatetime  { get; set; }
+    [Column("orderby")]
+    public int Orderby  { get; set; }
+    [Column("person_id")]
+    public string PersonId  { get; set; }
     [Column("relation_type")]
     public string? RelationType  { get; set; }
     [Column("remark")]
     public string? Remark  { get; set; }
+    [Column("spouse_id")]
+    public string? SpouseId  { get; set; }
+    [Column("tree_id")]
+    public string TreeId  { get; set; }
+    [Column("updated_by")]
+    public string UpdatedBy  { get; set; }
+    [Column("updated_datetime")]
+    public DateTime UpdatedDatetime  { get; set; }
 
-    public const string CREATED_DATETIME = "CreatedDatetime";
-    public const string CREATED_BY = "CreatedBy";
-    public const string UPDATED_DATETIME = "UpdatedDatetime";
-    public const string UPDATED_BY = "UpdatedBy";
-    public const string TREE_ID = "TreeId";
-    public const string PERSON_ID = "PersonId";
-    public const string SPOUSE_ID = "SpouseId";
     public const string CHILDREN_ID = "ChildrenId";
+    public const string CREATED_BY = "CreatedBy";
+    public const string CREATED_DATETIME = "CreatedDatetime";
+    public const string ORDERBY = "Orderby";
+    public const string PERSON_ID = "PersonId";
     public const string RELATION_TYPE = "RelationType";
     public const string REMARK = "Remark";
+    public const string SPOUSE_ID = "SpouseId";
+    public const string TREE_ID = "TreeId";
+    public const string UPDATED_BY = "UpdatedBy";
+    public const string UPDATED_DATETIME = "UpdatedDatetime";
 
     public const string DB_NAME_FAMILY_TREE_CHILDREN_MAP = "family_tree_children_map";
-    public const string DB_NAME_FIELDS="created_datetime,created_by,updated_datetime,updated_by,tree_id,person_id,spouse_id,children_id,relation_type,remark";
+    public const string DB_NAME_FIELDS="children_id,created_by,created_datetime,orderby,person_id,relation_type,remark,spouse_id,tree_id,updated_by,updated_datetime";
 
-    public const string DB_CREATED_DATETIME = "created_datetime";
-    public const string DB_CREATED_BY = "created_by";
-    public const string DB_UPDATED_DATETIME = "updated_datetime";
-    public const string DB_UPDATED_BY = "updated_by";
-    public const string DB_TREE_ID = "tree_id";
-    public const string DB_PERSON_ID = "person_id";
-    public const string DB_SPOUSE_ID = "spouse_id";
     public const string DB_CHILDREN_ID = "children_id";
+    public const string DB_CREATED_BY = "created_by";
+    public const string DB_CREATED_DATETIME = "created_datetime";
+    public const string DB_ORDERBY = "orderby";
+    public const string DB_PERSON_ID = "person_id";
     public const string DB_RELATION_TYPE = "relation_type";
     public const string DB_REMARK = "remark";
+    public const string DB_SPOUSE_ID = "spouse_id";
+    public const string DB_TREE_ID = "tree_id";
+    public const string DB_UPDATED_BY = "updated_by";
+    public const string DB_UPDATED_DATETIME = "updated_datetime";
 
     private string ProviderName { get; set; }
 
@@ -79,23 +83,24 @@ namespace CloudBuilder.Master.Entity
             throw new NullReferenceException("Source entity is null.");
         }
 
-        this.CreatedDatetime =  source.CreatedDatetime;
-        this.CreatedBy =  source.CreatedBy;
-        this.UpdatedDatetime =  source.UpdatedDatetime;
-        this.UpdatedBy =  source.UpdatedBy;
-        this.TreeId =  source.TreeId;
-        this.PersonId =  source.PersonId;
-        this.SpouseId =  source.SpouseId;
         this.ChildrenId =  source.ChildrenId;
+        this.CreatedBy =  source.CreatedBy;
+        this.CreatedDatetime =  source.CreatedDatetime;
+        this.Orderby =  source.Orderby;
+        this.PersonId =  source.PersonId;
         this.RelationType =  source.RelationType;
         this.Remark =  source.Remark;
+        this.SpouseId =  source.SpouseId;
+        this.TreeId =  source.TreeId;
+        this.UpdatedBy =  source.UpdatedBy;
+        this.UpdatedDatetime =  source.UpdatedDatetime;
 
         if (includeSystemFields)
         {
-        this.CreatedDatetime =  source.CreatedDatetime;
         this.CreatedBy =  source.CreatedBy;
-        this.UpdatedDatetime =  source.UpdatedDatetime;
+        this.CreatedDatetime =  source.CreatedDatetime;
         this.UpdatedBy =  source.UpdatedBy;
+        this.UpdatedDatetime =  source.UpdatedDatetime;
         }
     }
 
@@ -167,7 +172,7 @@ namespace CloudBuilder.Master.Entity
     public  string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
     {
             if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
-            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_TREE_ID ;  		
+            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_CHILDREN_ID ;  		
 		int offset = limit * (start - 1);
         return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_CHILDREN_MAP}   where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
     }
@@ -175,7 +180,7 @@ namespace CloudBuilder.Master.Entity
     public  string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
     {
             if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
-            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_TREE_ID ;  		
+            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_CHILDREN_ID ;  		
 		string top = limit > 0 ? $"top {limit}" : "";
         return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_CHILDREN_MAP}  with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
     }

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeChildrenMapEntityKey.auto.cs

@@ -5,9 +5,9 @@ namespace CloudBuilder.Master
     [TypeScript]
     public class FamilyTreeChildrenMapEntityKey
     {
-        public string TreeId  { get; set; }
-        public string PersonId  { get; set; }
         public string ChildrenId  { get; set; }
+        public string PersonId  { get; set; }
+        public string TreeId  { get; set; }
 
         public override bool Equals(object obj)
         {
@@ -16,9 +16,9 @@ namespace CloudBuilder.Master
             FamilyTreeChildrenMapEntityKey pkey = obj as FamilyTreeChildrenMapEntityKey;
             if (pkey == null) return false;
 
-            if (TreeId != pkey.TreeId) return false;
-            if (PersonId != pkey.PersonId) return false;
             if (ChildrenId != pkey.ChildrenId) return false;
+            if (PersonId != pkey.PersonId) return false;
+            if (TreeId != pkey.TreeId) return false;
 
             return true;
         }
@@ -27,9 +27,9 @@ namespace CloudBuilder.Master
             public override string ToString()
             {
                 string declareSql="";
-                declareSql=declareSql+$"declare @__tkey_TreeId_0 varchar(50) select @__tkey_TreeId_0 ='{TreeId}'; " ;                declareSql=declareSql+$"declare @__tkey_PersonId_1 varchar(50) select @__tkey_PersonId_1 ='{PersonId}'; " ;                declareSql=declareSql+$"declare @__tkey_ChildrenId_2 varchar(50) select @__tkey_ChildrenId_2 ='{ChildrenId}'; " ;
+                declareSql=declareSql+$"declare @__tkey_ChildrenId_0 varchar(50) select @__tkey_ChildrenId_0 ='{ChildrenId}'; " ;                declareSql=declareSql+$"declare @__tkey_PersonId_1 varchar(50) select @__tkey_PersonId_1 ='{PersonId}'; " ;                declareSql=declareSql+$"declare @__tkey_TreeId_2 varchar(50) select @__tkey_TreeId_2 ='{TreeId}'; " ;
                 return declareSql;
             }
         }
     }
-    /* builder.Entity<FamilyTreeChildrenMapEntity>().HasKey(c => new {        c.TreeId,        c.PersonId,        c.ChildrenId});    */
+    /* builder.Entity<FamilyTreeChildrenMapEntity>().HasKey(c => new {        c.ChildrenId,        c.PersonId,        c.TreeId});    */

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeChildrenMapViewEntity.auto.cs

@@ -0,0 +1,208 @@
+
+using CloudBuilder.Core.Authorization;
+using CloudBuilder.Core.DatabaseAccessor.Entity;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace CloudBuilder.Master.Entity
+ {
+    [TypeScript]
+    [Table("family_tree_children_map_view")]
+    public class FamilyTreeChildrenMapViewEntity : ViewEntityBase
+    {
+
+    public FamilyTreeChildrenMapViewEntity() 
+    {
+    }
+
+    [Column("children_common_name")]
+    public string? ChildrenCommonName  { get; set; }
+    [Column("children_genealogy_name")]
+    public string? ChildrenGenealogyName  { get; set; }
+    [Column("children_id")]
+    public string ChildrenId  { get; set; }
+    [Column("children_surname")]
+    public string ChildrenSurname  { get; set; }
+    [Column("common_name")]
+    public string? CommonName  { get; set; }
+    [Column("gender")]
+    public string? Gender  { get; set; }
+    [Column("genealogy_name")]
+    public string? GenealogyName  { get; set; }
+    [Column("orderby")]
+    public int Orderby  { get; set; }
+    [Column("person_id")]
+    public string PersonId  { get; set; }
+    [Column("relation_type")]
+    public string? RelationType  { get; set; }
+    [Column("remark")]
+    public string? Remark  { get; set; }
+    [Column("spouse_id")]
+    public string? SpouseId  { get; set; }
+    [Column("surname")]
+    public string Surname  { get; set; }
+    [Column("tree_id")]
+    public string TreeId  { get; set; }
+
+    public const string CHILDREN_COMMON_NAME = "ChildrenCommonName";
+    public const string CHILDREN_GENEALOGY_NAME = "ChildrenGenealogyName";
+    public const string CHILDREN_ID = "ChildrenId";
+    public const string CHILDREN_SURNAME = "ChildrenSurname";
+    public const string COMMON_NAME = "CommonName";
+    public const string GENDER = "Gender";
+    public const string GENEALOGY_NAME = "GenealogyName";
+    public const string ORDERBY = "Orderby";
+    public const string PERSON_ID = "PersonId";
+    public const string RELATION_TYPE = "RelationType";
+    public const string REMARK = "Remark";
+    public const string SPOUSE_ID = "SpouseId";
+    public const string SURNAME = "Surname";
+    public const string TREE_ID = "TreeId";
+
+    public const string DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW = "family_tree_children_map_view";
+    public const string DB_NAME_FIELDS="children_common_name,children_genealogy_name,children_id,children_surname,common_name,gender,genealogy_name,orderby,person_id,relation_type,remark,spouse_id,surname,tree_id";
+
+    public const string DB_CHILDREN_COMMON_NAME = "children_common_name";
+    public const string DB_CHILDREN_GENEALOGY_NAME = "children_genealogy_name";
+    public const string DB_CHILDREN_ID = "children_id";
+    public const string DB_CHILDREN_SURNAME = "children_surname";
+    public const string DB_COMMON_NAME = "common_name";
+    public const string DB_GENDER = "gender";
+    public const string DB_GENEALOGY_NAME = "genealogy_name";
+    public const string DB_ORDERBY = "orderby";
+    public const string DB_PERSON_ID = "person_id";
+    public const string DB_RELATION_TYPE = "relation_type";
+    public const string DB_REMARK = "remark";
+    public const string DB_SPOUSE_ID = "spouse_id";
+    public const string DB_SURNAME = "surname";
+    public const string DB_TREE_ID = "tree_id";
+
+    private string ProviderName { get; set; }
+
+    public static FamilyTreeChildrenMapViewEntity GetInstance(string providerName)
+    {
+        return new FamilyTreeChildrenMapViewEntity() { ProviderName = providerName };
+    }
+
+    public virtual void CopyFrom(FamilyTreeChildrenMapViewEntity source)
+    {
+        CopyFrom(source, true);
+    }
+
+    public virtual void CopyFrom(FamilyTreeChildrenMapViewEntity source, bool includeSystemFields)
+    {
+        if (source == null)
+        {
+            throw new NullReferenceException("Source entity is null.");
+        }
+
+        this.ChildrenCommonName =  source.ChildrenCommonName;
+        this.ChildrenGenealogyName =  source.ChildrenGenealogyName;
+        this.ChildrenId =  source.ChildrenId;
+        this.ChildrenSurname =  source.ChildrenSurname;
+        this.CommonName =  source.CommonName;
+        this.Gender =  source.Gender;
+        this.GenealogyName =  source.GenealogyName;
+        this.Orderby =  source.Orderby;
+        this.PersonId =  source.PersonId;
+        this.RelationType =  source.RelationType;
+        this.Remark =  source.Remark;
+        this.SpouseId =  source.SpouseId;
+        this.Surname =  source.Surname;
+        this.TreeId =  source.TreeId;
+
+        if (includeSystemFields)
+        {
+        }
+    }
+
+    public override string GetSelectFrom()
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectFromByMySql();
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectFromByBySqlServer();
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+    public  string GetSelectFromByMySql()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}  with(nolock) ";
+    }
+    public  string GetSelectFromByBySqlServer()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}   ";
+    }
+
+    public override string GetSelectCountFrom(string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectCountFromByMySql(sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectCountFromBySqlServer(sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectCountFromByMySql(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}   where 1=1 {sqlWhere}";
+    }
+    public  string GetSelectCountFromBySqlServer(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}  with(nolock) where 1=1 {sqlWhere}";
+    }
+
+	public override string GetSelectTopFrom(int limit, int start, string orderby, string orderbytag, string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectTopFromByMySql(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectTopFromBySqlServer(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_CHILDREN_COMMON_NAME ;  		int offset = limit * (start - 1);
+        return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}   where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
+    }
+
+    public  string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_CHILDREN_COMMON_NAME ;  		string top = limit > 0 ? $"top {limit}" : "";
+        return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_CHILDREN_MAP_VIEW}  with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
+    }
+
+    public FamilyTreeChildrenMapViewEntity Clone()
+    {
+        FamilyTreeChildrenMapViewEntity result = new FamilyTreeChildrenMapViewEntity();
+        result.CopyFrom(this);
+
+        return result;
+    }
+
+    }
+}

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeSpouseMapEntity.auto.cs

@@ -14,67 +14,71 @@ namespace CloudBuilder.Master.Entity
     {
     }
 
-    [Column("created_datetime")]
-    public DateTime CreatedDatetime  { get; set; }
     [Column("created_by")]
     public string CreatedBy  { get; set; }
-    [Column("updated_datetime")]
-    public DateTime UpdatedDatetime  { get; set; }
-    [Column("updated_by")]
-    public string UpdatedBy  { get; set; }
-    [Column("tree_id")]
-    public string TreeId  { get; set; }
-    [Column("person_id")]
-    public string PersonId  { get; set; }
-    [Column("spouse_id")]
-    public string SpouseId  { get; set; }
-    [Column("marry_date_text")]
-    public string? MarryDateText  { get; set; }
-    [Column("marry_date")]
-    public Nullable<DateTime> MarryDate  { get; set; }
-    [Column("divorce_date_text")]
-    public string? DivorceDateText  { get; set; }
+    [Column("created_datetime")]
+    public DateTime CreatedDatetime  { get; set; }
     [Column("divorce_date")]
     public Nullable<DateTime> DivorceDate  { get; set; }
-    [Column("marry_type")]
-    public string? MarryType  { get; set; }
+    [Column("divorce_date_text")]
+    public string? DivorceDateText  { get; set; }
     [Column("is_current")]
     public string? IsCurrent  { get; set; }
+    [Column("marry_date")]
+    public Nullable<DateTime> MarryDate  { get; set; }
+    [Column("marry_date_text")]
+    public string? MarryDateText  { get; set; }
+    [Column("marry_type")]
+    public string? MarryType  { get; set; }
+    [Column("orderby")]
+    public int Orderby  { get; set; }
+    [Column("person_id")]
+    public string PersonId  { get; set; }
     [Column("remark")]
     public string? Remark  { get; set; }
+    [Column("spouse_id")]
+    public string SpouseId  { get; set; }
+    [Column("tree_id")]
+    public string TreeId  { get; set; }
+    [Column("updated_by")]
+    public string UpdatedBy  { get; set; }
+    [Column("updated_datetime")]
+    public DateTime UpdatedDatetime  { get; set; }
 
-    public const string CREATED_DATETIME = "CreatedDatetime";
     public const string CREATED_BY = "CreatedBy";
-    public const string UPDATED_DATETIME = "UpdatedDatetime";
-    public const string UPDATED_BY = "UpdatedBy";
-    public const string TREE_ID = "TreeId";
-    public const string PERSON_ID = "PersonId";
-    public const string SPOUSE_ID = "SpouseId";
-    public const string MARRY_DATE_TEXT = "MarryDateText";
-    public const string MARRY_DATE = "MarryDate";
-    public const string DIVORCE_DATE_TEXT = "DivorceDateText";
+    public const string CREATED_DATETIME = "CreatedDatetime";
     public const string DIVORCE_DATE = "DivorceDate";
-    public const string MARRY_TYPE = "MarryType";
+    public const string DIVORCE_DATE_TEXT = "DivorceDateText";
     public const string IS_CURRENT = "IsCurrent";
+    public const string MARRY_DATE = "MarryDate";
+    public const string MARRY_DATE_TEXT = "MarryDateText";
+    public const string MARRY_TYPE = "MarryType";
+    public const string ORDERBY = "Orderby";
+    public const string PERSON_ID = "PersonId";
     public const string REMARK = "Remark";
+    public const string SPOUSE_ID = "SpouseId";
+    public const string TREE_ID = "TreeId";
+    public const string UPDATED_BY = "UpdatedBy";
+    public const string UPDATED_DATETIME = "UpdatedDatetime";
 
     public const string DB_NAME_FAMILY_TREE_SPOUSE_MAP = "family_tree_spouse_map";
-    public const string DB_NAME_FIELDS="created_datetime,created_by,updated_datetime,updated_by,tree_id,person_id,spouse_id,marry_date_text,marry_date,divorce_date_text,divorce_date,marry_type,is_current,remark";
+    public const string DB_NAME_FIELDS="created_by,created_datetime,divorce_date,divorce_date_text,is_current,marry_date,marry_date_text,marry_type,orderby,person_id,remark,spouse_id,tree_id,updated_by,updated_datetime";
 
-    public const string DB_CREATED_DATETIME = "created_datetime";
     public const string DB_CREATED_BY = "created_by";
-    public const string DB_UPDATED_DATETIME = "updated_datetime";
-    public const string DB_UPDATED_BY = "updated_by";
-    public const string DB_TREE_ID = "tree_id";
-    public const string DB_PERSON_ID = "person_id";
-    public const string DB_SPOUSE_ID = "spouse_id";
-    public const string DB_MARRY_DATE_TEXT = "marry_date_text";
-    public const string DB_MARRY_DATE = "marry_date";
-    public const string DB_DIVORCE_DATE_TEXT = "divorce_date_text";
+    public const string DB_CREATED_DATETIME = "created_datetime";
     public const string DB_DIVORCE_DATE = "divorce_date";
-    public const string DB_MARRY_TYPE = "marry_type";
+    public const string DB_DIVORCE_DATE_TEXT = "divorce_date_text";
     public const string DB_IS_CURRENT = "is_current";
+    public const string DB_MARRY_DATE = "marry_date";
+    public const string DB_MARRY_DATE_TEXT = "marry_date_text";
+    public const string DB_MARRY_TYPE = "marry_type";
+    public const string DB_ORDERBY = "orderby";
+    public const string DB_PERSON_ID = "person_id";
     public const string DB_REMARK = "remark";
+    public const string DB_SPOUSE_ID = "spouse_id";
+    public const string DB_TREE_ID = "tree_id";
+    public const string DB_UPDATED_BY = "updated_by";
+    public const string DB_UPDATED_DATETIME = "updated_datetime";
 
     private string ProviderName { get; set; }
 
@@ -95,27 +99,28 @@ namespace CloudBuilder.Master.Entity
             throw new NullReferenceException("Source entity is null.");
         }
 
-        this.CreatedDatetime =  source.CreatedDatetime;
         this.CreatedBy =  source.CreatedBy;
-        this.UpdatedDatetime =  source.UpdatedDatetime;
-        this.UpdatedBy =  source.UpdatedBy;
-        this.TreeId =  source.TreeId;
-        this.PersonId =  source.PersonId;
-        this.SpouseId =  source.SpouseId;
-        this.MarryDateText =  source.MarryDateText;
-        this.MarryDate =  source.MarryDate;
-        this.DivorceDateText =  source.DivorceDateText;
+        this.CreatedDatetime =  source.CreatedDatetime;
         this.DivorceDate =  source.DivorceDate;
-        this.MarryType =  source.MarryType;
+        this.DivorceDateText =  source.DivorceDateText;
         this.IsCurrent =  source.IsCurrent;
+        this.MarryDate =  source.MarryDate;
+        this.MarryDateText =  source.MarryDateText;
+        this.MarryType =  source.MarryType;
+        this.Orderby =  source.Orderby;
+        this.PersonId =  source.PersonId;
         this.Remark =  source.Remark;
+        this.SpouseId =  source.SpouseId;
+        this.TreeId =  source.TreeId;
+        this.UpdatedBy =  source.UpdatedBy;
+        this.UpdatedDatetime =  source.UpdatedDatetime;
 
         if (includeSystemFields)
         {
-        this.CreatedDatetime =  source.CreatedDatetime;
         this.CreatedBy =  source.CreatedBy;
-        this.UpdatedDatetime =  source.UpdatedDatetime;
+        this.CreatedDatetime =  source.CreatedDatetime;
         this.UpdatedBy =  source.UpdatedBy;
+        this.UpdatedDatetime =  source.UpdatedDatetime;
         }
     }
 
@@ -187,7 +192,7 @@ namespace CloudBuilder.Master.Entity
     public  string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
     {
             if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
-            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_TREE_ID ;  		
+            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_PERSON_ID ;  		
 		int offset = limit * (start - 1);
         return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_SPOUSE_MAP}   where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
     }
@@ -195,7 +200,7 @@ namespace CloudBuilder.Master.Entity
     public  string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
     {
             if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
-            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_TREE_ID ;  		
+            if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_PERSON_ID ;  		
 		string top = limit > 0 ? $"top {limit}" : "";
         return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_SPOUSE_MAP}  with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
     }

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeSpouseMapEntityKey.auto.cs

@@ -5,9 +5,9 @@ namespace CloudBuilder.Master
     [TypeScript]
     public class FamilyTreeSpouseMapEntityKey
     {
-        public string TreeId  { get; set; }
         public string PersonId  { get; set; }
         public string SpouseId  { get; set; }
+        public string TreeId  { get; set; }
 
         public override bool Equals(object obj)
         {
@@ -16,9 +16,9 @@ namespace CloudBuilder.Master
             FamilyTreeSpouseMapEntityKey pkey = obj as FamilyTreeSpouseMapEntityKey;
             if (pkey == null) return false;
 
-            if (TreeId != pkey.TreeId) return false;
             if (PersonId != pkey.PersonId) return false;
             if (SpouseId != pkey.SpouseId) return false;
+            if (TreeId != pkey.TreeId) return false;
 
             return true;
         }
@@ -27,9 +27,9 @@ namespace CloudBuilder.Master
             public override string ToString()
             {
                 string declareSql="";
-                declareSql=declareSql+$"declare @__tkey_TreeId_0 varchar(50) select @__tkey_TreeId_0 ='{TreeId}'; " ;                declareSql=declareSql+$"declare @__tkey_PersonId_1 varchar(50) select @__tkey_PersonId_1 ='{PersonId}'; " ;                declareSql=declareSql+$"declare @__tkey_SpouseId_2 varchar(50) select @__tkey_SpouseId_2 ='{SpouseId}'; " ;
+                declareSql=declareSql+$"declare @__tkey_PersonId_0 varchar(50) select @__tkey_PersonId_0 ='{PersonId}'; " ;                declareSql=declareSql+$"declare @__tkey_SpouseId_1 varchar(50) select @__tkey_SpouseId_1 ='{SpouseId}'; " ;                declareSql=declareSql+$"declare @__tkey_TreeId_2 varchar(50) select @__tkey_TreeId_2 ='{TreeId}'; " ;
                 return declareSql;
             }
         }
     }
-    /* builder.Entity<FamilyTreeSpouseMapEntity>().HasKey(c => new {        c.TreeId,        c.PersonId,        c.SpouseId});    */
+    /* builder.Entity<FamilyTreeSpouseMapEntity>().HasKey(c => new {        c.PersonId,        c.SpouseId,        c.TreeId});    */

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeSpouseMapViewEntity.auto.cs

@@ -0,0 +1,228 @@
+
+using CloudBuilder.Core.Authorization;
+using CloudBuilder.Core.DatabaseAccessor.Entity;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace CloudBuilder.Master.Entity
+ {
+    [TypeScript]
+    [Table("family_tree_spouse_map_view")]
+    public class FamilyTreeSpouseMapViewEntity : ViewEntityBase
+    {
+
+    public FamilyTreeSpouseMapViewEntity() 
+    {
+    }
+
+    [Column("common_name")]
+    public string? CommonName  { get; set; }
+    [Column("divorce_date")]
+    public Nullable<DateTime> DivorceDate  { get; set; }
+    [Column("divorce_date_text")]
+    public string? DivorceDateText  { get; set; }
+    [Column("gender")]
+    public string? Gender  { get; set; }
+    [Column("genealogy_name")]
+    public string? GenealogyName  { get; set; }
+    [Column("is_current")]
+    public string? IsCurrent  { get; set; }
+    [Column("marry_date")]
+    public Nullable<DateTime> MarryDate  { get; set; }
+    [Column("marry_date_text")]
+    public string? MarryDateText  { get; set; }
+    [Column("marry_type")]
+    public string? MarryType  { get; set; }
+    [Column("orderby")]
+    public int Orderby  { get; set; }
+    [Column("person_id")]
+    public string PersonId  { get; set; }
+    [Column("remark")]
+    public string? Remark  { get; set; }
+    [Column("spouse_common_name")]
+    public string? SpouseCommonName  { get; set; }
+    [Column("spouse_genealogy_name")]
+    public string? SpouseGenealogyName  { get; set; }
+    [Column("spouse_id")]
+    public string SpouseId  { get; set; }
+    [Column("spouse_surname")]
+    public string SpouseSurname  { get; set; }
+    [Column("surname")]
+    public string Surname  { get; set; }
+    [Column("tree_id")]
+    public string TreeId  { get; set; }
+
+    public const string COMMON_NAME = "CommonName";
+    public const string DIVORCE_DATE = "DivorceDate";
+    public const string DIVORCE_DATE_TEXT = "DivorceDateText";
+    public const string GENDER = "Gender";
+    public const string GENEALOGY_NAME = "GenealogyName";
+    public const string IS_CURRENT = "IsCurrent";
+    public const string MARRY_DATE = "MarryDate";
+    public const string MARRY_DATE_TEXT = "MarryDateText";
+    public const string MARRY_TYPE = "MarryType";
+    public const string ORDERBY = "Orderby";
+    public const string PERSON_ID = "PersonId";
+    public const string REMARK = "Remark";
+    public const string SPOUSE_COMMON_NAME = "SpouseCommonName";
+    public const string SPOUSE_GENEALOGY_NAME = "SpouseGenealogyName";
+    public const string SPOUSE_ID = "SpouseId";
+    public const string SPOUSE_SURNAME = "SpouseSurname";
+    public const string SURNAME = "Surname";
+    public const string TREE_ID = "TreeId";
+
+    public const string DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW = "family_tree_spouse_map_view";
+    public const string DB_NAME_FIELDS="common_name,divorce_date,divorce_date_text,gender,genealogy_name,is_current,marry_date,marry_date_text,marry_type,orderby,person_id,remark,spouse_common_name,spouse_genealogy_name,spouse_id,spouse_surname,surname,tree_id";
+
+    public const string DB_COMMON_NAME = "common_name";
+    public const string DB_DIVORCE_DATE = "divorce_date";
+    public const string DB_DIVORCE_DATE_TEXT = "divorce_date_text";
+    public const string DB_GENDER = "gender";
+    public const string DB_GENEALOGY_NAME = "genealogy_name";
+    public const string DB_IS_CURRENT = "is_current";
+    public const string DB_MARRY_DATE = "marry_date";
+    public const string DB_MARRY_DATE_TEXT = "marry_date_text";
+    public const string DB_MARRY_TYPE = "marry_type";
+    public const string DB_ORDERBY = "orderby";
+    public const string DB_PERSON_ID = "person_id";
+    public const string DB_REMARK = "remark";
+    public const string DB_SPOUSE_COMMON_NAME = "spouse_common_name";
+    public const string DB_SPOUSE_GENEALOGY_NAME = "spouse_genealogy_name";
+    public const string DB_SPOUSE_ID = "spouse_id";
+    public const string DB_SPOUSE_SURNAME = "spouse_surname";
+    public const string DB_SURNAME = "surname";
+    public const string DB_TREE_ID = "tree_id";
+
+    private string ProviderName { get; set; }
+
+    public static FamilyTreeSpouseMapViewEntity GetInstance(string providerName)
+    {
+        return new FamilyTreeSpouseMapViewEntity() { ProviderName = providerName };
+    }
+
+    public virtual void CopyFrom(FamilyTreeSpouseMapViewEntity source)
+    {
+        CopyFrom(source, true);
+    }
+
+    public virtual void CopyFrom(FamilyTreeSpouseMapViewEntity source, bool includeSystemFields)
+    {
+        if (source == null)
+        {
+            throw new NullReferenceException("Source entity is null.");
+        }
+
+        this.CommonName =  source.CommonName;
+        this.DivorceDate =  source.DivorceDate;
+        this.DivorceDateText =  source.DivorceDateText;
+        this.Gender =  source.Gender;
+        this.GenealogyName =  source.GenealogyName;
+        this.IsCurrent =  source.IsCurrent;
+        this.MarryDate =  source.MarryDate;
+        this.MarryDateText =  source.MarryDateText;
+        this.MarryType =  source.MarryType;
+        this.Orderby =  source.Orderby;
+        this.PersonId =  source.PersonId;
+        this.Remark =  source.Remark;
+        this.SpouseCommonName =  source.SpouseCommonName;
+        this.SpouseGenealogyName =  source.SpouseGenealogyName;
+        this.SpouseId =  source.SpouseId;
+        this.SpouseSurname =  source.SpouseSurname;
+        this.Surname =  source.Surname;
+        this.TreeId =  source.TreeId;
+
+        if (includeSystemFields)
+        {
+        }
+    }
+
+    public override string GetSelectFrom()
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectFromByMySql();
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectFromByBySqlServer();
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+    public  string GetSelectFromByMySql()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}  with(nolock) ";
+    }
+    public  string GetSelectFromByBySqlServer()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}   ";
+    }
+
+    public override string GetSelectCountFrom(string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectCountFromByMySql(sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectCountFromBySqlServer(sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectCountFromByMySql(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}   where 1=1 {sqlWhere}";
+    }
+    public  string GetSelectCountFromBySqlServer(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}  with(nolock) where 1=1 {sqlWhere}";
+    }
+
+	public override string GetSelectTopFrom(int limit, int start, string orderby, string orderbytag, string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectTopFromByMySql(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectTopFromBySqlServer(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_COMMON_NAME ;  		int offset = limit * (start - 1);
+        return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}   where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
+    }
+
+    public  string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_COMMON_NAME ;  		string top = limit > 0 ? $"top {limit}" : "";
+        return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_SPOUSE_MAP_VIEW}  with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
+    }
+
+    public FamilyTreeSpouseMapViewEntity Clone()
+    {
+        FamilyTreeSpouseMapViewEntity result = new FamilyTreeSpouseMapViewEntity();
+        result.CopyFrom(this);
+
+        return result;
+    }
+
+    }
+}

CloudBuilder/CloudBuilder.Master/Entity/FamilyTreeViewEntity.auto.cs

@@ -0,0 +1,178 @@
+
+using CloudBuilder.Core.Authorization;
+using CloudBuilder.Core.DatabaseAccessor.Entity;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace CloudBuilder.Master.Entity
+ {
+    [TypeScript]
+    [Table("family_tree_view")]
+    public class FamilyTreeViewEntity : ViewEntityBase
+    {
+
+    public FamilyTreeViewEntity() 
+    {
+    }
+
+    [Column("ancestor_person_id")]
+    public string AncestorPersonId  { get; set; }
+    [Column("brief")]
+    public string? Brief  { get; set; }
+    [Column("common_name")]
+    public string? CommonName  { get; set; }
+    [Column("genealogy_name")]
+    public string? GenealogyName  { get; set; }
+    [Column("public_indc")]
+    public string PublicIndc  { get; set; }
+    [Column("surname")]
+    public string Surname  { get; set; }
+    [Column("tree_id")]
+    public string TreeId  { get; set; }
+    [Column("tree_name")]
+    public string TreeName  { get; set; }
+
+    public const string ANCESTOR_PERSON_ID = "AncestorPersonId";
+    public const string BRIEF = "Brief";
+    public const string COMMON_NAME = "CommonName";
+    public const string GENEALOGY_NAME = "GenealogyName";
+    public const string PUBLIC_INDC = "PublicIndc";
+    public const string SURNAME = "Surname";
+    public const string TREE_ID = "TreeId";
+    public const string TREE_NAME = "TreeName";
+
+    public const string DB_NAME_FAMILY_TREE_VIEW = "family_tree_view";
+    public const string DB_NAME_FIELDS="ancestor_person_id,brief,common_name,genealogy_name,public_indc,surname,tree_id,tree_name";
+
+    public const string DB_ANCESTOR_PERSON_ID = "ancestor_person_id";
+    public const string DB_BRIEF = "brief";
+    public const string DB_COMMON_NAME = "common_name";
+    public const string DB_GENEALOGY_NAME = "genealogy_name";
+    public const string DB_PUBLIC_INDC = "public_indc";
+    public const string DB_SURNAME = "surname";
+    public const string DB_TREE_ID = "tree_id";
+    public const string DB_TREE_NAME = "tree_name";
+
+    private string ProviderName { get; set; }
+
+    public static FamilyTreeViewEntity GetInstance(string providerName)
+    {
+        return new FamilyTreeViewEntity() { ProviderName = providerName };
+    }
+
+    public virtual void CopyFrom(FamilyTreeViewEntity source)
+    {
+        CopyFrom(source, true);
+    }
+
+    public virtual void CopyFrom(FamilyTreeViewEntity source, bool includeSystemFields)
+    {
+        if (source == null)
+        {
+            throw new NullReferenceException("Source entity is null.");
+        }
+
+        this.AncestorPersonId =  source.AncestorPersonId;
+        this.Brief =  source.Brief;
+        this.CommonName =  source.CommonName;
+        this.GenealogyName =  source.GenealogyName;
+        this.PublicIndc =  source.PublicIndc;
+        this.Surname =  source.Surname;
+        this.TreeId =  source.TreeId;
+        this.TreeName =  source.TreeName;
+
+        if (includeSystemFields)
+        {
+        }
+    }
+
+    public override string GetSelectFrom()
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectFromByMySql();
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectFromByBySqlServer();
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+    public  string GetSelectFromByMySql()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_VIEW}  with(nolock) ";
+    }
+    public  string GetSelectFromByBySqlServer()
+    {
+        return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_VIEW}   ";
+    }
+
+    public override string GetSelectCountFrom(string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectCountFromByMySql(sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectCountFromBySqlServer(sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectCountFromByMySql(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_VIEW}   where 1=1 {sqlWhere}";
+    }
+    public  string GetSelectCountFromBySqlServer(string sqlWhere)
+    {
+        return $" select count(*) from { DB_NAME_FAMILY_TREE_VIEW}  with(nolock) where 1=1 {sqlWhere}";
+    }
+
+	public override string GetSelectTopFrom(int limit, int start, string orderby, string orderbytag, string sqlWhere)
+    {
+        if (ProviderName.Contains("MySql"))
+        {
+            return GetSelectTopFromByMySql(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else if (ProviderName.Contains("SqlServer"))
+        {
+            return GetSelectTopFromBySqlServer(limit, start, orderby, orderbytag, sqlWhere);
+        }
+        else
+        {
+            throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
+        }
+    }
+
+    public  string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_ANCESTOR_PERSON_ID ;  		int offset = limit * (start - 1);
+        return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_VIEW}   where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
+    }
+
+    public  string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag,  string sqlWhere)
+    {
+            if (string.IsNullOrEmpty(orderbytag)  || orderbytag.Trim() != "desc") orderbytag = "asc";
+		
+        if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby =  DB_ANCESTOR_PERSON_ID ;  		string top = limit > 0 ? $"top {limit}" : "";
+        return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS}  ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_VIEW}  with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
+    }
+
+    public FamilyTreeViewEntity Clone()
+    {
+        FamilyTreeViewEntity result = new FamilyTreeViewEntity();
+        result.CopyFrom(this);
+
+        return result;
+    }
+
+    }
+}

CloudBuilder/CloudBuilder.Master/Policy/MasterPrefixPolicy.cs

@@ -13,5 +13,11 @@ namespace CloudBuilder.Master.Policy
         public const string FAMILY_PERSON_PREFIX = "P";
         public const string FAMILY_PERSON_FORMAT = "0000000";
 
+        public const string FAMILY_TREE = "FAMILY_TREE";
+        public const string FAMILY_TREE_TREE_ID = "TREE_ID";
+        public const string FAMILY_TREE_PREFIX = "T";
+        public const string FAMILY_TREE_FORMAT = "0000000";
+
+        
     }
 }

CloudBuilder/CloudBuilder.Master/Service/IFamilyTreeService.auto.cs

@@ -9,6 +9,7 @@ namespace CloudBuilder.Master.Service
 {
     public interface IFamilyTreeService : IServiceBase<FamilyTreeData, string, FamilyTreeSearchCriteria>
     {
+        FamilyTreeData FindByCurrentPerson(string key, string personId);
         FamilyTreeResultData FindBySearchCriteria(FamilyTreeSearchCriteria tc);
         dynamic PrintBySearchCriteria(FamilyTreeSearchCriteria tc);
         void Deletes(string[] keys);

CloudBuilder/CloudBuilder.Request/Master/FamilyTreeRequest.auto.cs

@@ -26,6 +26,16 @@ this.serviceRequest = serviceRequest;
                 {
 return Task.Run(() =>   serviceRequest.PostAsJsonAsync<FamilyTreeData>("/FamilyTree/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult();                }
 
+                
+                    public class FindByCurrentPersonCompositionData2                    { 
+                     public string key { get; set; }
+                         public string personId { get; set; }
+                        
+                    }
+                            public  FamilyTreeData FindByCurrentPerson(string key, string personId)       
+                {
+var compositionData = new FindByCurrentPersonCompositionData2{	␍key = key,	␍personId = personId };	␍return Task.Run(() =>  serviceRequest.PostAsJsonAsync<FindByCurrentPersonCompositionData2, FamilyTreeData>("/FamilyTree/FindByCurrentPerson", compositionData)).GetAwaiter().GetResult();                }
+
                         public  FamilyTreeResultData FindBySearchCriteria(FamilyTreeSearchCriteria criteria)       
                 {
 return Task.Run(() =>   serviceRequest.PostAsJsonAsync<FamilyTreeSearchCriteria,FamilyTreeResultData>("/FamilyTree/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult();                }

CloudBuilder/CloudBuilder.Request/Security/LocaleRequest.auto.cs

@@ -31,6 +31,16 @@ this.serviceRequest = serviceRequest;
                 {
 return Task.Run(() => serviceRequest.GetAsync<LocaleEntity[]>("/Locale/FindAll")).GetAwaiter().GetResult();                }
 
+                
+                    public class FindSelectOptionCompositionData2                    { 
+                     public string groupName { get; set; }
+                         public bool blank { get; set; }
+                        
+                    }
+                            public  SelectOption[] FindSelectOption(string groupName, bool blank)       
+                {
+var compositionData = new FindSelectOptionCompositionData2{	␍groupName = groupName,	␍blank = blank };	␍return Task.Run(() =>  serviceRequest.PostAsJsonAsync<FindSelectOptionCompositionData2, SelectOption[]>("/Locale/FindSelectOption", compositionData)).GetAwaiter().GetResult();                }
+
                         public  LocaleResultData FindBySearchCriteria(LocaleSearchCriteria criteria)       
                 {
 return Task.Run(() =>   serviceRequest.PostAsJsonAsync<LocaleSearchCriteria,LocaleResultData>("/Locale/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult();                }

CloudBuilder/CloudBuilder.Security.Service/LocaleService.cs

@@ -7,6 +7,7 @@ using CloudBuilder.Security.Policy;
 using CloudBuilder.Security.SearchCriteria;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 namespace CloudBuilder.Security.Service
 {
     public class LocaleService : ILocaleService
@@ -27,6 +28,31 @@ namespace CloudBuilder.Security.Service
             return repository.DetachedEntities.ToArray();
         }
 
+        [AllowAnonymous]
+        [HttpPost]
+        public SelectOption[] FindSelectOption(string groupName, bool blank = true)
+        {
+            LocaleEntity[] ents = repository.DetachedEntities.Where(x => x.GroupName == groupName && x.Lang == service.Locale).OrderBy(x => x.OrderBy).ToArray();
+
+            List<SelectOption> l = new List<SelectOption>();
+
+            SelectOption selectOption;
+            if (blank)
+            {
+                selectOption = new SelectOption();
+                l.Add(selectOption);
+            }
+
+            foreach (var ent in ents)
+            {
+                selectOption = new SelectOption();
+                selectOption.BindValue = ent.Name;
+                selectOption.DisplayName = ent.Value;
+                l.Add(selectOption);
+            }
+            return l.ToArray();
+        }
+
         [AllowAnonymous]
         public LocaleResultData FindBySearchCriteria(LocaleSearchCriteria criteria)
         {

CloudBuilder/CloudBuilder.Security/Service/ILocaleService.auto.cs

@@ -9,6 +9,7 @@ namespace CloudBuilder.Security.Service
 {
     public interface ILocaleService : IServiceBase<LocaleEntity, LocaleEntityKey, LocaleSearchCriteria>
     {
+        SelectOption[] FindSelectOption(string groupName, bool blank);
         LocaleEntity[] FindAll();
         LocaleResultData FindBySearchCriteria(LocaleSearchCriteria tc);
 

CloudBuilder/CloudBuilder.Web.Entry/Controllers/Master/FamilyTreeController.auto.cs

@@ -48,6 +48,33 @@ this.familyTreeService= familyTreeService;
                     }           
                     }
 
+                    
+                    public class FindByCurrentPersonCompositionData
+                    { 
+                     public string key { get; set; }
+                         public string personId { get; set; }
+                        
+                    }
+                            [PermissionOperate(name: "FamilyTree", operate: "Find")]
+                            [HttpPost]
+                            public dynamic FindByCurrentPerson(FindByCurrentPersonCompositionData compositionData)       
+                    {
+                    try
+                    {            
+
+                    var result = familyTreeService.FindByCurrentPerson(compositionData.key,compositionData.personId);
+                    return result;
+                    }
+                    catch (ValidatedException vex)
+                    {
+                    return vex;
+                    }            
+                    catch (Exception ex)
+                    {
+                    return new ServiceErrorException(ex);
+                    }           
+                    }
+
                             [PermissionOperate(name: "FamilyTree", operate: "Find")]
                             [HttpPost]
                             public dynamic FindBySearchCriteria(FamilyTreeSearchCriteria criteria)       

CloudBuilder/CloudBuilder.Web.Entry/Controllers/Security/LocaleController.auto.cs

@@ -53,6 +53,33 @@ this.localeService= localeService;
                     }           
                     }
 
+                    
+                    public class FindSelectOptionCompositionData
+                    { 
+                     public string groupName { get; set; }
+                         public bool blank { get; set; }
+                        
+                    }
+                            [AllowAnonymous]
+                            [HttpPost]
+                            public dynamic FindSelectOption(FindSelectOptionCompositionData compositionData)       
+                    {
+                    try
+                    {            
+
+                    var result = localeService.FindSelectOption(compositionData.groupName,compositionData.blank);
+                    return result;
+                    }
+                    catch (ValidatedException vex)
+                    {
+                    return vex;
+                    }            
+                    catch (Exception ex)
+                    {
+                    return new ServiceErrorException(ex);
+                    }           
+                    }
+
                             [AllowAnonymous]
                             [HttpPost]
                             public dynamic FindBySearchCriteria(LocaleSearchCriteria criteria)       

CloudBuilder/Data/insert_locale.sql

@@ -0,0 +1,22 @@
+INSERT INTO locale (
+    created_datetime,
+    created_by,
+    updated_datetime,
+    updated_by,
+    group_name,
+    lang,
+    name,
+    value,
+    order_by
+)
+VALUES
+(GETDATE(), 'system', GETDATE(), 'system', 'GenderPolicy', 'zh-cn', 'M', N'¨k', 1),
+(GETDATE(), 'system', GETDATE(), 'system', 'GenderPolicy', 'zh-cn', 'W', N'¤k', 2),
+(GETDATE(), 'system', GETDATE(), 'system', 'GenderPolicy', 'en', 'M', N'¨k', 1),
+(GETDATE(), 'system', GETDATE(), 'system', 'GenderPolicy', 'en', 'W', N'¤k', 2)
+
+select * from locale
+where group_name='RelationTypePolicy' and name in ('M','W')
+
+delete from locale
+where group_name='RelationTypePolicy' and name in ('M','W')

CodeGenerator/CloudBuilder.CodeGenerator/Program.cs

@@ -17,6 +17,8 @@ namespace WinFormsApp
 
             var services = new ServiceCollection();
 
+            try
+            {
                 services.Initialize();
 
                 var serviceProvider = services.BuildServiceProvider();
@@ -25,5 +27,10 @@ namespace WinFormsApp
 
                 Application.Run(mainFunctionView);
             }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
     }
 }

WebVue/src/hooks/useLocalePolicy.ts

@@ -0,0 +1,58 @@
+import { computed } from "vue";
+import type { ComputedRef } from "vue";
+import i18n from "@/locales";
+import { SelectOption } from "@/data/auto/selectOption";
+
+/**
+ * 基于应用启动时已合并到 i18n 的 locale 数据（main.ts -> mergeDbLocaleMessages），
+ * 提供策略组下拉选项，避免再次调用服务器。
+ * 映射规则与后端 LocaleService.FindSelectOption 保持一致：
+ *   BindValue = Name, DisplayName = Value
+ * 顺序为 i18n 中 locale 表的合并顺序（对应 locale 表 order_by 的插入顺序）。
+ */
+export const useLocalePolicy = () => {
+  const getPolicyOptions = (groupName: string, blank = true): SelectOption[] => {
+    const locale = ((i18n.global.locale as any)?.value ?? "zh-cn") as string;
+    const messages = (i18n.global.messages as any)?.value ?? {};
+    const group: Record<string, unknown> = messages[locale]?.[groupName] ?? {};
+
+    const options: SelectOption[] = [];
+    if (blank) options.push(new SelectOption());
+
+    Object.entries(group).forEach(([key, value]) => {
+      const option = new SelectOption();
+      option.BindValue = key;
+      option.DisplayName = String(value);
+      options.push(option);
+    });
+    return options;
+  };
+
+  const getPolicyOptionsComputed = (
+    groupName: string,
+    blank = true
+  ): ComputedRef<SelectOption[]> => computed(() => getPolicyOptions(groupName, blank));
+
+  /**
+   * 可直接绑定 <a-select :options> 的选项结构（label/value）
+   */
+  const getPolicySelectOptions = (groupName: string, blank = true): { label: string; value: string }[] => {
+    return getPolicyOptions(groupName, blank).map((o) => ({
+      label: o.DisplayName,
+      value: o.BindValue,
+    }));
+  };
+
+  const getPolicySelectOptionsComputed = (
+    groupName: string,
+    blank = true
+  ): ComputedRef<{ label: string; value: string }[]> =>
+    computed(() => getPolicySelectOptions(groupName, blank));
+
+  return {
+    getPolicyOptions,
+    getPolicyOptionsComputed,
+    getPolicySelectOptions,
+    getPolicySelectOptionsComputed,
+  };
+};

WebVue/src/injections/security/operation-to-enquiry.ts

@@ -9,6 +9,8 @@ export class OperationToEnquiryModelOption {
   public isModalPermissionDependent?: boolean = false;
   public isModalMaster?: boolean = false;
   public isModalFunction?: boolean = false;
+  public isModalTree?: boolean = false; //家谱树查询
+  public isModalPerson?: boolean = false; //族员人员查询
   public initBindOptionsUser?: BindOption[] = []; //初始化查询条件的值
   public initBindOptionsGroup?: BindOption[] = [];
   public initBindOptionsActor?: BindOption[] = [];
@@ -16,6 +18,8 @@ export class OperationToEnquiryModelOption {
   public initBindOptionsPermission?: BindOption[] = [];
   public initBindOptionsMaster?: BindOption[] = [];
   public initBindOptionsFunction?: BindOption[] = [];
+  public initBindOptionsTree?: BindOption[] = [];
+  public initBindOptionsPerson?: BindOption[] = [];
   public selectionTypeGroup?: string = "radio"; //记录单选还是多选
   public selectionTypeUser?: string = "radio";
   public selectionTypeActor?: string = "radio";
@@ -23,6 +27,8 @@ export class OperationToEnquiryModelOption {
   public selectionTypePermission?: string = "radio";
   public selectionTypeMaster?: string = "radio";
   public selectionTypeFunction?: string = "radio";
+  public selectionTypeTree?: string = "radio";
+  public selectionTypePerson?: string = "radio";
 }
 
 //子组件调用父组件的方法==================

WebVue/src/service/master/familyTreeService.ts

@@ -16,6 +16,16 @@ class FamilyTreeService{
                         )
                         };
                         
+                        async FindByCurrentPerson(data: any) {
+                        return request<FamilyTreeData>(
+                                {
+                                url: "/FamilyTree/FindByCurrentPerson",
+                                method: "post",
+                                data,
+                                }
+                        )
+                        };
+                        
                         async FindBySearchCriteria(data: FamilyTreeSearchCriteria) {
                         return request<FamilyTreeResultData>(
                                 {

WebVue/src/service/security/localeService.ts

@@ -1,6 +1,7 @@
 
 import { request } from "@/utils/request";
         import type { LocaleEntity } from "@/data/auto/localeEntity";
+        import type { SelectOption } from "@/data/auto/selectOption";
         import type { LocaleSearchCriteria } from "@/data/auto/localeSearchCriteria";
         import type { LocaleResultData } from "@/data/auto/localeResultData";
         import type { LocaleEntityKey } from "@/data/auto/localeEntityKey";
@@ -17,6 +18,16 @@ class LocaleService{
                         )
                         };
                         
+                        async FindSelectOption(data: any) {
+                        return request<SelectOption[]>(
+                                {
+                                url: "/Locale/FindSelectOption",
+                                method: "post",
+                                data,
+                                }
+                        )
+                        };
+                        
                         async FindBySearchCriteria(data: LocaleSearchCriteria) {
                         return request<LocaleResultData>(
                                 {

WebVue/src/views/master/FamilyPersonEnquiry.vue

@@ -63,9 +63,9 @@ import { enquiryMethodKey, searchCriteriaManagerKey, operationToEnquiryMethodKey
 const actorOperationMethod = inject(operationToEnquiryMethodKey);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
-const isModal = ref(modelOption ? modelOption.isModalPermission : false);
-const selectionType = ref(modelOption ? modelOption.selectionTypePermission : 'checkbox');
-const initBindOptions = ref((modelOption ? modelOption.initBindOptionsPermission : []) as BindOption[]);
+const isModal = ref(modelOption ? modelOption.isModalPerson : false);
+const selectionType = ref(modelOption ? modelOption.selectionTypePerson : 'checkbox');
+const initBindOptions = ref((modelOption ? modelOption.initBindOptionsPerson : []) as BindOption[]);
 
 //报表名称(layout)
 const layoutProviderMethod = inject(layoutProviderMethodKey);

WebVue/src/views/master/FamilyPersonOperation.vue

@@ -105,11 +105,7 @@
                       v-model:value="data.FamilyPerson.Gender"
                       :disabled="!isEdit"
                       style="width: 100%"
-                    >
-                      <a-select-option
-                        v-for="o in yesNoPolicy"
-                        :value="o.BindValue"
-                        >{{ o.DisplayName }}</a-select-option
+                      :options="genderSelectOptions"
                     >
                     </a-select>
                   </a-col>
@@ -594,7 +590,7 @@
       </div>
     </div>
     <dragModal
-      v-model:open="modelOption.isModalPermission"
+      v-model:open="modelOption.isModalPerson"
       width="80%"
       title="人员查询"
       :mask-closable="false"
@@ -635,6 +631,7 @@ import FamilyPersonEnquiry from "./FamilyPersonEnquiry.vue";
 import { FamilyPersonData } from "@/data/auto/familyPersonData";
 import FamilyPersonService from "@/service/master/familyPersonService";
 import { useYesNoPolicy } from "@/hooks/useYesNoPolicy";
+import { useLocalePolicy } from "@/hooks/useLocalePolicy";
 import { SelectOption } from "@/data/auto/selectOption";
 import { useWindowSize } from "@vueuse/core";
 import { FamilyPersonEntity } from "@/data/auto/familyPersonEntity";
@@ -667,6 +664,8 @@ const data = ref<FamilyPersonData>(new FamilyPersonData());
 const hasData = ref<boolean>(false);
 
 const yesNoPolicy = ref<SelectOption[]>([]);
+const { getPolicySelectOptionsComputed } = useLocalePolicy();
+const genderSelectOptions = getPolicySelectOptionsComputed('GenderPolicy');
 const birthDate = ref<Dayjs | null>(null);
 const deathDate = ref<Dayjs | null>(null);
 const resultH = ref("");
@@ -688,9 +687,9 @@ const enquiry = ref<FamilyPersonEnquiry | null>(null);
 const modelOption = ref<OperationToEnquiryModelOption>(
   new OperationToEnquiryModelOption(),
 );
-modelOption.value.isModalPermission = false;
-modelOption.value.selectionTypePermission = "radio";
-modelOption.value.initBindOptionsPermission = [];
+modelOption.value.isModalPerson = false;
+modelOption.value.selectionTypePerson = "radio";
+modelOption.value.initBindOptionsPerson = [];
 
 const getOperationToEnquiryModelOption = () => {
   return modelOption.value;
@@ -732,8 +731,8 @@ const computResultTableHeight = () => {
 };
 
 const onModalSearch = () => {
-  modelOption.value.isModalPermission = true;
-  modelOption.value.selectionTypePermission = "radio";
+  modelOption.value.isModalPerson = true;
+  modelOption.value.selectionTypePerson = "radio";
   showModalType.value = 0;
 };
 
@@ -848,7 +847,7 @@ const handleSelect = async () => {
 
         onSearch();
       }
-      modelOption.value.isModalPermission = false;
+      modelOption.value.isModalPerson = false;
     } else {
       notification.info({
         message: "系统提示：",

WebVue/src/views/master/FamilyTreeEnquiry.vue

@@ -0,0 +1,345 @@
+<template>
+    <search @on-submit="onSubmit" @on-print="onPrint" @on-reset="onReset" @use-pagination="onPagination"
+        :is-modal="isModal" :loading="loading" :pagination="result" :rowSelectionType="selectionType"
+        @on-row-dblclick="onRowDblclick" @on-select-change="onSelectChange">
+        <template #control>
+            <a-button type="primary" v-if="canCreate && !isModal" :icon="h(FileAddOutlined)"
+                @click.prevent="onCreate">新增</a-button>
+        </template>
+        <template #bodyCell="{ column, record, index }">
+            <template v-if="column.dataIndex === FamilyTreeViewEntity.PUBLIC_INDC">
+                <template v-if="record.PublicIndc == 'Y'">
+                    <span>是</span>
+                </template>
+                <template v-else> <span>否</span></template>
+            </template>
+        </template>
+        <template #footer>
+            <div v-if="!isModal" class="page-footer">
+                <a-row :gutter="24">
+                    <a-col :lg="24" :sm="24">
+                        <a-row :gutter="[16, 8]">
+                            <a-space>
+                                <a-button type="primary" v-if="canView" :icon="h(FileTextOutlined)"
+                                    :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看</a-button>
+                                <a-button type="primary" v-if="canAmend" :icon="h(EditOutlined)"
+                                    :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改</a-button>
+                                <a-popconfirm title="确定是否删除这条记录?" ok-text="是" cancel-text="否" @confirm="onDelete">
+                                    <a-button type="primary" danger :icon="h(DeleteOutlined)" v-if="canDelete"
+                                        :disabled="!(keys && keys.length > 0)">删除</a-button>
+                                </a-popconfirm>
+                            </a-space>
+                        </a-row>
+                    </a-col>
+                </a-row>
+            </div>
+        </template>
+    </search>
+</template>
+<script setup lang="ts">
+import { reactive, inject, defineComponent, onMounted, ref, unref, provide, h } from "vue";
+import { BindOption } from "@/data/custom/bindOption";
+import { SelectOption } from "@/data/auto/selectOption";
+import search from "@/components/basic/Search.vue";
+import { DeleteOutlined, EditOutlined, FileAddOutlined, FileTextOutlined } from "@ant-design/icons-vue";
+
+import { FamilyTreeResultData } from "@/data/auto/familyTreeResultData";
+import { FamilyTreeViewEntity } from "@/data/auto/familyTreeViewEntity";
+import { SearchFilter } from "@/data/auto/searchFilter"
+import familyTreeService from "@/service/master/familyTreeService";
+import { useYesNoPolicy } from "@/hooks/useYesNoPolicy"
+import { FamilyTreeSearchCriteria } from "@/data/auto/familyTreeSearchCriteria";
+import { SearchCriteriaResultData } from "@/data/auto/searchCriteriaResultData";
+import { PermissionContext, usePermissionContext } from "@/hooks/PermissionContext"
+import { useRoute, useRouter } from "vue-router";
+
+import { useBindOption } from "@/hooks/useBindOption";
+import { SearchFilterOperatorPolicy } from "@/data/custom/searchFilterOperatorPolicy"
+import { SearchFilterTypePolicy } from "@/data/custom/searchFilterTypePolicy"
+import { notification } from "ant-design-vue";
+import { GridColumnInfo } from "@/data/auto/gridColumnInfo"
+import { useGridColumnInfo } from "@/hooks/gridColumnInfo"
+import { title } from "process";
+import { enquiryMethodKey, searchCriteriaManagerKey, operationToEnquiryMethodKey, OperationToEnquiryModelOption, layoutProviderMethodKey } from "@/injections";
+import { useOrderedChildren } from "@/hooks/use-ordered-children";
+import { SearchCriteriaContext } from "@/injections";
+//page from-----------------------------------------------------------------------------------------------------------------------------------
+//================inject================
+//报表名称(layout)
+const layoutProviderMethod = inject(layoutProviderMethodKey);
+
+const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
+
+const isModal = ref(modelOption ? modelOption.isModalTree : false);
+const selectionType = modelOption ? modelOption.selectionTypeTree : 'checkbox';
+const initBindOptions = ref((modelOption ? modelOption.initBindOptionsTree : []) as BindOption[]);
+
+//================inject================
+
+const emit = defineEmits(['onRowDblclick']);
+
+const loading = ref<boolean>(false);
+const canView = ref<boolean>(false);
+const canAmend = ref<boolean>(false);
+const canDelete = ref<boolean>(false);
+const canCreate = ref<boolean>(false);
+const route = useRoute();
+const router = useRouter();
+
+const columns = ref([
+    {
+        title: '序号',
+        dataIndex: 'index',
+        width: '5%',
+        align: 'center',
+        fixed: 'left',
+        sequence: 0,
+        hidden: 'N',
+        format: ''
+    },
+    {
+        title: "树名称",
+        dataIndex: FamilyTreeViewEntity.TREE_NAME,
+        sorter: true,
+        width: '15%',
+        sequence: 1,
+        hidden: 'N'
+    },
+    {
+        title: "简介",
+        dataIndex: FamilyTreeViewEntity.BRIEF,
+        sorter: true,
+        width: '15%',
+        sequence: 2,
+        hidden: 'N'
+    },
+    {
+        title: "公开?",
+        dataIndex: FamilyTreeViewEntity.PUBLIC_INDC,
+        sorter: true,
+        width: '5%',
+        sequence: 4,
+        hidden: 'N'
+    },
+    {
+        title: "祖先姓氏",
+        dataIndex: FamilyTreeViewEntity.SURNAME,
+        sorter: true,
+        width: '20%',
+        sequence: 2,
+        hidden: 'N'
+    },
+    {
+        title: "祖先谱名",
+        dataIndex: FamilyTreeViewEntity.GENEALOGY_NAME,
+        sorter: true,
+        width: '20%',
+        sequence: 2,
+        hidden: 'N'
+    },
+]);
+
+
+const viewOption = {
+    Value: 'default',
+    SelectOptions: [{ BindValue: 'default', DisplayName: "默认" }],
+    Columns: [{ BindValue: 'default', BindColumn: columns }]
+};
+
+const bindOptions = ref<BindOption[]>([]);
+const datas = ref<FamilyTreeViewEntity[]>([]);
+const pagingParams = ref<PagingParams>({ pageSize: 20, page: 1 });
+const result = ref<SearchCriteriaResultData>(new SearchCriteriaResultData());
+
+const data = ref<FamilyTreeResultData>(new FamilyTreeResultData());
+
+const isSearched = ref<boolean>(false);
+const currentSearchCriteria = ref<FamilyTreeSearchCriteria>(new FamilyTreeSearchCriteria());
+
+const keys = ref<FamilyTreeViewEntity[]>([]);
+
+const {
+    children: items,
+    addChild: addItem,
+    removeChild: removeItem,
+} = useOrderedChildren<SearchCriteriaContext>();
+
+//================provide================
+//初始化查询条件UI
+provide(enquiryMethodKey, {
+    getLayoutSetting: () => { return { controlLeft: 16, controlRight: 8, space: true, soltLeft: 24, soltRight: 24 }; },
+    getBindOptions: () => { return unref(bindOptions); },
+    getViewOption: () => { return unref(viewOption); },
+    getDatas: () => { return datas; },
+});
+
+provide(
+    searchCriteriaManagerKey,
+    reactive({
+        items,
+        addItem,
+        removeItem,
+    })
+);
+//================provide================
+
+defineExpose({
+    keys,
+    initBindOptions,
+})
+
+onMounted(() => {
+    let pContext: PermissionContext = usePermissionContext();
+    canView.value = pContext.canView(route.meta.permission as string);
+    canAmend.value = pContext.canAmend(route.meta.permission as string);
+    canDelete.value = pContext.canDelete(route.meta.permission as string);
+    canCreate.value = pContext.canCreate(route.meta.permission as string);
+    initBindOption();
+    onSearch();
+})
+
+const onSelectChange = ((selected: FamilyTreeViewEntity[]) => {
+    keys.value = selected;
+})
+
+const onRowDblclick = ((e: any, record: FamilyTreeViewEntity) => {
+    if (isModal.value) {
+        emit('onRowDblclick', record);
+    }
+    else {
+        router.push({ name: "FamilyTreeOperation", params: { id: record.TreeId, mode: 'view' } });
+    }
+})
+
+const onReset = (() => {
+    keys.value = [];
+    result.value.Total = 0;
+})
+
+const onView = (() => {
+    if (keys.value.length == 0) return;
+    router.push({ name: "FamilyTreeOperation", params: { id: keys.value[0].TreeId, mode: 'view' } });
+})
+
+const onCreate = (() => {
+    router.push({ name: "FamilyTreeOperation", params: { id: '', mode: 'create' } });
+})
+
+const onAmend = (() => {
+    if (keys.value.length == 0) return;
+    router.push({ name: "FamilyTreeOperation", params: { id: keys.value[0].TreeId, mode: 'amend' } });
+})
+
+const onDelete = (async () => {
+
+    for (let i = 0; i < keys.value.length; i++) {
+        await familyTreeService.Delete(keys.value[i].TreeId);
+    }
+
+    notification.info({
+        message: '系统提示：',
+        description: '记录删除成功',
+        placement: "topRight",
+    });
+    onReload();
+})
+
+const setBindOptionValue = ((bindValue: string, value: string, value1: string, values: string[], disabled: boolean) => {
+    let bindOption: BindOption = bindOptions.value.filter(x => x.BindValue == bindValue)[0];
+    if (!bindOption) return;
+    bindOption.Value = value;
+    bindOption.Value1 = value1;
+    bindOption.Values = values;
+    bindOption.disabled = disabled;
+})
+
+
+
+//初始化查询条件
+const initBindOption = (async () => {
+    let ubo = useBindOption();
+    let bindOption: BindOption = ubo.getBindOption(FamilyTreeViewEntity.DB_TREE_NAME, '树名称', SearchFilterTypePolicy.TEXT, SearchFilterOperatorPolicy.CONTAIN);
+    bindOptions.value.push(bindOption);
+    bindOption = ubo.getBindOption(FamilyTreeViewEntity.DB_BRIEF, '简介', SearchFilterTypePolicy.TEXT, SearchFilterOperatorPolicy.CN_CONTAIN);
+    bindOption.lg = 10;
+    bindOptions.value.push(bindOption);
+    let rps: SelectOption[] = await useYesNoPolicy().getSelectOption(true);
+    bindOption = ubo.getBindSelectOption(FamilyTreeViewEntity.DB_PUBLIC_INDC, '公开?', SearchFilterTypePolicy.SINGLE_SELECTION, SearchFilterOperatorPolicy.SINGLE, rps);
+    bindOptions.value.push(bindOption);
+
+    initBindOptions.value.forEach(element => {
+        setBindOptionValue(element.BindValue, element.Value, element.Value1, element.Values, element.disabled);
+    });
+})
+
+//table from-----------------------------------------------------------------------------------------------------------------------------------
+
+result.value.Page = pagingParams.value.page ?? 1;
+result.value.Limit = pagingParams.value.pageSize;
+
+const onSubmit = (async (filters: SearchFilter[]) => {
+
+    let c: FamilyTreeSearchCriteria = new FamilyTreeSearchCriteria();
+
+    isSearched.value = true;
+    c.Filter = filters;
+    c.limit = pagingParams.value.pageSize;
+    c.page = pagingParams.value.page ?? 1;
+    c.GridColumns = [];
+    currentSearchCriteria.value = c;
+    await findBySearchCriteria(c);
+})
+
+const onSearch = (async () => {
+    onSubmit(items.value[0].getFilter());
+})
+
+
+const onPrint = (async () => {
+    let c: FamilyTreeSearchCriteria = new FamilyTreeSearchCriteria();
+    c.Filter = items.value[0].getFilter();
+
+    c.limit = pagingParams.value.pageSize;
+    c.page = pagingParams.value.page ?? 1;
+    c.GridColumns = useGridColumnInfo().getGridColumnInfo(unref(columns));
+    c.ReportName = layoutProviderMethod?.getLayoutProvider().layoutTitle!;
+    try {
+        // familyTreeService 暂无打印方法
+    } catch (error) {
+        console.log(error);
+    }
+
+})
+
+const findBySearchCriteria = (async (c: FamilyTreeSearchCriteria) => {
+    data.value = await familyTreeService.FindBySearchCriteria(c);
+    result.value.Total = data.value.Total;
+    result.value.Page = data.value.Page;
+    result.value.Limit = data.value.Limit;
+    datas.value = data.value.Datas;
+})
+
+const onPagination = (async (params: PagingParams) => {
+
+    if (!isSearched.value) return;
+    let c: FamilyTreeSearchCriteria = new FamilyTreeSearchCriteria();
+
+    c.Filter = items.value[0].getFilter();
+
+    c.limit = params.pageSize;
+    c.page = params.page ?? 1;
+    if (params.sortField)
+        c.orderby = params.sortField!;
+    if (params.sortOrder)
+        c.orderbytag = params.sortOrder?.toString().substring(0, 4)!;
+    c.GridColumns = [];
+    currentSearchCriteria.value = c;
+    await findBySearchCriteria(c);
+});
+
+const onReload = (async () => {
+    await findBySearchCriteria(unref(currentSearchCriteria));
+})
+//table end-----------------------------------------------------------------------------------------------------------------------------------
+</script>

WebVue/src/views/master/FamilyTreeOperation.vue

@@ -0,0 +1,984 @@
+<template>
+    <a-spin size="large" :spinning="loading">
+        <div class="page-container">
+            <div class="page-header">
+                <a-row :gutter="[16, 8]">
+                    <a-col :lg="8" :sm="24">
+                        <a-row :wrap="false">
+                            <a-col flex="none">
+                                <div style="padding: 0 "><a-input flex="none" readonly value="族谱编号"
+                                        class="site-input-split" style="width: 160px;border-radius:0; border-top-left-radius: 5pt 5pt;
+                                    border-bottom-left-radius: 5pt 5pt;
+                                 pointer-events: none" /></div>
+                            </a-col>
+                            <a-col flex="auto">
+                                <a-input-search :disabled="isEdit" v-model:value="treeId" flex="auto"
+                                    @search="onModalSearch" />
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :lg="12" :sm="24">
+                        <a-space>
+                            <a-button type="primary" :disabled="isEdit" :icon="h(FileSearchOutlined)"
+                                @click.prevent="onSearch">查询</a-button>
+                            <a-button type="primary" :disabled="isEdit" :icon="h(ClearOutlined)"
+                                @click.prevent="onReset">重置</a-button>
+                            <a-button type="primary" :disabled="isEdit" :icon="h(FileAddOutlined)"
+                                @click.prevent="onCreate">新增</a-button>
+                        </a-space>
+                    </a-col>
+                </a-row>
+            </div>
+            <div class="page-main" :style="{ height: resultH }">
+                <a-row :gutter="[16, 8]">
+                    <a-col :lg="8" :sm="24">
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>族谱编号:</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-input required :readonly="true"
+                                    v-model:value="data.FamilyTree.TreeId" />
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :lg="{ span: 8, offset: 2 }" :sm="24">
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>族谱名称:</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-input required :readonly="!isEdit"
+                                    v-model:value="data.FamilyTree.TreeName" />
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="[16, 8]" style="margin-top: 8px;">
+                    <a-col :lg="8" :sm="24">
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>简介:</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-input :readonly="!isEdit" v-model:value="data.FamilyTree.Brief" />
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :lg="{ span: 8, offset: 2 }" :sm="24">
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>封面文件名:</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-input :readonly="!isEdit" v-model:value="data.FamilyTree.TreeCoverFilename"
+                                    flex="auto" />
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="[16, 8]" style="margin-top: 8px;">
+                    <a-col :lg="8" :sm="24">   
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>祖先:</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-input-group compact style="display: flex; width: 100%;">
+                                    <a-input :disabled="true"
+                                        v-model:value="data.FamilyTree.AncestorPersonGenealogyName" placeholder="族谱名"
+                                        style="width: 50%;" />
+                                    <a-input-search required :disabled="!isEdit" style="width: 50%;"
+                                        v-model:value="data.FamilyTree.AncestorPersonId"
+                                        @search="onModalPerson" />
+                                </a-input-group>
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :lg="{ span: 8, offset: 2 }" :sm="24">
+                     
+                        <a-row :wrap="false" align="middle">
+                            <a-col :lg="6" :sm="6" style="min-width: 80px;">
+                                <span>公开?</span>
+                            </a-col>
+                            <a-col :lg="18" :sm="18" style="min-width: 300px;">
+                                <a-select v-model:value="data.FamilyTree.PublicIndc" :disabled="!isEdit"
+                                    style="width: 100%;min-width:124px;">
+                                    <a-select-option v-for="o in yesNoPolicy" :value="o.BindValue">{{
+                                        o.DisplayName }}</a-select-option>
+                                </a-select>
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                </a-row>
+                <a-divider orientation="left" orientation-margin="0px" dashed style="background-color: silver">
+                </a-divider>
+                <a-row :gutter="[16, 8]">
+                    <a-col :lg="8" :sm="24">
+                        <a-row :wrap="false">
+                            <a-col flex="auto">
+                                <a-input-group compact style="display: flex; width: 100%;">
+                                    <a-input readonly value="当前族员" class="site-input-split"
+                                        style="width: 160px; pointer-events: none;" />
+                                    <a-input :disabled="!isEdit"
+                                        v-model:value="data.CurrentPerson.FamilyPerson.GenealogyName" placeholder="族谱名"
+                                        style="flex: 1; min-width: 0;" />
+                                    <a-input-search style="flex: 1; min-width: 0;"
+                                        v-model:value="data.CurrentPerson.FamilyPerson.PersonId"
+                                        @search="onModalCurrentPerson" />
+                                </a-input-group>
+                            </a-col>
+                        </a-row>
+                    </a-col>
+                </a-row>
+                  <a-divider orientation="left" orientation-margin="0px" dashed style="background-color: silver">
+                </a-divider>
+                <a-collapse v-model:activeKey="activeKey">
+                    <a-collapse-panel key="1" header="夫妻关系">
+                        <a-table bordered :data-source="data.CurrentPerson.FamilyTreeSpouseMaps"
+                            :columns="columnParents" :row-class-name="rowParentClassName" :pagination="false"
+                            :scroll="{ x: 1200, y: 600 }">
+                            <template #bodyCell="datas">
+                                <template v-if="datas.column.dataIndex === 'index'">
+                                    <span>{{ datas.index + 1 }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.GENDER">
+                                    <span>{{ getPolicyText(genderOptions, datas.record.Gender) }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.MARRY_DATE_TEXT">
+                                    <a-input v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.MarryDateText" placeholder="结婚日期文本" />
+                                    <span v-else>{{ datas.record.MarryDateText }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.MARRY_DATE">
+                                    <a-date-picker v-if="isEdit" size="small" style="width: 100%"
+                                        :value="datas.record.MarryDate ? dayjs(datas.record.MarryDate) : null"
+                                        @change="onMarryDateChange(datas.record, $event)" />
+                                    <span v-else>{{ formatDate(datas.record.MarryDate) }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.DIVORCE_DATE_TEXT">
+                                    <a-input v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.DivorceDateText" placeholder="离婚日期文本" />
+                                    <span v-else>{{ datas.record.DivorceDateText }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.DIVORCE_DATE">
+                                    <a-date-picker v-if="isEdit" size="small" style="width: 100%"
+                                        :value="datas.record.DivorceDate ? dayjs(datas.record.DivorceDate) : null"
+                                        @change="onDivorceDateChange(datas.record, $event)" />
+                                    <span v-else>{{ formatDate(datas.record.DivorceDate) }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.MARRY_TYPE">
+                                    <a-input v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.MarryType" placeholder="婚配类型" />
+                                    <span v-else>{{ datas.record.MarryType }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.IS_CURRENT">
+                                    <a-select v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.IsCurrent">
+                                        <a-select-option v-for="o in yesNoPolicy" :value="o.BindValue">{{
+                                            o.DisplayName }}</a-select-option>
+                                    </a-select>
+                                    <span v-else>{{ getPolicyText(yesNoPolicy, datas.record.IsCurrent) }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === FamilyTreeSpouseMapViewEntity.REMARK">
+                                    <a-input v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.Remark" placeholder="备注" />
+                                    <span v-else>{{ datas.record.Remark }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === 'operation' && isEdit">
+                                    <UpSquareTwoTone :style="{ fontSize: '24px', color: '#08c' }"
+                                        @click="upParent(datas.index)" />
+                                    <DownSquareTwoTone
+                                        :style="{ fontSize: '24px', color: '#08c', marginLeft: '20px', marginRight: '20px' }"
+                                        @click="downParent(datas.index)" />
+                                    <DeleteOutlined :style="{ fontSize: '24px', color: 'red' }"
+                                        @click="deleteParent(datas.record.SpouseId)" />
+                                </template>
+                            </template>
+                        </a-table>
+                        <template #extra
+                            v-if="isEdit">
+                            <PlusSquareTwoTone :style="{ fontSize: '24px', color: '#08c' }" @click="addSpouse" />
+                        </template>
+                    </a-collapse-panel>
+                    <a-collapse-panel key="2" header="孩子关系">
+                        <a-table bordered :data-source="data.CurrentPerson.FamilyTreeChildrenMaps"
+                            :columns="columnSons" :row-class-name="rowSonClassName" :pagination="false"
+                            :scroll="{ x: 950, y: 600 }">
+                            <template #bodyCell="datas">
+                                <template v-if="datas.column.dataIndex === 'index'">
+                                    <span>{{ datas.index + 1 }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === FamilyTreeChildrenMapViewEntity.GENDER">
+                                    <span>{{ getPolicyText(genderOptions, datas.record.Gender) }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === FamilyTreeChildrenMapViewEntity.SPOUSE_ID">
+                                    <a-select v-if="isEdit" size="small" style="width: 100%" allow-clear
+                                        show-search :options="spouseOptions" v-model:value="datas.record.SpouseId"
+                                        placeholder="选择父母" />
+                                    <span v-else>{{ getSpouseName(datas.record.SpouseId) }}</span>
+                                </template>
+                                <template
+                                    v-else-if="datas.column.dataIndex === FamilyTreeChildrenMapViewEntity.RELATION_TYPE">
+                                    <a-select v-if="isEdit" size="small" style="width: 100%" allow-clear
+                                        show-search :options="relationTypeSelectOptions"
+                                        v-model:value="datas.record.RelationType" placeholder="关系类型" />
+                                    <span v-else>{{ getPolicyText(relationTypeOptions, datas.record.RelationType) }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === FamilyTreeChildrenMapViewEntity.REMARK">
+                                    <a-input v-if="isEdit" size="small" style="width: 100%"
+                                        v-model:value="datas.record.Remark" placeholder="备注" />
+                                    <span v-else>{{ datas.record.Remark }}</span>
+                                </template>
+                                <template v-else-if="datas.column.dataIndex === 'operation' && isEdit">
+                                    <UpSquareTwoTone :style="{ fontSize: '24px', color: '#08c' }"
+                                        @click="upSon(datas.index)" />
+                                    <DownSquareTwoTone
+                                        :style="{ fontSize: '24px', color: '#08c', marginLeft: '20px', marginRight: '20px' }"
+                                        @click="downSon(datas.index)" />
+                                    <DeleteOutlined :style="{ fontSize: '24px', color: 'red' }"
+                                        @click="deleteSon(datas.record.ChildrenId)" />
+                                </template>
+                            </template>
+                        </a-table>
+                        <template #extra v-if="isEdit">
+                            <PlusSquareTwoTone :style="{ fontSize: '24px', color: '#08c' }" @click="addSon" />
+                        </template>
+                    </a-collapse-panel>
+                </a-collapse>
+            </div>
+            <div class="page-footer">
+                <div style="">
+                    <a-row :gutter="24">
+                        <a-col :lg="24" :sm="24">
+                            <div>
+                                <a-row v-if="isEdit" :gutter="[16, 8]">
+                                    <a-space>
+                                        <a-popconfirm v-if="data.FamilyTree.CreatedBy" title="确定是否取消修改?"
+                                            ok-text="是" cancel-text="否" @confirm="onCancel">
+                                            <a-button type="primary" ghost :icon="h(UndoOutlined)">取消</a-button>
+                                        </a-popconfirm>
+                                        <a-button v-if="!data.FamilyTree.CreatedBy" type="primary" ghost
+                                            :icon="h(UndoOutlined)" @click.prevent="onCancel">取消</a-button>
+                                        <a-button type="primary" ghost :icon="h(SaveOutlined)"
+                                            @click.prevent="onSave">保存</a-button>
+                                    </a-space>
+                                </a-row>
+                                <a-row v-else :gutter="[16, 8]">
+                                    <a-space>
+                                        <a-button type="primary" v-if="canAmend" :icon="h(EditOutlined)"
+                                            :disabled="!hasData" @click.prevent="onAmend">修改</a-button>
+                                        <a-popconfirm :disabled="!hasData" title="确定是否删除这条记录?" ok-text="是"
+                                            cancel-text="否" @confirm="onDelete">
+                                            <a-button type="primary" danger :icon="h(DeleteOutlined)"
+                                                :disabled="!hasData" v-if="canDelete">删除</a-button>
+                                        </a-popconfirm>
+                                    </a-space>
+                                </a-row>
+                            </div>
+                        </a-col>
+                    </a-row>
+                </div>
+            </div>
+        </div>
+        <dragModal v-model:open="modelOption.isModalTree" width="80%" title="族谱查询" @cancel="handleCance"
+            :fullscreen="width < 640" :mask-closable="false" @ok="handleSelect">
+            <FamilyTreeEnquiry ref="enquiry" @on-row-dblclick="handleSelect"></FamilyTreeEnquiry>
+        </dragModal>
+        <dragModal v-model:open="modelOption.isModalPerson" width="80%" title="人员查询" @cancel="handleCance"
+            :fullscreen="width < 640" :mask-closable="false" @ok="handleSelectPerson">
+            <FamilyPersonEnquiry ref="personEnquiry"
+                @on-row-dblclick="handleSelectPerson"></FamilyPersonEnquiry>
+        </dragModal>
+    </a-spin>
+</template>
+<script lang="ts" setup>
+import { ref, unref, onBeforeMount, inject, provide, h, onMounted, computed } from "vue";
+import { notification } from "ant-design-vue";
+import { useRoute, useRouter } from 'vue-router'
+import dayjs from "dayjs";
+import type { Dayjs } from "dayjs";
+import { DeleteOutlined, EditOutlined, ClearOutlined, FileSearchOutlined, FileAddOutlined, UndoOutlined, SaveOutlined, PlusSquareTwoTone, DownSquareTwoTone, UpSquareTwoTone } from "@ant-design/icons-vue";
+import { PermissionContext, usePermissionContext } from "@/hooks/PermissionContext"
+import dragModal from "@/components/basic/DragModal.vue"
+import FamilyTreeEnquiry from "./FamilyTreeEnquiry.vue";
+import FamilyPersonEnquiry from "./FamilyPersonEnquiry.vue";
+import { FamilyTreeData } from "@/data/auto/familyTreeData";
+import { FamilyTreeSpouseMapViewEntity } from "@/data/auto/familyTreeSpouseMapViewEntity";
+import { FamilyTreeChildrenMapViewEntity } from "@/data/auto/familyTreeChildrenMapViewEntity";
+import familyTreeService from "@/service/master/familyTreeService";
+import { useYesNoPolicy } from "@/hooks/useYesNoPolicy"
+import { useLocalePolicy } from "@/hooks/useLocalePolicy"
+import { SelectOption } from "@/data/auto/selectOption";
+import { useWindowSize } from '@vueuse/core'
+import { FamilyTreeViewEntity } from "@/data/auto/familyTreeViewEntity";
+import { FamilyPersonEntity } from "@/data/auto/familyPersonEntity";
+import { operationToEnquiryMethodKey, OperationToEnquiryModelOption } from "@/injections"
+
+//================inject================
+const loading = ref<boolean>(false);
+//================inject================
+
+const { width, height } = useWindowSize()
+
+const route = useRoute();
+const router = useRouter();
+
+const treeId = ref<string>(route.params.id as string)
+const mode = ref<string>(route.params.mode as string)
+
+const isEdit = ref<boolean>(false);
+const canAmend = ref<boolean>(false);
+const canDelete = ref<boolean>(false);
+const canCreate = ref<boolean>(false);
+
+const showModalType = ref<number>(0);
+
+const data = ref<FamilyTreeData>(new FamilyTreeData());
+const hasData = ref<boolean>(false);
+
+const yesNoPolicy = ref<SelectOption[]>([]);
+const resultH = ref('');
+const oldTreeId = ref<string>(treeId.value);
+
+
+interface TreeEnquiry {
+    keys: FamilyTreeViewEntity[],
+    setBindOptionValue(bindValue: string, value: string, value1: string, values: string[]): void,
+}
+
+
+interface PersonEnquiry {
+    keys: FamilyPersonEntity[],
+    setBindOptionValue(bindValue: string, value: string, value1: string, values: string[]): void,
+}
+
+const enquiry = ref<TreeEnquiry | null>(null)
+const personEnquiry = ref<PersonEnquiry | null>(null)
+
+const activeKey = ref(['1', '2']);
+
+const columnParents = ref([
+    {
+        title: '序号',
+        dataIndex: 'index',
+        width: '8%',
+        align: 'center',
+        fixed: 'left',
+        sequence: 0,
+        hidden: 'N',
+        format: ''
+    },
+    {
+        title: "配偶姓氏",
+        dataIndex: FamilyTreeSpouseMapViewEntity.SPOUSE_SURNAME,
+        width: '10%',
+        sequence: 1,
+        hidden: 'N'
+    },
+    {
+        title: "配偶谱名",
+        dataIndex: FamilyTreeSpouseMapViewEntity.SPOUSE_GENEALOGY_NAME,
+        width: '10%',
+        sequence: 2,
+        hidden: 'N'
+    },
+    {
+        title: "性别",
+        dataIndex: FamilyTreeSpouseMapViewEntity.GENDER,
+        width: '8%',
+        sequence: 3,
+        hidden: 'N'
+    },
+    {
+        title: "结婚日期文本",
+        dataIndex: FamilyTreeSpouseMapViewEntity.MARRY_DATE_TEXT,
+        width: '11%',
+        sequence: 4,
+        hidden: 'N'
+    },
+    {
+        title: "结婚日期",
+        dataIndex: FamilyTreeSpouseMapViewEntity.MARRY_DATE,
+        width: '11%',
+        sequence: 5,
+        hidden: 'N'
+    },
+    {
+        title: "离婚日期文本",
+        dataIndex: FamilyTreeSpouseMapViewEntity.DIVORCE_DATE_TEXT,
+        width: '11%',
+        sequence: 6,
+        hidden: 'N'
+    },
+    {
+        title: "离婚日期",
+        dataIndex: FamilyTreeSpouseMapViewEntity.DIVORCE_DATE,
+        width: '11%',
+        sequence: 7,
+        hidden: 'N'
+    },
+    {
+        title: "婚配类型",
+        dataIndex: FamilyTreeSpouseMapViewEntity.MARRY_TYPE,
+        width: '8%',
+        sequence: 8,
+        hidden: 'N'
+    },
+    {
+        title: "当前?",
+        dataIndex: FamilyTreeSpouseMapViewEntity.IS_CURRENT,
+        width: '8%',
+        sequence: 9,
+        hidden: 'N'
+    },
+    {
+        title: "备注",
+        dataIndex: FamilyTreeSpouseMapViewEntity.REMARK,
+        width: '11%',
+        sequence: 10,
+        hidden: 'N'
+    },
+    {
+        title: "",
+        dataIndex: 'operation',
+        width: '12%',
+        sequence: 11,
+        hidden: 'N'
+    }
+]);
+
+const columnSons = ref([
+    {
+        title: '序号',
+        dataIndex: 'index',
+        width: '8%',
+        align: 'center',
+        fixed: 'left',
+        sequence: 0,
+        hidden: 'N',
+        format: ''
+    },
+    {
+        title: "姓氏",
+        dataIndex: FamilyTreeChildrenMapViewEntity.CHILDREN_SURNAME,
+        width: '10%',
+        sequence: 1,
+        hidden: 'N'
+    },
+    {
+        title: "谱名",
+        dataIndex: FamilyTreeChildrenMapViewEntity.CHILDREN_GENEALOGY_NAME,
+        width: '10%',
+        sequence: 2,
+        hidden: 'N'
+    },
+    {
+        title: "性别",
+        dataIndex: FamilyTreeChildrenMapViewEntity.GENDER,
+        width: '8%',
+        sequence: 3,
+        hidden: 'N'
+    },
+    {
+        title: "父母",
+        dataIndex: FamilyTreeChildrenMapViewEntity.SPOUSE_ID,
+        width: '14%',
+        sequence: 4,
+        hidden: 'N'
+    },
+    {
+        title: "关系",
+        dataIndex: FamilyTreeChildrenMapViewEntity.RELATION_TYPE,
+        width: '12%',
+        sequence: 5,
+        hidden: 'N'
+    },
+    {
+        title: "备注",
+        dataIndex: FamilyTreeChildrenMapViewEntity.REMARK,
+        width: '14%',
+        sequence: 6,
+        hidden: 'N'
+    },
+    {
+        title: "",
+        dataIndex: 'operation',
+        width: '12%',
+        sequence: 7,
+        hidden: 'N'
+    }
+]);
+//================provide================
+const modelOption = ref<OperationToEnquiryModelOption>(new OperationToEnquiryModelOption());
+modelOption.value.isModalTree = false;
+modelOption.value.isModalPerson = false;
+
+modelOption.value.selectionTypeTree = 'radio';
+modelOption.value.selectionTypePerson = 'radio';
+
+modelOption.value.initBindOptionsTree = [];
+modelOption.value.initBindOptionsPerson = [];
+
+
+const getOperationToEnquiryModelOption = () => {
+    return modelOption.value
+}
+provide(
+    operationToEnquiryMethodKey,
+    {
+        getOperationToEnquiryModelOption,
+    }
+);
+//================provide================
+
+onBeforeMount(async () => {
+    yesNoPolicy.value = await useYesNoPolicy().getSelectOption(false);
+})
+
+onMounted(() => {
+    let pContext: PermissionContext = usePermissionContext();
+    canAmend.value = pContext.canAmend(route.meta.permission as string);
+    canDelete.value = pContext.canDelete(route.meta.permission as string);
+    canCreate.value = pContext.canCreate(route.meta.permission as string);
+    computResultTableHeight();
+
+    if (treeId.value && treeId.value.trim().length > 0) {
+        onSearch();
+    }
+    if (mode.value && mode.value == 'create') {
+        onCreate();
+        isEdit.value = true;
+    }
+    else if (mode.value && mode.value == 'amend') {
+        isEdit.value = true;
+    }
+})
+
+const computResultTableHeight = () => {
+    if (width.value > 640) {
+        resultH.value = 'calc(100vh -  220px )';
+    }
+    else {
+        resultH.value = 'calc(100vh -  250px )';
+    }
+}
+
+const onModalSearch = (() => {
+    modelOption.value.isModalTree = true;
+    modelOption.value.selectionTypeTree = 'radio';
+
+    showModalType.value = 0;
+})
+
+
+const onSearch = (async () => {
+
+    if (!treeId.value || treeId.value.trim().length == 0) {
+        notification.info({
+            message: '系统提示：',
+            description: '请输入族谱编号',
+            placement: "topRight",
+        });
+        hasData.value = false;
+        return;
+    }
+
+    data.value = await familyTreeService.FindByCurrentPerson({
+        key: treeId.value.trim(),
+        personId: data.value.CurrentPerson.FamilyPerson.PersonId,
+    });
+
+    if (data.value.FamilyTree == null) {
+        notification.info({
+            message: '系统提示：',
+            description: '记录不存在',
+            placement: "topRight",
+        });
+        data.value = new FamilyTreeData();
+        hasData.value = false;
+        return;
+    }
+
+    hasData.value = true;
+})
+
+const onReset = (() => {
+    data.value = new FamilyTreeData();
+    data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
+    data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
+    treeId.value = '';
+    hasData.value = false;
+    selectedSonIndex.value = -1;
+    selectedParentIndex.value = -1;
+})
+
+const onCreate = (() => {
+    onReset();
+    isEdit.value = true;
+})
+
+const onAmend = (() => {
+    isEdit.value = true;
+    oldTreeId.value = unref(data.value.FamilyTree.TreeId);
+})
+
+const onSave = (async () => {
+
+    try {
+        loading.value = true;
+
+        if (!data.value.CurrentPerson.FamilyTreeSpouseMaps) data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
+        if (!data.value.CurrentPerson.FamilyTreeChildrenMaps) data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
+
+        if (data.value.FamilyTree?.CreatedBy)
+            data.value = await familyTreeService.Update(data.value);
+        else {
+            data.value = await familyTreeService.Insert(data.value);
+        }
+
+        treeId.value = data.value.FamilyTree.TreeId;
+
+        loading.value = false;
+        hasData.value = true;
+        isEdit.value = false;
+        selectedSonIndex.value = -1;
+        selectedParentIndex.value = -1;
+
+    } catch (error) {
+        loading.value = false;
+        console.log(error);
+    }
+
+})
+
+const onCancel = (() => {
+    onReset();
+    if (oldTreeId.value && oldTreeId.value.length > 0) {
+        treeId.value = oldTreeId.value;
+        onSearch();
+    }
+    isEdit.value = false;
+})
+
+const onDelete = (async () => {
+    try {
+        loading.value = true;
+
+        await familyTreeService.Delete(data.value.FamilyTree.TreeId);
+
+        onReset();
+        loading.value = false;
+
+    } catch (error) {
+        loading.value = false;
+        console.log(error);
+    }
+})
+
+const handleCance = (async () => {
+
+})
+
+const addSpouse = (event: MouseEvent) => {
+    modelOption.value.isModalPerson = true;
+    modelOption.value.selectionTypePerson = 'radio';
+    showModalType.value = 1;
+
+    // If you don't want click extra trigger collapse, you can prevent this:
+    event.stopPropagation();
+};
+
+const deleteParent = (key: string) => {
+    data.value.CurrentPerson.FamilyTreeSpouseMaps = data.value.CurrentPerson.FamilyTreeSpouseMaps.filter(item => item.SpouseId !== key);
+};
+
+const formatDate = (value?: Date | null) => {
+    return value ? dayjs(value).format('YYYY-MM-DD') : '';
+};
+
+const onMarryDateChange = (record: FamilyTreeSpouseMapViewEntity, date: Dayjs | null) => {
+    record.MarryDate = date ? date.toDate() : null!;
+    record.MarryDateText = date ? date.format('YYYY-MM-DD') : '';
+};
+
+const onDivorceDateChange = (record: FamilyTreeSpouseMapViewEntity, date: Dayjs | null) => {
+    record.DivorceDate = date ? date.toDate() : null!;
+    record.DivorceDateText = date ? date.format('YYYY-MM-DD') : '';
+};
+
+const getPolicyText = (options: SelectOption[], value?: string | null) => {
+    const o = options.find(x => x.BindValue === value);
+    return o ? o.DisplayName : value;
+};
+
+const selectedParentIndex = ref<number>(-1);
+
+const rowParentClassName = (record: FamilyTreeSpouseMapViewEntity, index: number) => {
+    return index === selectedParentIndex.value ? 'parent-row-selected' : '';
+};
+
+const upParent = (index: number) => {
+    if (index > 0) {
+        const item = data.value.CurrentPerson.FamilyTreeSpouseMaps.splice(index, 1)[0];
+        data.value.CurrentPerson.FamilyTreeSpouseMaps.splice(index - 1, 0, item);
+        selectedParentIndex.value = index - 1;
+        refreshParentOrderby();
+    }
+};
+
+const downParent = (index: number) => {
+    if (index < data.value.CurrentPerson.FamilyTreeSpouseMaps.length) {
+        const item = data.value.CurrentPerson.FamilyTreeSpouseMaps.splice(index, 1)[0];
+        data.value.CurrentPerson.FamilyTreeSpouseMaps.splice(index + 1, 0, item);
+        selectedParentIndex.value = index + 1;
+
+        refreshParentOrderby();
+    }
+};
+
+const refreshParentOrderby = () => {
+    data.value.CurrentPerson.FamilyTreeSpouseMaps.forEach((item, idx) => {
+        item.Orderby = idx + 1;
+    });
+};
+
+const addSon = (event: MouseEvent) => {
+    modelOption.value.isModalPerson = true;
+    modelOption.value.selectionTypePerson = 'checkbox';
+
+    showModalType.value = 2;
+
+    // If you don't want click extra trigger collapse, you can prevent this:
+    event.stopPropagation();
+};
+
+const selectedSonIndex = ref<number>(-1);
+
+const rowSonClassName = (record: FamilyTreeChildrenMapViewEntity, index: number) => {
+    return index === selectedSonIndex.value ? 'son-row-selected' : '';
+};
+
+const upSon = (index: number) => {
+    if (index > 0) {
+        const item = data.value.CurrentPerson.FamilyTreeChildrenMaps.splice(index, 1)[0];
+        data.value.CurrentPerson.FamilyTreeChildrenMaps.splice(index - 1, 0, item);
+        selectedSonIndex.value = index - 1;
+        refreshSonOrderby();
+    }
+};
+
+const downSon = (index: number) => {
+    if (index < data.value.CurrentPerson.FamilyTreeChildrenMaps.length) {
+        const item = data.value.CurrentPerson.FamilyTreeChildrenMaps.splice(index, 1)[0];
+        data.value.CurrentPerson.FamilyTreeChildrenMaps.splice(index + 1, 0, item);
+        selectedSonIndex.value = index + 1;
+
+        refreshSonOrderby();
+    }
+};
+
+const refreshSonOrderby = () => {
+  data.value.CurrentPerson.FamilyTreeChildrenMaps.forEach((item, idx) => {
+    item.Orderby = idx + 1; // orderby从1开始，也可以用 idx
+  });
+};
+
+const deleteSon = (key: string) => {
+    data.value.CurrentPerson.FamilyTreeChildrenMaps = data.value.CurrentPerson.FamilyTreeChildrenMaps.filter(item => item.ChildrenId !== key);
+};
+
+const { getPolicyOptionsComputed, getPolicySelectOptionsComputed } = useLocalePolicy();
+const relationTypeOptions = getPolicyOptionsComputed('RelationTypePolicy');
+const relationTypeSelectOptions = getPolicySelectOptionsComputed('RelationTypePolicy');
+const genderOptions = getPolicyOptionsComputed('GenderPolicy');
+
+const spouseOptions = computed(() => {
+    return (data.value.CurrentPerson.FamilyTreeSpouseMaps || []).map(s => ({
+        label: (s.SpouseSurname || '') + (s.SpouseGenealogyName || ''),
+        value: s.SpouseId,
+    }));
+});
+
+const getSpouseName = (spouseId?: string) => {
+    if (!spouseId) return '';
+    const s = (data.value.CurrentPerson.FamilyTreeSpouseMaps || []).find(x => x.SpouseId === spouseId);
+    return s ? (s.SpouseSurname || '') + (s.SpouseGenealogyName || '') : spouseId;
+};
+
+const handleSelect = (async () => {
+    if (enquiry.value) {
+        if (enquiry.value.keys.length > 0) {
+            //查询弹出
+            if (showModalType.value == 0) {
+                treeId.value = enquiry.value.keys[0].TreeId;
+                data.value = new FamilyTreeData();
+                data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
+                data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
+
+                onSearch();
+            }
+
+            modelOption.value.isModalTree = false;
+        }
+        else {
+            notification.info({
+                message: '系统提示：',
+                description: '请选择一条记录',
+                placement: "topRight",
+            });
+        }
+    }
+})
+
+const onModalPerson = (() => {
+    modelOption.value.isModalPerson = true;
+    modelOption.value.selectionTypePerson = 'radio';
+    showModalType.value = 3;
+})
+
+const onModalCurrentPerson = (() => {
+    modelOption.value.isModalPerson = true;
+    modelOption.value.selectionTypePerson = 'radio';
+    showModalType.value = 4;
+})
+
+const handleSelectPerson = (async () => {
+    if (personEnquiry.value) {
+        if (personEnquiry.value.keys.length > 0) {
+            //祖先人员选择
+            if (showModalType.value == 3) {
+                data.value.FamilyTree.AncestorPersonId = personEnquiry.value.keys[0].PersonId;
+                data.value.FamilyTree.AncestorPersonGenealogyName = personEnquiry.value.keys[0].GenealogyName;
+            }
+            //当前族员选择
+            else if (showModalType.value == 4) {
+                data.value.CurrentPerson.FamilyPerson.GenealogyName = personEnquiry.value.keys[0].GenealogyName;
+                data.value.CurrentPerson.FamilyPerson.PersonId = personEnquiry.value.keys[0].PersonId;
+
+                onSearch();
+            }
+            //添加夫妻关系
+            else if (showModalType.value == 1) {
+                if (!data.value.CurrentPerson.FamilyTreeSpouseMaps) data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
+                let spouse: FamilyTreeSpouseMapViewEntity = new FamilyTreeSpouseMapViewEntity();
+                spouse.SpouseId = personEnquiry.value.keys[0].PersonId;
+                spouse.SpouseSurname = personEnquiry.value.keys[0].Surname;
+                spouse.SpouseCommonName = personEnquiry.value.keys[0].CommonName;
+                spouse.SpouseGenealogyName = personEnquiry.value.keys[0].GenealogyName;
+
+                data.value.CurrentPerson.FamilyTreeSpouseMaps.push(spouse);
+            }
+            //添加孩子关系
+            else if (showModalType.value == 2) {
+                if (!data.value.CurrentPerson.FamilyTreeChildrenMaps) data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
+                personEnquiry.value.keys.forEach(element => {
+                    let child: FamilyTreeChildrenMapViewEntity = new FamilyTreeChildrenMapViewEntity();
+                    child.ChildrenId = element.PersonId;
+                    child.ChildrenSurname = element.Surname;
+                    child.ChildrenCommonName = element.CommonName;
+                    child.ChildrenGenealogyName = element.GenealogyName;
+
+                    data.value.CurrentPerson.FamilyTreeChildrenMaps.push(child);
+                });
+            }
+
+            modelOption.value.isModalPerson = false;
+        }
+        else {
+            notification.info({
+                message: '系统提示：',
+                description: '请选择一条记录',
+                placement: "topRight",
+            });
+        }
+    }
+})
+
+</script>
+<style lang="less">
+.page-container {
+    margin-right: 0px;
+
+}
+
+.page-header {
+    padding-top: 4px;
+    padding-bottom: 8px;
+    padding-right: 12px;
+    border-bottom: 1px solid silver;
+    margin-left: 6px;
+}
+
+.page-header .ant-input-search .ant-input {
+    border-radius: 0;
+    border-left: 0;
+    text-align: left
+}
+
+.page-main {
+    overflow-y: auto;
+    padding-top: 24px;
+    padding-bottom: 4px;
+    padding-right: 32px;
+    padding-left: 12px;
+}
+
+.ant-input-search .ant-input {
+    border-radius: 0;
+    border-left: 0;
+    text-align: left
+}
+
+.page-footer {
+    z-index: 999;
+    padding-left: 8px;
+    padding-right: 18px;
+    padding-top: 8px;
+    width: 100%;
+    position: fixed;
+    bottom: 8px;
+    border-top: 1px solid silver;
+}
+
+.son-row-selected td {
+    border-top: 2px solid #1677ff !important;
+    border-bottom: 2px solid #1677ff !important;
+}
+
+.son-row-selected td:first-child {
+    border-left: 2px solid #1677ff !important;
+}
+
+.son-row-selected td:last-child {
+    border-right: 2px solid #1677ff !important;
+}
+
+.son-row-selected > td {
+    background-color: #e6f4ff !important;
+}
+
+.parent-row-selected td {
+    border-top: 2px solid #1677ff !important;
+    border-bottom: 2px solid #1677ff !important;
+}
+
+.parent-row-selected td:first-child {
+    border-left: 2px solid #1677ff !important;
+}
+
+.parent-row-selected td:last-child {
+    border-right: 2px solid #1677ff !important;
+}
+
+.parent-row-selected > td {
+    background-color: #e6f4ff !important;
+}
+</style>