efront 3.18.2 → 3.18.3

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/menuList.js

@@ -231,7 +231,7 @@ function main(page, items, active, direction = 'y') {
         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,7 @@ function main(page, items, active, direction = 'y') {
                 a.menu = s;
                 return a;
             },
-            menus: items,
+            menus: items.map(i => i instanceof Item ? i : new Item(i)),
             hasIcon: hasIcon(),
             open: fire,
             cancel,
@@ -316,6 +316,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);

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) {
@@ -192,7 +194,6 @@ var createRepeat = function (search, id = 0) {
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;
-            clone = render(clone, $scope, clone.$parentScopes);
             clonedElements1[k] = clone;
             return clone;
         }, this);
@@ -201,6 +202,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]);
         }

package/package.json

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