@joyzl/eno 1.2.7 → 1.2.9

package/index.js

@@ -852,7 +852,13 @@ function getEntity(element, entity, converter) {
 		} else {
 			setValue(entity, name, element.innerText);
 		}
+	} else {
+		if (element.disabled) {
+			// 阻止禁用标签元素的子元素处理
+			return;
+		}
 	}
+
 	if (element.childElementCount) {
 		for (let i = 0; i < element.children.length; i++) {
 			getEntity(element.children[i], entity, converter);
@@ -886,9 +892,13 @@ function setEntity(element, entity, converter) {
 		// 默认处理
 		if (element.type) {
 			// 所有控件具有type属性
+			// 设置时不考虑disabled状态
 			if (element.type === "checkbox" || element.type === "radio") {
 				// Radio / Check
 				element.checked = element.value == value;
+			} else
+			if (element.type === "fieldset") {
+				//忽略
 			} else {
 				// OTHER
 				element.value = value;
@@ -1119,8 +1129,9 @@ function element(e) {
  * @param {String} name
  * @param {String} value
  * @example target(event); 返回事件源标签元素
- * @example target(event, name); 返回事件目标标签元素指定的属性值
+ * @example target(event, name); 返回事件目标指定属性的标签元素
  * @example target(event, name, value); 返回事件目标指定属性和值的标签元素
+ * @example target(event, name, null); 返回事件目标指定属性标签元素的属性值
  */
 function target(event, name, value) {
 	if (arguments.length == 1) {
@@ -1132,7 +1143,7 @@ function target(event, name, value) {
 		let element = event.target || event.srcElement;
 		while (element && element !== event.currentTarget) {
 			if (element.hasAttribute(name)) {
-				return element.getAttribute(name);
+				return element;
 			}
 			element = element.parentElement;
 		}
@@ -1140,11 +1151,20 @@ function target(event, name, value) {
 	if (arguments.length == 3) {
 		// target(event, name, value);
 		let element = event.target || event.srcElement;
-		while (element && element !== event.currentTarget) {
-			if (element.getAttribute(name) == value) {
-				return element;
+		if (value) {
+			while (element && element !== event.currentTarget) {
+				if (element.getAttribute(name) == value) {
+					return element;
+				}
+				element = element.parentElement;
+			}
+		} else {
+			while (element && element !== event.currentTarget) {
+				if (element.getAttribute(name) == value) {
+					return element.getAttribute(name);
+				}
+				element = element.parentElement;
 			}
-			element = element.parentElement;
 		}
 	}
 	return null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@joyzl/eno",
-	"version": "1.2.7",
+	"version": "1.2.9",
 	"description": "Easy Node Object",
 	"main": "dist/joyzl-eno.js",
 	"module": "index.js",