valar 1.0.28__tar.gz → 1.0.29__tar.gz

{valar-1.0.28/src/valar.egg-info → valar-1.0.29}/PKG-INFO

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

{valar-1.0.28 → valar-1.0.29}/setup.py

@@ -16,7 +16,7 @@ requires = [
 
 setup(
     name="valar",  # 包名
-    version="1.0.28",  # 版本号
+    version="1.0.29",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

{valar-1.0.28 → valar-1.0.29}/src/valar/core/counter.py

@@ -5,5 +5,5 @@ class Counter:
 
     def tick(self):
         self.index += 1
-        percentage = round(self.index * 100 / self.length)
+        percentage = round(self.index * 100 / self.length) if self.length else 0
         return {"index": self.index, "length": self.length, "percentage": percentage}

{valar-1.0.28 → valar-1.0.29}/src/valar/core/dao/dao_base.py

@@ -35,7 +35,7 @@ class Dao(AbstractDao):
         return self.dao.transform(o)
 
     def tree(self, root, conditions=None):
-        return self.dao.tree(conditions, root)
+        return self.dao.tree(root, conditions)
 
 
 

{valar-1.0.28 → valar-1.0.29}/src/valar/core/dao/dao_orm.py

@@ -17,7 +17,7 @@ class OrmDao(AbstractDao):
     def get_model(self):
         return self.model
 
-    def save_one(self, item):
+    def save_one(self, item, with_id=False):
         oid, simple_item, complex_item  = self.model.detach_item(item)
         query_set = self.objects.filter(id=oid) if oid else []
         if len(query_set):
@@ -25,9 +25,12 @@ class OrmDao(AbstractDao):
             query_set.update(**simple_item)
             bean = query_set.first()
         else:
-            bean = self.objects.create(**simple_item)
-            bean.sort = bean.id
-            bean.save()
+            if with_id:
+                bean = self.objects.create(**{**simple_item, "id": oid})
+            else:
+                bean = self.objects.create(**simple_item)
+                bean.sort = bean.id
+                bean.save()
         self.model.save_complex_field(complex_item, bean)
         bean.save()
         return bean
@@ -67,7 +70,7 @@ class OrmDao(AbstractDao):
 
     def delete(self, conditions):
         query_set, total = self.find(conditions)
-        self.model.remove_files(query_set)
+        # self.model.remove_files(query_set)
         query_set.delete()
 
     def transform(self, o, code=None):
@@ -77,7 +80,7 @@ class OrmDao(AbstractDao):
             return o.full()
 
     def tree(self, root, conditions=None):
-        all_set, _ = self.find([])
+        all_set, _ = self.find()
         query = OrmQuery(conditions)
         if query.is_empty(conditions):
             return all_set
@@ -93,4 +96,4 @@ class OrmDao(AbstractDao):
                 _id = mapping.get(_id)
             if root in route:
                 id_set.update(route)
-        return all_set.filter(id__in=id_set).order_by('-sort')
+        return all_set.filter(id__in=id_set).order_by('-sort')

{valar-1.0.28 → valar-1.0.29}/src/valar/core/dao/engine_minio.py

@@ -41,8 +41,9 @@ class MinioEngine(metaclass=SingletonMeta):
         return f'{bucket_name}/{object_name}'
 
     def remove_path(self, path):
-        bucket_name, object_name = path.split('/')
-        self.remove(bucket_name, object_name)
+        if path:
+            bucket_name, object_name = path.split('/')
+            self.remove(bucket_name, object_name)
 
     def remove(self, bucket_name, object_name):
         self.client.remove_object(

{valar-1.0.28 → valar-1.0.29}/src/valar/core/dao/model_orm.py

@@ -1,3 +1,7 @@
+import copy
+
+from bson import ObjectId
+from bson.errors import InvalidId
 from deepmerge import always_merger
 from django.db.models import ManyToOneRel, ForeignKey, ManyToManyRel, ManyToManyField, OneToOneField, OneToOneRel
 from django.db.models import QuerySet
@@ -10,9 +14,8 @@ from .utils_orm import OrmUtils
 from ..meta.defaults.field_keys_default import meta_field_key_defaults
 from ..meta.defaults.field_values_default import meta_field_value_defaults
 from ..meta.field_orm import OrmField
-from ..meta.init_meta_frame import init_meta_frame
 from ..valar_models import VModel, VTree
-from ...data.models import  MetaFieldDomain
+from ...data.models import MetaFieldDomain
 
 
 class OrmModel:
@@ -35,7 +38,11 @@ class OrmModel:
 
     @staticmethod
     def object_id(_id):
-        return _id if isinstance(_id, int) and _id else None
+        try:
+            return int(_id)
+        except TypeError:
+            return None
+
 
     def props(self, domain=None):
         array = []
@@ -46,21 +53,6 @@ class OrmModel:
         return array
 
 
-    def meta_frame(self):
-        query_set = MetaFieldDomain.objects.all()
-        if query_set.count() == 0:
-            query_set = init_meta_frame()
-        values = query_set.values('name', 'default__code', 'align')
-        return {
-            vs['name']: {
-                "tool": vs['default__code'],
-                "align": vs['align'],
-            }
-            for vs in values
-        }
-
-
-
 
     def initial_fields(self, code):
         props = self.props()
@@ -74,17 +66,28 @@ class OrmModel:
         code_values = default_values.get(code, {})
         default_fields = always_merger.merge(init_values, code_values)
 
-        meta_frame = self.meta_frame()
+        values = MetaFieldDomain.objects.all().values('name', 'default__code', 'align')
+        meta_frame = {
+            vs['name']: {
+                "tool": vs['default__code'],
+                "align": vs['align'],
+            }
+            for vs in values
+        }
         fields = []
         for prop in props:
             field = self.get_field(prop)
             field_json = field.json()
-            frame = meta_frame.get(field.domain, {})
+            frame = copy.deepcopy(meta_frame.get(field.domain, {}))
+            refer = field_json['refer']
+            if refer['isTree'] and frame.get('tool') == 'select' :
+                frame['tool'] = 'tree'
+            elif self.is_tree and prop =='icon':
+                frame['tool'] = 'icon'
             field_json.update(frame)
             default_field = default_fields.get(prop, {})
             always_merger.merge(field_json, default_field)
             fields.append(field_json)
-
         fields.reverse()
         return fields
 

{valar-1.0.28 → valar-1.0.29}/src/valar/core/dao/query_orm.py

@@ -20,7 +20,8 @@ def __translate_condition__(conditions, _type):
 
 class OrmQuery:
 
-    def __init__(self, conditions: list, orders = None):
+    def __init__(self, conditions: list , orders = None):
+        conditions = conditions or []
         self.orders =  __translate_orders__(orders or {'sort': -1})
         conditions = conditions if len(conditions) else [{'includes':{},'excludes':{}}]
         self.includes = __translate_condition__(conditions,'includes')
@@ -32,7 +33,7 @@ class OrmQuery:
             temp = {}
             for cond in conditions:
                 temp.update(cond)
-            return len(temp.keys()) >0
+            return len(temp.keys()) == 0
         else:
             return True
 

{valar-1.0.28 → valar-1.0.29}/src/valar/core/meta/defaults/field_values_default.py

@@ -63,8 +63,8 @@ meta_field_value_defaults = {
                 'tool': 'tree',
                 'refer': {
                     'entity':'data.MetaFieldTool',
-                    'includes': {'metafielddomain__name':'$domain'},
-                    'value': 'code'
+                    'includes': {'metafielddomain__name':'${domain}'},
+                    'value': 'code','display':'code'
                 }
 
             },

{valar-1.0.28 → valar-1.0.29}/src/valar/core/meta/defaults/frame_defaults.py

@@ -39,14 +39,14 @@ meta_field_domain = [
         'name': 'CharField',
         'default_id': 'text', 'align': 'left',
         'tools': [
-            'text', 'number', 'meta', 'color', 'auto', 'date', 'select', 'tree', 'cascade', 'icon',
+            'text', 'number', 'meta', 'color', 'auto', 'date', 'time','select', 'tree', 'cascade', 'icon',
             'textarea', 'timerange', 'daterange', 'dates', 'set'
         ]
      },
     {
         'name': 'TextField',
         'default_id': 'textarea', 'align': 'left',
-        'tools': ['text', 'textarea']
+        'tools': ['text', 'textarea', 'rich']
     },
     {
         'name': 'BooleanField',
@@ -116,7 +116,7 @@ meta_field_domain = [
     {
         'name': 'FileField',
         'default_id': 'file', 'align': 'center',
-        'tools': ['image', 'file', 'rich']
+        'tools': ['image', 'file']
     },
     {
         'name': 'BigAutoField',

valar-1.0.29/src/valar/core/meta/defaults/view_defaults.py

@@ -0,0 +1,20 @@
+meta_view_default_values = {
+    'data.MetaView': {
+        '__init__': {
+           'allow_insert': False,
+            'allow_edit': False
+        }
+    },
+    'data.Meta': {
+        '__init__': {
+            'allow_insert': False,
+            'allow_edit': False
+        }
+    },
+    'data.MetaField': {
+        '__init__': {
+            'allow_insert': False,
+            'allow_edit': False
+        }
+    }
+}

{valar-1.0.28 → valar-1.0.29}/src/valar/core/meta/field_orm.py

@@ -4,6 +4,7 @@ from django.db.models import IntegerField, BooleanField, FloatField,TextField, C
 from django.db.models import FileField, JSONField
 from django.db.models import DateTimeField, TimeField, DateField
 
+from src.valar.core.valar_models import VTree
 
 
 class OrmField:
@@ -43,7 +44,7 @@ class OrmField:
         }
         if self.is_tree:
             if self.prop in ['pid', 'isLeaf']:
-                _field['hide_on_table'] = True
+                # _field['hide_on_table'] = True
                 _field['hide_on_form'] = True
                 _field['hide_on_form_branch'] = True
                 _field['hide_on_form_leaf'] = True
@@ -92,14 +93,15 @@ class OrmField:
     def __refer__(self):
         refer = {
             "entity": None,
-            "value": "name", "label": 'name', "display": "id",
+            "value": "id", "label": 'name', "display": "id",
             "multiple": self.multiple, "strict": False, "remote": False,
             "includes": {}, "excludes": {},
-            "root": 0, "isTree": self.is_tree
+            "root": 0, "isTree": False
         }
         if self.model:
             module, name = self.model.__module__, self.model.__name__
             refer['entity'] = '%s.%s' % (module.replace('.models', '').split('.')[-1], name)
+            refer['isTree'] = issubclass(self.model, VTree)
         return refer
 
     def __formating__(self):

{valar-1.0.28 → valar-1.0.29}/src/valar/core/meta/init_meta_frame.py

@@ -10,16 +10,18 @@ def init_meta_frame():
     tool_dao = OrmDao('data.MetaFieldTool')
     domain_dao = OrmDao('data.MetaFieldDomain')
     mapping = {}
+    tool_dao.objects.all().delete()
     for item in meta_field_tool:
+        item = copy.deepcopy(item)
         _id, code = item['id'], item['code']
         item.update({"saved": True})
         if item['isLeaf']:
             mapping[code] = _id
-        tool_dao.save_one(item)
-
+        tool_dao.save_one(item, True)
+    domain_dao.objects.all().delete()
     for row in meta_field_domain:
+        row = copy.deepcopy(row)
         default_id, tools = row['default_id'], row['tools']
-        print(mapping[default_id])
         _row = copy.deepcopy(row)
         _row.update({
             'default_id': mapping[default_id],

{valar-1.0.28 → valar-1.0.29}/src/valar/core/meta/meta_orm.py

@@ -2,7 +2,7 @@ from deepmerge import always_merger
 
 from .defaults.view_defaults import meta_view_default_values
 from ...core.dao.dao_orm import OrmDao
-from ...data.models import MetaView, Meta
+from ...data.models import MetaView, Meta, MetaFieldDomain
 
 
 class OrmMeta:
@@ -38,8 +38,9 @@ class OrmMeta:
             field_dao = OrmDao('data.MetaField')
             _fields = self.dao.model.initial_fields(code)
             for _field in _fields:
-                _field.update({'view_id':view.id, "saved": True })
-                field_dao.save_one(_field)
+                if _field['prop'] not in [ 'sort', 'create_time','modify_time','saved']:
+                    _field.update({'view_id': view.id, "saved": True})
+                    field_dao.save_one(_field)
 
 
     def get_view(self):
@@ -47,7 +48,11 @@ class OrmMeta:
         meta = self.meta.json()
         name, entity = meta['name'], meta['entity']
         fields = self.view.metafield_set.all().order_by('-sort')
-        _fields = {field.prop: field.json(entity=entity, code=self.code, db='orm') for field in fields}
+        _fields = {
+            field.prop: field.json(entity=entity, code=self.code, db='orm')
+            for field in fields
+            # if field.prop not in ['id', 'sort', 'create_time','modify_time','saved','pid','isLeaf']
+        }
         _view.update({
             '$db': 'orm',
             '$entity': entity,

valar-1.0.29/src/valar/data/apps.py

@@ -0,0 +1,13 @@
+# apps.py
+import os
+from django.apps import AppConfig
+
+
+
+
+class ValarDataConfig(AppConfig):
+    name='src.valar.data'
+    def ready(self):
+        if os.environ.get('RUN_MAIN') == 'true':
+            from src.valar.core.meta.init_meta_frame import init_meta_frame
+            init_meta_frame()

valar-1.0.29/src/valar/data/migrations/0001_initial.py

@@ -0,0 +1,140 @@
+# Generated by Django 4.2.23 on 2025-07-06 02:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Meta',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('entity', models.CharField(max_length=100, null=True, unique=True, verbose_name='数据源')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='实体别名')),
+            ],
+            options={
+                'verbose_name': '数据实体',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaFieldTool',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('name', models.CharField(max_length=255, null=True, verbose_name='名称')),
+                ('code', models.CharField(max_length=100, null=True, unique=True, verbose_name='代码')),
+            ],
+            options={
+                'verbose_name': '元数据字段工具',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaView',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('code', models.CharField(default='default ', max_length=50, verbose_name='类视图')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='视图名称')),
+                ('form_width', models.IntegerField(default=0, verbose_name='表单宽度')),
+                ('form_height', models.IntegerField(default=0, verbose_name='表单高度')),
+                ('table_width', models.IntegerField(default=0, verbose_name='表格宽度')),
+                ('table_height', models.IntegerField(default=0, verbose_name='表格高度')),
+                ('enable', models.BooleanField(default=True, verbose_name='是否启用')),
+                ('show_header', models.BooleanField(default=True, verbose_name='展示头部')),
+                ('allow_batch', models.BooleanField(default=True, verbose_name='批处理')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='检索功能')),
+                ('allow_sort', models.BooleanField(default=True, verbose_name='排序功能')),
+                ('allow_pop', models.BooleanField(default=True, verbose_name='移动功能')),
+                ('allow_insert', models.BooleanField(default=True, verbose_name='新增功能')),
+                ('allow_edit', models.BooleanField(default=True, verbose_name='编辑功能')),
+                ('allow_remove', models.BooleanField(default=True, verbose_name='删除功能')),
+                ('allow_download', models.BooleanField(default=True, verbose_name='下载功能')),
+                ('allow_upload', models.BooleanField(default=True, verbose_name='上传功能')),
+                ('meta', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='data.meta', verbose_name='元数据')),
+            ],
+            options={
+                'verbose_name': '数据视图',
+                'unique_together': {('meta', 'code')},
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaFieldDomain',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('name', models.CharField(max_length=255, null=True, unique=True, verbose_name='名称')),
+                ('align', models.CharField(max_length=10, null=True, verbose_name='对齐方式')),
+                ('default', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='data.metafieldtool', verbose_name='默认工具')),
+                ('search', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='data.metafieldtool', verbose_name='搜索工具')),
+                ('tools', models.ManyToManyField(to='data.metafieldtool', verbose_name='工具集')),
+            ],
+            options={
+                'verbose_name': '元数据字段类型',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaField',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('prop', models.CharField(max_length=100, verbose_name='字段名称')),
+                ('label', models.CharField(max_length=100, verbose_name='字段标签')),
+                ('name', models.CharField(max_length=100, verbose_name='字段别名')),
+                ('domain', models.CharField(max_length=100, verbose_name='字段类型')),
+                ('tool', models.CharField(default='default', max_length=100, verbose_name='工具组件')),
+                ('refer', models.JSONField(default=dict, verbose_name='索引')),
+                ('format', models.JSONField(default=dict, verbose_name='格式')),
+                ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
+                ('allow_edit', models.BooleanField(default=True, verbose_name='可编辑')),
+                ('allow_sort', models.BooleanField(default=True, verbose_name='可排序')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='可搜索')),
+                ('allow_download', models.BooleanField(default=True, verbose_name='可下载')),
+                ('allow_upload', models.BooleanField(default=False, verbose_name='可上传')),
+                ('allow_update', models.BooleanField(default=False, verbose_name='可更新')),
+                ('unit', models.CharField(max_length=55, null=True, verbose_name='单位符')),
+                ('column_width', models.FloatField(default=0, verbose_name='表头宽度')),
+                ('align', models.CharField(default='left', max_length=55, verbose_name='对齐方式')),
+                ('fixed', models.CharField(max_length=100, null=True, verbose_name='固定位置')),
+                ('header_color', models.CharField(max_length=55, null=True, verbose_name='表头颜色')),
+                ('cell_color', models.CharField(max_length=55, null=True, verbose_name='单元颜色')),
+                ('edit_on_table', models.BooleanField(default=True, verbose_name='表格编辑')),
+                ('hide_on_table', models.BooleanField(default=False, verbose_name='表内隐藏')),
+                ('span', models.IntegerField(default=0, verbose_name='表单占位')),
+                ('hide_on_form', models.BooleanField(default=False, verbose_name='表单隐藏')),
+                ('hide_on_form_edit', models.BooleanField(default=False, verbose_name='编辑隐藏')),
+                ('hide_on_form_insert', models.BooleanField(default=False, verbose_name='新增隐藏')),
+                ('hide_on_form_branch', models.BooleanField(default=False, verbose_name='分支隐藏')),
+                ('hide_on_form_leaf', models.BooleanField(default=False, verbose_name='叶子隐藏')),
+                ('view', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='data.metaview', verbose_name='数据视图')),
+            ],
+            options={
+                'verbose_name': '视图字段',
+            },
+        ),
+    ]

