valar 1.3.7__tar.gz → 1.3.8__tar.gz

{valar-1.3.7/src/valar.egg-info → valar-1.3.8}/PKG-INFO

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

{valar-1.3.7 → valar-1.3.8}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.7"
+version = "1.3.8"
 
 requires = [
     'channels==3.0.3',

{valar-1.3.7 → valar-1.3.8}/src/valar/dao/__init__.py

@@ -17,8 +17,8 @@ class Dao(AbstractDao):
     def save_many(self, array: list):
         self.dao.save_many(array)
 
-    def save_one(self, item, with_id=False):
-        return self.dao.save_one(item, with_id)
+    def save_one(self, item):
+        return self.dao.save_one(item)
 
     def delete_one(self, _id):
         return self.dao.delete_one(_id)

{valar-1.3.7 → valar-1.3.8}/src/valar/dao/abstract.py

@@ -46,7 +46,7 @@ class AbstractDao(ABC):
         return self.fields[prop]
 
     @abstractmethod
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         pass
 
     @abstractmethod

{valar-1.3.7 → valar-1.3.8}/src/valar/dao/engine.py

@@ -1,10 +1,10 @@
-import pymongo
 from django.apps import apps
 from django.conf import settings
 from urllib.parse import urlparse
 
 from django.core.mail import EmailMessage
 from minio import Minio
+from pymongo import MongoClient
 from pymongo.synchronous.collection import Collection
 
 from ..classes.singleton_meta import SingletonMeta
@@ -26,7 +26,7 @@ class ValarEngine(metaclass=SingletonMeta):
 
         # mon
         if hasattr(settings, 'MONGO_URI'):
-            self.mongo_client = pymongo.MongoClient(
+            self.mongo_client: MongoClient = MongoClient(
                 settings.MONGO_URI,
                 **{
                     'maxPoolSize': 10,
@@ -39,7 +39,7 @@ class ValarEngine(metaclass=SingletonMeta):
             )
             self.mongo_engine = self.mongo_client[settings.BASE_APP]
         else:
-            self.mongo_client = None
+            self.mongo_client: MongoClient = None
             self.mongo_engine = None
 
         # minio

{valar-1.3.7 → valar-1.3.8}/src/valar/dao/mon_dao.py

@@ -57,7 +57,7 @@ class MonDao(AbstractDao):
     def values(self, conditions, props):
         return None
 
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         oid, item = self.__detach_item__(item)
         if oid:
             self.manager.update_one({'_id': oid}, {'$set': item})

{valar-1.3.7 → valar-1.3.8}/src/valar/dao/orm_dao.py

@@ -38,7 +38,9 @@ class OrmDao(AbstractDao):
         self.fields = fields
 
     def save_many(self, array: list):
-        pass
+        for item in array:
+            item.update({'saved': True})
+            self.save_one(item)
 
     def values(self, conditions, props: list):
         query_set, _ = self.find(conditions)
@@ -46,7 +48,7 @@ class OrmDao(AbstractDao):
             props.append('id')
         return list(query_set.values(*props))
 
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         oid, simple_item, complex_item = self.__detach_item__(item)
         query_set = self.manager.filter(id=oid) if oid else []
         if len(query_set):

valar-1.3.8/src/valar/migrations/0001_initial.py

@@ -0,0 +1,301 @@
+# Generated by Django 4.2.24 on 2025-09-18 18:23
+
+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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('db', models.CharField(max_length=100, null=True, verbose_name='数据库')),
+                ('entity', models.CharField(max_length=100, null=True, verbose_name='数据源')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='实体别名')),
+                ('tree', models.BooleanField(default=False, verbose_name='是否树形')),
+            ],
+            options={
+                'verbose_name': '数据实体',
+                'unique_together': {('db', 'entity')},
+            },
+        ),
+        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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('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='代码')),
+                ('align', models.CharField(max_length=10, null=True, verbose_name='对齐方式')),
+            ],
+            options={
+                'verbose_name': '元数据字段工具',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaViewDefault',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+            ],
+            options={
+                'verbose_name': '元数据字段类型',
+            },
+        ),
+        migrations.CreateModel(
+            name='Role',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('duty', models.TextField(null=True, verbose_name='职责描述')),
+            ],
+            options={
+                'verbose_name': '角色',
+            },
+        ),
+        migrations.CreateModel(
+            name='Valar',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('text_field', models.TextField(null=True, verbose_name='Text Field')),
+                ('boolean_field', models.BooleanField(null=True, verbose_name='Boolean Field')),
+                ('integer_field', models.IntegerField(null=True, verbose_name='Integer Field')),
+                ('float_field', models.FloatField(null=True, verbose_name='Float Field')),
+                ('date_field', models.DateField(null=True, verbose_name='Date Field')),
+                ('datetime_field', models.DateTimeField(null=True, verbose_name='Datetime Field')),
+                ('time_field', models.TimeField(null=True, verbose_name='Time Field')),
+                ('json_field', models.JSONField(null=True, verbose_name='Json Field')),
+                ('file', models.FileField(null=True, upload_to='', verbose_name='File Field')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Voo',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='Name')),
+                ('valar', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='valar.valar', verbose_name='Valar')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Vmo',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='Name')),
+                ('valar', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='valar.valar', verbose_name='Valar')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Vmm',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('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')),
+                ('valars', models.ManyToManyField(to='valar.valar', verbose_name='valars')),
+            ],
+            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='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('property', models.JSONField(default=dict, verbose_name='属性')),
+                ('code', models.CharField(default='default ', max_length=50, verbose_name='类视图')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='视图名称')),
+                ('lock', models.BooleanField(default=False, verbose_name='锁定元数据')),
+                ('enable', models.BooleanField(default=True, verbose_name='是否启用')),
+                ('form_width', models.IntegerField(null=True, verbose_name='表单宽度')),
+                ('form_height', models.IntegerField(null=True, verbose_name='表单高度')),
+                ('table_width', models.IntegerField(null=True, verbose_name='表格宽度')),
+                ('table_height', models.IntegerField(null=True, verbose_name='表格高度')),
+                ('allow_search', 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_edit_on_form', models.BooleanField(default=True, verbose_name='表单编辑')),
+                ('allow_edit_on_cell', models.BooleanField(default=True, verbose_name='表内编辑')),
+                ('allow_edit_on_sort', 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='valar.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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=255, null=True, unique=True, verbose_name='名称')),
+                ('default', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='valar.metafieldtool', verbose_name='默认工具')),
+                ('tools', models.ManyToManyField(to='valar.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, verbose_name='已保存')),
+                ('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='格式')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
+                ('allow_edit', 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=True, verbose_name='可上传')),
+                ('allow_update', models.BooleanField(default=True, verbose_name='可更新')),
+                ('unit', models.CharField(max_length=55, null=True, verbose_name='单位符')),
+                ('column_width', models.FloatField(default=0, verbose_name='表头宽度')),
+                ('align', models.CharField(max_length=55, null=True, 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='valar.metaview', verbose_name='数据视图')),
+            ],
+            options={
+                'verbose_name': '视图字段',
+            },
+        ),
+        migrations.CreateModel(
+            name='Account',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('username', models.CharField(max_length=255, null=True, unique=True, verbose_name='账号')),
+                ('password', models.CharField(max_length=255, null=True, verbose_name='密码')),
+                ('email', models.CharField(max_length=255, null=True, unique=True, verbose_name='邮箱')),
+                ('is_admin', models.BooleanField(default=False, verbose_name='超级管理员')),
+                ('is_active', models.BooleanField(default=False, verbose_name='激活状态')),
+                ('token', models.CharField(max_length=255, null=True, verbose_name='Token')),
+                ('roles', models.ManyToManyField(to='valar.role')),
+            ],
+            options={
+                'verbose_name': '账户信息',
+            },
+        ),
+        migrations.CreateModel(
+            name='Menu',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='域')),
+                ('path', models.CharField(max_length=255, null=True, verbose_name='地址')),
+                ('is_admin', models.BooleanField(default=False, null=True, verbose_name='超管权限')),
+                ('is_auth', models.BooleanField(default=False, null=True, verbose_name='需要登录')),
+                ('roles', models.ManyToManyField(to='valar.role')),
+            ],
+            options={
+                'verbose_name': '菜单',
+                'unique_together': {('scope', 'path')},
+            },
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0002_indicatortree.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IndicatorTree',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('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='名称')),
+                ('frequency', models.CharField(max_length=100, null=True, verbose_name='频度')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='尺度')),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0003_remove_indicatortree_frequency_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0002_indicatortree'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='indicatortree',
+            name='frequency',
+        ),
+        migrations.RemoveField(
+            model_name='indicatortree',
+            name='scope',
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V1',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V2',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V3',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V4',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='indicatortree',
+            name='name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0004_delete_indicatortree.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0003_remove_indicatortree_frequency_and_more'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='IndicatorTree',
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0005_indicatortree_indicatorset.py

@@ -0,0 +1,54 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0004_delete_indicatortree'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IndicatorTree',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('V1', models.CharField(max_length=100, null=True)),
+                ('V2', models.CharField(max_length=100, null=True)),
+                ('V3', models.CharField(max_length=100, null=True)),
+                ('V4', models.CharField(max_length=100, null=True)),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+        migrations.CreateModel(
+            name='IndicatorSet',
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='名称')),
+                ('frequency', models.CharField(max_length=100, null=True, verbose_name='频度')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='尺度')),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0006_alter_indicatorset_unique_together_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0005_indicatortree_indicatorset'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='indicatorset',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='indicatortree',
+            unique_together=set(),
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0007_indicatorset_file_indicatorset_unit.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0006_alter_indicatorset_unique_together_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indicatorset',
+            name='file',
+            field=models.FileField(null=True, upload_to='', verbose_name='数据文件'),
+        ),
+        migrations.AddField(
+            model_name='indicatorset',
+            name='unit',
+            field=models.CharField(max_length=100, null=True, verbose_name='尺度'),
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0008_indicatorset_object_id_alter_indicatorset_unit.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0007_indicatorset_file_indicatorset_unit'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indicatorset',
+            name='object_id',
+            field=models.CharField(max_length=100, null=True, verbose_name='尺度'),
+        ),
+        migrations.AlterField(
+            model_name='indicatorset',
+            name='unit',
+            field=models.CharField(max_length=100, null=True, verbose_name='单位'),
+        ),
+    ]

valar-1.3.8/src/valar/migrations/0009_alter_indicatorset_object_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0008_indicatorset_object_id_alter_indicatorset_unit'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='indicatorset',
+            name='object_id',
+            field=models.CharField(max_length=100, null=True, verbose_name='ObjectId'),
+        ),
+    ]

valar-1.3.8/src/valar/models/__init__.py

@@ -0,0 +1 @@
+from . import core, frame, meta, auth, test, indicator

valar-1.3.8/src/valar/models/indicator.py

@@ -0,0 +1,24 @@
+from ..models.core import VTree, VModel
+from django.db import models
+
+
+class IndicatorTree(VTree):
+    V1 = models.CharField(max_length=100, null=True)
+    V2 = models.CharField(max_length=100, null=True)
+    V3 = models.CharField(max_length=100, null=True)
+    V4 = models.CharField(max_length=100, null=True)
+
+    class Meta:
+        verbose_name = '指标集'
+
+
+class IndicatorSet(VModel):
+    name = models.CharField(max_length=100, verbose_name='名称', null=True)
+    frequency = models.CharField(max_length=100, verbose_name='频度', null=True)
+    unit = models.CharField(max_length=100, verbose_name='单位', null=True)
+    scope = models.CharField(max_length=100, verbose_name='尺度', null=True)
+    object_id = models.CharField(max_length=100, verbose_name='ObjectId', null=True)
+    file = models.FileField(null=True, verbose_name='数据文件')
+
+    class Meta:
+        verbose_name = '指标集'

