Browse Source

maint: code adjustment

wangweimin 4 years ago
parent
commit
e0dcae1186
4 changed files with 11 additions and 8 deletions
  1. 2 0
      docs/conf.py
  2. 2 2
      pywebio/html/index.html
  3. 6 6
      pywebio/session/__init__.py
  4. 1 0
      webiojs/src/session.ts

+ 2 - 0
docs/conf.py

@@ -42,6 +42,8 @@ default_role = "py:obj"
 
 master_doc = 'index'
 
+autodoc_member_order = 'bysource'
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #

+ 2 - 2
pywebio/html/index.html

@@ -3,8 +3,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>PyWebIO</title>
-    <link rel="icon" type="image/png" sizes="32x32" href="image/favicon_open_32.png" id="favicon32">
-    <link rel="icon" type="image/png" sizes="16x16" href="image/favicon_open_16.png" id="favicon16">
+    <link rel="icon" type="image/png" sizes="32x32" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAwklEQVQ4T63TvU5CQRCG4WcwMfEuqOgNtQ2Nd4CxV2LHtVhJ0N7AHdjQUBtrrLwLA4ks2Rx+/Qucw3Y78807M7sz4ft5dq6mI7RQX7o/JCNzfdfetkNifRk6k9wLN9jYdxMkyZPQ1faZXYUwB/OCix8V/W4Y4zJDCsBAX7jdM7iQJY+udELu+cTrP2X/xU2+NMPAg3B3UPaVOOmFoQkapQC8Z8AUpyUBs6MAKrZQ+RErf2PlQTrKKK8gpZdpewgOXOcFTTxEjYwMoIkAAAAASUVORK5CYII=" id="favicon32">
+    <link rel="icon" type="image/png" sizes="16x16" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABmUlEQVRYR82XK0wDQRCGv21TUUUJGBwGDBggGCSGBIcAWnBAgsNAgkKhSMDgCA8HtEXgSDBIDC9DDRgcpoSiKo52yea49DiutMttsz27M/98N7s7OyNo9tujgxSTwDiCIaAXSH27l4AXJA/AFSUuWOajGWnR0ChLP3HWkWSAZEN716CM4JQKW6R5+sunPkCeJJJNBCtAosnAQTMHyS6CDWYoh2mEAxzTR4JzYOCfgYNuBRymmOc5uPAbIMswMS6BbkPBPZkiVSZIc+/X/Qng/vl1C4LXIBzG/JmoAag9hxuDaa+XwAIw6p2JGkCObQSrhtMeLifZYZY1tegCqKsW4zHCadfldqgyqK6oC3DGIZIFXZVI9oIjplkUqArXyatGkYkU1+dc5p0eQY4MghNTqlo6kjkFsI9gScvRlLHkQJDnFhgxpampc6cAikCXpqMp8zcF8AnETSlq6lTaAsD6Flg+hNavofVCZL0UW3+M2uI5VhBWGxIFYL0lUxBWm1KviFttyz0Iq4OJB2F1NPO/qdaG0+DD3qLx/AuMVJFhmC8dSgAAAABJRU5ErkJggg==" id="favicon16">
     <link rel="stylesheet" href="css/mditor.min.css">
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/codemirror.min.css">

+ 6 - 6
pywebio/session/__init__.py

@@ -152,12 +152,12 @@ def download(name, content):
     send_msg('download', spec=dict(name=name, content=content))
 
 
-def run_js(code, **args):
+def run_js(code_, **args):
     """运行js代码.
 
     代码运行在浏览器的JS全局作用域中
 
-    :param str code: js代码
+    :param str code_: js代码
     :param args: 传递给js代码的局部变量。变量值需要可以被json序列化
 
     Example::
@@ -166,14 +166,14 @@ def run_js(code, **args):
 
     """
     from ..io_ctrl import send_msg
-    send_msg('run_script', spec=dict(code=code, args=args))
+    send_msg('run_script', spec=dict(code=code_, args=args))
 
 
 @chose_impl
-def eval_js(expression, **args):
+def eval_js(expression_, **args):
     """执行js表达式,并获取表达式的值
 
-    :param str expression: js表达式. 表达式的值需要能JSON序列化
+    :param str expression_: js表达式. 表达式的值需要能JSON序列化
     :return: js表达式的值
     :param args: 传递给js代码的局部变量。变量值需要可以被json序列化
 
@@ -201,7 +201,7 @@ def eval_js(expression, **args):
             task_id: WebIOCurrentTaskID,  // local var in run_script command
             data: ____result____ || null
         });
-    })(WebIO);""" % expression
+    })(WebIO);""" % expression_
 
     run_js(script, **args)
 

+ 1 - 0
webiojs/src/session.ts

@@ -215,6 +215,7 @@ export class HttpSession implements Session {
             },
             error: function () {  // todo
                 console.error('Http push event failed, event data: %s', msg);
+                error_alert("连接服务器失败!");
             }
         });