valar-1.0.29/src/valar/data/migrations/0002_remove_metaview_allow_batch.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.23 on 2025-07-06 06:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='metaview',
+            name='allow_batch',
+        ),
+    ]

valar-1.0.29/src/valar/data/migrations/0003_remove_metaview_allow_pop_metaview_allow_order_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.23 on 2025-07-06 06:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0002_remove_metaview_allow_batch'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='metaview',
+            name='allow_pop',
+        ),
+        migrations.AddField(
+            model_name='metaview',
+            name='allow_order',
+            field=models.BooleanField(default=True, verbose_name='排序功能'),
+        ),
+        migrations.AlterField(
+            model_name='metaview',
+            name='allow_sort',
+            field=models.BooleanField(default=True, verbose_name='移动功能'),
+        ),
+    ]

valar-1.0.29/src/valar/data/migrations/0004_rename_allow_sort_metafield_allow_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-07-06 06:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0003_remove_metaview_allow_pop_metaview_allow_order_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='metafield',
+            old_name='allow_sort',
+            new_name='allow_order',
+        ),
+    ]

{valar-1.0.28 → valar-1.0.29}/src/valar/data/models.py

@@ -26,10 +26,9 @@ class MetaView(VModel):
 
     enable = models.BooleanField(default=True, verbose_name='是否启用')
     show_header = models.BooleanField(default=True, verbose_name='展示头部')
-    allow_batch = models.BooleanField(default=True, verbose_name='批处理')
     allow_search = models.BooleanField(default=True, verbose_name='检索功能')
-    allow_sort = models.BooleanField(default=True, verbose_name='排序功能')
-    allow_pop = models.BooleanField(default=True, verbose_name='移动功能')
+    allow_sort = models.BooleanField(default=True, verbose_name='移动功能')
+    allow_order = models.BooleanField(default=True, verbose_name='排序功能')
     allow_insert = models.BooleanField(default=True, verbose_name='新增功能')
     allow_edit = models.BooleanField(default=True, verbose_name='编辑功能')
     allow_remove = models.BooleanField(default=True, verbose_name='删除功能')
@@ -58,7 +57,7 @@ class MetaField(VModel):
     """rest"""
     not_null = models.BooleanField(default=False, verbose_name='不为空') #
     allow_edit = models.BooleanField(default=True, verbose_name='可编辑')
-    allow_sort = models.BooleanField(default=True, verbose_name='可排序')
+    allow_order = models.BooleanField(default=True, verbose_name='可排序')
     allow_search = models.BooleanField(default=True, verbose_name='可搜索')
     allow_download = models.BooleanField(default=True, verbose_name='可下载')
     allow_upload = models.BooleanField(default=False, verbose_name='可上传')

