deepfos 1.1.47__tar.gz → 1.1.49__tar.gz

{deepfos-1.1.47 → deepfos-1.1.49}/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.1.49] - 2024-11-21
+
+### 变更
+
+* 凭证组件元素table对象增加逻辑表数据库方言信息
+
+## [1.1.48] - 2024-11-19
+
+### 变更
+
+* 维度元素兼容1.0中1.2已不存在的字段处理
+
 ## [1.1.47] - 2024-11-14
 
 ### 变更

{deepfos-1.1.47 → deepfos-1.1.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.47
+Version: 1.1.49
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team

{deepfos-1.1.47 → deepfos-1.1.49}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-13T02:32:25+0000",
+ "date": "2024-11-26T02:28:34+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "afbdac8f1acd9e3227431b4078b601d8a7ea2032",
- "version": "1.1.47"
+ "full-revisionid": "e764c23720721ec089056e2e10f985fdeb9c949c",
+ "version": "1.1.49"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.47 → deepfos-1.1.49}/deepfos/api/V1_2/models/dimension.py

@@ -1064,6 +1064,15 @@ class DimensionMemberOperationDto(BaseModel):
     ud60: Optional[str]
     #: 周，期间类特有属性
     week: Optional[str]
+    # 如下字段仅做维度低版本兼容
+    #: is_modula
+    is_modula: Optional[bool]
+    #: is_base
+    is_base: Optional[bool]
+    #: is_calculated
+    is_calculated: Optional[bool]
+    #: formula
+    formula: Optional[str]
 
 
 class DimensionMemberQuerySw(BaseModel):

{deepfos-1.1.47 → deepfos-1.1.49}/deepfos/element/dimension.py

@@ -124,6 +124,18 @@ class DimMemberV12(DimensionMemberOperationDto):
     def period_level(self):
         return self.periodLevel
 
+    @property
+    def start_year(self):
+        return self.startYear
+
+    @property
+    def start_period(self):
+        return self.startPeriod
+
+    @property
+    def sort_col(self):
+        return self.sortCol
+
 
 ADD = 'add'
 UPD = 'update'
@@ -145,6 +157,13 @@ V10_TO_V12 = {
     'origin_name': 'originName',
     'origin_parent_name': 'originParentName',
     'sharedmember': 'sharedMember',
+    'start_period': 'startPeriod',
+    'start_year': 'startYear',
+    'sort_col': 'sortCol',
+    'is_modula': 'is_modula',
+    'is_base': 'is_base',
+    'is_calculated': 'is_calculated',
+    'formula': 'formula',
 }
 
 

{deepfos-1.1.47 → deepfos-1.1.49}/deepfos/element/journal.py

@@ -2,6 +2,7 @@ import uuid
 
 from pydantic import parse_obj_as
 
+from deepfos.element.datatable import get_table_class
 from deepfos.exceptions import (
     JournalModelSaveError, JournalModelCheckError, JournalModelPostingError
 )
@@ -57,8 +58,6 @@ _escape_table = {
 
 class AsyncJournalModel(ElementBase[JournalModelAPI]):
     """凭证组件"""
-    quote_char = '`'
-
     def __init__(
         self,
         element_name: str,
@@ -77,6 +76,15 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         res = await api.journal_model_data.get_config(element_info)
         return res
 
+    @cached_property
+    def quote_char(self) -> str:
+        try:
+            element_type = self.config.logicTable.dataTableInfo.elementDetail.elementType
+            dbcls = get_table_class(element_type)
+            return dbcls.quote_char
+        except Exception: # noqa
+            return '`'
+
     @cached_property
     def table_name(self) -> str:
         """数据表真实表名"""
@@ -95,7 +103,12 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
             `pypika的github <https://github.com/kayak/pypika#tables-columns-schemas-and-databases>`_
 
         """
-        return Table(self.table_name)
+        try:
+            element_type = self.config.logicTable.dataTableInfo.elementDetail.elementType
+            dbcls = get_table_class(element_type)
+            return Table(self.table_name, query_cls=dbcls.query)
+        except Exception: # noqa
+            return Table(self.table_name)
 
     def _parse_where(self, where: Union[None, Term, EmptyCriterion]) -> str:
         if isinstance(where, (Term, EmptyCriterion)):

{deepfos-1.1.47 → deepfos-1.1.49}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.47
+Version: 1.1.49
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team