ex4nicegui 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

ex4nicegui/reactive/EChartsComponent/ECharts.js

@@ -56,7 +56,8 @@ export default {
   template: "<div></div>",
   async mounted() {
     await new Promise((resolve) => setTimeout(resolve, 0)); // wait for Tailwind classes to be applied
-    this.chart = echarts.init(this.$el, this.theme);
+
+    this.chart = echarts.init(this.$el, this.theme, this.initOptions);
     this.resizeObs = new ResizeObserver(this.chart.resize)
 
     // Prevent interruption of chart animations due to resize operations.
@@ -84,6 +85,11 @@ export default {
       }
     });
 
+    if (this.eventTasks) {
+      for (const [eventName, query] of Object.entries(this.eventTasks)) {
+        this.echarts_on(eventName, query);
+      }
+    }
   },
   beforeDestroy() {
     this.chart.dispose();
@@ -116,6 +122,8 @@ export default {
   props: {
     options: Object | undefined,
     theme: String | Object | undefined,
+    initOptions: Object | undefined,
     code: String | undefined,
+    eventTasks: Object | undefined,
   },
 };

ex4nicegui/reactive/EChartsComponent/ECharts.py

@@ -16,7 +16,6 @@ import nicegui
 from .types import (
     _T_event_name,
 )
-from ex4nicegui.reactive.deferredTask import DeferredTask
 from .utils import get_bound_event_args, create_event_handler_args
 
 NG_ROOT = Path(nicegui.__file__).parent / "elements"
@@ -28,9 +27,9 @@ class echarts(Element, component="ECharts.js", dependencies=libraries):  # type:
         self,
         options: Optional[dict] = None,
         code: Optional[str] = None,
+        init_options: Optional[dict] = None,
     ) -> None:
         super().__init__()
-        self.__deferred_task = DeferredTask()
 
         if (options is None) and (bool(code) is False):
             raise ValueError("At least one of options and code must be valid.")
@@ -45,6 +44,8 @@ class echarts(Element, component="ECharts.js", dependencies=libraries):  # type:
 
         self._props["options"] = options
         self._props["code"] = code
+        self._props["initOptions"] = init_options
+        self._props["eventTasks"] = {}
 
     def update_chart(
         self,
@@ -107,9 +108,7 @@ class echarts(Element, component="ECharts.js", dependencies=libraries):  # type:
         ui_event_name = f"chart:{event_name}"
         super().on(ui_event_name, org_handler, args=get_bound_event_args(event_name))
 
-        @self.__deferred_task.register
-        def _():
-            self.run_method("echarts_on", ui_event_name, query)
+        self._props["eventTasks"][ui_event_name] = query
 
     def run_chart_method(
         self, name: str, *args, timeout: float = 1

ex4nicegui/reactive/base.py

@@ -48,7 +48,7 @@ _T_bind_classes_type = Union[
     _T_bind_classes_type_ref_dict,
     _T_bind_classes_type_single,
     _T_bind_classes_type_array,
-    Dict[str, bool],
+    Dict[str, TMaybeRef[bool]],
     List[str],
 ]
 
@@ -271,7 +271,7 @@ class BindableUi(Generic[TWidget]):
     def bind_classes(self, classes: Dict[str, TGetterOrReadonlyRef[bool]]) -> Self: ...
 
     @overload
-    def bind_classes(self, classes: Dict[str, bool]) -> Self: ...
+    def bind_classes(self, classes: Dict[str, TMaybeRef[bool]]) -> Self: ...
 
     @overload
     def bind_classes(self, classes: TGetterOrReadonlyRef[Dict[str, bool]]) -> Self: ...

ex4nicegui/reactive/officials/echarts.py

@@ -27,9 +27,23 @@ class EChartsBindableUi(BindableUi[echarts]):
         options: Optional[TMaybeRef[Dict]] = None,
         not_merge: TMaybeRef[Union[bool, None]] = None,
         code: Optional[str] = None,
+        init_options: Optional[Dict] = None,
     ) -> None:
+        """Create a new ECharts instance.
+
+        @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#rxuiecharts
+        @中文文档 - https://gitee.com/carson_add/ex4nicegui#rxuiecharts
+
+        Args:
+            options (Optional[TMaybeRef[Dict]], optional): echart options. Defaults to None.
+            not_merge (TMaybeRef[Union[bool, None]], optional): merge options when chart update. Defaults to None.
+            code (Optional[str], optional): javascript code to initialize echart. Defaults to None.
+            init_options (Optional[Dict], optional): echart initialization options. Defaults to None.
+        """
         pc = ParameterClassifier(
-            locals(), maybeRefs=["options", "code"], exclude=["not_merge"]
+            locals(),
+            maybeRefs=["options", "code", "init_options"],
+            exclude=["not_merge"],
         )
 
         value_kws = pc.get_values_kws()

ex4nicegui/utils/proxy/string.py

@@ -58,8 +58,8 @@ class StringProxy(Proxy, str):
     def count(
         self,
         sub: str,
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> int:
         return self._ref.value.count(sub, start, end)
@@ -70,8 +70,8 @@ class StringProxy(Proxy, str):
     def endswith(
         self,
         suffix: Union[str, Tuple[str, ...]],
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> bool:
         return self._ref.value.endswith(suffix, start, end)
@@ -88,8 +88,8 @@ class StringProxy(Proxy, str):
     def find(
         self,
         sub: str,
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> int:
         return self._ref.value.find(sub, start, end)
@@ -109,8 +109,8 @@ class StringProxy(Proxy, str):
     def index(
         self,
         sub: str,
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> int:
         return self._ref.value.index(sub, start, end)
@@ -230,8 +230,8 @@ class StringProxy(Proxy, str):
     def rfind(
         self,
         sub: str,
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> int:
         return self._ref.value.rfind(sub, start, end)
@@ -239,8 +239,8 @@ class StringProxy(Proxy, str):
     def rindex(
         self,
         sub: str,
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> int:
         return self._ref.value.rindex(sub, start, end)
@@ -263,16 +263,6 @@ class StringProxy(Proxy, str):
     def rpartition(self, sep: str, /) -> Tuple[str, str, str]:
         return self._ref.value.rpartition(sep)
 
-    @overload
-    def rsplit(
-        self: LiteralString,
-        sep: Optional[LiteralString] = None,
-        maxsplit: SupportsIndex = -1,
-    ) -> List[LiteralString]: ...
-    @overload
-    def rsplit(
-        self, sep: Optional[str] = None, maxsplit: SupportsIndex = -1
-    ) -> List[str]: ...  # type: ignore[misc]
     def rsplit(
         self, sep: Optional[str] = None, maxsplit: SupportsIndex = -1
     ) -> List[str]:
@@ -312,8 +302,8 @@ class StringProxy(Proxy, str):
     def startswith(
         self,
         prefix: Union[str, Tuple[str, ...]],
-        start: Optional[SupportsIndex] = ...,
-        end: Optional[SupportsIndex] = ...,
+        start: Optional[SupportsIndex] = None,
+        end: Optional[SupportsIndex] = None,
         /,
     ) -> bool:
         return self._ref.value.startswith(prefix, start, end)

{ex4nicegui-0.8.1.dist-info → ex4nicegui-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.8.1
+Version: 0.8.2
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 Home-page: https://github.com/CrystalWindSnake/ex4nicegui
 License: MIT

{ex4nicegui-0.8.1.dist-info → ex4nicegui-0.8.2.dist-info}/RECORD

@@ -71,12 +71,12 @@ ex4nicegui/libs/gsap/utils/matrix.js,sha256=77scrxbQZXx4ex5HkvnT9IkhMG1rQoDNp4TS
 ex4nicegui/libs/gsap/utils/paths.js,sha256=2SPaRHQ7zgba9cH8hGhkTYPCZdrrEhE2qhh6ECAEvSA,49314
 ex4nicegui/libs/gsap/utils/strings.js,sha256=47G9slz5ltG9mDSwrfQDtWzzdV5QJ-AIMLRMNK0VSiM,10472
 ex4nicegui/reactive/__init__.py,sha256=_VDZ79Gp9lo2NlaKKKT6rvrMWVNkUzTBHQnn0e6Q8Gk,4374
-ex4nicegui/reactive/base.py,sha256=yH0__hVkxWA30HKT7oX1H-1Fd8p94V_idAHd9HtbBkM,15904
+ex4nicegui/reactive/base.py,sha256=aaNgolaDQMuMy_c2XCAtdRpOSXsn2engdJZoWqj9WU8,15926
 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=dFv4WPZO32mikf3TN9l84ByvBFvVQfbHQdxqTnaAF0M,3594
-ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=mIjixc_miaPKuNP6kR_t7-1O27ob0WvOYMNNAenUvbo,4292
+ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=K9sX34SMnghwDMCkl-IA7WsntxyryeRsboihkIwDb84,3852
+ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=jLRdKqJWCtKHzNlFAX9ePAmzP1WSXRzBQAO0KHHkfBA,4258
 ex4nicegui/reactive/EChartsComponent/events.py,sha256=_BtmLRcAIZciDQT5i1eFc-r3e0pBnAabW1BSl6uzhCc,570
 ex4nicegui/reactive/EChartsComponent/types.py,sha256=_7AekG0IyzRpDEBZMtKRiZ3o3dUCcn6btegBk8c9Fig,1001
 ex4nicegui/reactive/EChartsComponent/utils.py,sha256=a5r2fghC6IIZbyfUUR8TEkpLj9HPbcf8QHEBatXaL2M,1463
@@ -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=rGVd-ewP9vlGjVUdtVoW4jjsJ4oUp-HZ059kqdoFBe4,10142
+ex4nicegui/reactive/officials/echarts.py,sha256=xRBKVbcCUwUGA8n7bw2eJj9FBQIayL4t_rzXZrjD3Pc,10895
 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=Bq83jejsxQSYVc9O1IE6JUgUndUm1uexb4fq9EZWjHQ,921
@@ -169,7 +169,7 @@ ex4nicegui/utils/proxy/dict.py,sha256=r3qMT2RRvi2aUs8kzav2iNMGgBrFUWKsbHCAuz4P0F
 ex4nicegui/utils/proxy/float.py,sha256=fdMUS7_xwypdDNscuZaUn3NA0vx8LGswAOc9kw0jK0c,5271
 ex4nicegui/utils/proxy/int.py,sha256=0Y7L924Zzq6LWRZEmaTmoXf0J6kC0o5EtW--2Lk7SNw,7381
 ex4nicegui/utils/proxy/list.py,sha256=bmjBMlO8UfJekL1nfGypMO21RKraIj1jw46-8QwfptE,4913
-ex4nicegui/utils/proxy/string.py,sha256=viTHAEmG0SROA6_rO469DviMoTLk21aWKDna0g4BUvE,14179
+ex4nicegui/utils/proxy/string.py,sha256=BFZ5Uba47S68mMSoJFYFZqKjivJDz80vmEozxxfhUok,13861
 ex4nicegui/utils/proxy/utils.py,sha256=8LawrZ8KmzP64iCmweFJh4kmwEvRxOp7MwV7AsnEMJM,148
 ex4nicegui/utils/refComputed.py,sha256=Vb7fyi0wNieFeLfCjXl6wSzpws3i6_aeCka1s9dsc8E,4232
 ex4nicegui/utils/refWrapper.py,sha256=gX5sdfC1P4UXmMYM6FwdImfLD39y02kq7Af6dIMDrZ8,1472
@@ -177,7 +177,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.1.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.8.1.dist-info/METADATA,sha256=Prg4-C7tRuseJmB1EmKj_Akzb3KpGPJ9R7QlhD6baUk,42343
-ex4nicegui-0.8.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ex4nicegui-0.8.1.dist-info/RECORD,,
+ex4nicegui-0.8.2.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.8.2.dist-info/METADATA,sha256=U0v4tjvnuTjqwgnb9sMNV-hLpvuyW7yYEgopZcEMxas,42343
+ex4nicegui-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ex4nicegui-0.8.2.dist-info/RECORD,,