efront 3.20.1 → 3.20.4

package/apps/pivot/menu.yml

@@ -5,15 +5,11 @@ WEB:
   文件管理: /wow/root
   长连接管理: /link/index
   字典: /dict/list
-  接口: /api/list
 任务:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
   # 服务器: /api/host
-用户:
-  账号列表: /user/list
-  标签管理: /user/tag/list
 服务器日志:
   访问计数: /log/count
   启动记录: /log/boot

package/apps/pivot/wow/root.js

@@ -27,7 +27,7 @@ function main() {
         $scope.open();
         return false;
     }
-    page.setAttribute('ng-mousedown', 'setActive')
+    page.setAttribute('on-contextmenu', 'setActive')
     bind('drop')(page, async function (event) {
         event.preventDefault();
         var files = event.dataTransfer.files;

package/coms/basic/Tree.js

@@ -0,0 +1,154 @@
+class Tree extends Array {
+    constructor(src) {
+        if (src instanceof Tree) return src;
+        if (src instanceof Array && src[0] && ('tab' in src[0] || 'deep' in src[0])) {
+            return Tree.fromArray(src);
+        }
+        else if (src instanceof Array) {
+            return Tree.fromData(src);
+        }
+        if (src && src.children) {
+            return Tree.fromData(src.children);
+        }
+        super();
+    }
+    static fromData(array) {
+        if (array instanceof Tree) return array;
+        var root = new Tree;
+        root.tab = -Infinity;
+        root.count = 0;
+        var map = {};
+        array = array.filter(a => !!a);
+        var active_item = null;
+        var hasIcon = [];
+        array.forEach(function (data) {
+            var item = new Item(data);
+            if (!active_item && item.isActived()) active_item = item;
+            if (data.id) {
+                map[data.id] = item;
+            } else {
+                root.push(item);
+            }
+        });
+        array.forEach(function (data) {
+            if (!data) return;
+            var parent = map[data.parentId];
+            if (parent) {
+                var item = map[data.id];
+                delete map[data.id];
+                if (parent) {
+                    parent.push(item);
+                }
+            }
+        });
+        var items = Object.keys(map).map(a => map[a]);
+        root.push.apply(root, items);
+        var tab = 0;
+        var deep = 0;
+        var run = function (item, parent) {
+            item.tab = tab;
+            item.deep = tab;
+            var count = 0, total = 0;
+            item.parent = parent;
+            item.root = root;
+            if (item.icon && !hasIcon[deep]) hasIcon[deep] = true;
+            if (item.length) {
+                tab++;
+                if (hasIcon[deep]) tab++;
+                deep++;
+                for (var cx = 0, dx = item.length; cx < dx; cx++) {
+                    var i = item[cx];
+                    run(i, parent);
+                    count += i.count || 1;
+                    total += i.total;
+                }
+                deep--;
+                if (hasIcon[deep]) tab--;
+                tab--;
+            }
+            item.total = total + item.length;
+            return item.count = count;
+        };
+        run(root);
+        root.hasIcon = hasIcon;
+        root.actived = active_item;
+        return root;
+    }
+    static fromArray(array) {
+        if (array instanceof Tree) return array;
+        var root = new Tree;
+        root.tab = -Infinity;
+        root.count = 0;
+        root.total = 0;
+        var path = [root];
+        for (var cx = 0, dx = array.length; cx < dx; cx++) {
+            var arg = array[cx];
+            var item = new Item(arg);
+            item.root = root;
+            for (var cy = path.length - 1; cy >= 0; cy--) {
+                var parentElement = path[cy];
+                if (parentElement.tab < arg.tab) {
+                    item.parent = parentElement;
+                    parentElement.push(item);
+                    path.splice(cy + 1, path.length - cy - 1, item);
+                    break;
+                }
+                parentElement.parent.count += parentElement.count || parentElement.length || 1;
+                parentElement.parent.total += (parentElement.total || parentElement.length) + 1;
+            }
+        }
+        while (path.length > 1) {
+            var item = path.pop();
+            path[path.length - 1].count += item.count || item.length || 1;
+        }
+        return root;
+    }
+    static toArray(root, skipClosed = true) {
+        var path = [root], pathcx = [0];
+        var result = [];
+        var max_deep = 1;
+        loop: while (pathcx.length) {
+            var pathindex = pathcx.length - 1;
+            var cx = pathcx[pathindex];
+            var item = path[pathindex];
+            if (cx >= item.length) {
+                path.pop();
+                pathcx.pop();
+                continue loop;
+            }
+            var elem = item[cx];
+            elem.parent = item;
+            result.push(elem);
+            pathcx[pathindex] = ++cx;
+            if (!skipClosed || !elem.isClosed()) {
+                if (elem.length) {
+                    path.push(elem);
+                    pathcx.push(0);
+                    if (pathcx.length > max_deep) {
+                        max_deep = pathcx.length;
+                    }
+                }
+            }
+        }
+        result.deep = max_deep;
+        return result;
+    }
+    static appendTo(parent, datas) {
+        var tab = parent && parent.tab + 1 || 1;
+        var length = parent.length;
+        for (var data of datas) {
+            if (isObject(data)) {
+                data.tab = tab;
+                var item = new Item(data);
+                item.parent = parent;
+                item.root = parent.root;
+                parent.push(item);
+            }
+        }
+        var delta = parent.length - length;
+        while (parent) {
+            parent.count += delta;
+            parent = parent.parent;
+        }
+    }
+}

package/coms/basic/cookie.js

@@ -23,6 +23,7 @@ var parseCookieFromText = function (cookie) {
 };
 
 function addCookie(cookie_text, originDomain = "") {
+    originDomain = getDomainPath(originDomain);
     if (!cookie_text) return;
     if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
     var cookies = cookie_text.replace(/(^|;|,)\s*(expires)=(\w*),([^=]*)(;|$)/ig, "$1$2=$3.$4$5")
@@ -57,6 +58,7 @@ function addCookie(cookie_text, originDomain = "") {
 }
 
 function getCookies(domainPath) {
+    domainPath = getDomainPath(domainPath);
     var cookieObject = {};
     var splited = domainPath.split("/");
     var domain = splited[0];
@@ -85,8 +87,22 @@ function getCookies(domainPath) {
     } while (domain.length);
     return serialize(cookieObject, ";");
 }
+
+function delCookies(domainPath) {
+    domainPath = getDomainPath(domainPath);
+    var splited = domainPath.split("/");
+    var domain = splited[0];
+    delete cookiesMap[domain];
+}
+function getDomainPath(url) {
+    var { host, pathname } = parseURL(url);
+    if (pathname) return host + pathname;
+    return host;
+}
+
 return {
     cookiesMap,
     addCookie,
     getCookies,
+    delCookies,
 }

package/coms/basic/cross_.js

@@ -1,4 +1,4 @@
-var { getCookies, addCookie } = cookie;
+var { getCookies, addCookie, delCookies } = cookie;
 var { File } = this;
 function isFile(a) {
     if (File) {
@@ -11,7 +11,7 @@ var encrypt = null;
 var domainReg = /^(?:(https?)\:)?\/\/(.*?)(?:\/(.*?))?([\?#].*)?$/i;
 var setHost = function (host) {
     base = host;
-    if (encrypt) encrypt = getCode.call(this);
+    encrypt = null;
 };
 var HeadersKeys = ["Content-Type"];
 var cors_hosts = [];
@@ -29,7 +29,7 @@ function isChildPath(relative, path) {
 }
 
 var getCrossUrl = function (domain, headers, encrypt) {
-    if (notCross(domain)) return domain;
+    if (notCross(domain, !!encrypt)) return domain;
     var originDomain = getDomainPath(domain);
     var _cookies = getCookies(originDomain);
     var _headers = {};
@@ -45,7 +45,7 @@ var getCrossUrl = function (domain, headers, encrypt) {
         .replace(/^(s?)(\/\/)/i, "http$1:$2")
         .replace(domainReg, `$2${_headers}/$3$4`)
     if (ishttps) domain = b + domain;
-    if (encrypt) domain = encode62.timeencode(domain);
+    if (encrypt) domain = encode62.timeencode(encode62.safeencode(domain, encrypt));
     return base + b + domain;
 };
 function noop() { }
@@ -70,7 +70,6 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var loaded, errored;
     var onload = function (data) {
-        removeFromList(requests, xhr);
         if (xhr.decoder) {
             data = xhr.decoder(data);
         }
@@ -79,13 +78,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         digest();
     };
     var onerror1 = function (e) {
-        removeFromList(requests, xhr);
         errored = e || "未知错误！";
         flush();
         digest();
     };
     var onerror = async function (e) {
         if (e.type === 'error') {
+            removeFromList(requests, e.target);
             e = { response: "无法访问服务器", toString: toResponse };
         }
         for (var r of reforms) {
@@ -119,8 +118,12 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         xhr.onerror = onerror;
     }
     else {
-        var nocross = notCross(url);
+        var isencrypt = /^[夏商周秦xszq]/i.test(method);
+        if (isencrypt) method = method.slice(1);
+        var nocross = notCross(url, isencrypt);
+        if (nocross) isencrypt = false;
         var callback = async function () {
+            removeFromList(requests, xhr);
             var exposeHeaders = !nocross && xhr.getResponseHeader("access-control-expose-headers");
             var exposeMap = {};
             if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
@@ -128,15 +131,30 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 var exposekey = nocross ? "set-cookie" : "efront-cookie";
                 if (exposeMap[exposekey]) {
                     var cookie = xhr.getResponseHeader(exposekey);
-                    addCookie(cookie, originDomain);
+                    if (cookie && !xhr.nocookie) {
+                        try {
+                            if (isencrypt) cookie = encode62.safedecode(cookie, xhr.encrypt);
+                        }
+                        catch (e) {
+                            onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse });
+                            return;
+                        }
+                        addCookie(cookie, originDomain);
+                    }
+
                 }
             }
             if (isencrypt && xhr.response) {
-                xhr = {
-                    status: xhr.status,
-                    response: encode62.safedecode(xhr.response || xhr.responseText, xhr.encrypt),
-                };
-                xhr.responseText = xhr.response;
+                try {
+                    xhr = {
+                        status: xhr.status,
+                        response: encode62.safedecode(xhr.response || xhr.responseText, xhr.encrypt),
+                    };
+                    xhr.responseText = xhr.response;
+                }
+                catch (e) {
+                    return onerror({ status: xhr.status, response: "数据无法解析！", toString: toResponse })
+                }
             };
             switch (xhr.status) {
                 case 0:
@@ -181,10 +199,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         var xhr = cross(callback, onerror);
         var send = xhr.send;
         xhr.toString = toResponse;
-        var isencrypt = /^[夏商周秦xszq]/i.test(method);
-        if (isencrypt) method = method.slice(1);
         if (isencrypt && !encrypt) encrypt = cross.getCode();
-        xhr.encrypt = encrypt;
+        if (isencrypt) xhr.encrypt = encrypt;
         xhr.json = xhr.data = xhr.send = function (data, value) {
             if (!jsondata && !(isEmpty(data) && isEmpty(value))) jsondata = data instanceof Array ? [] : {};
             if (FormData && data instanceof FormData) {
@@ -255,12 +271,12 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 extend(realHeaders, _headers);
                 xhr.open(method, url);
             } else {
-                xhr.open(method, getCrossUrl(url, _headers, isencrypt));
+                xhr.open(method, getCrossUrl(url, _headers, isencrypt && code));
             }
             if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
-
+            delete realHeaders.Cookie;
             Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
-            if (!isEmpty(datas)) send.call(xhr, nocross || !isencrypt ? datas : encode62.safeencode(datas, code));
+            if (!isEmpty(datas)) send.call(xhr, !isencrypt ? datas : encode62.safeencode(datas, code));
             else send.call(xhr);
             digest();
         };
@@ -301,6 +317,14 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         removeFromList(requests, this);
         if (isFunction(abort)) abort.call(this);
     };
+    xhr.delCookies = function () {
+        delCookies(originDomain);
+        xhr.nocookie = true;
+        return xhr;
+    };
+    xhr.getCookies = function () {
+        return getCookies(originDomain);
+    };
     requests.push(xhr);
     return xhr;
 }
@@ -308,11 +332,10 @@ function addDirect(a) {
     if (cors_hosts.indexOf(a) >= 0) return;
     if (typeof a === 'string' || a instanceof RegExp) cors_hosts.push(a);
 }
-function notCross(domain) {
-    if (!base ||
-        location_href && location_href === domain.slice(0, location_href.length) ||
-        !/^https?\:\/\/|^s?\/\//.test(domain) ||
-        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2')) return true;
+function notCross(domain, encrypt) {
+    if (!location_href || !base || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
+    if (location_href === domain.slice(0, location_href.length) ||
+        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2')) return !encrypt;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/basic/queue.js

@@ -42,7 +42,8 @@ function queue(list, count = 1, context = null) {
         if (!(count >= 1)) {
             count = 1;
         }
-        while (cx < count) {
+        if (list.length === 0) run();
+        else while (cx < count) {
             run();
         }
     });

package/coms/layer/glance.js

@@ -9,11 +9,11 @@ var dragview = function (dragview) {
             offsetWidth = menu.offsetWidth;
             var { target } = event;
             moving = null;
-            if (/(input|textarea)/i.test(target.tagName)) {
+            if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag') || a.dragable === false, event.target)) {
                 moving = false;
             } else {
                 var { childNodes } = target;
-                for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
+                if (getComputedStyle(target).cursor === 'auto') for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
                     var child = childNodes[cx];
                     if (child.nodeType === 3) {
                         moving = false;
@@ -27,7 +27,7 @@ var dragview = function (dragview) {
                         break;
                     }
                     target = target.parentNode;
-                } while (target.nodeType == 1);
+                } while (target && target.nodeType == 1);
             }
         },
         move(event) {
@@ -38,6 +38,7 @@ var dragview = function (dragview) {
             ) return;
             var deltaX = savedX - event.clientX;
             var deltaY = savedY - event.clientY;
+            event.preventDefault();
             if (!moving) {
                 if (Math.abs(deltaX) < MOVELOCK_DELTA && Math.abs(deltaY) < MOVELOCK_DELTA) return;
                 if (Math.abs(deltaY) >= Math.abs(deltaX)) {
@@ -140,7 +141,7 @@ function main(mainPath, historyName = "") {
     };
     on("transitionend")(layer, function (event) {
         if (event.target !== this) return;
-        dispatch(window, 'render');
+        dispatch(window, 'resize');
     });
     layer.closeLeft = function () {
         closed = true;

package/coms/pivot/left-header.html

@@ -1 +1 @@
-<select -model="host" @change="setHost(this.value)" direction=y addable><option -repeat="h in hosts" :value=h.key -text="h.name"></option></select>
+<select -model="host" @change="setHost(this.value)" direction=y editable  -src="h in hosts"><option :value=h.key -text="h.name"></option></select>

package/coms/pivot/left-header.js

@@ -3,6 +3,7 @@ function main() {
     a.innerHTML = template;
     render(a, {
         setHost(a) {
+            data.setInstance("hosts", this.hosts, true);
             data.setInstance("base", { base: location.protocol + "//" + a + "/", host: a });
             data.abortAll();
             zimoli();

package/coms/reptile/submit.js

@@ -0,0 +1 @@
+submit_

package/coms/zimoli/cloneVisible.js

@@ -1,5 +1,5 @@
 var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace".split(",");
-var cloneProperties2 = "position,backdropFilter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
+var cloneProperties2 = "position,backdropFilter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,textOverflow,wordBreak,webkitLineClamp,webkitBoxOrient,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
 var pushProperty = function (key, props) {
     props.split(",").forEach(k => {
         cloneProperties2.push(key + k);

package/coms/zimoli/data.js

@@ -348,6 +348,16 @@ var parseData = function (sourceText) {
 };
 
 function fixApi(api, href) {
+    if (/^\//.test(href)) {
+        var { protocol, host } = parseURL(location.href);
+        href = protocol + "//" + host + href;
+    }
+    else if (/^\.\//.test(href)) {
+        var { protocol, host, pathname } = parseURL(location.href);
+        href = href.slice(1);
+        if (pathname) href = pathname.replace(/\/[^\/\\]*$/, '') + href;
+        href = protocol + "//" + host + href;
+    };
     api.transpile = getTranspile(api.url);
     api.url = api.url.replace(/#[\s\S]*$/, '');
     if (!reg.test(api.url)) {

package/coms/zimoli/drag.js

@@ -128,6 +128,7 @@ var bindActionTarget = function (action, actionTarget) {
 };
 
 drag.on = function (target, actionTarget = target.dragTarget) {
+    if (getTargetIn(target, actionTarget, false)) [target, actionTarget] = [actionTarget, target];
     if (!actionTarget) {
         if (target.dragHandle) {
             actionTarget = target;

package/coms/zimoli/field.html

@@ -4,7 +4,7 @@
         <span class="required" ng-if="field.required">*</span>
     </div>
     <div class="body">
-        <model _data=data _field=field></model>
+        <model _data=data _field=field _readonly="readonly"></model>
         <span class="error" ng-bind="error"></span>
     </div>
     <div class="foot" ng-if="field.msg">
@@ -12,5 +12,5 @@
     </div>
 </template>
 <template v-else>
-    <model _data=data _field=field></model>
+    <model _data=data _field=field _readonly="readonly"></model>
 </template>

package/coms/zimoli/field.js

@@ -9,7 +9,8 @@ function main(elem) {
             model,
             data,
             error: null,
-            field: f
+            field: f,
+            readonly: !!this.readonly
         });
         elem.oldValue = data[f.key];
         elem.setAttribute("field", f.key);

package/coms/zimoli/gallery.js

@@ -1,4 +1,3 @@
-var mountedGalleries = resizingList;
 var complete_class = "complete";
 var inadequate_class = "lack";
 function bindScroll(elements) {
@@ -36,6 +35,7 @@ function gallery(element, minWidth, generator) {
 
     var resize = function () {
         var clientWidth = parseFloat(freePixel(element.clientWidth));
+        if (!clientWidth) return;
         boxCount = clientWidth / minWidth | 0;
         if (boxCount < 1) boxCount = 1;
         element.paddingMax = boxCount;
@@ -47,19 +47,7 @@ function gallery(element, minWidth, generator) {
             maxWidth: fromPixel(maxWidth),
         });
     };
-    var _onappend = function () {
-        mountedGalleries.push(element);
-        element.resize();
-    };
-    onappend(element, _onappend);
-
-    onremove(element, function () {
-        for (var cx = mountedGalleries.length - 1; cx >= 0; cx--) {
-            if (mountedGalleries[cx] === element) {
-                mountedGalleries.splice(cx, 1);
-            }
-        }
-    });
+    resizingList.set(element);
     var createColumn = function (id) {
         var _box = list(function (index) {
             var realindex = index * boxCount + id;
@@ -102,8 +90,6 @@ function gallery(element, minWidth, generator) {
         index = realIndex / boxCount || 0;
         element.go(index);
     }, 0);
-    if (!element.renders) element.renders = [];
-    element.renders.unshift(element.resize);
     care(element, function () {
         var index = this.index();
         this.clean();

package/coms/zimoli/getTreeFromData.js

@@ -1,53 +1 @@
-
-function getTreeFromData(array) {
-    var root = [];
-    root.tab = -Infinity;
-    root.count = 0;
-    var map = {};
-    array = array.filter(a => !!a);
-    var active_item = null;
-    array.forEach(function (data) {
-        var item = new Item(data);
-        if (!active_item && item.isActived()) active_item = item;
-        if (data.id) {
-            map[data.id] = item;
-        } else {
-            root.push(item);
-        }
-    });
-    array.forEach(function (data) {
-        if (!data) return;
-        var parent = map[data.parentId];
-        if (parent) {
-            var item = map[data.id];
-            delete map[data.id];
-            if (parent) {
-                parent.push(item);
-            }
-        }
-    });
-    var items = Object.keys(map).map(a => map[a]);
-    root.push.apply(root, items);
-    var tab = 0;
-    var run = function (item, parent) {
-        item.tab = tab;
-        var count = 0, total = 0;
-        item.parent = parent;
-        item.root = root;
-        if (item.length) {
-            tab++;
-            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--;
-        }
-        item.total = total + item.length;
-        return item.count = count;
-    };
-    run(root);
-    root.actived = active_item;
-    return root;
-}
+Tree.fromData;

package/coms/zimoli/lattice.js

@@ -1,11 +1,12 @@
-var mountedLattices = resizingList;
 var complete_class = "complete";
 var inadequate_class = "lack";
 function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
     var boxCount;
     var resize = function () {
         var _layers = layers || _box.src || [];
+        if (!_layers.length) return;
         var clientWidth = parseFloat(freePixel(_box.clientWidth));
+        if (!clientWidth) return;
         boxCount = clientWidth / minWidth | 0;
         if (boxCount >= _layers.length) {
             boxCount = _layers.length;
@@ -52,19 +53,16 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         if (element.with instanceof Array) element.with.forEach(build);
         else if (isElement(element.with)) build(element.with);
     };
+    var go = _box.go;
+    _box.go = function (value) {
+        resize();
+        if (!boxCount) return;
+        go.call(_box, value);
+    };
     var _onappend = function () {
-        mountedLattices.push(_box);
         _box.resize();
     };
     onappend(_box, _onappend);
-
-    onremove(_box, function () {
-        for (var cx = mountedLattices.length - 1; cx >= 0; cx--) {
-            if (mountedLattices[cx] === _box) {
-                mountedLattices.splice(cx, 1);
-            }
-        }
-    });
     _box.resize = lazy(function () {
         var savedCount = boxCount;
         var index = _box.index();
@@ -76,10 +74,9 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         [].forEach.call(_box.children, function (c) {
             build(c);
         });
-        _box.go(index);
+        go.call(_box, index);
     }, 0);
-    if (!_box.renders) _box.renders = [];
-    _box.renders.unshift(_box.resize);
+    resizingList.set(_box);
     on('resize')(_box, _box.resize);
     return _box;
 }