@pageboard/html 0.10.8 → 0.10.9

package/elements/form-input-property.js

@@ -54,6 +54,7 @@ exports.input_property = {
 		// /.api/form wraps it into block.data
 		list.shift();
 		name = list.join('.');
+		const id = scope.$id;
 		let prop = el;
 		let propKey;
 		let required = false;
@@ -77,8 +78,14 @@ exports.input_property = {
 		}
 		node.textContent = "";
 		if (prop.nullable) required = false;
-		let listOf = prop.anyOf || prop.oneOf;
-		let propType;
+		let propType = prop;
+		let multiple = d.multiple;
+		if (prop.type == "array" && prop.items && Array.isArray(prop.items) == false) {
+			propType = prop.items;
+			multiple = true;
+		}
+
+		let listOf = propType.anyOf || propType.oneOf;
 		if (listOf) {
 			const listOfNo = listOf.filter((item) => item.type != "null");
 			if (listOfNo.length != listOf.length) {
@@ -87,7 +94,7 @@ exports.input_property = {
 			if (listOfNo.length == 1 && listOfNo[0].const === undefined) {
 				propType = listOfNo[0];
 				listOf = null;
-			} else if (d.multiple) {
+			} else if (multiple) {
 				listOf = listOfNo;
 			}
 		} else if (Array.isArray(prop.type)) {
@@ -106,7 +113,6 @@ exports.input_property = {
 				listOf = null; // cannot deal with this for now
 			}
 		}
-		if (!propType) propType = prop;
 
 		if (listOf) {
 			if (listOf.length <= d.radios) {
@@ -126,7 +132,7 @@ exports.input_property = {
 				content = content.lastElementChild;
 				for (const item of listOf) {
 					content.appendChild(view.render({
-						type: d.multiple ? 'input_checkbox' : 'input_radio',
+						type: multiple ? 'input_checkbox' : 'input_radio',
 						data: {
 							name: name,
 							value: item.type == "null" ? null : item.const,
@@ -151,10 +157,11 @@ exports.input_property = {
 					}));
 				}
 				node.appendChild(view.render({
+					id,
 					type: 'input_select',
 					data: {
 						name: name,
-						multiple: d.multiple,
+						multiple: multiple,
 						placeholder: prop.description,
 						disabled: d.disabled,
 						required: required
@@ -170,15 +177,16 @@ exports.input_property = {
 			if (propType.minimum != null && propType.maximum != null) {
 				if (propType.maximum - propType.minimum <= d.range) {
 					return node.appendChild(view.render({
+						id,
 						type: 'input_range',
 						data: {
 							name: name,
 							min: propType.minimum,
 							max: propType.maximum,
-							value: d.multiple ? `${propType.minimum}⩽${propType.maximum}` : propType.default,
+							value: multiple ? `${propType.minimum}⩽${propType.maximum}` : propType.default,
 							disabled: d.disabled,
 							required: required,
-							multiple: d.multiple,
+							multiple: multiple,
 							step: step
 						},
 						content: {
@@ -188,6 +196,7 @@ exports.input_property = {
 				}
 			}
 			node.appendChild(view.render({
+				id,
 				type: 'input_number',
 				data: {
 					name: name,
@@ -204,6 +213,7 @@ exports.input_property = {
 			}));
 		} else if (propType.type == "boolean") {
 			node.appendChild(view.render({
+				id,
 				type: 'input_checkbox',
 				data: {
 					name: name,
@@ -221,6 +231,7 @@ exports.input_property = {
 				type = 'input_text';
 			}
 			node.appendChild(view.render({
+				id,
 				type: type,
 				data: {
 					name: name,
@@ -240,6 +251,7 @@ exports.input_property = {
 				type = 'input_text';
 			}
 			node.appendChild(view.render({
+				id,
 				type: type,
 				data: {
 					name: name,
@@ -255,7 +267,7 @@ exports.input_property = {
 			}));
 		} else if (propType.$helper && propType.$helper.name == "href") {
 			const limits = {
-				files: d.multiple ? null : 1
+				files: multiple ? null : 1
 			};
 			const filter = propType.$helper.filter;
 			if (filter && filter.type) {
@@ -266,6 +278,7 @@ exports.input_property = {
 				});
 			}
 			node.appendChild(view.render({
+				id,
 				type: 'input_file',
 				data: {
 					name: name,
@@ -280,10 +293,11 @@ exports.input_property = {
 			}));
 		} else {
 			node.appendChild(view.render({
+				id,
 				type: 'input_text',
 				data: {
 					name: name,
-					type: propType.format ? 'text' : 'textarea',
+					type: (propType.pattern || propType.format) ? 'text' : 'textarea',
 					disabled: d.disabled,
 					default: propType.default,
 					placeholder: propType.description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "description": "",
   "main": "index.js",
   "scripts": {