efront 3.18.2 → 3.19.1

package/coms/zimoli/maps_test.js

@@ -1,33 +1,42 @@
 function maps_test() {
-    var map = new maps({
+    var config = {
         center: [/*兰考*/114.834364, 34.82138],
-        center: [/*蒙古*/104.751074, 44.163022],
-        center: [/*西亚*/48.068813, 29.321316],
-        zoom: 12
-    });
-    onclick(map, function (event) {
-        var map = this.map;
-        var layerx = event.offsetX || event.layerX || 0;
-        var layery = event.offsetY || event.layerY || 0;
-        var [lng, lat] = map.location(layerx, layery);
-        alert(`${lng},${lat}`);
-    });
-    var active;
-    var buttons = ["百度", "谷歌", "OSM", "Default"].map((a, cx) => {
-        var btn = button(a);
-        onclick(btn, function () {
-            if (active) for (var k in active) {
-                delete map.map[k];
+        // center: [/*蒙古*/104.751074, 44.163022],
+        // center: [/*西亚*/48.068813, 29.321316],
+        zoom: 3
+    };
+    var page = document.createElement('map-test');
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        menus: ["高德", "百度", "谷歌", "OSM", { name: "Default", actived: true }].map(a => isObject(a) ? a : { name: a }),
+        menu,
+        maps: [
+            maps$gaode,
+            maps$baidu,
+            maps$google,
+            maps$osm,
+        ],
+        actived: null,
+        locat(event) {
+            var map = this.map;
+            var layerx = event.offsetX || event.layerX || 0;
+            var layery = event.offsetY || event.layerY || 0;
+            var [lng, lat] = map.location(layerx, layery);
+            alert(`${lng},${lat}`);
+        },
+        open(m) {
+            console.log(m, this.actived)
+            for (var k in this.actived) {
+                delete this.mp.map[k];
             }
-            extend(map.map, active = [
-                maps$baidu,
-                maps$google,
-                maps$osm
-            ][cx]);
-            map.map.refresh();
-        });
-        return btn;
+            extend(this.mp.map, m, { cache: [] });
+            this.mp.map.refresh();
+            console.log(this.mp.map)
+            this.actived = m;
+        },
+        map() {
+            return new maps(config);
+        },
     });
-    buttons[3].click();
-    return option(group(buttons), map, 8);
+    return page;
 }

package/coms/zimoli/maps_test.less

@@ -7,11 +7,9 @@
     background-position: 0 0, @background-size/2 @background-size/2;
     height: 200px;
 }
-canvas{
-    background-color: #035;
-}
-.button {
-    height: 40px;
+
+canvas {
     width: 100%;
-    display: block;
+    height: 100%;
+    background-color: #035;
 }

package/coms/zimoli/menu.js

@@ -153,7 +153,7 @@ function main(elem, mode) {
                     tree(elem, function (index, item, menu) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
-                        var m = menuItem(e, menu, elem.useIcon);
+                        var m = menuItem(null, menu, elem.useIcon);
                         return m;
                     });
                     care(elem, function (data) {
@@ -196,7 +196,7 @@ function main(elem, mode) {
             case "vertical":
                 if (!direction) mode = "vertical", direction = 'y';
                 var emit = function (item, target) {
-                    active(elem, item.value, item, elem.$src ? createItemTarget.call(elem, item.value) : target);
+                    active(elem, item, null, elem.$src ? createItemTarget.call(elem, item, target) : target);
                 };
                 if ("$src" in elem) {
                     getGenerator(elem, 'menu-item');

package/coms/zimoli/menuItem.html

@@ -1,4 +1,4 @@
-<i ng-class="icon" ng-if='useIcon||hasIcon'></i>
+<i ng-class="icon?" ng-if='useIcon||hasIcon'></i>
 <span ng-html="name?"></span>
 <template -if="hotkey?">
     &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>

package/coms/zimoli/menuItem.js

@@ -8,16 +8,14 @@ function main(elem, scope, hasIcon) {
         var scope = item.$scope;
     }
     if (scope.menu) scope = scope.menu;
-    var name = scope.name;
-    var icon = scope.icon;
-    if (hasIcon === undefined) hasIcon = !!icon;
+    if (hasIcon === undefined) hasIcon = !!scope.icon;
     if (scope.disabled || scope.enabled === false) {
         item.setAttribute('disabled', '');
     }
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }], 0);
+    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon }]);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     if (scope.hotkey) bindAccesskey(item, scope.hotkey);
     return item;

package/coms/zimoli/menuList.html

@@ -1,6 +1,6 @@
 <menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open.call(this)" ng-mouseleave="cancel()"
     ng-mouseenter="popMenu.call(this)" ng-mousedown="popMenu1.call(this,event)" ng-class="{'has-children':menu.children&&menu.children.length,
