valar 1.0.18__tar.gz → 1.0.20__tar.gz

{valar-1.0.18/src/valar.egg-info → valar-1.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.18
+Version: 1.0.20
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
@@ -11,6 +11,10 @@ Requires-Dist: channels==3.0.3
 Requires-Dist: pymongo~=4.11.2
 Requires-Dist: asgiref~=3.8.1
 Requires-Dist: django-cors-headers==4.2.0
+Requires-Dist: pandas==2.2.3
+Requires-Dist: openpyxl==3.1.5
+Requires-Dist: deepmerge~=2.0
+Requires-Dist: minio==7.2.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -32,7 +36,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-""" Minimized compulsory settings """
+
+""" DataSource """
 
 DATABASES = {
     'default': {
@@ -41,6 +46,22 @@ DATABASES = {
     }
 }
 
+MONGO_SETTINGS = {
+    'host': '47.98.192.120',
+    'port': 27017,
+    "username": "admin",
+    "password": '19870120'
+}
+
+MINIO_SETTINGS = {
+    'endpoint': '10.134.10.92:9000',
+    'access_key': 'admin',
+    "secret_key": "19870120",
+    'secure': False
+}
+
+""" Minimized compulsory settings """
+
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
@@ -67,6 +88,7 @@ ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
+
 """ Optional settings """
 # ALLOWED_HOSTS = ['*']
 # LANGUAGE_CODE = 'en-us'
@@ -81,27 +103,27 @@ VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
 # root urls
 ```python
-from django.urls import path
+from django.urls import path, include
 
 from valar.channels import ValarSocketSender
 from valar.channels.views import handel_channel
 
 urlpatterns = [
     path('socket/<str:handler>', handel_channel),
+    path('data/', include('valar.data.urls')),
 ]
 
 
-async def test_handler(data, sender: ValarSocketSender):
-    # print(data, sender.handler, sender.client, sender.uid)
-    await sender.to_users({'user': 15}, 15)
-    for i in range(3):
-        await sender.to_clients({'h': i},sender.client)
-
-
 channel_handler_mapping = {
-    'test': test_handler
+    # 'test': test_handler
 }
 
+# async def test_handler(data, sender: ValarSocketSender):
+#     # print(data, sender.handler, sender.client, sender.uid)
+#     await sender.to_users({'user': 15}, 15)
+#     for i in range(3):
+#         await sender.to_clients({'h': i},sender.client)
+
 ```
 
 

{valar-1.0.18 → valar-1.0.20}/README.md

@@ -10,7 +10,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-""" Minimized compulsory settings """
+
+""" DataSource """
 
 DATABASES = {
     'default': {
@@ -19,6 +20,22 @@ DATABASES = {
     }
 }
 
+MONGO_SETTINGS = {
+    'host': '47.98.192.120',
+    'port': 27017,
+    "username": "admin",
+    "password": '19870120'
+}
+
+MINIO_SETTINGS = {
+    'endpoint': '10.134.10.92:9000',
+    'access_key': 'admin',
+    "secret_key": "19870120",
+    'secure': False
+}
+
+""" Minimized compulsory settings """
+
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
@@ -45,6 +62,7 @@ ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
+
 """ Optional settings """
 # ALLOWED_HOSTS = ['*']
 # LANGUAGE_CODE = 'en-us'
@@ -59,27 +77,27 @@ VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
 # root urls
 ```python
-from django.urls import path
+from django.urls import path, include
 
 from valar.channels import ValarSocketSender
 from valar.channels.views import handel_channel
 
 urlpatterns = [
     path('socket/<str:handler>', handel_channel),
+    path('data/', include('valar.data.urls')),
 ]
 
 
-async def test_handler(data, sender: ValarSocketSender):
-    # print(data, sender.handler, sender.client, sender.uid)
-    await sender.to_users({'user': 15}, 15)
-    for i in range(3):
-        await sender.to_clients({'h': i},sender.client)
-
-
 channel_handler_mapping = {
-    'test': test_handler
+    # 'test': test_handler
 }
 
+# async def test_handler(data, sender: ValarSocketSender):
+#     # print(data, sender.handler, sender.client, sender.uid)
+#     await sender.to_users({'user': 15}, 15)
+#     for i in range(3):
+#         await sender.to_clients({'h': i},sender.client)
+
 ```
 
 

{valar-1.0.18 → valar-1.0.20}/setup.py

@@ -6,11 +6,20 @@ with open("README.md", "r", encoding="utf-8") as f:
 # with open('requirements.txt', "r", encoding="utf-8") as f:
 #     required = f.read().splitlines()
 
-requires = ['channels==3.0.3','pymongo~=4.11.2','asgiref~=3.8.1','django-cors-headers==4.2.0']
+requires = [
+    'channels==3.0.3',
+    'pymongo~=4.11.2',
+    'asgiref~=3.8.1',
+    'django-cors-headers==4.2.0',
+    'pandas==2.2.3',
+    'openpyxl==3.1.5',
+    'deepmerge~=2.0',
+    'minio==7.2.2'
+]
 
 setup(
     name="valar",  # 包名
-    version="1.0.18",  # 版本号
+    version="1.0.20",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

valar-1.0.20/src/valar/data/file/__init__.py

@@ -0,0 +1,91 @@
+import json
+from io import BytesIO
+
+from django.conf import settings
+from minio import Minio
+from urllib3 import HTTPResponse
+
+def minio_upload_object(bucket_name, object_name, _bytes):
+    client = __get_minio_client__()
+    __create_bucket__(bucket_name, client)
+    file_data = BytesIO(_bytes)
+    file_size = len(_bytes)  # file.siz
+    client.put_object(bucket_name=bucket_name, object_name=object_name, data=file_data, length=file_size)
+    return f'{bucket_name}/{object_name}'
+
+def minio_remove_object(bucket_name, object_name):
+    client = __get_minio_client__()
+    client.remove_object(bucket_name=bucket_name, object_name=object_name)
+
+def minio_remove_path(path):
+    [bucket_name, object_name] = path.split('/')
+    client = __get_minio_client__()
+    client.remove_object(bucket_name=bucket_name, object_name=object_name)
+
+
+def minio_read_object(bucket_name, object_name) -> HTTPResponse:
+    client = __get_minio_client__()
+    return client.get_object(bucket_name=bucket_name, object_name=object_name)
+
+
+
+
+
+def __get_minio_client__(bucket_name=None):
+    options = settings.MINIO_SETTINGS
+    client =  Minio(**options)
+    if bucket_name:
+        __create_bucket__(bucket_name, client)
+    return client
+
+def __create_bucket__(bucket_name, client=None):
+    client = client or __get_minio_client__()
+    exists = client.bucket_exists(bucket_name)
+    if not exists:
+        client.make_bucket(bucket_name)
+        policy = generate_policy(bucket_name)
+        client.set_bucket_policy(bucket_name, policy)
+
+
+def get_minio_bucket_name(entity):
+    value = f'{settings.BASE_DIR.name}.{entity}'
+    bucket_name = value.replace('_','-').lower()
+    __create_bucket__(bucket_name)
+    return bucket_name
+
+def get_minio_object_name(_id, prop, file_name):
+    return f"{_id}-{prop}-{file_name}"
+
+def generate_policy(bucket_name):
+    return json.dumps({
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:GetBucketLocation",
+                "Resource": f"arn:aws:s3:::{bucket_name}"
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:ListBucket",
+                "Resource": f"arn:aws:s3:::{bucket_name}"
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:GetObject",
+                "Resource": f"arn:aws:s3:::{bucket_name}/*"
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:PutObject",
+                "Resource": f"arn:aws:s3:::{bucket_name}/*"
+            }
+      ]})

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

@@ -0,0 +1,238 @@
+# Generated by Django 4.2.21 on 2025-05-17 11:07
+
+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='代码')),
+                ('format', models.JSONField(default=dict, verbose_name='格式参数')),
+            ],
+            options={
+                'verbose_name': '元数据字段工具',
+            },
+        ),
+        migrations.CreateModel(
+            name='TestM',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='<UNK>')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Vala',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('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)),
+                ('text_field', models.TextField(null=True, verbose_name='text')),
+                ('boolean_field', models.BooleanField(null=True, verbose_name='boolean')),
+                ('integer_field', models.IntegerField(null=True, verbose_name='integer')),
+                ('float_field', models.FloatField(null=True, verbose_name='float')),
+                ('date_field', models.DateField(null=True, verbose_name='date')),
+                ('datetime_field', models.DateTimeField(null=True, verbose_name='datetime')),
+                ('time_field', models.TimeField(null=True, verbose_name='time')),
+                ('json_field', models.JSONField(null=True, verbose_name='json')),
+                ('file', models.FileField(null=True, upload_to='', verbose_name='File')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ValaTree',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('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='图标')),
+                ('text', models.TextField(null=True, verbose_name='text')),
+            ],
+            options={
+                'verbose_name': '树形测试',
+            },
+        ),
+        migrations.CreateModel(
+            name='O2O',
+            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=100, null=True, verbose_name='name')),
+                ('vala', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='data.vala', verbose_name='vala')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        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='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('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='类视图')),
+                ('view_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': '视图字段',
+            },
+        ),
+        migrations.CreateModel(
+            name='M2O',
+            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=100, null=True, verbose_name='name')),
+                ('vala', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='data.vala', verbose_name='vala')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='M2M',
+            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=100, null=True, verbose_name='name')),
+                ('valas', models.ManyToManyField(to='data.vala', verbose_name='valas')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

{valar-1.0.18 → valar-1.0.20}/src/valar/data/models.py

@@ -4,6 +4,7 @@ from django.db.models.fields.files import FieldFile
 
 
 class VModel(models.Model):
+    objects = models.Manager()
     sort = models.BigIntegerField(null=True, verbose_name='序号')
     name = models.CharField(max_length=50, null=True)
     create_time = models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')
@@ -180,15 +181,23 @@ class MetaFieldTool(VTree):
         verbose_name = '元数据字段工具'
 #
 #
+class TestM(models.Model):
+    name = models.CharField(max_length=100, verbose_name='<UNK>')
+
 class MetaFieldDomain(VModel):
     name = models.CharField(max_length=255, unique=True, null=True, verbose_name='名称')
     tools = models.ManyToManyField(to=MetaFieldTool, verbose_name='工具集')
-    default = models.ForeignKey(to=MetaFieldTool, null=True, on_delete=models.SET_NULL, related_name='+',
-                                verbose_name='默认工具')
-    search = models.ForeignKey(to=MetaFieldTool, null=True, on_delete=models.SET_NULL, related_name='+',
-                               verbose_name='搜索工具')
+    default = models.ForeignKey(
+        to=MetaFieldTool, null=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        verbose_name='默认工具')
+    search = models.ForeignKey(
+        to=MetaFieldTool, null=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        verbose_name='搜索工具')
     align = models.CharField(max_length=10, null=True, verbose_name='对齐方式')
-
     class Meta:
         verbose_name = '元数据字段类型'
 
@@ -222,6 +231,6 @@ class O2O(VModel):
     name = models.CharField(max_length=100, null=True, verbose_name='name')
 
 
-class M2M(VModel):
+class M2M(VTree):
     valas = models.ManyToManyField(to=Vala, verbose_name='valas')
     name = models.CharField(max_length=100, null=True, verbose_name='name')

{valar-1.0.18 → valar-1.0.20}/src/valar/data/orm/__init__.py

@@ -1,14 +1,18 @@
 import datetime
 from django.apps import apps
 from django.core.paginator import Paginator
-from django.db.models import Manager, QuerySet
+from django.db.models import Manager, QuerySet, FileField
 
+from .meta_frame import load_meta_frame
+from ..file import minio_remove_path
 from ..orm.detacher import detach_props, save_detached
 from ..orm.meta_loader import load_meta, load_view, load_meta_field
-from ..models import VModel
+from ..models import VModel, VTree
 from ..query import Query
 
 
+load_meta_frame()
+
 def load_model(entity=None):
     mapping = {}
     for mod in apps.get_models():
@@ -31,12 +35,13 @@ class OrmDao:
         if param is None:
             raise Exception('no entity named %s' % entity)
         self.model = param[0]
+        self.isTree = issubclass(self.model, VTree)
         self.name: str = param[1]
         self.manager: Manager = self.model.objects
         self.meta_fields = {}
         self.model_fields = {}
         for field in self.model._meta.get_fields():
-            _field = load_meta_field(field)
+            _field = load_meta_field(field, self.isTree)
             prop = _field['prop']
             self.model_fields[prop] = field
             self.meta_fields[prop] = _field
@@ -45,7 +50,6 @@ class OrmDao:
     def tree(self, query: Query, root_id = 0):
         all_set, _ = self.find_many(Query())
         includes, excludes = query.orm_conditions()
-        print(root_id)
         if not len(includes) + len(excludes) + root_id:
             return all_set
         values = all_set.values('id','pid')
@@ -62,6 +66,19 @@ class OrmDao:
                 id_set.update(route)
         return all_set.filter(id__in=id_set).order_by('-sort')
 
+    def __check_remove_file__(self, query_set, template:dict = None):
+        props = [key for key in self.model_fields if type(self.model_fields[key]) == FileField]
+        keys = [ key for key in props if template.get(key, 1) is None] if template else  props
+        if len(keys):
+            values = query_set.values(*props)
+            for row in values:
+                for path in row.values():
+                    if path:
+                        print(path)
+                        minio_remove_path(path)
+
+
+
     def save_one(self, item):
         _item = detach_props(item, self.meta_fields.values())
         _id = item.get('id',0)
@@ -69,6 +86,7 @@ class OrmDao:
         if len(query_set):
             del item['id']
             item['modify_time'] = datetime.datetime.now()
+            self.__check_remove_file__(query_set,item)
             query_set.update(**item)
             bean = query_set.first()
         else:
@@ -79,13 +97,18 @@ class OrmDao:
         return bean
 
     def update_many(self, query: Query, template):
-        self.find_many(query).update(**template)
+        query_set, total = self.find_many(query)
+        query_set.update(**template)
 
     def delete_one(self, _id):
-        self.manager.filter(id=_id).delete()
+        query_set = self.manager.filter(id=_id)
+        self.__check_remove_file__(query_set)
+        query_set.delete()
 
     def delete_many(self, query: Query):
-        self.find_many(query)[0].delete()
+        query_set, total = self.find_many(query)
+        self.__check_remove_file__(query_set)
+        query_set.delete()
 
     def find_one(self, _id):
         return self.manager.filter(id=_id).first()
@@ -104,7 +127,9 @@ class OrmDao:
         omit = [ 'id', 'saved', 'sort', 'create_time', 'modify_time']
         fields = [ self.meta_fields[prop] for prop in self.meta_fields if prop not in omit]
         view =  load_view(self.entity, code, self.name, fields)
-        return load_meta(view)
+        _view = load_meta(view)
+        _view['isTree'] = self.isTree
+        return _view