efront 4.10.0 → 4.10.1

package/coms/frame/route.js

@@ -141,19 +141,19 @@
                     }
                     mmap[menu.id] = menu;
                 }
-                if (menu.id === opened.active) actived = menu, actived_value = historys.length;
+                if (menu.id === opened.$active) actived = menu, actived_value = historys.length;
             }
             return res;
         };
         result.push.apply(result, items.filter(a));
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
-        var active = result.active;
+        var active = result.$active;
         if (!active || result.indexOf(active) < 0) {
-            actived = mmap[opened.active] || actived;
+            actived = mmap[opened.$active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
                     setActive(actived, true);
-                    result.active = actived;
+                    result.$active = actived;
                 };
             }
         }
@@ -176,38 +176,38 @@
         data.setInstance("option-buttons", zimoli.options || [], false);
         var menu = getChild(zimoli);
         if (!menu) return;
-        if (menu !== result.active) {
-            setActive(result.active, false);
+        if (menu !== result.$active) {
+            setActive(result.$active, false);
             setActive(menu, true);
-            result.active = menu;
+            result.$active = menu;
         }
         if (menu.id) {
             var opened = result.opened || [];
             var oped = opened.map(a => a.id);
-            oped.active = menu.id;
+            oped.$active = menu.id;
             data.setInstance('menu-opened', oped);
         }
     });
     result.open = function (menu) {
         if (!menu) {
-            menu = result.active || result[0];
-            delete result.active;
+            menu = result.$active || result[0];
+            delete result.$active;
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
         }
-        if (menu === result.active) return;
+        if (menu === result.$active) return;
         var opened = result.opened || [];
         if (!~opened.indexOf(menu) && !getChild(menu).id) {
             opened.push(menu);
         }
-        if (result.active && result.active.id !== menu.id) {
-            setActive(result.active, false);
+        if (result.$active && result.$active.id !== menu.id) {
+            setActive(result.$active, false);
         }
         setActive(menu, true);
         result.load(menu);
-        result.active = menu;
+        result.$active = menu;
     };
     result.close = function (menu) {
         if (menu === result[0]) return;
@@ -228,7 +228,7 @@
         }
     };
     result.reload = function () {
-        result.load(result.active);
+        result.load(result.$active);
         return result;
     };
     result.from = result.fetch = function (url) {

package/coms/zimoli/render.js

@@ -467,7 +467,7 @@ var src2 = function (search) {
     var savedValue;
     this.$renders.push(function () {
         var origin = getter(this);
-        var temp = shallowClone(origin, 1);
+        var temp = shallowClone(origin);
         if (isHandled(savedValue)) {
             if (shallowEqual(temp, savedValue, 1)) return;
         }

package/coms/zimoli/tree.js

@@ -25,9 +25,9 @@ function getChildrenBottom(com) {
                 return t;
             }
         }
-        if (c.target) return c.target;
+        if (c.$target) return c.$target;
     }
-    return com.target;
+    return com.$target;
 }
 
 var getArrayFromTree = Tree.toArray;
@@ -121,13 +121,13 @@ function tree() {
             }
             _div.style.zIndex = 1;
             _div.itemid = com.id;
-            if (_div._index === changed_index) {
+            if (_div.$index === changed_index) {
                 saved_top = _div;
                 setState(true);
             } else {
                 setState();
             }
-            if (_div._index === changed_offset) {
+            if (_div.$index === changed_offset) {
                 saved_offset = _div;
             }
             com.closed = com.isClosed();
@@ -138,7 +138,7 @@ function tree() {
             var saved = com.saved;
             if (com.length) {
 
-                if (saved.closed !== closed || _div !== com.target) {
+                if (saved.closed !== closed || _div !== com.$target) {
                     saved.closed = closed;
                     if (closed) {
                         addClass(_div, 'closed');
@@ -165,7 +165,7 @@ function tree() {
         };
         var getChildrenTop = function (com) {
             while (com.joined) com = com[0];
-            return com[0]?.target;
+            return com[0]?.$target;
         }
         onclick(_div, function (event) {
             var isClosed = com.isClosed();
@@ -175,24 +175,24 @@ function tree() {
             if (isClosed === com.isClosed() && com.length) {
                 com.setClosed(!isClosed);
             }
-            var index = this._index;
+            var index = this.$index;
             changed_index = index;
             buildCrack(com);
             changed_offset = com.crack + index;
             if (!com.length) {
-                dom.forEach(d => d.target && d.target.refresh());
+                dom.forEach(d => d.$target && d.$target.refresh());
                 return;
             }
             var z0 = function () {
                 var z = function (e) {
-                    if (e.target) e.target.style.zIndex = 0;
+                    if (e.$target) e.$target.style.zIndex = 0;
                     if (e instanceof Array) e.forEach(z);
                 };
                 com.forEach(z);
             };
             var z1 = function () {
                 var z = function (e) {
-                    if (e.target) e.target.style.zIndex = 1;
+                    if (e.$target) e.$target.style.zIndex = 1;
                     if (e instanceof Array) e.forEach(z);
                 };
                 com.forEach(z);
@@ -244,14 +244,14 @@ function tree() {
         if (index >= coms.length) return;
         var com = coms[index];
         if (!com) return;
-        if (com.target) {
-            com.target._index = index;
-            com.target.refresh();
-            return com.target;
+        if (com.$target) {
+            com.$target.$index = index;
+            com.$target.refresh();
+            return com.$target;
         }
         var _div = createChild(com, index);
-        com.target = _div;
-        _div._index = index;
+        com.$target = _div;
+        _div.$index = index;
         _div.refresh();
         return _div;
     });
@@ -274,10 +274,10 @@ function tree() {
         var f = banner.getFirstVisibleElement(stickys.top + 1);
         if (!f) return;
         var limitHeight = f.offsetTop - banner.scrollTop;
-        var c = dom[f._index];
+        var c = dom[f.$index];
         var useLimit = false;
         if (p) {
-            var d = dom[p._index];
+            var d = dom[p.$index];
             if (d.tab == c.tab) {
                 var { top, height } = getOffset(p);
                 if (top + height >= limitHeight) {
@@ -296,6 +296,7 @@ function tree() {
         while (c.parent) {
             var p = c.parent;
             if (!p?.joined) {
+                if (!c.$target) return;
                 parents.push(c);
             }
             c = p;
@@ -303,7 +304,7 @@ function tree() {
         stickys.forEach(s => s.sticky = false);
         parents = parents.map(p => {
             p.sticky = true;
-            return p.target;
+            return p.$target;
         });
         parents.reverse();
         stickys.forEach(s => {
@@ -330,7 +331,7 @@ function tree() {
     }
     var refresh = function () {
         var index = banner.index();
-        var needremoves = dom.map(d => d.target).filter(d => !!d);
+        var needremoves = dom.map(d => d.$target).filter(d => !!d);
         dom = getArrayFromTree(root, banner.joined);
         remove(needremoves, false);
         banner.go(index || 0);

package/docs//347/273/204/344/273/266.xht

@@ -73,6 +73,7 @@
     [codearea]>.codetext {
         overflow: auto;
         display: block;
+        white-space: pre;
         height: auto;
         min-height: 100%;
         border-width: 10px 20px 40px 20px;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.10.0",
+    "version": "4.10.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {