ex4nicegui 0.8.6__py3-none-any.whl → 0.8.8__py3-none-any.whl

ex4nicegui/reactive/EChartsComponent/ECharts.js

@@ -1,6 +1,13 @@
 import 'echarts'
 import { convertDynamicProperties } from "../../static/utils/dynamic_properties.js";
 
+const registerThemeTask = Promise.all(
+  (echarts._ex4ng_themes || []).map(async ({ name, url }) => {
+    const data = await fetch(url).then(response => response.json());
+    echarts.registerTheme(name, data);
+  })
+);
+
 function collectMapRegisterTask() {
   const tasks = new Map();
 
@@ -57,6 +64,8 @@ export default {
   async mounted() {
     await new Promise((resolve) => setTimeout(resolve, 0)); // wait for Tailwind classes to be applied
 
+    await registerThemeTask;
+
     this.chart = echarts.init(this.$el, this.theme, this.initOptions);
     this.resizeObs = new ResizeObserver(this.chart.resize)
 

ex4nicegui/reactive/EChartsComponent/ECharts.py

@@ -28,6 +28,7 @@ class echarts(Element, component="ECharts.js", dependencies=libraries):  # type:
         options: Optional[dict] = None,
         code: Optional[str] = None,
         init_options: Optional[dict] = None,
+        theme: Optional[str] = None,
     ) -> None:
         super().__init__()
 
@@ -47,6 +48,9 @@ class echarts(Element, component="ECharts.js", dependencies=libraries):  # type:
         self._props["initOptions"] = init_options
         self._props["eventTasks"] = {}
 
+        if theme:
+            self._props["theme"] = theme
+
     def update_chart(
         self,
         merge_opts: Optional[dict] = None,

ex4nicegui/reactive/__init__.py

@@ -74,7 +74,7 @@ from .mermaid.mermaid import Mermaid as mermaid
 from .officials.dialog import DialogBindableUi as dialog
 from .vfor import vfor, VforStore
 from .vmodel import vmodel
-from .view_model import ViewModel, var, cached_var, list_var
+from .view_model import ViewModel, var, cached_var, list_var, dict_var
 
 pagination = q_pagination
 
@@ -102,6 +102,7 @@ __all__ = [
     "var",
     "cached_var",
     "list_var",
+    "dict_var",
     "html",
     "aggrid",
     "button",

ex4nicegui/reactive/officials/echarts.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Union, cast, Optional, Literal
+from typing import Any, Callable, Dict, List, Union, cast, Optional, Literal, ClassVar
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
@@ -17,10 +17,14 @@ from ex4nicegui.reactive.EChartsComponent.events import EChartsMouseEventArgumen
 from nicegui.awaitable_response import AwaitableResponse
 from nicegui import ui, app
 import orjson as json
+from contextvars import ContextVar
 
 
 class EChartsBindableUi(BindableUi[echarts]):
     EChartsMouseEventArguments = EChartsMouseEventArguments
+    _CURRENT_THEME: ClassVar[ContextVar[Optional[str]]] = ContextVar(
+        "CURRENT_THEME", default=None
+    )
 
     def __init__(
         self,
@@ -28,6 +32,8 @@ class EChartsBindableUi(BindableUi[echarts]):
         not_merge: TMaybeRef[Union[bool, None]] = None,
         code: Optional[str] = None,
         init_options: Optional[Dict] = None,
+        *,
+        theme: Optional[str] = None,
     ) -> None:
         """Create a new ECharts instance.
 
@@ -43,10 +49,11 @@ class EChartsBindableUi(BindableUi[echarts]):
         pc = ParameterClassifier(
             locals(),
             maybeRefs=["options", "code", "init_options"],
-            exclude=["not_merge"],
+            exclude=["not_merge", "theme"],
         )
 
         value_kws = pc.get_values_kws()
+        value_kws["theme"] = theme or self._CURRENT_THEME.get()
 
         element = echarts(**value_kws).classes("nicegui-echart")
 
@@ -59,6 +66,44 @@ class EChartsBindableUi(BindableUi[echarts]):
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
 
+    @classmethod
+    def register_theme(cls, name: str, theme: Path):
+        """register a new theme to echarts.
+
+        @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#rxuiechartsregister_theme
+        @中文文档 - https://gitee.com/carson_add/ex4nicegui/tree/main/#rxuiechartsregister_theme
+
+        Args:
+            name (str): Theme name.
+            theme (Path): Theme file path.
+
+        ## Examples
+        .. code-block:: python
+
+            @ui.page('/)
+            def index():
+                rxui.echarts.register_theme("my_theme", Path("path/to/my_theme.json"))
+                rxui.echarts(opts)
+
+        """
+
+        url = app.add_static_file(local_file=theme)
+
+        ui.add_body_html(
+            rf"""
+    <script type="module">
+        import "echarts";
+        echarts._ex4ng_themes = echarts._ex4ng_themes || [];
+        echarts._ex4ng_themes.push({{
+            name: "{name}",
+            url: "{url}"
+        }});
+    </script>
+        """
+        )
+        cls._CURRENT_THEME.set(name)
+        return cls
+
     @classmethod
     def register_map(
         cls,

ex4nicegui/reactive/view_model.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Any, Callable, List, Optional, Union, Type, TypeVar, overload
+from typing import Any, Callable, Dict, List, Optional, Union, Type, TypeVar, overload
 from ex4nicegui.utils.signals import (
     deep_ref,
     is_ref,
@@ -23,6 +23,7 @@ from ex4nicegui.utils.proxy.descriptor import ProxyDescriptor
 
 _CACHED_VARS_FLAG = "__vm_cached__"
 _LIST_VAR_FLAG = "__vm_list_var__"
+_DICT_VAR_FLAG = "__vm_dict_var__"
 
 _T = TypeVar("_T")
 
@@ -72,7 +73,8 @@ class ViewModel(NoProxy):
             if callable(value) and hasattr(value, _CACHED_VARS_FLAG):
                 setattr(self, name, computed(partial(value, self)))
 
-    def __init_subclass__(cls) -> None:
+    def __init_subclass__(cls, **kwargs) -> None:
+        super().__init_subclass__(**kwargs)
         need_vars = (
             (name, value)
             for name, value in vars(cls).items()
@@ -80,7 +82,7 @@ class ViewModel(NoProxy):
         )
 
         for name, value in need_vars:
-            class_var_setter(cls, name, value, _LIST_VAR_FLAG)
+            class_var_setter(cls, name, value, _LIST_VAR_FLAG, _DICT_VAR_FLAG)
 
     @overload
     @staticmethod
@@ -280,6 +282,34 @@ def list_var(factory: Callable[[], List[_T_Var_Value]]) -> List[_T_Var_Value]:
     return factory  # type: ignore
 
 
+def dict_var(factory: Callable[[], Dict]) -> Dict:
+    """Create implicitly proxied reactive variables for dictionaries. Use them just like ordinary dictionaries while maintaining reactivity. Only use within rxui.ViewModel.
+
+    Args:
+        factory (Callable[[], Dict]): A factory function that returns a new dictionary.
+
+    Example:
+    .. code-block:: python
+        from ex4nicegui import rxui
+        class State(rxui.ViewModel):
+            data = rxui.dict_var(lambda: {"a": 1, "b": 2, "c": 3})
+
+            def update_data(self):
+                self.data["d"] = len(self.data) + 1
+
+            def display_data(self):
+                return ",".join(f"{k}:{v}" for k, v in self.data.items())
+
+        state = State()
+        ui.button("Update", on_click=state.update_data)
+        rxui.label(state.display_data)
+
+    """
+    assert callable(factory), "factory must be a callable"
+    setattr(factory, _DICT_VAR_FLAG, None)
+    return factory  # type: ignore
+
+
 def cached_var(func: Callable[..., _T]) -> ReadonlyRef[_T]:
     """A decorator to cache the result of a function. Only use within rxui.ViewModel.
 

ex4nicegui/utils/proxy/descriptor.py

@@ -8,6 +8,7 @@ from .float import FloatProxy
 from .bool import BoolProxy
 from .date import DateProxy
 from .dict import DictProxy
+from ex4nicegui.utils.signals import deep_ref
 import datetime
 import warnings
 from . import to_value_if_base_type_proxy
@@ -61,9 +62,34 @@ class ListDescriptor(ProxyDescriptor[Callable[[], List]]):
         super().__init__(name, value, lambda x: ListProxy(x() if callable(x) else x))
 
 
-class DictDescriptor(ProxyDescriptor[Dict]):
-    def __init__(self, name: str, value: Dict) -> None:
-        super().__init__(name, value, DictProxy)
+class DictDescriptor:
+    def __init__(
+        self,
+        name: str,
+        factory: Callable[[], Dict],
+    ) -> None:
+        self.name = name
+        self._ref_builder = lambda: deep_ref(factory())
+
+    def __get__(self, instance: object, owner: Any):
+        if instance is None:
+            return self
+
+        proxy = instance.__dict__.get(self.name, None)
+        if proxy is None:
+            proxy = self._ref_builder()
+            instance.__dict__[self.name] = proxy
+
+        return proxy.value
+
+    def __set__(self, instance: object, value: T) -> None:
+        value = to_value_if_base_type_proxy(value)
+        proxy = instance.__dict__.get(self.name, None)
+        if proxy is None:
+            proxy = self._ref_builder()
+            instance.__dict__[self.name] = proxy
+
+        proxy.value = value  # type: ignore
 
 
 class StringDescriptor(ProxyDescriptor[str]):
@@ -91,7 +117,9 @@ class DateDescriptor(ProxyDescriptor[datetime.date]):
         super().__init__(name, value, lambda x: DateProxy(x.year, x.month, x.day))
 
 
-def class_var_setter(cls: Type, name: str, value, list_var_flat: str) -> None:
+def class_var_setter(
+    cls: Type, name: str, value, list_var_flat: str, dict_var_flat: str
+) -> None:
     if value is None or isinstance(value, str):
         setattr(cls, name, StringDescriptor(name, value))
     elif isinstance(value, bool):
@@ -111,9 +139,8 @@ def class_var_setter(cls: Type, name: str, value, list_var_flat: str) -> None:
                 )
         setattr(cls, name, ListDescriptor(name, lambda: []))
 
-    elif isinstance(value, dict):
-        pass  # TODO
-        # setattr(cls, name, DictDescriptor(name, value))
+    elif callable(value) and hasattr(value, dict_var_flat):
+        setattr(cls, name, DictDescriptor(name, value))
     elif isinstance(value, float):
         setattr(cls, name, FloatDescriptor(name, value))
     elif isinstance(value, datetime.date):

{ex4nicegui-0.8.6.dist-info → ex4nicegui-0.8.8.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: ex4nicegui
-Version: 0.8.6
+Version: 0.8.8
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
-Home-page: https://github.com/CrystalWindSnake/ex4nicegui
 License: MIT
 Keywords: nicegui,ex4nicegui,webui
 Author: CrystalWindSnake
@@ -15,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: executing (>=2.0.1,<3.0.0)
 Requires-Dist: nicegui (>=2.0.0,<3.0.0)
 Requires-Dist: signe (>=0.4.22,<0.5.0)
@@ -458,6 +458,7 @@ class MyApp(rxui.ViewModel):
         - [echarts 图表鼠标事件](#echarts-图表鼠标事件)
         - [rxui.echarts.from\_javascript](#rxuiechartsfrom_javascript)
         - [rxui.echarts.register\_map](#rxuiechartsregister_map)
+        - [rxui.echarts.register\_theme](#rxuiechartsregister_theme)
       - [tab\_panels](#tab_panels)
       - [lazy\_tab\_panels](#lazy_tab_panels)
       - [scoped\_style](#scoped_style)
@@ -1346,6 +1347,35 @@ rxui.echarts.register_map(
 )
 ```
 
+---
+##### rxui.echarts.register_theme
+注册主题.
+
+```python
+@ui.page("/")
+def page():
+    # 本页范围，所有 rxui.echarts 默认主题均为 walden(最后注册的主题)
+    rxui.echarts.register_theme(
+        "my_theme", Path(__file__).parent / "echarts_theme.json"
+    ).register_theme("walden", Path(__file__).parent / "echarts_walden.json")
+
+    opts = {
+        "xAxis": {"data": ["Shirts", "Cardigans"]},
+        "yAxis": {},
+        "series": [{"type": "bar", "data": [5, 20]}],
+    }
+
+    # 主题为 walden
+    rxui.echarts(opts)
+
+    # 主题为 my_theme
+    rxui.echarts(
+        opts,
+        theme="my_theme",
+    )
+
+```
+
 ---
 
 #### tab_panels

{ex4nicegui-0.8.6.dist-info → ex4nicegui-0.8.8.dist-info}/RECORD

@@ -70,13 +70,13 @@ ex4nicegui/libs/gsap/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ex4nicegui/libs/gsap/utils/matrix.js,sha256=77scrxbQZXx4ex5HkvnT9IkhMG1rQoDNp4TSYgUeYVk,15235
 ex4nicegui/libs/gsap/utils/paths.js,sha256=2SPaRHQ7zgba9cH8hGhkTYPCZdrrEhE2qhh6ECAEvSA,49314
 ex4nicegui/libs/gsap/utils/strings.js,sha256=47G9slz5ltG9mDSwrfQDtWzzdV5QJ-AIMLRMNK0VSiM,10472
-ex4nicegui/reactive/__init__.py,sha256=I5GhhBCPBIVj3vhLE7Zf_UpjIK7ZOwCFFCC3YNPE4Rs,4668
+ex4nicegui/reactive/__init__.py,sha256=Mzt4pXWcj5abJuUfqyy_oGex-jTmaXiH3fiB972JprY,4695
 ex4nicegui/reactive/base.py,sha256=CQmWhrKHNMF2ql7O6VOKEOBdEcc3-yagOcERpnUPYus,16323
 ex4nicegui/reactive/deferredTask.py,sha256=g78TTG1EIkBxjPih01xmrCZw9OxQG93veSVSELWKfcU,987
 ex4nicegui/reactive/dropZone/dropZone.js,sha256=7rSpFJX-Fk_W_NGZhOTyuEw0bzR-YUc8ZYPzQG9KzE0,2713
 ex4nicegui/reactive/dropZone/dropZone.py,sha256=hg9UKTayff8v8Ek-n38h_3wX1Qmiotvdyv1Hsqilh5Y,2590
-ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=K9sX34SMnghwDMCkl-IA7WsntxyryeRsboihkIwDb84,3852
-ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=jLRdKqJWCtKHzNlFAX9ePAmzP1WSXRzBQAO0KHHkfBA,4258
+ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=Dhsfzlio9zO2T3LhK5cI7IdPXHtWhbBXMdlL3uvkU24,4110
+ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=NjJocWIEF4xzvRQVbkTQSaB2fF_GIVf2_QaMKjln9hU,4359
 ex4nicegui/reactive/EChartsComponent/events.py,sha256=ln10cNw5ODiSmdKVi6KBZ6JMR3YIZ6itYZcMgNAlKhA,741
 ex4nicegui/reactive/EChartsComponent/types.py,sha256=_7AekG0IyzRpDEBZMtKRiZ3o3dUCcn6btegBk8c9Fig,1001
 ex4nicegui/reactive/EChartsComponent/utils.py,sha256=YqxodbGD_lk_Bp-K8s8XvgqSXRf_CIHmzeubrqFRuVM,1013
@@ -105,7 +105,7 @@ ex4nicegui/reactive/officials/column.py,sha256=fllKknMEUw7uNhmP7w4pgBT7HTDbpkN-d
 ex4nicegui/reactive/officials/date.py,sha256=lRiJNrgs_oNo9AZTfTX_66dYL7az4co5rfRyIzvGAIo,2440
 ex4nicegui/reactive/officials/dialog.py,sha256=3dyrvsUwM1Q7jr_PgLKt92KDA6Hris0DH90-sKamfFE,1297
 ex4nicegui/reactive/officials/drawer.py,sha256=_Ro6stOh8U3igYMeDwI4omBgi1nld5berrAk9Dv5RVw,2346
-ex4nicegui/reactive/officials/echarts.py,sha256=xRBKVbcCUwUGA8n7bw2eJj9FBQIayL4t_rzXZrjD3Pc,10895
+ex4nicegui/reactive/officials/echarts.py,sha256=ANI74NjGFLF7LoABbc8x9L2Z5nLOguptoK4iUIoSizY,12288
 ex4nicegui/reactive/officials/element.py,sha256=-qsHcxfF3fMfU0sJlKtTksX_wYPMIPJ_AgFcZbbI754,412
 ex4nicegui/reactive/officials/expansion.py,sha256=8xwJa0SpsVhFxbYwYRZtf1ul9m4oYTjgmtrRI_lqF_0,1822
 ex4nicegui/reactive/officials/grid.py,sha256=0vLLJOe7t_b351TsYOWpnrPsWKaqV_bG_010Xp-_BfY,2012
@@ -153,7 +153,7 @@ ex4nicegui/reactive/useMouse/UseMouse.py,sha256=cFNlso7_BneyAfGmWbl-N9vQwGleV2Ar
 ex4nicegui/reactive/usePagination.py,sha256=8YLqcZ_ecuX0FdQ0ct-XdEFfMAVkubAS_K02YOhg5oo,2584
 ex4nicegui/reactive/vfor.js,sha256=sCy3KR5Aeyx68yh9VI6I9Vj7bnVuir_LUYKZBe_ePTg,908
 ex4nicegui/reactive/vfor.py,sha256=SSu3X2DLZeCveTrcLANYNMNpLv34cJonLCp_9W0HFlY,7931
-ex4nicegui/reactive/view_model.py,sha256=1V5s_uBx9N_Iv2b0tJLsRA_7LNBi6ySlge-rbyQkCC8,8792
+ex4nicegui/reactive/view_model.py,sha256=OSOnOTc86JgYqO6pb3J_IrOdDKP0MyEIeSHYX4P3EOI,9904
 ex4nicegui/reactive/vmodel.py,sha256=ymrUpC_68jaHF76ivKmgz-C4Xl6i65c_41uMc0ffEhY,5936
 ex4nicegui/toolbox/__init__.py,sha256=Q5pIvMJX5Ugf2dLcffU4wK6DFQW_qsKV5iTJPoALvTQ,235
 ex4nicegui/toolbox/core/vue_use.py,sha256=0wzNJTDuZ08BNEVs0ibXiinje8SQIpeqEJIoug25iwg,969
@@ -173,7 +173,7 @@ ex4nicegui/utils/proxy/__init__.py,sha256=L0SO_32i33Unue0fCFVpHdyZljuykWHjll3Dmd
 ex4nicegui/utils/proxy/base.py,sha256=g_7308xGAB3bB3EiEf_-0JKfUzImwt5_T9XVyT7zJJg,128
 ex4nicegui/utils/proxy/bool.py,sha256=KQ2Sp2r4nLScif9DhupDmkpRhbsuXdpXTkxSrtFYtDE,1774
 ex4nicegui/utils/proxy/date.py,sha256=wS0M4nfGVQ7A1u9tJkPqilEhDwcMKBjtTC9VjUsOqac,2356
-ex4nicegui/utils/proxy/descriptor.py,sha256=VuPBXAE7mHbJ3EUAsftr3mettDvju79bR-SlwczRrAs,4594
+ex4nicegui/utils/proxy/descriptor.py,sha256=BG6KQGTSMX1QKpXDvkrMk9wvL__vzg6m2GSuaj1leeE,5384
 ex4nicegui/utils/proxy/dict.py,sha256=MPtx-09ylf_bHXnkr1c7PmJeaq2KpDp-_Shyw5YjOLU,3046
 ex4nicegui/utils/proxy/float.py,sha256=fdMUS7_xwypdDNscuZaUn3NA0vx8LGswAOc9kw0jK0c,5271
 ex4nicegui/utils/proxy/int.py,sha256=0Y7L924Zzq6LWRZEmaTmoXf0J6kC0o5EtW--2Lk7SNw,7381
@@ -186,7 +186,7 @@ ex4nicegui/utils/scheduler.py,sha256=1gyq7Y2BkbwmPK_Q9kpRpc1MOC9H7xcpxuix-RZhN9k
 ex4nicegui/utils/signals.py,sha256=Jz0jKFPrJIRV0Gye62Bgk2kGgod1KBvDhnF-W3lRm04,7373
 ex4nicegui/utils/types.py,sha256=pE5WOSbcTHxaAhnT24FaZEd1B2Z_lTcsd46w0OKiMyc,359
 ex4nicegui/version.py,sha256=NE7u1piESstg3xCtf5hhV4iedGs2qJQw9SiC3ZSpiio,90
-ex4nicegui-0.8.6.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.8.6.dist-info/METADATA,sha256=_cFoYls_MNIYvzX1RQEo_95byNPo0WgBbj7hKZiG3c8,46125
-ex4nicegui-0.8.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ex4nicegui-0.8.6.dist-info/RECORD,,
+ex4nicegui-0.8.8.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.8.8.dist-info/METADATA,sha256=F65K1T5Q-aq5j43kfUik17A08SdSUBNJnAsPWLLjTQk,46832
+ex4nicegui-0.8.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+ex4nicegui-0.8.8.dist-info/RECORD,,

{ex4nicegui-0.8.6.dist-info → ex4nicegui-0.8.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any