Enhance prompt

javalikescript · javalikescript · commit 9f5607a17c03 · 2025-06-29T19:09:52.000+02:00
diff --git a/extensions/web-base/www/app/app.js b/extensions/web-base/www/app/app.js
@@ -552,28 +552,43 @@ var promptDialog = new Vue({
   data: {
     message: 'Nothing here',
     schema: false,
-    value: null
+    value: ''
   },
   methods: {
     ask: function(schema, message) {
+      if (typeof schema === 'string') {
+        message = schema;
+        schema = undefined;
+      }
       if (!isObject(schema)) {
-        return Promise.reject('invalid schema');
+        schema = {
+          title: 'Value',
+          type: 'string'
+        };
       }
-      this.schema = schema;
+      var wrapped = false;
       if (schema.type === 'object') {
+        this.schema = schema;
         this.value = {};
       } else if (schema.type === 'array') {
+        this.schema = schema;
         this.value = [];
       } else {
-        this.value = '';
+        this.schema = {
+          type: 'array',
+          prefixItems: [schema],
+          minItems: 1
+        }
+        this.value = [];
+        wrapped = true;
       }
       this.message = message || 'Value?';
       app.openDialog('prompt');
       var self = this;
       return new Promise(function(resolve, reject) {
         self.apply = function(confirm) {
           if (confirm) {
-            resolve(self.value);
+            resolve(wrapped ? self.value[0] : self.value);
           } else {
             reject('canceled');
           }
diff --git a/extensions/web-base/www/app/json.js b/extensions/web-base/www/app/json.js
@@ -426,11 +426,15 @@ Vue.component('json-item', {
             v = parseJsonItemValue(this.schema.type, val);
           }
         }
-        var k = this.$vnode.key;
-        if (v === undefined) {
-          delete this.pobj[k];
-        } else {
-          this.pobj[k] = v;
+        if (this.pobj && isObject(this.pobj)) {
+          var k = this.$vnode.key;
+          if (v === undefined) {
+            delete this.pobj[k];
+          } else {
+            this.pobj[k] = v;
+          }
+        } else if (v !== undefined) {
+          this.obj = v;
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -426,11 +426,15 @@ Vue.component('json-item', {`
`426`	`426`	`v = parseJsonItemValue(this.schema.type, val);`
`427`	`427`	`}`
`428`	`428`	`}`
`429`		`- var k = this.$vnode.key;`
`430`		`- if (v === undefined) {`
`431`		`- delete this.pobj[k];`
`432`		`- } else {`
`433`		`- this.pobj[k] = v;`
	`429`	`+ if (this.pobj && isObject(this.pobj)) {`
	`430`	`+ var k = this.$vnode.key;`
	`431`	`+ if (v === undefined) {`
	`432`	`+ delete this.pobj[k];`
	`433`	`+ } else {`
	`434`	`+ this.pobj[k] = v;`
	`435`	`+ }`
	`436`	`+ } else if (v !== undefined) {`
	`437`	`+ this.obj = v;`
`434`	`438`	`}`
`435`	`439`	`}`
`436`	`440`	`},`