efront 3.18.2 → 3.19.1

package/coms/zimoli/Item.js

@@ -1,13 +1,14 @@
 var id = 0;
-function Item(value) {
-    this.children = this;
-    this.count = 0;//子项中的叶子节点数
-    this.total = 0;//子项中的节点数
-    this.crack = 0;
-    this.id = ++id;
-    this.extends(value);
-}
-Item.prototype = extend([], {
+class Item extends Array {
+    constructor(value) {
+        super();
+        this.children = this;
+        this.count = 0;//子项中的叶子节点数
+        this.total = 0;//子项中的节点数
+        this.crack = 0;
+        this.id = ++id;
+        this.extends(value);
+    }
     extends(value) {
         this.value = value;
         if (value.children instanceof Array) {
@@ -16,7 +17,6 @@ Item.prototype = extend([], {
             this.push.apply(this, children);
         }
         if (isObject(value)) {
-            this.name = value.name;
             this.tab = value.tab;
             this.icon = value.icon;
             this.color = value.color;
@@ -28,30 +28,38 @@ Item.prototype = extend([], {
             if (value.href) this.href = value.href;
             if (value.src) this.src = value.src;
         }
-        else {
-            this.name = value;
-        }
-    },
+    }
 
     valueOf() {
         return this.value;
-    },
+    }
     toString() {
         return String(this.value);
-    },
+    }
+    get warn() {
+        if (isObject(this.value)) {
+            return /danger|red|warn/.test(this.value.type) || this.value.warn;
+        }
+        return false;
+    }
+    get name() {
+        if (isObject(this.value)) return this.value.name;
+        return this.value;
+    }
+
     isClosed() {
         return !!this.value.closed;
-    },
+    }
     setClosed(value) {
         this.value.closed = value;
-    },
+    }
     isActive() {
         if (isObject(this.value)) {
             if ("active" in this.value) return this.value.active;
             if ('actived' in this.value) return this.value.actived;
         }
         return !!this.actived;
-    },
+    }
     setActive(value) {
         if (isObject(this.value)) {
             if ('active' in this.value) {
@@ -61,15 +69,16 @@ Item.prototype = extend([], {
             }
         }
         this.actived = value;
-    },
+    }
     isSelected() {
         return !!this.value.selected;
-    },
+    }
     isChecked() {
         return !!this.value.checked;
-    },
+    }
     getClass() {
         return !!this.value.class;
     }
-});
+
+}
 Item.prototype.isActived = Item.prototype.isActive;

package/coms/zimoli/contextmenu.js

@@ -8,10 +8,11 @@ var createMenu = function (event, items) {
         if (!item.when(event)) return false;
         return true;
     });
-    var elem = menuList(menulist, items, async function (item) {
-        if (await action.call(this, item, event.target) !== false) {
-            remove(elem);
-        }
+    var elem = menuList(menulist, items, function (item) {
+        action.call(this, item, event.target).then(function (e) {
+            if (e !== false) remove(elem);
+        });
+        return false;
     });
 
     return elem;
@@ -30,26 +31,8 @@ function contextmenu(target, menuItems) {
         css(menu, {
             position: "absolute",
         });
-        popup(menu);
+        popup(menu, event);
         menu.focus();
-        var { offsetWidth, offsetHeight } = menu;
-        var left = event.clientX, top = event.clientY;
-        if (offsetWidth + left > innerWidth) {
-            left = left - offsetWidth;
-        }
-        if (left < 0) {
-            left = 0;
-        }
-        if (offsetHeight + top > innerHeight) {
-            top = top - offsetHeight;
-        }
-        if (top < 0) {
-            top = 0;
-        }
-        css(menu, {
-            left: left + "px",
-            top: top + "px"
-        });
         onmousedown(menu, e => e.preventDefault());
         onblur(menu, lazy(e => remove(menu)));
     });

package/coms/zimoli/createItemTarget.js

@@ -1,7 +1,13 @@
-function createItemTarget(item) {
+function createItemTarget(item, target) {
     var $scope = {};
-    var { itemName } = this.$src;
+    var { itemName, indexName, keyName } = this.$src;
     if (itemName) $scope[itemName] = item;
     else $scope.$item = item;
+    if (target && target.$scope) {
+        if (indexName) $scope[indexName] = target.$scope[indexName];
+        if (keyName) $scope[keyName] = target.$scope[keyName];
+        $scope.$index = target.$scope.$index;
+        $scope.$key = target.$scope.$key;
+    }
     return { $scope };
 }

package/coms/zimoli/drag.js

@@ -146,5 +146,4 @@ drag.on = function (target, actionTarget = target.dragTarget) {
     on("drop")(actionTarget || target, setZIndex);
     onmousedown(target, _mousedrag);
     ontouchstart(target, _touchdrag);
-    move.bindPosition(actionTarget || target);
 };

package/coms/zimoli/list.js

@@ -351,7 +351,7 @@ function ylist(container, generator, $Y) {
             }
         }
     };
-
+    list.getLastVisibleElement = getLastVisibleElement;
     list.stopY = function (count, spd) {
         var firstElement = getFirstVisibleElement();
         var lastElement = getLastVisibleElement();