1
0
Эх сурвалжийг харах

Merge pull request #1287 from zauberzeug/quasar_config

Move Quasar config to Python
Falko Schindler 1 жил өмнө
parent
commit
3b602ab563

+ 1 - 0
nicegui/client.py

@@ -86,6 +86,7 @@ class Client:
             'vue_scripts': '\n'.join(vue_scripts),
             'imports': json.dumps(imports),
             'js_imports': '\n'.join(js_imports),
+            'quasar_config': json.dumps(globals.quasar_config),
             'title': self.page.resolve_title(),
             'viewport': self.page.resolve_viewport(),
             'favicon_url': get_favicon_url(self.page, prefix),

+ 9 - 1
nicegui/globals.py

@@ -48,11 +48,19 @@ air: Optional['Air'] = None
 socket_io_js_extra_headers: Dict = {}
 endpoint_documentation: Literal['none', 'internal', 'page', 'all'] = 'none'
 socket_io_js_transports: List[Literal['websocket', 'polling']] = ['websocket', 'polling']
-
 _socket_id: Optional[str] = None
 slot_stacks: Dict[int, List['Slot']] = {}
 clients: Dict[str, 'Client'] = {}
 index_client: 'Client'
+quasar_config: Dict = {
+    'brand': {
+        'primary': '#5898d4',
+    },
+    'loadingBar': {
+        'color': 'primary',
+        'skipHijack': False,
+    },
+}
 
 page_routes: Dict[Callable[..., Any], str] = {}
 

+ 1 - 8
nicegui/templates/index.html

@@ -308,14 +308,7 @@
           }
         },
       }).use(Quasar, {
-        config: {
-          brand: {
-            primary: '#5898d4',
-          },
-          loadingBar: {
-            color: 'primary'
-          },
-        }
+        config: {{ quasar_config | safe }}
       });
 
       {{ js_imports | safe }}