{valar-1.0.28 → valar-1.0.29}/src/valar/data/urls.py

@@ -1,5 +1,6 @@
 from django.urls import path
 
+from .views.file import save_file
 from ..channels.views import handel_channel
 from .views.rest import save_many,delete_many,save_one,delete_one,find_one,find,update,table, tree, meta_view
 
@@ -15,4 +16,8 @@ urlpatterns = [
     path('<str:db>/<str:entity>/table', table),
     path('<str:db>/<str:entity>/tree', tree),
     path('<str:db>/<str:entity>/meta_view', meta_view),
+
+    path('<str:db>/<str:entity>/save_file', save_file),
+
+
 ]

valar-1.0.29/src/valar/data/views/file.py

@@ -0,0 +1,12 @@
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.http import QueryDict
+
+from src.valar.core.response import ValarResponse
+
+
+def save_file(request, db, entity):
+    params: QueryDict = request.POST.dict()
+    _id, prop, field = (params.get(key) for key in ['id', 'prop', 'field'])
+    file: InMemoryUploadedFile = request.FILES['file']
+
+    return  ValarResponse(True)

{valar-1.0.28 → valar-1.0.29}/src/valar/data/views/handler.py

@@ -29,10 +29,10 @@ def delete_many_handler(sender: ValarSocketSender):
         paths = dao.model.get_file_paths(query_set)
         query_set.delete()
         counter = Counter(len(paths))
-        for path in paths:
-            dao.model.minio.remove_path(path)
-            payload = counter.tick()
-            sender.to_clients(payload, sender.client, wait=True)
+        # for path in paths:
+            # dao.model.minio.remove_path(path)
+        payload = counter.tick()
+        sender.to_clients(payload, sender.client, wait=True)
     else:
         dao = MonDao(entity)
         dao.delete(conditions)

{valar-1.0.28 → valar-1.0.29}/src/valar/data/views/rest.py

@@ -71,6 +71,7 @@ def table(request, db, entity):
 def tree(request, db, entity):
     body = json.loads(request.body)
     conditions = body.get('conditions', [])
+
     root = body.get('root')
     dao = Dao(entity, db)
     query_set = dao.tree(root, conditions)
@@ -84,6 +85,5 @@ def tree(request, db, entity):
 def meta_view(request, db, entity):
     body = json.loads(request.body)
     code = body.get('code')
-    _meta = OrmMeta(entity, code)
-    _view = _meta.get_view()
+    _view = OrmMeta(entity, code).get_view()
     return ValarResponse(_view)

{valar-1.0.28 → valar-1.0.29/src/valar.egg-info}/PKG-INFO

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

{valar-1.0.28 → valar-1.0.29}/src/valar.egg-info/SOURCES.txt

@@ -44,9 +44,15 @@ src/valar/core/meta/defaults/field_values_default.py
 src/valar/core/meta/defaults/frame_defaults.py
 src/valar/core/meta/defaults/view_defaults.py
 src/valar/data/__init__.py
+src/valar/data/apps.py
 src/valar/data/models.py
 src/valar/data/urls.py
+src/valar/data/migrations/0001_initial.py
+src/valar/data/migrations/0002_remove_metaview_allow_batch.py
+src/valar/data/migrations/0003_remove_metaview_allow_pop_metaview_allow_order_and_more.py
+src/valar/data/migrations/0004_rename_allow_sort_metafield_allow_order.py
 src/valar/data/migrations/__init__.py
 src/valar/data/views/__init__.py
+src/valar/data/views/file.py
 src/valar/data/views/handler.py
 src/valar/data/views/rest.py

valar-1.0.28/src/valar/core/meta/defaults/view_defaults.py

@@ -1,7 +0,0 @@
-meta_view_default_values = {
-    'data.MetaView': {
-        '__init__': {
-           'allow_insert': False
-        }
-    }
-}