efront 3.4.6 → 3.5.2

package/apps/pivot/api.yml

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

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/edit.html

@@ -0,0 +1,10 @@
+<div head>修改</div>
+<div body>
+    <form>
+        <field -repeat="f in fields" -src="[f,data]"></field>
+    </form>
+</div>
+<div foot>
+    <button white @click="close()">取消</button>
+    <button @click="save()"> 保存 </button>
+</div>

package/apps/pivot/share/edit.js

@@ -0,0 +1,16 @@
+function main({ fields, item }) {
+    var page = view();
+    page.innerHTML = edit;
+    renderWithDefaults(page, {
+        fields,
+        close() {
+            return remove(page);
+        },
+        save() {
+            return data.from("share", { opt: item ? 'update' : 'create', data: this.data }).loading_promise;
+        },
+        data: Object.assign({}, item)
+    });
+    drag.on(page.firstChild, page);
+    return page;
+}

package/apps/pivot/share/list.html

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

package/apps/pivot/share/list.js

@@ -0,0 +1,36 @@
+var fields = refilm`
+路径/path
+挂载点/name
+`;
+var options = [
+    {
+        name: "删除",
+        do(e) {
+            data.from('share', { opt: 'delete', item: e });
+        }
+    },
+    {
+        name: "修改",
+        do(e) {
+            popup('/share/edit', { fields, item: e });
+        }
+    }
+];
+console.log(fields)
+function main() {
+    var page = div();
+    page.innerHTML = list;
+    var a = data.from("share", { opt: 'list' }, a => {
+        if (a) return a.map(b => ({ path: b }));
+    });
+    renderWithDefaults(page, {
+        data: a,
+        fields: fields.concat({
+            name: "操作",
+            type: 'button',
+            options,
+        }),
+    });
+    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

@@ -1,13 +1,14 @@
 var styles = {
-    blue: "#2a53cd",
+    blue: "#2a83cd",
     green: "#228B22",
-    orange: "#dd6a16",
-    red: "#dc352e"
+    orange: "#fdca86",
+    red: "#cc352e"
 };
 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/autodragchildren.js

@@ -86,6 +86,16 @@ var bindTarget = function (index, element) {
 };
 
 var hooka = function (matcher, move, event, targetChild, isMovingSource) {
+    var dragbox = this.dragbox;
+    if (dragbox instanceof Function) {
+        dragbox = dragbox.call(this);
+        if (dragbox && !getTargetIn(dragbox, event.target)) return;
+    }
+    else {
+        dragbox = this;
+    }
+    var that = this;
+
     var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
 
     var recover = function (element) {
@@ -130,41 +140,89 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     }
     var targetBox, saved_opacity, saved_filter, moveMargin, moveChildren;
     var previousElements, followedElements, rebuildTargets, scroll;
-    if (getTargetIn(this, targetChild)) {
-        targetBox = targetChild.parentNode;
-        previousElements = getPreviousElementSiblings(targetChild);
-        followedElements = getFollowedElementSiblings(targetChild);
-        saved_filter = targetBox.style.filter;
-        saved_opacity = targetBox.style.opacity;
-        rebuildTargets = function () { };
-        [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
-        moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-    } else {
-        previousElements = [];
-        followedElements = [];
-        moveChildren = () => { };
-        rebuildTargets = function () {
-            var temp = matcher(drag.target);
-            if (temp === targetBox) return;
-            if (previousElements) previousElements.map(recover);
-            if (followedElements) followedElements.map(recover);
-            if (targetBox) {
-                removeClass(targetBox, "dropping");
-            }
-            targetBox = temp;
-            if (!targetBox) {
-                previousElements = [];
+    var that = this;
+    var draginit = function () {
+        that.setAttribute('dragchildren', '');
+        if (targetBox) addClass(targetBox, 'dropping');
+        if (getTargetIn(dragbox, targetChild)) {
+            targetBox = targetChild.parentNode;
+            previousElements = getPreviousElementSiblings(targetChild);
+            followedElements = getFollowedElementSiblings(targetChild);
+            saved_filter = targetBox.style.filter;
+            saved_opacity = targetBox.style.opacity;
+            rebuildTargets = function () { };
+            [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
+            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+        } else {
+            previousElements = [];
+            followedElements = [];
+            moveChildren = () => { };
+            rebuildTargets = function () {
+                var temp = matcher(drag.target);
+                if (temp === targetBox) return;
+                if (previousElements) previousElements.map(recover);
+                if (followedElements) followedElements.map(recover);
+                if (targetBox) {
+                    removeClass(targetBox, "dropping");
+                }
+                targetBox = temp;
+                if (!targetBox) {
+                    previousElements = [];
+                    followedElements = [];
+                    moveChildren = () => { };
+                    return;
+                }
+                addClass(targetBox, "dropping");
+                previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
-                moveChildren = () => { };
-                return;
+                [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
+                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+            };
+        }
+    };
+    var dragfire = function () {
+        that.removeAttribute('dragchildren');
+        removeClass(targetBox, "dropping");
+        var dst, appendSibling, delta;
+        var src = previousElements.length;
+        if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
+            if (!previousElements[cx]) {
+                dst = 0;
+                delta = 0;
+                appendSibling = appendChild.before;
+            } else if (!previousElements[cx].moved) {
+                dst = previousElements.length - cx;
+                delta = -1;
+                appendSibling = appendChild.after;
+                break;
             }
-            addClass(targetBox, "dropping");
-            previousElements = [].slice.call(targetBox.children, 0).reverse();
-            followedElements = [];
-            [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-        };
-    }
+        }
+
+        if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
+            if (!followedElements[cx]) {
+                dst = followedElements.length + previousElements.length;
+                delta = 0;
+                appendSibling = appendChild.after;
+            } else if (!followedElements[cx].moved) {
+                dst = previousElements.length + cx;
+                delta = 1;
+                appendSibling = appendChild.before;
+                break;
+            }
+        }
+        if (appendSibling) {
+            var children = targetBox.children;
+            var srcElement = children[src];
+            var dstElement = children[dst + delta];
+            src = bindTarget(src, srcElement);
+            dst = bindTarget(dst, dstElement);
+            isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
+            if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
+        } else if (isMovingSource === false) {
+            move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
+        }
+    };
+
     var offall = function () {
         offmousup();
         offtouchend();
@@ -190,8 +248,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
 
     // 修改margin无效的情况
     function dragclone() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         var _previousElements = previousElements.map(cloneCell);
         var _followedElements = followedElements.map(cloneCell);
         previousElements.splice(0, previousElements.length);
@@ -204,109 +262,33 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         var offall = function () {
             offdragmove();
             offdragend();
-            removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
+            dragfire();
             css(targetBox, { opacity: saved_opacity, filter: saved_filter });
             remove(previousElements);
             remove(followedElements);
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
             previousElements.map(recover);
             followedElements.map(recover);
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
     // 仅修改Margin就可以实现拖拽效果
     function draglist() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         autoScroll();
         var offall = function () {
             cancelScroll();
             offdragmove();
             offdragend();
-            if (targetBox) removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
+            dragfire();
             previousElements.map(e => moveMargin(e, false));
             followedElements.map(e => moveMargin(e, false));
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
@@ -320,9 +302,7 @@ var hookEvent = function (matcher, move, event) {
     if (event.target === this) return;
     var targetChild = getTargetIn(matcher, event.target, false);
     if (!targetChild) return;
-    var dragbox = this.dragbox;
-    if (dragbox instanceof Function) dragbox = dragbox.call(this);
-    hooka.call(dragbox || this, matcher, move, event, targetChild);
+    hooka.call(this, matcher, move, event, targetChild);
 };
 function addhook() {
     var mousedownEvent, targetElement, callback, matcher, dropid, allowdrops;

package/coms/zimoli/button.js

@@ -95,6 +95,11 @@ function button(texter, type) {
         if (_texter.tagName) {
             var button = _texter;
             if (button.childNodes.length) {
+                if (button.childNodes.length === 1 && button.childNodes[0].nodeType !== 1) {
+                    _texter = createElement(_label);
+                    _texter.appendChild(button.childNodes[0]);
+                    button.appendChild(_texter);
+                }
                 appendChild.before(button.childNodes[0], tracker);
             } else {
                 appendChild(button, tracker);

package/coms/zimoli/button.less

@@ -18,7 +18,9 @@
     overflow: hidden;
     outline: none;
 }
-
+>.label{
+    position: relative;
+}
 
 @keyframes busy-loading {
     0% {
@@ -139,9 +141,11 @@
         margin-left: -2px;
         height: 200%;
         background: #fff9;
+        background: inherit;
+        opacity: 0.9;
         border-left: 1px #fff3 solid;
         border-right: 3px #fff6 solid;
-        animation: ltr 3s linear 1s infinite;
+        animation: ltr 2s linear 0s infinite;
     }
 
 }