efront 3.4.4 → 3.5.0

package/apps/pivot/api.yml

@@ -1,3 +1,4 @@
 ./aapi/ authorization: 
   login: options /::login-:a
-  run: options /:::run
+  run: options /:::run
+  share: options /::share

package/apps/pivot/home/welcome.js

@@ -13,12 +13,12 @@ function main() {
             } catch { }
             target.removeAttribute('pending');
         },
-        logout() {
+        async logout() {
             data.setSource('authorization', null);
-            user.logout();
-            location.reload();
+            await user.Logout();
+            zimoli.switch();
+            zimoli();
         }
     });
-    console.log(page)
     return page;
 }

package/apps/pivot/main.js

@@ -1,6 +1,9 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
-// user.token = data.getSource('authorization');
+var token = data.getSource('authorization');
+if (token) {
+    user.login({});
+}
 setInterval(function () {
     var auth = data.getSource('authorization');
     if (!auth) return;

package/apps/pivot/main.less

@@ -0,0 +1,3 @@
+>:not([layer]) {
+    padding: 50px 10px 0;
+}

package/apps/pivot/menu.yml

@@ -1,3 +1,5 @@
 首页: /home/welcome
-工作台: /home/short
+共享目录管理: /share/list
+短链接: /home/short
+# 用户: /home/short
 # 用户列表: /user/list

package/apps/pivot/share/list.html

@@ -0,0 +1 @@
+<table :src=[fields,data]></table>

package/apps/pivot/share/list.js

@@ -0,0 +1,24 @@
+var fields = refilm`
+路径/path
+操作 btn ${[{
+        name: "删除",
+        do(e) {
+            console.log(e)
+            alert("暂不支持删除！");
+        }
+    }]}
+`;
+console.log(fields)
+function main() {
+    var page = div();
+    page.innerHTML = list;
+    var a = data.from("share", a => {
+        if (a) return a.map(b => ({ path: b }));
+    });
+    renderWithDefaults(page, {
+        data: a,
+        fields,
+    });
+    console.log(a)
+    return page;
+}

package/coms/layer/glance.js

@@ -90,14 +90,14 @@ function main(mainPath, historyName = "") {
         var hook = function () {
             if (--index !== 0) return;
             if (leftPath) {
-                var page = zimoli.go(leftPath, null, leftLayer);
+                var page = zimoli.create(leftPath);
                 page.setAttribute('layer', 'left');
                 appendChild.replace(leftLayer, page);
                 leftLayer = page;
                 dragview({ page: layer, toLeft: layer.closeLeft, toRight: layer.openLeft, menu: leftLayer });
             }
             if (topPath) {
-                var page = zimoli.go(topPath, null, topLayer);
+                var page = zimoli.create(topPath);
                 page.setAttribute('layer', 'top');
                 appendChild.replace(topLayer, page);
                 topLayer = page;

package/coms/zimoli/alert.js

@@ -8,6 +8,7 @@ styles.success = styles.pass = styles.green;
 styles.info = styles.blue;
 styles.error = styles.danger = styles.red;
 styles.warn = styles.orange;
+styles.default = '#000';
 var alerts = [];
 var clean = Cleanup(alerts);
 var build = function () {
@@ -21,15 +22,15 @@ var build = function () {
 };
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
-var _text = function (color, parameters) {
+var _text = function (bgcolor, parameters) {
     var box = div();
     css(box, `top:${fromPixel(alerts.length ? Math.max.apply(Math, alerts.map(e => e.offsetTop + e.children[0].offsetHeight)) : 0)};height:0;line-height:${fromPixel(singleHeight - 20)};left:0;right:0;font-size:${fromPixel(fontSize)}; transition: all 0.2s ease-out;position:absolute;color:#fff;text-align:center;`);
-    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${color};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
+    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
     box.initialStyle = `margin:-${fromPixel(singleHeight)} auto;opacity:0;`;
     return box;
 };
 function alert() {
-    var color = String(this), text, autoclose = true, onclose;
+    var color = String(isString(this) && this || styles.default), text, autoclose = true, onclose;
     var color_reg = /^#(?:\w{6}|\w{3})$/;
     [].map.call(arguments, function (arg) {
         switch (typeof arg) {

package/coms/zimoli/appendChild.js

@@ -116,6 +116,7 @@ appendChild.insert = function (parent, element, relative = parent.childNodes[0]
     }
 };
 appendChild.replace = function (alreadyMounted, element) {
+    if (alreadyMounted === element) return;
     if (!alreadyMounted || !alreadyMounted.parentNode) return;
     insertBefore(alreadyMounted, element);
     remove(alreadyMounted);

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

@@ -37,6 +37,7 @@ var trim3v = function (r, g, b) {
 			if (b > 0) b += rest;
 		}
 	} while (rest > 0);
+
 	return [r, g, b];
 }
 
@@ -56,7 +57,7 @@ var rgb4s = function (r, g, b, s) {
 		g -= m;
 		b -= m;
 	}
-	s = s * 255 / Math.max(r, g, b);
+	s = s * 255 / (Math.max(r, g, b) || 1);
 	if (s) {
 		r *= s;
 		g *= s;
@@ -276,7 +277,7 @@ var rgb2v = function (r, g, b) {
 	r *= .299;
 	g *= .587;
 	b *= .114;
-	return r + g + b;
+	return Math.max(r, g, b) / .587;
 };
 var v2rgb = function (v, r, g, b) {
 	var t = r + g + b || 1;

package/coms/zimoli/data.js

@@ -310,7 +310,11 @@ var parseData = function (sourceText) {
         sourceText = sourceText.replace(/^[^\(]+\(([\s\S]*)\)[^\)]*$/, "$1");
     }
     try {
-        sourceText = parseYML(sourceText);
+        if (/^[\[\{][\d\:,]+[\}\]],|^(Infinity|''|NaN|\d+|)$|^\/[\s\S]*?\/\w*$/.test(sourceText)) {
+            sourceText = JSAM.parse(sourceText);
+        } else {
+            sourceText = parseYML(sourceText);
+        }
     } catch (e) {
         throw "数据无法解析";
     }

package/coms/zimoli/gallery.js

@@ -121,18 +121,8 @@ function main() {
             minWidth = arg;
         }
     });
-    var src = element.getAttribute("src") || element.getAttribute("ng-src") || element.getAttribute("v-src");
-    if (src) {
-        var parsedSrc = render.parseRepeat(src);
-        if (!parsedSrc) {
-            element.setAttribute("ng-src", src);
-            element.removeAttribute("src");
-            var generator = getGenerator(element);
-        } else {
-            element.setAttribute("ng-src", parsedSrc.srcName);
-            element.removeAttribute("src");
-            var generator = getGenerator(element, parsedSrc);
-        }
+    if ("$src" in element) {
+        var generator = getGenerator(element);
         care(element, function () {
             var index = element.index();
             element.clean();

package/coms/zimoli/getGenerator.js

@@ -1,6 +1,6 @@
 
 var _slider = createElement(div);
-var getGenerator = function (container, parsedSrc) {
+var getGenerator = function (container) {
     if (!container) return;
     var template = document.createElement("div");
     var templates = [].concat.apply([], container.childNodes).filter(a => {
@@ -20,26 +20,27 @@ var getGenerator = function (container, parsedSrc) {
     appendChild(template, templates);
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
+    var scopes = container.$parentScopes.concat(container.$scope);
     return function (index, com) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
         if (!com) return;
-        var template1 = template.cloneNode();
-        template1.innerHTML = template.innerHTML;
+        var template1 = template.cloneNode(true);
         if (!template1.childNodes.length) return template1;
         var item = template1.childNodes[0];
         item.with = [].concat.apply([], template1.childNodes).slice(1);
+        var parsedSrc = container.$src;
         if (parsedSrc) {
             var { keyName, itemName, indexName } = parsedSrc;
-            var newScope = extend(Object.create(container.$scope), {
+            var newScope = {
                 [keyName || '$key']: index,
                 [itemName || '$item']: com,
                 [indexName || '$index']: index
-            });
-            var newItem = render(item, newScope);
-            newItem.with = render(item.with, newScope);
+            };
+            var newItem = render(item, newScope, scopes);
+            if (item.with.length) newItem.with = render(item.with, newScope, scopes);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -59,8 +60,8 @@ var getGenerator = function (container, parsedSrc) {
                     return this.$item;
                 }
             }
-            var newItem = render(item, newScope, [container.$scope]);
-            newItem.with = render(newItem.with = item.with, newScope, [container.$scope]);
+            var newItem = render(item, newScope, scopes);
+            newItem.with = render(newItem.with = item.with, newScope, scopes);
         }
         return newItem;
     };

package/coms/zimoli/image.less

@@ -14,6 +14,8 @@
 
     >.button {
         border: none;
+        width: 100%;
+        cursor: pointer;
 
         >.track {
 

package/coms/zimoli/list.js

@@ -433,18 +433,8 @@ function list() {
         bindSrc = container;
         container = div();
     } else if (container && !generator) {
-        var src = container.getAttribute("src") || container.getAttribute("ng-src") || container.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                container.setAttribute("ng-src", src);
-                container.removeAttribute("src");
-                var generator = getGenerator(container);
-            } else {
-                container.setAttribute("ng-src", parsedSrc.srcName);
-                container.removeAttribute("src");
-                var generator = getGenerator(container, parsedSrc);
-            }
+        if ("$src" in container) {
+            generator = getGenerator(container);
             care(container, function () {
                 var index = container.index();
                 container.clean();

package/coms/zimoli/menu.js

@@ -110,18 +110,6 @@ function main(elem, mode) {
             }
         }
         mode = mode ? mode.toLowerCase() : "horizonal";
-        var src = elem.getAttribute("src") || elem.getAttribute("ng-src") || elem.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem);
-            } else {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem, parsedSrc);
-            }
-            elem.setAttribute("ng-src", parsedSrc ? parsedSrc.srcName : src);
-        }
 
         switch (mode) {
             case "i":
@@ -130,6 +118,7 @@ function main(elem, mode) {
             case "t":
             case "tree":
                 if (elem) {
+                    var generator = getGenerator(elem);
                     tree(elem, function (index, item) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
@@ -165,9 +154,9 @@ function main(elem, mode) {
                 var emit = function (item) {
                     active(elem, item, item.value);
                 };
-                if (src) {
+                if ("$src" in elem) {
                     care(elem, function (src) {
-                        menuList(elem, getTreeFromData(src), emit, generator, direction);
+                        menuList(elem, getTreeFromData(src), emit, direction);
                     });
                 } else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/menuList.js

@@ -8,7 +8,7 @@ var release = function () {
 var clear = function () {
     clearTimeout(releaseTimer);
 };
-function main(page, items, active, generator, direction = 'y') {
+function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
@@ -21,7 +21,7 @@ function main(page, items, active, generator, direction = 'y') {
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
         clone.innerHTML = template.innerHTML;
-        var menu = main(clone, item.children, active, generator);
+        var menu = main(clone, item.children, active);
         mounted_menus.push(menu);
 
         page.active = menu;
@@ -46,7 +46,7 @@ function main(page, items, active, generator, direction = 'y') {
         template.innerHTML = page.innerHTML;
         page.tempalte = template;
     }
-    if (!generator || !page.children.length || page.menutype === 1) {
+    if (!page.children.length || page.menutype === 1) {
         page.innerHTML = menuList;
         page.menutype = 1;
         var hasIcon = function () {
@@ -82,6 +82,7 @@ function main(page, items, active, generator, direction = 'y') {
             this.$scope.hasIcon = hasIcon();
         });
     } else {
+        var generator = getGenerator(page);
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;

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;
             }
         }
     }