efront 4.22.13 → 4.22.16

package/coms/zimoli/tree.js

@@ -269,34 +269,25 @@ function tree() {
     }
     var stickys = [];
     var setSticky = function () {
-        var p = stickys[stickys.length - 1];
-        var f = banner.getFirstVisibleElement(stickys.top);
+        var top = stickys.top || 0;
+        var f = banner.getFirstVisibleElement(top);
         if (!f) return;
-        var limitHeight = f.offsetTop - banner.scrollTop - parseFloat(getComputedStyle(banner).paddingTop);
-        var c = dom[f.$index];
-        var useLimit = false;
-        if (p) {
-            var d = dom[p.$index];
-            if (d.tab == c.tab) {
-                var { top, height } = getOffset(p);
-                if (top + height >= limitHeight) {
-                    var ic = c.parent.indexOf(c);
-                    useLimit = c.parent[ic - 1] === d;
-                    if (useLimit) c = d;
-                }
-            }
-            else {
-                useLimit = true;
-                limitHeight += getOffset(f).height;
-            }
-        }
+        var i = f.$index;
+        if (top > 0 && dom[i - 1]?.tab > dom[i].tab) i--;
+        var c = dom[i++];
+        while (i < dom.length && c.tab <= dom[i].tab) i++;
+        var n = dom[i]?.$target;
+        var limitHeight = n && n.offsetTop ? n.offsetTop - banner.scrollTop - parseFloat(getComputedStyle(banner).paddingTop) : Infinity;
         var parents = [];
         if (c.isClosed() || !c.length) c = c.parent;
         while (c.parent) {
             var p = c.parent;
             if (!p?.joined) {
-                if (!c.$target) return;
-                parents.push(c);
+                var ct = c.$target;
+                if (!ct) break;
+                var pt = p.$target;
+                if (pt && ct.offsetTop > pt.offsetTop + pt.offsetHeight);
+                else parents.push(c);
             }
             c = p;
         }
@@ -319,11 +310,11 @@ function tree() {
         var top = 0;
         stickys.forEach(p => {
             var h = getOffset(p).height;
-            var limit = useLimit && top + h > limitHeight;
+            var limit = top + h > limitHeight;
             css(p, {
                 position: 'sticky',
-                zIndex: 2,
-                top: limit ? limitHeight - h : top, zIndex: 3 - limit
+                top: limit ? limitHeight - h : top,
+                zIndex: 3 - limit
             });
             top += h;
         });

package/coms/zimoli/zIndex.js

@@ -4,3 +4,4 @@ function zIndex(inc = 1) {
     if (inc > 0) count += inc;
     return count;
 };
+zIndex.start = count;

package/docs/main.xht

@@ -1,5 +1,5 @@
 <style>
-    :root {
+    :scope {
         --leftwidth: 260px;
         display: block;
         width: auto;
@@ -14,39 +14,39 @@
         background: #fff;
     }
 
-    :root+scrollbar {
+    :scope+scrollbar {
         right: 0;
         background: transparent;
     }
 
-    :root>* {
+    :scope>* {
         vertical-align: top;
     }
 
-    :root>menu f {
+    :scope>menu f {
         margin-left: 6px;
     }
 
-    :root>menu f[test]:before {
+    :scope>menu f[test]:before {
         color: #fc0;
         content: "测";
     }
 
-    :root>menu f[dang]:before {
+    :scope>menu f[dang]:before {
         color: #2cf;
         content: "档";
     }
 
-    :root>menu f[less]:before {
+    :scope>menu f[less]:before {
         color: #2c9;
         content: "样";
     }
 
-    :root>menu[inline] {
+    :scope>menu[inline] {
         height: 100%;
     }
 
-    :root>menu[inline] {
+    :scope>menu[inline] {
         margin: 0;
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
@@ -81,7 +81,7 @@
         background: linear-gradient(#f2f4ff, 70%, #e9fff2);
     }
 
-    :root>menu v {
+    :scope>menu v {
         display: inline-block;
         font-size: 12px;
         color: #79a;
@@ -99,11 +99,11 @@
             z-index: 0 !important;
         }
 
-        :root>open:after {
+        :scope>open:after {
             content: "≡";
         }
 
-        :root>open {
+        :scope>open {
 
             display: block;
             position: absolute;
@@ -121,7 +121,7 @@
             border-radius: 50%;
         }
 
-        :root>menu {
+        :scope>menu {
 
             position: absolute;
             z-index: -1;
@@ -150,7 +150,7 @@
 
         }
 
-        :root {
+        :scope {
             padding: 0px !important;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.22.13",
+    "version": "4.22.16",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {