Merge pull request #60 from ClericPy/dev

1.6.9

requirements.txt

@@ -1,4 +1,4 @@
-uniparser>=1.4.1
+uniparser>=1.4.2
 fastapi
 uvicorn
 databases

watchdogs/__init__.py

@@ -3,6 +3,6 @@
 from .config import Config
 from .main import init_app
 
-__version__ = '1.6.8'
+__version__ = '1.6.9'
 __all__ = ['Config', 'init_app']
 logging.getLogger('watchdogs').addHandler(logging.NullHandler())

watchdogs/settings.py

@@ -80,6 +80,10 @@ def setup_models():
 
 
 async def setup_uniparser():
+    import re
+    import datetime
+    import math
+    import random
     from torequests.utils import (curlparse, escape, guess_interval,
                                   itertools_chain, json, parse_qs, parse_qsl,
                                   ptime, quote, quote_plus, slice_by_size,
@@ -91,7 +95,11 @@ async def setup_uniparser():
     from uniparser.config import GlobalConfig
     import uniparser.fastapi_ui
     UDFParser._GLOBALS_ARGS.update({
+        're': re,
+        'datetime': datetime,
         'curlparse': curlparse,
+        'math': math,
+        'random': random,
         'escape': escape,
         'guess_interval': guess_interval,
         'itertools_chain': itertools_chain,

watchdogs/static/css/watchdogs.css

@@ -1,7 +1,7 @@
 .full-screen,
 body,
 .el-tabs__content,
-.el-tabs__content>* {
+.el-tabs__content > * {
     width: 100%;
     height: 100%;
 }
@@ -29,16 +29,16 @@ html {
     padding-left: 3em;
 }
 
-#input_host_form>.el-form-item:first-child .el-form-item__content,
-#input_host_form>.el-form-item:first-child {
+#input_host_form > .el-form-item:first-child .el-form-item__content,
+#input_host_form > .el-form-item:first-child {
     width: 100%;
 }
 
-[aria-label="Edit Crawler JSON"] .el-textarea__inner {
+[aria-label='Edit Crawler JSON'] .el-textarea__inner {
     height: 10em;
 }
 
-.el-table_1_column_8>.cell {
+.el-table_1_column_8 > .cell {
     white-space: nowrap;
 }
 
@@ -66,7 +66,7 @@ p.custom_links {
     color: black;
     background-color: rgba(223, 223, 223, 0.5);
     padding: 0.5em 0 0.5em 0;
-    box-shadow: 3px 3px 5px #888888
+    box-shadow: 3px 3px 5px #888888;
 }
 
 .request_args_pre {
@@ -76,3 +76,10 @@ p.custom_links {
 [v-cloak] {
     display: none;
 }
+.el-popover {
+    max-width: 50%;
+}
+pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+}