pywebexec 2.3.9__tar.gz → 2.3.10__tar.gz

{pywebexec-2.3.9/pywebexec.egg-info → pywebexec-2.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.3.9
+Version: 2.3.10
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-2.3.9 → pywebexec-2.3.10}/pywebexec/static/css/form.css

@@ -44,7 +44,7 @@
   }
   .btn-primary {
     position: relative;
-    margin-bottom: 10px;
+    margin-bottom: 20px;
     height: 24px;
     top: 20px;
     color: #fff;
@@ -224,13 +224,17 @@
   }
   ul ~ ._jsonform-array-buttons {
     display: block;
+  }
+  li > fieldset {
     width: 100%;
+    margin-bottom: 3px;
   }
   ._jsonform-array-buttons {
-    /* display: block; */
-    /* width: 100%; */
     text-align: right;
   }
+  ul._jsonform-array-ul > li > div.form-group {
+    width: 100%;
+  }
   i[title="Delete current"] {
     top: 5px;
   }
@@ -253,7 +257,7 @@
   }
   .alert {
     padding: 5px 10px;
-    margin-bottom: 2px;
+    margin-top: 10px;
     border: 1px solid transparent;
     border-radius: 15px;
     font-size: 14px;

{pywebexec-2.3.9 → pywebexec-2.3.10}/pywebexec/static/js/schemaform.js

@@ -11,7 +11,7 @@ function adjustInputWidth(input) {
   if (input.scrollWidth > 0) {
     input.style.width = `${input.scrollWidth + delta}px`;
   } else {
-    input.style.width = `${input.value.length * 11 + delta}px`;
+    input.style.width = `${input.value.length * 10 + 20}px`;
   }
   
 }
@@ -144,35 +144,30 @@ function validateSchemaForm(form, formDesc, schema, values, schemaName) {
 }
 
 function createSchemaForm($form, schema, onSubmit, schemaName) {
+  schema_options = undefined;
+  schema_params_options = undefined;
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
-  } else {
-    schema_options = {};
   }
   if (schema && schema.properties && schema.properties.params && schema.properties.params.schema_options) {
     schema_params_options = schema.properties.params.schema_options;
-  } else {
-    schema_params_options = {};
   }
 
   formkeys = {};
   formoptions = {};
   if (schema_options) {
-    formkeys = schema.schema_options.form || {};
-    formoptions = schema.schema_options.formoptions || {};
-  } else { 
-    if (schema_params_options) {
-      let fkeys = schema_params_options.form || {};
-      let foptions = schema_params_options.formoptions || {};
-      for (let key in fkeys) {
-        formkeys[`params.${key}`] = fkeys[key];
-      }
-      for (let key in foptions) {
-        formoptions[`params.${key}`] = foptions[key];
-      }
+    formkeys = schema_options.form || {}
+    formoptions = schema_options.formoptions || {};
+  } else if (schema_params_options) {
+    let fkeys = schema_params_options.form || {};
+    let foptions = schema_params_options.formoptions || {};
+    for (let key in fkeys) {
+      formkeys[`params.${key}`] = fkeys[key];
+    }
+    for (let key in foptions) {
+      formoptions[`params.${key}`] = foptions[key];
     }
   }
-
   formDesc = extractKeysAndPlaceholders(schema, formkeys, formoptions);
   if (schemaValues[schemaName]) {
     value = schemaValues[schemaName];
@@ -251,7 +246,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         }
       }
     }
-    if (formoptions) {
+    if (Object.keys(formoptions).length) {
       items = [];
       for (let key in formoptions) {
         items.push({
@@ -307,6 +302,22 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         }
       }
     }
+    if (formoptions) {
+      items = [];
+      for (let key in formoptions) {
+        items.push({
+          key: key,
+          ... formoptions[key],
+        });
+      }
+      formDesc.push({
+        type: 'fieldset',
+        title: 'Options',
+        fieldHtmlClass: 'fieldsetoptions',
+        expandable: true,
+        items: items,
+      });
+    }
   }
   // schemaForm.classList.add('form-inline');
   jsform = $form.jsonForm({

{pywebexec-2.3.9 → pywebexec-2.3.10}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.9'
-__version_tuple__ = version_tuple = (2, 3, 9)
+__version__ = version = '2.3.10'
+__version_tuple__ = version_tuple = (2, 3, 10)

{pywebexec-2.3.9 → pywebexec-2.3.10/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.3.9
+Version: 2.3.10
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau