efront 3.18.1 → 3.19.0

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) {
@@ -286,7 +286,7 @@ function main(page, items, active, direction = 'y') {
         };
         var $scope = {
             "menu-item"(e, s) {
-                if (s === e.$scope) s = itemName ? s[itemName] : s.menu;
+                if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
                 var a = button(
                     menuItem(e, s.value, this.hasIcon)
                 );
@@ -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/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]);
         }
@@ -691,7 +692,9 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                     }
                 });
                 replacer.renderid = element.renderid;
-                replacer.renders = element.renders;
+                var renders = element.renders;
+                if (replacer.renders) renders = renders.concat(replacer.renders);
+                replacer.renders = renders;
                 if (binds.src) replacer.$src = element.$src;
                 element = replacer;
                 element.$scope = scope;
@@ -701,6 +704,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     if (element.children && element.children.length) renderElement(element.children, scope, parentScopes, once);
     if (!isFirstRender) return element;
+    var renders = element.renders;
+    element.renders = [];
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) {
             directives[k].call(element, [withContext, binds[k]])
@@ -718,6 +723,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         } catch (e) { }
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
+    if (renders.length) element.renders.push.apply(element.renders, renders);
     if (element.renders.length) {
         if (element.renderid !== 9) {
             onmounted(element, addRenderElement);

package/coms/zimoli/zimoli.js

@@ -127,7 +127,13 @@ function go(pagepath, args, history_name, oldpagepath) {
     } else {
         var { roles, options, id } = getZimoliParams(pagepath);
     }
-    if (!pagepath) return true;
+    if (!pagepath) {
+        if (isNode(history_name)) {
+            remove(history_name.activateNode);
+            history_name.activate = pagepath;
+        }
+        return true;
+    }
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
     prepare(pagepath, function (res) {
         if (!res.roles || res.roles === true) res.roles = !!roles;
@@ -594,7 +600,11 @@ function addGlobal(element, name = null, isDestroy) {
         }
         global[name] = element;
     } else if (isNode(name)) {
-        if (isDestroy || name.nodeType !== 1) appendChild.insert(name, element);
+        if (name.nodeType !== 1) {
+            appendChild.after(name, element);
+            name.with = [element];
+        }
+        else if (isDestroy) appendChild.insert(name, element);
         else appendChild(name, element);
     } else if (isFunction(name)) {
         name(element);

package/package.json

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