efront 3.4.2 → 3.4.6

package/coms/layer/glance.less

@@ -34,7 +34,7 @@
     border-bottom: 1px solid rgba(0, 0, 0, .16);
 }
 
->:not([layer]) {
+>[layer=main] {
     padding: 50px 10px 20px 10px;
 }
 

package/coms/zimoli/checker.html

@@ -1 +1 @@
-▢<s>✓</s>
+<s>✓</s>

package/coms/zimoli/checker.less

@@ -1,12 +1,16 @@
 & {
-    height: 1em;
-    width: 1em;
+    height: .8em;
+    width: .8em;
     position: relative;
-    margin-right: 4px;
+    border: .1em solid;
+    margin-right: .3em;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;
     text-align: center;
+    margin-top: .15em;
+    border-radius: .12em;
+    vertical-align: middle;
 
     >s {
         display: none;
@@ -15,13 +19,13 @@
         font-weight: bold;
         left: 0;
         right: 0;
-        top: -.15em;
+        top: -.4em;
     }
 }
 
 
 &.checked {
     >s {
-        display: inline;
+        display: block;
     }
 }

package/coms/zimoli/getTreeFromData.js

@@ -29,15 +29,21 @@ function getTreeFromData(array) {
     var tab = 0;
     var run = function (item, parent) {
         item.tab = tab;
-        var total = 0;
+        var count = 0, total = 0;
         item.parent = parent;
         item.root = root;
         if (item.length) {
             tab++;
-            item.forEach(item => total += run(item, parent));
+            for (var cx = 0, dx = item.length; cx < dx; cx++) {
+                var i = item[cx];
+                run(i, parent);
+                count += i.count || 1;
+                total += i.total;
+            }
             tab--;
         }
-        return item.total = total || 1;
+        item.total = total + item.length;
+        return item.count = count;
     };
     run(root);
     return root;

package/coms/zimoli/radio.html

@@ -1,4 +1,4 @@
 <a ng-repeat="o in options" ng-click="select(o)" ng-class="{activate:o===options.active}">
-    <r>◯<s>●</s></r>
+    <r><s></s></r>
     <span ng-bind=o.name||o></span>
 </a>

package/coms/zimoli/radio.less

@@ -6,18 +6,36 @@
         font-family: sans-serif;
         display: inline-block;
         position: relative;
-        margin-right: 4px;
-        line-height: 1;
+        margin-right: .3em;
         text-align: center;
-        
+        vertical-align: middle;
+        width: 1em;
+        height: 1em;
+        border: .1em solid;
+        border-radius: 50%;
+
         >s {
             display: none;
             position: absolute;
             text-decoration: none;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0;
+            overflow: hidden;
+            border-radius: 50%;
+            width: .4em;
+            height: .4em;
+            top: 50%;
+            left: 50%;
+            margin: -.2em;
+
+            text-indent: -.5em;
+
+            &:after {
+                position: absolute;
+                left: 0;
+                top: 0;
+                display: block;
+                content: "";
+                border: .3em solid;
+            }
         }
     }
 
@@ -25,7 +43,7 @@
     &.activate {
         >r {
             >s {
-                display: inline;
+                display: block;
             }
         }
     }

package/coms/zimoli/tree.js

@@ -251,7 +251,7 @@ function tree() {
                 com.forEach(z);
                 setState();
             };
-
+            var time = size => (Math.log(-size / 30 + 2) * 100 | 0) / 1000;
             if (com.isClosed() && com.length) {
                 z0();
                 setState(true);
@@ -265,7 +265,7 @@ function tree() {
                     marginTop = top.offsetTop - bottom.offsetTop - bottom.offsetHeight;
                 }
                 var res = transition(top, {
-                    transition: 'margin-top .2s ease-out',
+                    transition: `margin-top ${time(marginTop)}s ease-out`,
                     marginTop: fromOffset(marginTop)
                 }, true);
                 if (res) timeout(refresh, res);
@@ -282,7 +282,7 @@ function tree() {
                 }
                 setState(false);
                 z0();
-                var res = transition(change_elem, { transition: "margin-top .2s ease-out", marginTop: fromOffset(margin_top) }, false);
+                var res = transition(change_elem, { transition: `margin-top ${time(margin_top)}s ease-out`, marginTop: fromOffset(margin_top) }, false);
                 timeout(z1, res);
             }
         });
@@ -307,7 +307,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, true);
         needremoves.forEach(_div => {
             delete _div.initialStyle;

package/coms/zimoli/view.less

@@ -109,11 +109,14 @@ body>& {
 }
 
 .button {
-    padding: 0 20px;
     min-width: 60px;
     vertical-align: middle;
+    margin-right: 10px;
+}
 
-    &+.button {
-        margin-left: 10px;
+>.foot,
+>[foot] {
+    .button {
+        padding: 0 20px;
     }
 }

package/package.json

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