valar 1.0.25__py3-none-any.whl → 1.0.27__py3-none-any.whl

valar/core/dao/model_orm.py

@@ -181,12 +181,15 @@ class OrmModel:
         # 简单字段取值
         simple_props = [field.prop for field in orm_fields if field.domain not in utils.referred_domains]
         custom_props = utils.custom_props(self.entity, code)
-        results = list(query_set.values(*[*simple_props, *custom_props]))
+        results = list(query_set.filter().values(*[*simple_props, *custom_props]))
         utils.date_values(orm_fields, results)
         # 关系型字段取值
         mapping = { row['id']: row for row in results}
         referred_fields = [field for field in orm_fields if field.domain in utils.referred_domains]
+        pks = mapping.keys()
         for field in referred_fields:
-            utils.linkage(field, query_set, mapping)
+            manager: Manager = query_set.model.objects
+            qs = manager.filter(id__in=pks)
+            utils.linkage(field, qs, mapping)
         return results
 

valar/core/dao/utils_orm.py

@@ -1,3 +1,5 @@
+from django.db.models import QuerySet
+
 from ..valar_models import VModel
 from ...core.meta.field_orm import OrmField
 from ...data.models import MetaField
@@ -21,7 +23,7 @@ class OrmUtils:
         return [item['prop'] for item in field_set if item['prop']]
 
 
-    def linkage(self, field, query_set, mapping):
+    def linkage(self, field, query_set: QuerySet, mapping):
         model_field = field.model_field
         prop = model_field.name
         multiple = field.domain in self.multiple_domains

valar/data/views/rest.py

@@ -71,11 +71,14 @@ def table(request, db, entity):
 def tree(request, db, entity):
     body = json.loads(request.body)
     conditions = body.get('conditions', [])
-    root = body.get('page')
+    root = body.get('root')
     dao = Dao(entity, db)
     query_set = dao.tree(root, conditions)
     results = dao.transform(query_set)
-    return ValarResponse(results)
+    return ValarResponse({
+        "results": results,
+        "root": root
+    })
 
 
 def meta_view(request, db, entity):

{valar-1.0.25.dist-info → valar-1.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.25
+Version: 1.0.27
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

{valar-1.0.25.dist-info → valar-1.0.27.dist-info}/RECORD

@@ -22,10 +22,10 @@ valar/core/dao/engine_minio.py,sha256=0Pycbq9eoJizvmElZYtstXBLPEa--b0H0AA3ZuHbfQ
 valar/core/dao/engine_mon.py,sha256=P0qOtG0Usu-nAkYa-2dSiFwbUPIhHULoBZoHm-60ypo,1051
 valar/core/dao/engine_orm.py,sha256=nUjjkVLD-enpbkXCZSkQib5hWJJPXT2TYhACKn6Pro0,752
 valar/core/dao/model_mon.py,sha256=uCHDARQRB_P3EjIgE58LOGboVDwPIAbfnaKVKnP4870,601
-valar/core/dao/model_orm.py,sha256=PkWJMYykr00KpfR5JvR3XpHgW8L7Dbym4hhJhZWZzlQ,7554
+valar/core/dao/model_orm.py,sha256=J7Q-xAwr_LukYEcTqTw4yn9_nIf2dTZVjjEDysJdPkc,7684
 valar/core/dao/query_mon.py,sha256=QfQoT74HFEVtcaukSqGVXaIGf63WkgZWY94H8QAvFOg,318
 valar/core/dao/query_orm.py,sha256=sBBZNkGMyF6ttRcDEPXWfvPM_agLHwKShz3YO3SF0zw,1067
-valar/core/dao/utils_orm.py,sha256=8nL8e2b8NOsBTyPUWkjDpNWzwruhatppWaw_EeSZQOA,3610
+valar/core/dao/utils_orm.py,sha256=BW4ze5JlnJfvL7vF6f5MDBQSLtW9aBPrG5LyU9aBcVg,3659
 valar/core/meta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/core/meta/field_orm.py,sha256=oKaESEAtzQN5LRQSa9FVYtEgBdqg7YMUmVAAiyFNhu4,4586
 valar/core/meta/init_meta_frame.py,sha256=5jEHzDfh5z5YLDJ0hu-a9MW3U-zg6Rk35pDZnjXZjes,921
@@ -41,9 +41,9 @@ valar/data/urls.py,sha256=phZGHxpQy00SkJBKnE_xAfkzdzoFVRycK5gRE2Y2Lj0,736
 valar/data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/data/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/data/views/handler.py,sha256=h769dO9ZiJXwgkGyIWVzMaz3LKpqafjwAM7ZH2oCSkQ,1214
-valar/data/views/rest.py,sha256=r13F3CKjF9bnlaqRzyLk9iu5CdNsmQSEBRcHseLiZ0I,2535
-valar-1.0.25.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.0.25.dist-info/METADATA,sha256=fyI30zlIzKfwXbNx-LkkTK367B87ClDraSuUGJm-tWA,3395
-valar-1.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.0.25.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.0.25.dist-info/RECORD,,
+valar/data/views/rest.py,sha256=Wr05feZLbfFpVjrGQsNchRPvSABegKQ71o0G0jo1tyQ,2584
+valar-1.0.27.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.0.27.dist-info/METADATA,sha256=A22sXX_R_smxzXBC-GsRqzQWcyf6Es5UqXYI_cexzws,3395
+valar-1.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.0.27.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.0.27.dist-info/RECORD,,