efront 3.14.2 → 3.14.3

package/coms/zimoli/confirm.js

@@ -123,9 +123,6 @@ function confirm() {
         onclick(btn, clickbtn);
         return btn;
     });
-    onclick(element, function () {
-        css(this, { zIndex: zIndex() });
-    });
     preventOverflowScrolling(element);
     appendChild(option, buttons);
     if (!target) element.initialStyle = "transform:scale(0.96);opacity:0;transition:transform .3s,opacity .2s ease-out";

package/coms/zimoli/drag.js

@@ -13,6 +13,21 @@ var getOffset = function (e) {
     if (isFinite(e.screenLeft)) return [e.screenLeft, e.screenTop];
     if (isFinite(e.screenX)) return [e.screenX, e.screenY];
 };
+var z;
+var addZIndex = function (clone) {
+    if (clone.style) clone.style.zIndex = z + (+clone.style.zIndex || 0);
+};
+var setZIndex = function () {
+    var target = this;
+    var computed = getComputedStyle(target);
+    var z0 = zIndex(0);
+    if (!z || computed.zIndex < z0) {
+        z = zIndex();
+        if (/^(absolute|fixed)$/i.test(computed.position)) {
+            css(target, { zIndex: z });
+        }
+    }
+};
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName)) return;
     if (target.dragable === false) return;
@@ -36,7 +51,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
         var saved_height = target.outerHeight;
     }
     var extraClones;
-
     var mousemove = function (event) {
         if (event.moveLocked) return;
         if (/resize/i.test(getComputedStyle(document.body).cursor)) return;
@@ -50,21 +64,20 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             dispatch("dragstart", target);
             if (isElement(target) && !/absolute|fixed/.test(getComputedStyle(target).position)) {
                 clone = toCloneTarget(target, isMovingSource);
+                z = zIndex(0) + 1;
+                addZIndex(clone);
                 appendChild(document.body, clone);
             } else {
                 clone = target;
                 extraTargets = [];
+                if (target.style) css(target, { zIndex: z });
             }
             var [clone_left, clone_top] = getOffset(clone);
             extraClones = extraTargets.map(toCloneTarget);
+            extraClones.forEach(addZIndex);
             extraClones.map(c => document.body.appendChild(c));
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
-            if (clone.style) {
-                var z = zIndex();
-                clone.style.zIndex = z + (+clone.style.zIndex || 0);
-                extraClones.map(e => e.style.zIndex = z + (+e.style.zIndex || 0));
-            }
         }
         drag.target = clone;
         var offsetLeft = saved_delta.x + event.screenX;
@@ -125,6 +138,9 @@ drag.on = function (target, actionTarget = target.dragTarget) {
         var _mousedrag = mousedrag;
         var _touchdrag = touchdrag;
     }
+    onmousedown(actionTarget || target, setZIndex);
+    ontouchstart(actionTarget || target, setZIndex);
+    on("drop")(actionTarget || target, setZIndex);
     onmousedown(target, _mousedrag);
     ontouchstart(target, _touchdrag);
     move.bindPosition(actionTarget || target);

package/coms/zimoli/popup.js

@@ -233,7 +233,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             display: element.style.display
         };
     }
-    var zindex = zIndex();
+    var zindex = zIndex(0) + 1;
     css(element, `position:absolute;z-index:${zindex}`);
     css(_rhomb, { zIndex: zindex });
     var release1 = onremove(target, function () {

package/coms/zimoli/render.js

@@ -7,7 +7,7 @@ presets.template = function (t) {
         var node = document.createElement(comment.parentNode.tagName || "div");
         node.innerHTML = t.innerHTML;
         comment.with = [].slice.call(node.childNodes, 0);
-        appendChild.after(comment,comment.with);
+        appendChild.after(comment, comment.with);
         renderElement(comment.with, comment.$scope, comment.$parentScopes);
     });
     return comment;
@@ -692,7 +692,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     for (var k in props) {
         try {
-            element[k] = props[k];
+            if (element[k] !== props[k]) element[k] = props[k];
         } catch (e) { }
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
@@ -782,6 +782,9 @@ function renderStructure(element, scope, parentScopes = []) {
             element.removeAttribute(name);
         }
         else {
+            if (!/\-/.test(name) || value === '') {
+                copys.push(attr);
+            }
             props[name.replace(/\-(\w)/g, (_, w) => w.toUpperCase())] = value === "" ? true : value;
         }
     }

package/coms/zimoli/zIndex.js

@@ -1,4 +1,6 @@
-var count=0x10000000;//弹出式菜单或窗口的zIndex起点
-function zIndex(){
-    return count++;
+var count = 0x10000000;//弹出式菜单或窗口的zIndex起点
+function zIndex(inc = 1) {
+    inc |= 0;
+    if (inc > 0) count += inc;
+    return count;
 };

package/package.json

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