valar 1.3.8__tar.gz → 1.3.10__tar.gz

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

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

{valar-1.3.8 → valar-1.3.10}/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.8"
+version = "1.3.10"
 
 requires = [
     'channels==3.0.3',

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

@@ -15,7 +15,7 @@ class Dao(AbstractDao):
         self.manager = self.dao.manager
 
     def save_many(self, array: list):
-        self.dao.save_many(array)
+        return self.dao.save_many(array)
 
     def save_one(self, item):
         return self.dao.save_one(item)

{valar-1.3.8 → valar-1.3.10}/src/valar/dao/defaults/field_keys_default.py

@@ -54,4 +54,7 @@ meta_field_key_defaults = {
     'valar.Menu': {
         'auth': ('pick', ['icon', 'path', 'name', 'roles', 'is_admin', 'scope']),
     },
+    'valar.Indicator': {
+        'default': ('pick', ['name', 'frequency', 'scope', 'unit', 'file']),
+    },
 }

{valar-1.3.8 → valar-1.3.10}/src/valar/dao/defaults/field_values_default.py

@@ -60,6 +60,7 @@ meta_field_value_defaults = {
             }
         }
     },
+
     'valar.MetaField': {
         "rest": {
             "name": {
@@ -131,5 +132,21 @@ meta_field_value_defaults = {
                 'tool': 'color',
             }
         }
+    },
+    'valar.Indicator': {
+        "__init__": {
+            "frequency": {
+                'column_width': 80,
+            },
+            "unit": {
+                'column_width': 80,
+            },
+            "scope": {
+                'column_width': 80,
+            },
+            "file": {
+                'column_width': 90,
+            }
+        },
     }
 }

{valar-1.3.8 → valar-1.3.10}/src/valar/dao/frame.py

@@ -20,7 +20,7 @@ class MetaFrame(metaclass=SingletonMeta):
             item.update({"saved": True})
             if item['isLeaf']:
                 mapping[code] = _id
-            tool_dao.save_one(item, True)
+            tool_dao.save_one(item)
         for row in meta_field_domain:
             row = copy.deepcopy(row)
             default_id, tools = row['default_id'], row['tools']

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

@@ -38,9 +38,11 @@ class OrmDao(AbstractDao):
         self.fields = fields
 
     def save_many(self, array: list):
+        results = []
         for item in array:
             item.update({'saved': True})
-            self.save_one(item)
+            results.append(self.save_one(item))
+        return results
 
     def values(self, conditions, props: list):
         query_set, _ = self.find(conditions)

{valar-1.3.8 → valar-1.3.10}/src/valar/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.24 on 2025-09-18 18:23
+# Generated by Django 4.2.24 on 2025-09-19 15:34
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,6 +12,24 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        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='已保存')),
+                ('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)),
+            ],
+            options={
+                'verbose_name': '指标集',
+            },
+        ),
         migrations.CreateModel(
             name='Meta',
             fields=[
@@ -252,6 +270,29 @@ class Migration(migrations.Migration):
                 'verbose_name': '视图字段',
             },
         ),
+        migrations.CreateModel(
+            name='Indicator',
+            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='已保存')),
+                ('domain', models.CharField(max_length=100, null=True, verbose_name='domain')),
+                ('category', models.CharField(max_length=100, null=True, verbose_name='category')),
+                ('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='尺度')),
+                ('unit', models.CharField(max_length=100, null=True, verbose_name='单位')),
+                ('object_id', models.CharField(max_length=100, null=True, verbose_name='ObjectId')),
+                ('file', models.FileField(null=True, upload_to='', verbose_name='数据文件')),
+                ('set', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='valar.indicatorset', verbose_name='指标集')),
+            ],
+            options={
+                'verbose_name': '指标项',
+            },
+        ),
         migrations.CreateModel(
             name='Account',
             fields=[

{valar-1.3.8 → valar-1.3.10}/src/valar/models/indicator.py

@@ -2,23 +2,23 @@ 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 IndicatorSet(VTree):
+    name = models.CharField(max_length=100, null=True)
 
     class Meta:
         verbose_name = '指标集'
 
 
-class IndicatorSet(VModel):
+class Indicator(VModel):
+    set = models.ForeignKey(IndicatorSet, null=True, on_delete=models.CASCADE, verbose_name='指标集')
+    domain = models.CharField(max_length=100, verbose_name='domain', null=True)
+    category = models.CharField(max_length=100, verbose_name='category', null=True)
     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)
+    unit = 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 = '指标集'
+        verbose_name = '指标项'

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

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

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

@@ -41,14 +41,6 @@ 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

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

@@ -1,34 +0,0 @@
-# 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

@@ -1,46 +0,0 @@
-# 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

@@ -1,16 +0,0 @@
-# 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

@@ -1,54 +0,0 @@
-# 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

@@ -1,21 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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'),
-        ),
-    ]