efront 3.26.8 → 3.26.15

package/coms/zimoli/drag.js

@@ -1,5 +1,7 @@
 var toCloneTarget = function (target, isMovingSource) {
+    target.setAttribute("dragclone", '');
     var clone = cloneVisible(target);
+    target.removeAttribute("dragclone");
     var position = getScreenPosition(target);
     css(clone, `position:absolute;left:${fromOffset(position.left)};top:${fromOffset(position.top)};user-select:none;`);
     setOpacity(target, isMovingSource !== false ? 0 : 1);
@@ -34,9 +36,11 @@ var setZIndex = function () {
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;
-    if (isArray(target)) {
-        var extraTargets = target.slice(1);
-        target = target[0];
+    if (isArrayLike(target)) {
+        var extraTargets = Array.prototype.slice.call(target, 0);
+        var index = extraTargets.length - 1;
+        while (index > 0 && !getTargetIn(extraTargets[index], initialEvent.target)) index--;
+        [target] = extraTargets.splice(index, 1);
     } else {
         var extraTargets = target.with ? [].concat(target.with) : [];
     }

package/coms/zimoli/field.html

@@ -5,7 +5,7 @@
     </div>
     <div class="body">
         <model _data=data _field=field _readonly="readonly"></model>
-        <span class="error" ng-bind="error"></span>
+        <container class="error" -src="error"></container>
     </div>
     <div class="foot" ng-if="field.msg">
         <span ng-bind=field.msg></span>

package/coms/zimoli/field.js

@@ -29,10 +29,16 @@ function main(elem) {
             this.setAttribute("error", error);
             switch (error) {
                 case "empty":
-                    scope.error = `${f.name}是必填字段！`;
+                    scope.error = true;
                     break;
                 default:
-                    scope.error = (f.name) + error;
+                    if (isNode(error)) {
+                        scope.error = error;
+                    }
+                    else {
+                        scope.error = document.createElement('error');
+                        scope.error.innerHTML = error;
+                    }
             }
         }
         else {

package/coms/zimoli/field.less

@@ -41,7 +41,6 @@
 
 &.error,
 &[error] {
-    background: #f322;
 
     model>* {
         background: #f322;

package/coms/zimoli/getChanges.js

@@ -4,6 +4,7 @@ function getChanges(current_props, previous_props) {
     if (!isObject(current_props)) current_props = Object.create(null), changes = {};
     if (!isObject(previous_props)) previous_props = Object.create(null), changes = {};
     keys(previous_props, current_props).forEach(function (key) {
+        if (key.charAt(0) === "$") return;
         if (!deepEqual.shallow(current_props[key], previous_props[key])) {
             if (!changes) changes = {};
             changes[key] = { previous: previous_props[key], current: current_props[key] };

package/coms/zimoli/list.js

@@ -380,6 +380,7 @@ function ylist(container, generator, $Y) {
         patchBottom(0);
     });
     list.getLastVisibleElement = getLastVisibleElement;
+    list.getFirstVisibleElement = getFirstVisibleElement;
     list.$stopY = function (t, spd) {
         var firstElement = getFirstVisibleElement();
         var lastElement = getLastVisibleElement();
@@ -471,7 +472,15 @@ function ylist(container, generator, $Y) {
      * @param {boolean} animate
      */
     list.setFocus = function (focused, animate) {
-        if (focused && (focused.hasAttribute("disabled") || focused.hasAttribute("line"))) return;
+        if (isElement(focused) && (focused.hasAttribute("disabled") || focused.hasAttribute("line"))) return;
+        if (isFinite(focused)) {
+            var index = focused;
+            focused = list.getIndexedElement(index);
+            if (!focused) {
+                list.go(index);
+                focused = list.getIndexedElement(index);
+            }
+        }
         if (!focused) {
             if (list.focused) {
                 removeClass(list.focused, 'focus');
@@ -482,6 +491,9 @@ function ylist(container, generator, $Y) {
         if (list.focused === focused) return;
         if (list.focused) removeClass(list.focused, 'focus');
         addClass(focused, "focus");
+        list.focused = focused;
+        while (focused && focused.parentNode !== list) focused = focused.parentNode;
+        if (!focused) return;
         var scrollTop = list.scrollTop;
         var firstElement = getFirstElement(1);
         var sideheight = 0;
@@ -497,7 +509,6 @@ function ylist(container, generator, $Y) {
             scrollTop = focused.offsetTop - sideheight;
         }
         if (scrollTop !== list.scrollTop) scrollBy(scrollTop - list.scrollTop, animate);
-        list.focused = focused;
     };
 
     /**
@@ -509,37 +520,37 @@ function ylist(container, generator, $Y) {
         var newIndex = 0, total = 0;
         if (delta === 'up') delta = -1;
         if (delta === 'down') delta = 1;
-        if (typeof delta === 'string') {
-            switch (delta.toLowerCase()) {
-                case "home":
-                    newIndex = 0;
-                    delta = 1;
-                    break;
-                case "end":
-                    var lastElement = getLastElement(1);
-                    if (!lastElement) return;
-                    newIndex = lastElement.index;
-                    delta = -1;
-                    break;
-                case "pageup":
-                    var firstElement = getFirstVisibleElement();
-                    if (!firstElement) return;
-                    newIndex = firstElement.index;
-                    list.scrollBy(-list.clientHeight + firstElement.offsetHeight);
-                    var lastElement = getLastVisibleElement();
-                    if (lastElement.index < newIndex) newIndex = lastElement.index;
-                    delta = -1;
-                    break;
-                case "pagedown":
-                    var lastElement = getLastVisibleElement();
-                    if (!lastElement) return;
-                    newIndex = lastElement.index;
-                    list.scrollBy(list.clientHeight - lastElement.offsetHeight);
-                    var firstElement = getFirstVisibleElement();
-                    if (firstElement.index > newIndex) newIndex = firstElement.index;
-                    delta = 1;
-                    break;
-            }
+        if (typeof delta === 'string') switch (delta.toLowerCase()) {
+            case "home":
+                newIndex = 0;
+                delta = 1;
+                break;
+            case "end":
+                var lastElement = getLastElement(1);
+                if (!lastElement) return;
+                newIndex = lastElement.index;
+                delta = -1;
+                break;
+            case "pageup":
+                var firstElement = getFirstVisibleElement();
+                if (!firstElement) return;
+                newIndex = firstElement.index;
+                list.scrollBy(-list.clientHeight + firstElement.offsetHeight);
+                var lastElement = getLastVisibleElement();
+                if (lastElement.index < newIndex) newIndex = lastElement.index;
+                delta = -1;
+                break;
+            case "pagedown":
+                var lastElement = getLastVisibleElement();
+                if (!lastElement) return;
+                newIndex = lastElement.index;
+                list.scrollBy(list.clientHeight - lastElement.offsetHeight);
+                var firstElement = getFirstVisibleElement();
+                if (firstElement.index > newIndex) newIndex = firstElement.index;
+                delta = 1;
+                break;
+            default:
+                return false;
         }
         else if (!focused) {
             var lastElement = getLastElement(1);

package/coms/zimoli/menu.js

@@ -89,29 +89,6 @@ var getTreeNodes = function (elem) {
     [].forEach.call(elem.children, run);
     return nodes;
 };
-/**
- * @param {any} item
- * @param {Event} event
- */
-var emitEvent = function (item, event) {
-    if (event.defaultPrevented) return;
-    event.preventDefault(true);
-    if (item.disabled) return;
-    active(this, item, "global", this.$src ? createItemTarget.call(this, item) : this);
-}
-function bindGlobalkey(elem, keymap, emit) {
-    if (elem.keyoff) {
-        for (var off of elem.keyoff) {
-            off();
-        }
-    }
-    if (!keymap) return;
-    var keyoff = [];
-    for (let k in keymap) {
-        keyoff.push(bind("keydown.only." + k)(elem, emitEvent.bind(elem, keymap[k])));
-    }
-    elem.keyoff = keyoff;
-}
 
 function main(elem, mode) {
     if (isElement(elem)) {
@@ -197,7 +174,7 @@ function main(elem, mode) {
                 if ("$src" in elem) {
                     var src0 = [];
                     care(elem, function (src) {
-                        bindGlobalkey(elem, src.keymap, emit);
+                        bindGlobalkey(elem, src.keymap);
                         src0.splice(0, src0.length);
                         var s = getTreeFromData(src);
                         if (s.actived) {

package/coms/zimoli/menuItem.html

@@ -5,7 +5,10 @@
     </template>
 </template>
 <span -html="name?" -style="{color:color?}"></span>
-<template -if="hotkey?.length">
+<template -if="typeof hotkey==='string'">
+    &nbsp;&nbsp; <span class="hotkey" -html="hotkey"></span>
+</template>
+<template -elseif="hotkey?.length">
     &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>
 </template>
 <s></s>

package/coms/zimoli/menuList.js

@@ -1,5 +1,5 @@
 var _active = action;
-var mounted_menus = [], releaseTimer = 0, root_menu;
+var mounted_menus = [], releaseTimer = 0;
 var release = function () {
     clear();
     releaseTimer = setTimeout(function () {
@@ -10,98 +10,61 @@ var clear = function () {
     clearTimeout(releaseTimer);
 };
 var unfocus = lazy(function () {
-    if (mounted_menus.indexOf(document.activeElement) >= 0) return;
-    remove(mounted_menus);
-    if (root_menu) root_menu.setFocus(null);
     var root = this.root || this;
+    if (mounted_menus.indexOf(document.activeElement) >= 0 || document.activeElement === root) return;
+    remove(mounted_menus);
     if (root.ispop === 1) root.ispop = false;
     root.actived = null;
     root.setFocus(null);
 });
 var unblur = function () {
     if (document.activeElement !== this) {
-        this.tabIndex = 0;
         this.focus();
     }
 };
 var openFocus = function () {
-    var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
+    var menu = this;
     if (!menu.ispop) menu.ispop = 1;
     menu.open(menu.focused);
 };
 var closeFocus = function () {
-    var menu = mounted_menus[mounted_menus.length - 1];
-    remove(menu);
+    remove(this.actived);
 };
-var keyAction = function (deltax, deltay) {
-    if (root_menu !== document.activeElement) return;
-    var menu = mounted_menus[mounted_menus.length - 1];
-    if (menu) var parent = mounted_menus[mounted_menus.length - 2] || root_menu;
-    else menu = root_menu;
-
-    if (menu.direction === 'y') {
-        if (deltax === 1) {
-            // right
-            if (menu.focused) var fmenu = menu.focused.menu;
-            if (fmenu && fmenu.children && fmenu.children.length) {
-                openFocus();
-            }
-            else if (parent) {
-                var index = mounted_menus.lastIndexOf(parent);
-                while (parent && parent.direction === 'y') {
-                    parent = mounted_menus[--index];
-                }
-                if (!parent && root_menu.direction !== 'y') parent = root_menu;
-                if (parent) parent.moveFocus(deltax, parent.ispop);
-            }
-        }
-        else if (deltax === -1) {
-            // left
-            if (parent) {
-                if (parent.direction === 'y') remove(mounted_menus.pop());
-                else parent.moveFocus(deltax, parent.ispop);
-            }
-        }
-        else {
-            menu.moveFocus(deltay, menu.ispop);
-        }
+var keydown = function () {
+    var menu = this;
+    if (menu.moveFocus("down") !== false) return;
+    if (menu.focused) var fmenu = menu.focused.menu;
+    if (fmenu && fmenu.children && fmenu.children.length) {
+        if (!menu.ispop) menu.ispop = 1;
+        menu.open(menu.focused);
+        return;
     }
-    else {
-        if (deltay === 1) {
-            // down
-            if (menu.focused) var fmenu = menu.focused.menu;
-            if (fmenu && fmenu.children && fmenu.children.length) openFocus();
-            else if (parent) {
-                var index = mounted_menus.lastIndexOf(parent);
-                while (parent && parent.direction !== 'y') {
-                    parent = mounted_menus[--index];
-                }
-                if (!parent && root_menu.direction === 'y') parent = root_menu;
-                if (parent) parent.moveFocus(deltay, parent.ispop);
-            }
-        }
-        else if (deltay === -1) {
-            // up
-            if (parent) {
-                if (parent.direction !== 'y') remove(mounted_menus.pop());
-                else parent.moveFocus(deltay, parent.ispop);
-            }
-        }
-        else {
-            menu.moveFocus(deltax, menu.ispop);
-        }
+    do {
+        menu = menu.parent;
+    }
+    while (menu && (menu.focus(), menu.moveFocus("down") === false));
+    if (menu && !menu.actived) menu.focus();
+};
+var keyup = function () {
+    var menu = this;
+    if (menu && menu.moveFocus("up") !== false) return;
+    var parent = menu.parent;
+    if (parent && (parent.focus(), parent.moveFocus("up") === false)) {
+        parent.focus();
+        remove(menu);
     }
 };
+var keyleft = arriswise(keyup, arguments);
+var keyright = arriswise(keydown, arguments);
 function keyalt() {
     if (this === document.activeElement) this.blur();
-    else if (root_menu === this && root_menu !== document.activeElement) {
-        root_menu.tabIndex = 0;
-        root_menu.focus();
-        root_menu.setFocus(root_menu.getIndexedElement(0));
+    else {
+        this.focus();
+        this.setFocus(this.getIndexedElement(0));
     }
 }
 function keytab(event) {
-    var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
+    var menu = this;
     event.preventDefault();
     menu.moveFocus(event.shiftKey ? -1 : 1);
 }
@@ -112,50 +75,28 @@ function keyesc() {
         else this.ispop = false;
     }
 }
-function keyup() {
-    keyAction(0, -1);
-}
-function keydown() {
-    keyAction(0, 1);
-}
-function keyleft() {
-    keyAction(-1, 0)
-}
-function keyright() {
-    keyAction(1, 0);
-}
-function getFocusedMenu() {
-    var menu = mounted_menus[mounted_menus.length - 1];
-    if (!menu || !menu.focused) menu = mounted_menus[mounted_menus.length - 2] || root_menu;
-    if (mounted_menus.indexOf(document.activeElement) >= 0 || document.activeElement === root_menu) return menu;
-}
 function keyspace() {
-    var menu = getFocusedMenu();
-    if (menu && menu.focused) {
-        menu.focused.click();
+    if (this.focused) {
+        this.focused.click();
     }
 }
 function keyhome() {
-    var menu = getFocusedMenu();
-    if (menu) menu.moveFocus("home", true);
+    this.moveFocus("home", true);
 }
 function keyend() {
-    var menu = getFocusedMenu();
-    if (menu) menu.moveFocus("end", true);
+    this.moveFocus("end", true);
 }
 function keypagedown() {
-    var menu = getFocusedMenu();
-    if (menu) menu.moveFocus("pagedown", true);
+    this.moveFocus("pagedown", true);
 }
 function keypageup() {
-    var menu = getFocusedMenu();
-    if (menu) menu.moveFocus("pageup", true);
+    this.moveFocus("pageup", true);
 }
-function register() {
-    var menu = this;
-    // if (!root_menu) root_menu = this;
+function registerAlt(menu) {
     bind('keydown.only.alt.')(menu, keyalt);
     bind('keydown.esc.only')(menu, keyesc);
+}
+function registerMenuKeys(menu) {
     on('keydown.pageup.only')(menu, keypageup);
     on('keydown.pagedown.only')(menu, keypagedown);
     on('keydown.home.only')(menu, keyhome);
@@ -185,6 +126,7 @@ function main() {
     function popMenu(item, target) {
         if (page.actived) {
             clear();
+            page.focus();
             remove(page.actived);
         }
         if (!item.length) return;
@@ -200,15 +142,16 @@ function main() {
         mounted_menus.push(menu);
         page.actived = menu;
         menu.root = page.root || page;
+        menu.parent = page;
         if (menu.go) menu.go(0);
         popup(menu, target);
+        unblur.call(menu);
         if (page.ispop === true) {
         } else {
             page.ispop = 1;
         }
         on("remove")(menu, function () {
             removeFromList(mounted_menus, this);
-            menu.setFocus(null);
             css(menu, "width:;height:;max-height:;max-width:;");
         });
         return menu;
@@ -221,7 +164,13 @@ function main() {
         template.innerHTML = page.innerHTML;
         page.$template = template;
     }
+    var enterMenuEnabled = 0;
+    onmousemove(page, function () {
+        enterMenuEnabled = Date.now();
+    });
     var enterMenu = lazy(function (menu) {
+        if (enterMenuEnabled + 200 < Date.now()) return;
+        enterMenuEnabled = false;
         if (page.ispop) {
             page.setFocus(menu);
             popMenu(menu.menu, menu);
@@ -377,7 +326,7 @@ function main() {
     });
     on("focused")(page, function () {
         var focused = page.focused;
-        if (page.ispop && page === root_menu) popMenu(focused.menu, focused, false);
+        if (page.ispop && !page.parent) popMenu(focused.menu, focused, false);
     });
     page.openFocus = openFocus;
     page.closeFocus = closeFocus;
@@ -387,8 +336,9 @@ function main() {
         enterMenu.cancel();
     });
     page.registerAsRoot = function () {
-        register.call(this);
-        root_menu = this;
+        registerAlt(this);
     };
+    page.tabIndex = 0;
+    registerMenuKeys(page);
     return page;
 }

package/coms/zimoli/menuList.less

@@ -33,6 +33,7 @@
 
         &.focus {
             color: #29c;
+            background-color: #29c2;
         }
 
         &.actived {

package/coms/zimoli/moveupon.js

@@ -81,8 +81,7 @@ function moveupon(target, { start, move, end }, initialEvent) {
         offtouchcancel = ontouchcancel(target, cancel);
     };
 
-    if (!start) {
-        if (!initialEvent) throw new Error("请传入touchstartEvent或者mousedownEvent");
+    if (initialEvent) {
         if (locktouch(initialEvent.target)) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
@@ -91,6 +90,7 @@ function moveupon(target, { start, move, end }, initialEvent) {
         } else {
             hookmouse();
         }
+        if (isFunction(start)) start.call(target, initialEvent);
         return;
     }
     onmousedown(target, function (event) {

package/coms/zimoli/overpos.js

@@ -0,0 +1,7 @@
+function overpos(rect, event) {
+    if (isArrayLike(rect)) var [left, top, right, bottom] = rect;
+    else if (isElement(rect)) var pos = getScreenPosition(rect), { left, top, right, bottom } = pos;
+    if (isArrayLike(event)) var [clientX, clientY] = event;
+    else var { clientX, clientY } = event;
+    return left < clientX && top < clientY && right > clientX && bottom > clientY;
+}

package/coms/zimoli/popup.js

@@ -1,17 +1,3 @@
-/**
- * 弹出层
- */
-on("keydown.esc.only")(document, function (e) {
-    if (e.defaultPrevented) return;
-    if (rootElements.length) {
-        var r = rootElements.pop();
-        if (r) {
-            r.blur();
-            remove(r);
-            e.preventDefault();
-        }
-    }
-});
 var animationStyle = "opacity:0;transform:scale(1.2);transition:.1s opacity ease-out,.2s transform ease-out;";
 var setInitialStyle = function (element) {
     if (!element.initialStyle) element.initialStyle = animationStyle;
@@ -38,7 +24,7 @@ var popup = function (path) {
     if (isNode(path)) {
         return popup_view.apply(null, arguments);
     }
-    throw new Error(`path isn't valid:${path}`);
+    throw new Error(`参数异常:${path}`);
 };
 var popup_path = function (path = "", parameters, target) {
     if (!popup.go || !popup.prepare) throw new Error("当前环境无法使用");
@@ -129,6 +115,8 @@ var popup_view = function (element, target, style) {
     if (target instanceof Event) {
         popup_to_event(element, target);
     } else if (target instanceof Array) {
+        if (isNode(style) && style.isMask) addMask(element, style);
+        else if (typeof style === 'boolean') addMask(element);
         popup_to_point(element, target);
     } else if (target) {
         popup_with_mask(element);
@@ -152,22 +140,29 @@ var createMask = function (element) {
     mask.isMask = true;
     return mask;
 };
-var popup_with_mask = function (element, mask = createMask(element)) {
+var mount = function (event) {
+    if (!this.parentNode) {
+        appendChild.before(event.target, this);
+        this.with.push(event.target);
+    }
+};
+var addMask = function (element, mask = createMask(element)) {
+    if (!mask.with) {
+        mask.with = [];
+        mask.clean = Cleanup.bind(mask);
+        mask.mount = mount.bind(mask);
+    }
+    element.$mask = mask;
+    onmounted(element, mask.mount);
+    onremove(element, mask.clean);
+    return mask;
+};
+var popup_with_mask = function (element, mask) {
+    mask = addMask(element, mask);
     css(element, `z-index:${zIndex()};`);
     if (mask.parentNode) {
         global(element, false);
     }
-    if (!element.with) {
-        element.with = [mask];
-    } else if (element.with instanceof Array) {
-        if (!~element.with.indexOf(element)) element.with.push(mask);
-    } else {
-        if (element.with !== element) element.with = [element.with, mask];
-    }
-    if (!mask.clean) {
-        mask.clean = new Cleanup(element.with);
-    }
-    onremove(element, mask.clean);
     if (!element.parentNode) global(element, false);
     return element;
 };

package/coms/zimoli/prompt.js

@@ -1,5 +1,27 @@
-function prompt(msg = "请输入", check) {
+var validate = function (text, checker, tip) {
+    var valid;
+    if (checker instanceof RegExp) {
+        valid = checker.test(text);
+    }
+    if (isFunction(checker)) {
+        var res = checker(text);
+        if (isEmpty(res)) valid = true;
+        else if (typeof res === 'boolean') valid = res;
+        else if (isNode(res)) remove(tip.childNodes), appendChild(tip, res);
+        else html(tip, res), valid = false;
+    }
+    if (valid) html(tip, '');
+    return valid;
+};
+function prompt() {
+    var msg = "请输入", check, ipt;
+    for (var arg of arguments) {
+        if (isNode(arg)) ipt = arg;
+        else if (typeof arg === 'string') msg = arg;
+        else if (isFunction(arg) || arg instanceof RegExp) check = arg;
+    }
     var ipt = input();
+    var tip = document.createElement("tip");
     var oked, ohed;
     var oks = [], ohs = [];
     var fire = function () {
@@ -9,17 +31,33 @@ function prompt(msg = "请输入", check) {
         oks.splice(0, oks.length);
         ohs.splice(0, ohs.length);
     };
-    var c = confirm(msg, ipt, ["确认", "取消"], function (_) {
+    var buttons = [button("确认"), button("取消", 'white')];
+    if (isFunction(check)) {
+        var setDistable = function () {
+            var valid = validate(ipt.value, check, tip);
+            attr(body, "error", !valid);
+            attr(buttons[0], 'disabled', !valid);
+        };
+        on('keyup')(ipt, setDistable);
+        on('keypress')(ipt, setDistable);
+        on('cut')(ipt, setDistable);
+        on('paste')(ipt, setDistable);
+        on('input')(ipt, setDistable);
+    }
+    var body = div();
+    appendChild(body, [ipt, tip]);
+    var c = confirm(msg, body, buttons, function (_) {
         if (oked || ohed) return;
-        if (_ === "确认") {
-            if (check && check(ipt.value) === false) return false;
+        if (_ === buttons[0]) {
+            if (check && validate(ipt.value, check, tip)) return false;
             oked = true;
         } else {
             ohed = true;
         }
         fire();
     });
-    on('append')(ipt, function () {
+    on('mounted')(ipt, function () {
+        setDistable();
         setTimeout(function () {
             ipt.focus();
         });