{valar-1.3.7 → valar-1.3.8}/src/valar/views/rest.py

@@ -78,7 +78,7 @@ def search(request, db, entity):
     dao = Dao(entity, db)
 
     qs, _ = dao.find(conditions)
-    qs.filter(saved=False).delete()
+    if db == 'orm': qs.filter(saved=False).delete()
 
     if _type == 'tree':
         query_set = dao.tree(root, conditions)

{valar-1.3.7 → valar-1.3.8/src/valar.egg-info}/PKG-INFO

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

{valar-1.3.7 → valar-1.3.8}/src/valar.egg-info/SOURCES.txt

@@ -40,11 +40,21 @@ src/valar/dao/defaults/__init__.py
 src/valar/dao/defaults/field_keys_default.py
 src/valar/dao/defaults/field_values_default.py
 src/valar/dao/defaults/view_defaults.py
+src/valar/migrations/0001_initial.py
+src/valar/migrations/0002_indicatortree.py
+src/valar/migrations/0003_remove_indicatortree_frequency_and_more.py
+src/valar/migrations/0004_delete_indicatortree.py
+src/valar/migrations/0005_indicatortree_indicatorset.py
+src/valar/migrations/0006_alter_indicatorset_unique_together_and_more.py
+src/valar/migrations/0007_indicatorset_file_indicatorset_unit.py
+src/valar/migrations/0008_indicatorset_object_id_alter_indicatorset_unit.py
+src/valar/migrations/0009_alter_indicatorset_object_id.py
 src/valar/migrations/__init__.py
 src/valar/models/__init__.py
 src/valar/models/auth.py
 src/valar/models/core.py
 src/valar/models/frame.py
+src/valar/models/indicator.py
 src/valar/models/meta.py
 src/valar/models/test.py
 src/valar/views/__init__.py

valar-1.3.7/src/valar/models/__init__.py

@@ -1 +0,0 @@
-from . import core, frame, meta, auth, test