tpltable 0.3.2__tar.gz → 0.3.3__tar.gz

{tpltable-0.3.2 → tpltable-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tpltable
-Version: 0.3.2
+Version: 0.3.3
 Summary: define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{tpltable-0.3.2 → tpltable-0.3.3}/setup.py

@@ -5,7 +5,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='tpltable',
-    version='0.3.2',
+    version='0.3.3',
     description='define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)',
     author_email='2229066748@qq.com',
     maintainer="Eagle'sBaby",

{tpltable-0.3.2 → tpltable-0.3.3}/tpltable/basic.py

@@ -19,7 +19,8 @@ from openpyxl.styles import Font, Color, Alignment, Border, Side, PatternFill
 NaN = pd.NA
 nan = pd.NA
 
-isnan = pd.isna
+def isnan(value):
+    return pd.isna(value) or str(value) == 'nan'
 
 # NOTE: Colorama Start -------------------------------------------------------------------------->
 # 初始化colorama

tpltable-0.3.3/tpltable/core.py

@@ -0,0 +1,12 @@
+from tpltable.basic import *
+
+
+class UnitCell:
+    def __init__(self, value, style):
+        self.value = value
+        self.style = style
+
+    def __str__(self):
+        return str(self.value)
+
+

{tpltable-0.3.2 → tpltable-0.3.3}/tpltable/excel.py

@@ -342,6 +342,7 @@ class ExcelFileIOException(Exception):
 
 
 class Excel(ListkeysDict):
+    _DEFAULT_PREFIX = 'Sheet'
     def __init__(self, fpath: str = None, *, style: bool = True):
         """
         *Create an Excel object from an excel file or empty

{tpltable-0.3.2 → tpltable-0.3.3}/tpltable/style.py

@@ -77,6 +77,24 @@ COLOR_MAGENTA = '00FF00FF'
 COLOR_DARKMAGENTA = '00800080'
 COLOR_LIGHTMAGENTA = '00FFC0CB'
 
+SIDE_THIN_BLACK = Side(style='thin', color=COLOR_BLACK)
+
+BORDER_LTRB = Border(SIDE_THIN_BLACK, SIDE_THIN_BLACK, SIDE_THIN_BLACK, SIDE_THIN_BLACK)
+BORDER_NOLEFT = Border(None, SIDE_THIN_BLACK, SIDE_THIN_BLACK, SIDE_THIN_BLACK)
+BORDER_NORIGHT = Border(SIDE_THIN_BLACK, None, SIDE_THIN_BLACK, SIDE_THIN_BLACK)
+BORDER_NOTOP = Border(SIDE_THIN_BLACK, SIDE_THIN_BLACK, None, SIDE_THIN_BLACK)
+BORDER_NOBOTTOM = Border(SIDE_THIN_BLACK, SIDE_THIN_BLACK, SIDE_THIN_BLACK, None)
+BORDER_LT = Border(SIDE_THIN_BLACK, SIDE_THIN_BLACK, None, None)
+BORDER_RB = Border(None, None, SIDE_THIN_BLACK, SIDE_THIN_BLACK)
+BORDER_LB = Border(SIDE_THIN_BLACK, None, None, SIDE_THIN_BLACK)
+BORDER_RT = Border(None, SIDE_THIN_BLACK, SIDE_THIN_BLACK, None)
+BORDER_LR = Border(SIDE_THIN_BLACK, SIDE_THIN_BLACK, None, None)
+BORDER_TB = Border(None, None, SIDE_THIN_BLACK, SIDE_THIN_BLACK)
+BORDER_L = Border(SIDE_THIN_BLACK, None, None, None)
+BORDER_R = Border(None, SIDE_THIN_BLACK, None, None)
+BORDER_T = Border(None, None, SIDE_THIN_BLACK, None)
+BORDER_B = Border(None, None, None, SIDE_THIN_BLACK)
+
 
 def _GetCellStyle(ws, cell, style_type: str) -> object:
     if style_type == TYPE_COLOR:
@@ -241,11 +259,11 @@ class Style:
             #         border_style: Incomplete | None = None,
             _l, _r, _t, _b, _diag = _bd.left, _bd.right, _bd.top, _bd.bottom, _bd.diagonal
             return {
-                'left': {'style': _l.style, 'color': _l.color, 'border_style': _l.border_style},
-                'right': {'style': _r.style, 'color': _r.color, 'border_style': _r.border_style},
-                'top': {'style': _t.style, 'color': _t.color, 'border_style': _t.border_style},
-                'bottom': {'style': _b.style, 'color': _b.color, 'border_style': _b.border_style},
-                'diagonal': {'style': _diag.style, 'color': _diag.color, 'border_style': _diag.border_style},
+                'left': {'style': _l.style, 'color': _l.color, 'border_style': _l.border_style} if _l is not None else None,
+                'right': {'style': _r.style, 'color': _r.color, 'border_style': _r.border_style} if _r is not None else None,
+                'top': {'style': _t.style, 'color': _t.color, 'border_style': _t.border_style} if _t is not None else None,
+                'bottom': {'style': _b.style, 'color': _b.color, 'border_style': _b.border_style} if _b is not None else None,
+                'diagonal': {'style': _diag.style, 'color': _diag.color, 'border_style': _diag.border_style} if _diag is not None else None,
                 'diagonal_direction': _bd.diagonal_direction,
                 'vertical': _bd.vertical, 'horizontal': _bd.horizontal,
                 'diagonalUp': _bd.diagonalUp, 'diagonalDown': _bd.diagonalDown,
@@ -301,6 +319,9 @@ class Style:
         self[key] = value
 
 
+
+
+
 def _raw_style() -> Style:
     wb = Workbook()
     ws = wb.active

{tpltable-0.3.2 → tpltable-0.3.3}/tpltable/table.py

@@ -4,7 +4,7 @@ import warnings
 import numpy as np
 import pandas as pd
 from tpltable.core import *
-from tpltable.style import Style
+from tpltable.style import Style, TYPE_BORDER
 
 _PAT_COORD = re.compile(r"([A-Z]+)(\d+)")
 class EMPTY_INDEX:
@@ -43,6 +43,34 @@ class _ExcelIndexsLike_1DArray:
 
         self._reindex()
 
+    @staticmethod
+    def _retype_to_unitcell(_from):
+        if isinstance(_from, pd.Series):
+            if len(_from) and not isinstance(_from.iloc[0]):
+                ...
+            self._sr = _from
+            if copy:
+                self._sr = self._sr.copy()
+        elif isinstance(_from, np.ndarray):
+            # check shape
+            s = _from.shape
+            if np.ndim(_from) != 1:
+                raise ValueError(f"Only 1D array is supported. But got {np.ndim(_from)}D array.(shape={s})")
+            if _from.shape[0] != 0:
+                ...
+
+        elif isinstance(_from, list):
+            try:
+                arr = np.array(_from)
+                s = arr.shape
+                if np.ndim(arr) != 1:
+                    raise ValueError(f"Only 1D array is supported. But got {np.ndim(arr)}D array from list.(shape={s})")
+                self._sr = pd.Series(arr)
+            except Exception as e:
+                raise ValueError(f"Failed to convert list to 1D array. {e}")
+        else:
+            raise ValueError(f"Unsupported type: {type(_from)}")
+
     def _reindex(self):
         if self._CLS_DEFAULT_INDEX_TYPE == "s":
             self._sr.index = [get_column_letter(i + 1) for i in range(self.size)]
@@ -61,6 +89,9 @@ class _ExcelIndexsLike_1DArray:
 
         return txt
 
+    def __len__(self):
+        return self.size
+
     @property
     def size(self):
         return self._sr.shape[0]
@@ -776,6 +807,13 @@ class _ExcelIndexsLike_2DArray:
         sr, sc = self._df.shape
         sr, sc = sr - 1, sc - 1
 
+        if isinstance(ir, slice):
+            ir = ir.stop if ir.stop is not None else sr
+
+        if isinstance(ic, slice):
+            ic = ic.stop if ic.stop is not None else sc
+
+
         if ir is None:
             ir = sr
         if ic is None:
@@ -787,9 +825,9 @@ class _ExcelIndexsLike_2DArray:
 
         # enlarge the table
         _2d_list = self._df.values.tolist()
-        if ir >= sr:
+        if ir > sr:
             _2d_list += [[fill] * sc for _ in range(ir - sr)]
-        if ic >= sc:
+        if ic > sc:
             for _l in _2d_list:
                 _l.extend([fill] * (ic - sc))
         self._reconstruct(_2d_list, *self._other_raws, copy=False)
@@ -842,7 +880,7 @@ class _ExcelIndexsLike_2DArray:
                 _i0 = slice(None)
             elif _is_i1_slice and _i1.start is None and _i1.stop is None:
                 _i1 = None
-            else:  # 单个元素赋值
+            else:  # 元素赋值
                 self._enlarge(_i0, _i1, fill=np.nan)
                 self._df.iloc[_i0, _i1] = value
 
@@ -957,6 +995,7 @@ class _ExcelIndexsLike_2DArray:
                 row.extend(values)
         self._reconstruct(_construct, *self._other_raws, copy=False)
 
+
     def clear(self):
         """
         Clear the table
@@ -1002,9 +1041,9 @@ class _ExcelIndexsLike_2DArray:
 
         # 先考虑扩张
         if _r < _new_r:
-            self.append([[fill.copy() if _has_fill_copy else fill] * _c for _ in range(_new_r - _r)], axis=0)
+            self.append(*[[fill.copy() if _has_fill_copy else fill] * _c for _ in range(_new_r - _r)], axis=0)
         if _c < _new_c:
-            self.append([fill.copy() if _has_fill_copy else fill for _ in range(_new_c - _c)], axis=1)
+            self.append(*[fill.copy() if _has_fill_copy else fill for _ in range(_new_c - _c)], axis=1)
 
         # 再考虑缩小 NOTE: 缩小不必考虑label的问题
         if _r > _new_r:
@@ -1033,6 +1072,9 @@ class _ExcelIndexsLike_2DArray:
             return not self._df.equals(other._df)
         return np.array(self._df) != other
 
+    def __len__(self):
+        return self.shape[0]
+
 
 
 class StyleRow(Row):
@@ -1075,7 +1117,7 @@ class Table(_ExcelIndexsLike_2DArray):
     # def __init__(self, _from=None, *, copy: bool = True):
     def __init__(self, data=None, styles=None, merges:list=None, *, copy: bool = True):
         super().__init__(data, copy=copy)
-        self._styles = StyleTable() if styles is None else StyleTable(styles)
+        self._styles = StyleTable() if styles is None else (styles.copy() if isinstance(styles, StyleTable) else StyleTable(styles))
         self._merges = []
 
         self.__raw_merges = merges
@@ -1101,7 +1143,7 @@ class Table(_ExcelIndexsLike_2DArray):
     def merges(self):
         return self._merges
 
-    def merge(self, key:U[int, str, slice, None], key1:U[int, str, slice, None]=EMPTY_INDEX):
+    def merge(self, key:U[int, str, slice, None], key1:U[int, str, slice, None]=EMPTY_INDEX, *, border:Border=None):
         if key1 is not EMPTY_INDEX:
             key = key, key1
 
@@ -1139,6 +1181,9 @@ class Table(_ExcelIndexsLike_2DArray):
 
         self._merges.append((lt, rb))
 
+        if border is not None:
+            self._styles[key].set(TYPE_BORDER, border)
+
     def _reconstruct(self, *args, **kwargs):
         """
         用于缩小或扩大表格时自动同步调整styles

{tpltable-0.3.2 → tpltable-0.3.3}/tpltable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tpltable
-Version: 0.3.2
+Version: 0.3.3
 Summary: define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

tpltable-0.3.2/tpltable/core.py

@@ -1 +0,0 @@
-from tpltable.basic import *