-    'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red',
+    'warn':menu.warn,
     'actived':menu.isActived()
 }">
 </menu-item>

package/coms/zimoli/menuList.js

@@ -226,12 +226,12 @@ function main(page, items, active, direction = 'y') {
         clear();
         clearTimeout(popTimer);
     }
-    var fire = function () {
+    var fire = async function () {
         cancel();
         if (this.menu.line) return;
         if (byMousedown) return;
         if (this.hasAttribute("disabled") || this.hasAttribute('line')) return;
-        var pop = active(this.menu, this);
+        var pop = active(this.menu.value, this);
         if (pop === false) return;
         var root = page.root || page;
         if (root.direction === 't' || root.selected) {
@@ -297,7 +297,6 @@ function main(page, items, active, direction = 'y') {
                 a.menu = s;
                 return a;
             },
-            menus: items,
             hasIcon: hasIcon(),
             open: fire,
             cancel,
@@ -308,7 +307,7 @@ function main(page, items, active, direction = 'y') {
             var src = page.$src;
             var itemName = src.itemName;
             var className = `{'has-children':${itemName}.children&&${itemName}.children.length,
-            'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red',
+            'warn':${itemName}.warn,
             actived:${itemName}.isActived()
         }`;
             var notHidden = `!${itemName}.hidden`;
@@ -316,6 +315,7 @@ function main(page, items, active, direction = 'y') {
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
+                if (!(item instanceof Item)) item = new Item(item);
                 var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
                 a.setAttribute("e-class", className);
@@ -334,6 +334,7 @@ function main(page, items, active, direction = 'y') {
         }
         else {
             page.innerHTML = menuList;
+            $scope.menus = items.map(i => i instanceof Item ? i : new Item(i));
             render(page, $scope);
             vbox(page);
         }

package/coms/zimoli/menuList.less

@@ -23,6 +23,11 @@
 
         &.warn {
             color: #c28;
+
+            &.focus {
+                color: #c28;
+                background: #c282;
+            }
         }
 
         &.focus {

package/coms/zimoli/move.js

@@ -152,30 +152,12 @@ var fixPosition = move.fixPosition = function (target) {
 };
 move.coordIn = coordIn;
 move.trimCoord = trimCoord;
-var resizingTargets = [];
-on('resize')(window, function () {
-    resizingTargets.forEach(fixPosition);
-});
-var off;
-var resizeTarget = function () {
-    var target = this;
-    var index = resizingTargets.indexOf(target);
-    if (index < 0) index = resizingTargets.push(target);
-    return index;
+var fixTarget = function () {
+    fixPosition(this);
 };
-var removeResize = function () {
-    removeFromList(resizingTargets, this);
-};
-
 move.bindPosition = function (target, position) {
-    if (position) {
+    oncemount(target, function () {
         setPosition(target, position);
-    }
-    var index = resizingTargets.indexOf(target);
-    if (index >= 0) return;
-    on("append")(target, resizeTarget);
-    on("remove")(target, removeResize);
-    if (isMounted(target)) {
-        resizeTarget.call(target);
-    }
+    });
+    on("resize")(target, fixTarget);
 }

package/coms/zimoli/oncemount.js

@@ -3,5 +3,5 @@ function oncemount(target, handle) {
         handle.call(target);
         return;
     }
-    once("append")(target, handle);
+    once("mounted")(target, handle);
 }

package/coms/zimoli/onmousewheel.js

@@ -11,6 +11,7 @@ var addDeltaY = function (event) {
         } else {
             delta = 120 / (1 - delta / 12) - 120;
         }
+        delta /= devicePixelRatio;
         if (event.axis === 1) {
             event.deltaX = delta;
             event.deltaY = 0;

package/coms/zimoli/popup.js

@@ -395,4 +395,5 @@ var global = function (element, issingle) {
 };
 var popup_as_yextra = _as_yextra.bind(null, global, innerWidth, innerHeight);
 var popup_as_xextra = _as_xextra.bind(null, global, innerHeight, innerWidth);
-var cleanup = new Cleanup(rootElements);
+var cleanup = new Cleanup(rootElements);
+popup.style = animationStyle;

package/coms/zimoli/render.js

@@ -90,6 +90,8 @@ var createGetter = function (search, isprop = true) {
 var initialComment = function (renders, type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
     comment.renders = renders;
+    comment.$scope = this.$scope;
+    comment.$parentScopes = this.$parentScopes;
     appendChild.after(this, comment);
     if (!/if/i.test(type)) remove(this);
     if (!this.$struct.once) {
@@ -188,11 +190,9 @@ var createRepeat = function (search, id = 0) {
             var clone = element.cloneNode();
             clone.innerHTML = element.innerHTML;
             clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;
-            clone = render(clone, $scope, clone.$parentScopes);
             clonedElements1[k] = clone;
             return clone;
         }, this);
@@ -201,6 +201,7 @@ var createRepeat = function (search, id = 0) {
             if (a.previousSibling !== last) appendChild.after(last, a);
             last = a;
         }, this);
+        cloned.forEach(a => render(a));
         for (var k in clonedElements) {
             if (clonedElements1[k] !== clonedElements[k]) remove(clonedElements[k]);
         }
@@ -212,27 +213,40 @@ var createRepeat = function (search, id = 0) {
         once("append")(this, initialComment.bind(this, renders, "repeat", expression));
     }
 };
+var comment = function (elements) {
+    for (var cx = elements.length - 2; cx > 1; cx -= 2) {
+        var e = elements[cx];
+        if (e.previousSibling === this) var c = this;
+        else {
+            var c = document.createComment('else' + (cx < elements.length - 2 ? "if .." : ''));
+            e.parentNode.insertBefore(c, e);
+        }
+        elements.splice(cx, 0, c);
+        remove(e);
+    }
+};
+var initIf = function (ifs) {
+    for (var s of ifs) {
+        comment(s);
+        if (s.parent) {
+            initialComment.call(s[0], s.renders, "if", s.comment);
+        } else {
+            once("append")(s[0], initialComment.bind(s[0], s.renders, "if", s.comment));
+        }
+    }
+};
 var createIf = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(search).bind(this);
     var element = this;
-    var p = element;
-    if (p.parentNode) {
-        p = p.parentNode;
-        for (var cx = 0, dx = if_top.length; cx < dx; cx++) {
-            if (if_top[cx].parent === p) {
-                break;
-            }
-        }
-    }
-    cx++;
-    if (cx > 0) if_top.splice(cx, if_top.length - cx);
     var elements = [element, getter];
     if_top.push(elements);
     var savedValue;
-    var renders = [function () {
+    elements.parent = this.parentNode;
+    elements.comment = search[1];
+    elements.renders = [function () {
         var shouldMount = -1;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var getter = elements[cx + 1];
             if (!getter || getter()) {
                 shouldMount = cx;
@@ -241,10 +255,10 @@ var createIf = function (search, id = 0) {
         }
         if (savedValue === shouldMount) return;
         savedValue = shouldMount;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var element = elements[cx];
             if (cx === shouldMount) {
-                appendChild.before(this, element);
+                appendChild.after(cx > 0 ? elements[cx - 1] : this, element);
                 if (element.renderid < 0) {
                     element.renderid = id;
                     elements[cx] = render(element, this.$scope, this.$parentScopes);
@@ -256,12 +270,6 @@ var createIf = function (search, id = 0) {
         }
 
     }];
-    if (this.parentNode) {
-        elements.parent = this.parentNode;
-        initialComment.call(this, renders, "if", search[1]);
-    } else {
-        once("append")(this, initialComment.bind(this, renders, "if", search[1]));
-    }
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
@@ -355,15 +363,18 @@ var structures = {
         createIf.call(this, search);
     },
     "else"(search) {
-        var top = if_top[if_top.length - 1];
-        if (!top || top.parent !== this.parentNode) {
+        for (var cx = if_top.length - 1; cx >= 0; cx--) {
+            if (if_top[cx].parent === this.parentNode) break;
+        }
+        if (cx < 0) {
             throw new Error("else/elseif前缺少同级if！");
         }
+        initIf(if_top.splice(cx + 1, if_top.length - cx - 1));
+        var top = if_top[cx];
         if (search && search[1]) {
             var getter = createGetter(search).bind(this);
         }
         top.push(this, getter);
-        remove(this);
     },
     repeat(search) {
         createRepeat.call(this, search);
@@ -852,7 +863,7 @@ function render(element, scope, parentScopes, lazy = true) {
         renderlock = false;
         eagermount = false;
     }
-    if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
+    if (if_top_length < if_top.length) initIf(if_top.splice(if_top_length, if_top.length - if_top_length));
     return e;
 }
 var digest = lazy(refresh, -{});

package/coms/zimoli/resize.js

@@ -121,11 +121,8 @@ var handle = {
             }
         });
         var rect = dragging.rect;
-        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
-        delete style.left;
-        delete style.top;
-        Object.keys(style).forEach(k => style[k] = fromOffset(style[k]));
         css(dragging.rect, style);
+        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
         dispatch(dragging.rect, 'resize');
         resizingList.forEach(a => {
             if (getTargetIn(dragging.rect, a)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.18.2",
+    "version": "3.19.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {