efront 4.28.4 → 4.29.1

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,6 +1,3 @@
-- zh-CN: 路径$1中发现冲突常量$2
-  en:    Conflict constant $2 found in path $1
-
 - zh-CN: 英文
   en:    English
 
@@ -43,6 +40,18 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: 无法下载！
+  en:    Cannot download!
+
+- zh-CN: 可以通过浏览器访问打开的端口以查看文件
+  en:    Open ports can be accessed through a browser to view files
+
+- zh-CN: 启动文件服务器
+  en:    Start the file server
+
+- zh-CN: 路径$1中发现冲突常量$2
+  en:    Conflict constant $2 found in path $1
+
 - zh-CN: 无法打开媒体设备
   en:    Unable to open media device
 

package/apps/pivot/main.js

@@ -7,48 +7,8 @@ i18n.setReloader(function () {
     zimoli.reload(false);
 });
 data.loadConfig("api.yml");
-user.loginPath = '/auth/login';
-var login_queue = [], reject_queue = [];
-cross.addReform(async function ({ status, url, headers }, reform, reject) {
-    if (status === 401) {
-        var xhr = this;
-        var abort = xhr.abort;
-        xhr.abort = function () {
-            removeFromList(login_queue, reform);
-            removeFromList(reject_queue, reject);
-            if (!login_queue.length) remove(reject_queue.splice(0, 1)[0]);
-            abort.call(this);
-        };
-
-        if (login_queue.length) {
-            login_queue.push(reform);
-            reject_queue.push(reject);
-            return false;
-        }
-        var base = data.getInstance("base").base;
-        var { protocol, host } = parseURL(url);
-        var base1 = protocol + "//" + host + "/";
-        if (base !== base1) {
-            data.setSource(base1, null);
-        }
-        login_queue.push(reform);
-        var page = await popup("/auth/login", base1);
-        if (!login_queue.length) return;
-        reject_queue.push(page, reject);
-        care(page, "login", function (info) {
-            data.setSource(base1, info);
-            headers.authorization = info;
-            login_queue.splice(0, login_queue.length).forEach(q => q());
-            reject_queue.splice(0, reject_queue.length);
-        });
-        on("remove")(page, function () {
-            login_queue.splice(0, login_queue.length);
-            if (reject_queue[0] === this) reject_queue.shift();
-            reject_queue.splice(0, reject_queue.length).forEach(r => r());
-        });
-        return false;
-    }
-})
+user.loginPath = 'frame$login';
+cross.addReform(relogin(user.loginPath))
 data.setReporter(function (m, t) {
     alert(m, t);
 });
@@ -95,6 +55,10 @@ on("drop")(document, function (event) {
 });
 remove(document.body.childNodes);
 zimoli.register('/wow/root');
+zimoli.register('/order/create', "/shop/order/create");
+zimoli.register('/order/list', "/shop/order/list");
+zimoli.register('/order/:id', "/shop/order/detail");
+zimoli.register('/mind/list', "/shop/mind/list");
 function main() {
     return layer;
-}
+}

package/apps/pivot/wow/root.js

@@ -75,17 +75,19 @@ function main(path) {
     var ps = $scoped.get(page);
     extend(ps, {
         pathlist: path ? path.split('/') : [],
-        read(from, start, size) {
-            var authorization = data.getSource(data.getInstance("base").base);
-            var xhr = cross("get", from.url, { authorization: authorization });
-            var end = start + size - 1;
-            xhr.setRequestHeader('range', `bytes=${start}-${end}`);
-            xhr.send();
-            return xhr;
+        async download(from) {
+            var res = await data.from('folder', { opt: "get", path: encode62.packencode(from) });
+            var frame = document.createElement("iframe");
+            css(frame, "pointer-events:none;opacity:0;display:none");
+            document.body.appendChild(frame);
+            frame.src = res;
+            setTimeout(function () {
+                remove(frame);
+            }, 20000);
         },
         load(p, force) {
             if (!force) {
-                location.href = "#/wow/root" + p;;
+                location.href = "#" + page.basepath + p;;
                 return { then() { } };
             }
             var base = data.getInstance("base").base;

package/coms/basic/extend.js

@@ -10,7 +10,8 @@ var extend = Object.assign || function (o1) {
     for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
         var o2 = arguments[cx];
         for (var k in o2) {
-            if (hasOwnProperty.call(o2, k)) o1[k] = o2[k];
+            if (!hasOwnProperty.call(o2, k)) break;
+            o1[k] = o2[k];
         }
     }
     return o1;

package/coms/basic/extendIfNeeded.js

@@ -4,7 +4,8 @@ function extendIfNeeded(o1) {
     for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
         var o2 = arguments[cx];
         for (var k in o2) {
-            if (hasOwnProperty.call(o2, k) && !(k in o1)) o1[k] = o2[k];
+            if (!hasOwnProperty.call(o2, k)) break;
+            if (!(k in o1)) o1[k] = o2[k];
         }
     }
     return o1;

package/coms/basic/extendIfOccurs.js

@@ -5,7 +5,7 @@ function extendIfOccurs(o1) {
     o1 = Object(o1);
     var ks = [];
     for (var k in o1) {
-        if (!hasOwnProperty.call(o1, k)) continue;
+        if (!hasOwnProperty.call(o1, k)) break;
         var f = getOwnPropertyDescriptor(o1, k);
         if (!f.writable && !f.set) continue;
         ks.push(k);

package/coms/basic_/&Array.js

@@ -1,7 +1,3 @@
-var hasOwnProperty = {}.__proto__ === Object.prototype ? function (k) {
-    var proto = this.__proto__;
-    return k in this && (!proto || !(k in proto));
-} : Object.prototype.hasOwnProperty;
 var setPrototypeOf = Object.setPrototypeOf;
 var wrapMethod = function (f) {
     return function () {

package/coms/basic_/&rest.js

@@ -10,10 +10,9 @@ function rest_(o, keys) {
     for (var k of keys) map[k] = true;
     var res = {};
     for (var k in o) {
-        if (hasOwnProperty.call(o, k)) {
-            if (k in map) continue;
-            res[k] = o[k];
-        }
+        if (!hasOwnProperty.call(o, k)) break;
+        if (k in map) continue;
+        res[k] = o[k];
     }
     if (typeof Object.getOwnPropertySymbols === 'function') {
         for (var k of Object.getOwnPropertySymbols(o)) {

package/coms/compile//347/264/240/351/246/250.js

@@ -9,6 +9,7 @@ class 素玉 extends Program {
     quotes = this.quotes.slice(0, 2).concat();
     keepspace = true;
     scopes = [["(", ")"], ["{", "}"]];
+    setType() { }
 }
 
 var rarg = new 素玉;
@@ -338,19 +339,19 @@ class 素心 extends Program {
 
 var setVarsUsed = function (s) {
     var vars = null, used = null;
-    for (var cx = s.length - 1; cx >= 0; cx--) {
+    for (var cx = 0, dx = s.length; cx < dx; cx++) {
         var { p: k, v } = s[cx];
         if (/^\-\-|^@[^\{]/.test(k) && !("used" in v) && v.length) {
             if (!vars) vars = Object.create(null);
             vars[k] = v.join(" ");
             s.splice(cx, 1);
+            cx--; dx--;
         }
         else {
             if (!used) used = [];
             used.push({ p: k, v });
         }
     }
-    if (used) used.reverse();
     s.used = used;
     s.vars = vars;
 };
@@ -438,6 +439,16 @@ var getFromScopeList = function (name, varsList, value = name) {
 };
 var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
 var fixBase = function (b, a) {
+    if (/@keyframes\s/i.test(a)) {
+        var bs = [];
+        splitParams(b).forEach(b => {
+            b.replace(/@{@[^\}]+}/g, a => {
+                if (bs.indexOf(a) < 0) bs.push(a)
+            });
+        });
+        bs.push(`@{${a}}`);
+        return bs.join(" ");
+    }
     return splitParams(a).map(a => {
         if (presets.test(a)) a = `@{${a}}`;
         var replaced = false;
@@ -505,7 +516,7 @@ var Method = function () {
     vlist.pop();
     return body;
 }
-var vlist = [], mlist = [macros], clist = [], base = "";
+var vlist = [], mlist = [macros], clist = [], base = "", kfmap = null;
 var killneg = function (v, n) {
     if (n === "-") {
         if (/^\-/.test(v)) {
@@ -572,10 +583,32 @@ var eval2 = function (props) {
     var rest = [];
     var result = [];
     var methods = Object.create(null);
-    mlist.push(methods);
     if (props.maps) clist.push(props.maps);
 
     for (var { p: k, v: p } of props) {
+        var kfname;
+        if (kfname = /^@keyframes\s+([^\s\{\[\]\}\(\)\,\;]+)/i.exec(k)) {
+            kfname = kfname[1];
+            var ps = getFromScopeList(kfname, mlist);
+            if (ps) ps = kfmap[ps];
+            if (kfname in kfmap) {
+                var tmp = kfname;
+                var i = 0;
+                while (tmp + i in kfmap) i++;
+                tmp = tmp + i;
+                methods[kfname] = tmp;
+                kfmap[tmp] = p.used;
+                kfname = tmp;
+            }
+            else {
+                kfmap[kfname] = p.used;
+                methods[kfname] = kfname;
+            }
+            if (ps) p.used.unshift(...ps);
+            p.base = fixBase(base, `@keyframes ${kfname}`);
+            p.rooted = true;
+            continue;
+        }
         if (p.used) {
             var match = /^([@\.#][^\s,]+)\s*\(([\s\S]*?)\)\s*$/.exec(k);
             if (!match) continue;
@@ -593,14 +626,17 @@ var eval2 = function (props) {
             p.isMethod = true;
         }
     }
+    mlist.push(methods);
     for (var { p: k, v: p } of props) {
         if (p.isMethod) continue;
         if (p.used) {
             k = calcvars(k);
             k = removeSelectorSpace(k);
-            if (base && !p.rooted) p.base = fixBase(base, k);
+            var pvars = p.vars;
+            var vars = pvars ? Object.assign(Object.create(null), pvars) : null;
+            if (p.rooted);
+            else if (base) p.base = fixBase(base, k);
             else p.base = presets.test(k) ? `@{${k}}` : k;
-            var vars = shallowClone(p.vars);
             if (vars) vlist.push(vars);
             initvars(vars);
             var value = evalthis(p);
@@ -611,6 +647,9 @@ var eval2 = function (props) {
         else if (p.length) {
             k = calcvars(k);
             p = calcvars(p.join(" "));
+            if (/^animation(\-name)?$/i.test(k)) {
+                p = p.replace(/^\S+/, a => getFromScopeList(a, mlist, a));
+            }
             p = replace_punc(seprateFunc(p).map(evalproc).join(''));
             result.push(k, ":", p, ';');
         }
@@ -639,8 +678,10 @@ function evalscoped(scoped, scopeName = '') {
     if (and) and.forEach(a => extend(vars, a.vars));
     vlist.push(vars);
     clist.push(smaps);
+    kfmap = Object.create(null);
     initvars(vars);
     var result = eval2(scoped, [vars]);
+    kfmap = null;
     vlist.pop();
     clist.pop();
     base = _base;

package/coms/compile//347/264/240/351/246/250_test.js

@@ -17,6 +17,25 @@ test(`a{ &[b]:nth-child(1){a:1}}`, `a[b]:nth-child(1){a:1;}`);
 test(`a,b{c{a:1}}`, `a c,b c{a:1;}`);
 test(`@media(){div{a:1}}`, `@media(){div{a:1;}}`);
 test(`@keyframes a{%1{a:1}}`, `@keyframes a{%1{a:1;}}`);
+test(`
+@keyframes ltr{ 0%{-x:0}}
+b{
+    @keyframes ltr{
+        100% {
+            -x: -15px;
+        }
+    }
+    animation:ltr 2s linear 0s;
+}
+a{
+    @keyframes ltr {
+        100% {
+            -x: 15px;
+        }
+    }
+    animation:ltr 2s linear 0s;
+}
+`, `@keyframes ltr{0%{-x:0;}}\r\n@keyframes ltr0{0%{-x:0;}100%{-x:-15px;}}b{animation:ltr0 2s linear 0s;}\r\n@keyframes ltr1{0%{-x:0;}100%{-x:15px;}}a{animation:ltr1 2s linear 0s;}`);
 test(`@media screen and (max-width: 200px){@keyframes a{%1{a:1}}}`, `@media screen and (max-width: 200px){@keyframes a{%1{a:1;}}}`);
 test(`@a:1`, ``);
 test(`@a:1;a{a:@a}`, `a{a:1;}`);

package/coms/docs/helps.js

@@ -6,6 +6,7 @@ var helps = [
     ["f", i18n`显示efront的安装路径`, "path", "--path"],
     ["f", i18n`显示帮助信息`, "help", "-h", "--help", "help COMMAND", "-h COMMAND", "--help COMMAND"],
     ["f", i18n`启动文档服务器`, "docs"],
+    ["f", i18n`启动文件服务器`, "file|fs|filesystem|wj|文件系统"],
     ["f", i18n`查看efront自身占用的内存`, "memery", "memory", "-m", "--memery", "--memory"],
     ["m", i18n`启动示例项目服务器`, "demo", "demo SRCNAME"],
     ["m", i18n`创建应用，项目目录允许创建第二个应用`, "init", "from SRCNAME", "init APPNAME", "init APPNAME from SRCNAME", "from SRCNAME init APPNAME"],

package/coms/explorer/Explorer.js

@@ -39,6 +39,7 @@ e.delete = function () { alert(i18n`无法删除！`) }
 e.mov = function () { alert(i18n`无法移动！`) }
 e.copy = function () { alert(i18n`无法复制！`) }
 e.read = function () { alert(i18n`无法读取文件内容！`) }
+e.download = function () { alert(i18n`无法下载！`) }
 e.rename = function () { alert(i18n`无法重命名！`) }
 e.upload = function () { alert(i18n`添加失败！`) }
 e.getToken = function () { }

package/coms/explorer/context.js

@@ -8,6 +8,15 @@ var getStable = e => {
     if (!a) return;
     return !$scoped.get(a).d.pending;
 };
+var pointerFile = e => {
+    var a = getActive(e);
+    if (!a || a.pending) return;
+    var s = $scoped.get(a);
+    var d = s.d;
+    var ps = getPageScope(a);
+    if (ps.selected.length > 1) return;
+    return !d.isfolder && !d.pending;
+}
 var getSelected = function (d) {
     var p = getPageScope(d);
     return p.selected;
@@ -77,6 +86,15 @@ return () => [
             scope.open(scope.selected[0]);
         }
     },
+    {
+        name: i18n`下载` + `(D)`,
+        hotkey: "Ctrl + S",
+        when: pointerFile,
+        async do(d) {
+            var $scope = getPageScope(d);
+            for (var s of $scope.selected) await $scope.download("/" + $scope.pathlist.concat(s.name).join("/"));
+        }
+    },
     {
         name: i18n`剪切` + `(C)`,
         hotkey: "Ctrl+X",

package/coms/pivot/login.xht

@@ -0,0 +1,95 @@
+<style>
+    & {
+        position: absolute;
+    }
+
+    [foot],
+    [head] {
+        &::before {
+            display: none;
+        }
+
+        text-align: center;
+    }
+
+    [message] {
+        padding: 2px 4px;
+        line-height: 1.2;
+        text-align: center;
+        color: #29c;
+        border-top: 1px solid #29c;
+        background: #29c1;
+        margin: 0 auto;
+        font-size: 12px;
+    }
+
+
+    .button {
+        padding: 0px 40px;
+    }
+</style>
+<div head>
+    ${i18n`请输入服务器密码`}
+</div>
+<div body>
+    <field ng-repeat="f in fields" ng-src="[f,data]"></field>
+</div>
+<div foot>
+    <button pending.="pending" type="submit">${i18n`登录`}</button>
+</div>
+<div message>
+    ${i18n`${i18n`登录`}之前需要使用${`&nbsp;<b>efront password</b>&nbsp;`}命令在${i18n`服务器`}上设置${i18n`密码`}`}
+</div>
+<i18n-chooser></i18n-chooser>
+<script>
+
+    var hosts = data.getItem("hosts");
+    if (!hosts.length) hosts.push({ key: location.host, name: location.host });
+    function main(host) {
+        var fields = refilm`
+        服务器地址/host* select?a ${hosts}
+        密码/password* password
+        `;
+        var page = view();
+        page.innerHTML = login;
+        drag.on(page);
+        fields[0].readonly = !!host;
+        on("mounted")(page, function () {
+            move.bindPosition(page, [.5, .5]);
+        });
+        renderWithDefaults(page, {
+            i18nChooser,
+            fields, data: {
+                host: host ? parseURL(host).host : data.getInstance("base").host || location.host,
+            }, pending: false
+        });
+        on("submit")(page, async function () {
+            data.setInstance("hosts", hosts, true);
+            var { password } = submit(fields, $scoped.get(this).data);
+            $scoped.get(this).pending = true;
+            page.disabled = true;
+            try {
+                var base = location.protocol + "//" + parseURL($scoped.get(this).data.host).host + "/";
+                if (!host) data.setInstance("base", { base, host: parseURL(base).host });
+                var api = Object.assign({}, await data.getApi("login"));
+                api.base = base;
+                var info = await data.from(api, {
+                    a: encode62.packencode(encode62.geta(password))
+                }).loading_promise;
+                info = encode62.packupdate(info);
+                data.setSource(base, info);
+                if (host) {
+                    cast(page, 'login', info);
+                    remove(page);
+                } else {
+                    user.login({});
+                    zimoli();
+                }
+            } catch (e) {
+                console.log(e);
+            }
+            $scoped.get(this).pending = false;
+        })
+        return page;
+    }
+</script>

package/coms/zimoli/button.less

@@ -122,47 +122,33 @@
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.3) inset;
 }
 
+@import "pending.less";
+
 &[pending],
 &[loading] {
     @keyframes ltr {
         0% {
-            left: -30%;
-        }
-
-        30% {
-            left: -30%;
-        }
-
-        60% {
-            left: 20%;
-        }
-
-        90% {
-            left: 60%;
+            background-position-x: 0;
         }
 
         100% {
-            left: 130%;
+            background-position-x: 15px;
         }
 
     }
 
     &:before {
-        transform: rotate(-12deg);
         display: block;
         content: "";
         position: absolute;
-        left: -30%;
-        top: -10%;
-        width: 6px;
-        margin-left: -2px;
-        height: 200%;
-        background: #fff9;
-        background: inherit;
-        opacity: 0.9;
-        border-left: 1px #fff3 solid;
-        border-right: 3px #fff6 solid;
-        animation: ltr 2s linear 0s infinite;
+        width: auto;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        height: auto;
+        animation: ltr 1.2s linear 0s infinite;
+        @pending(#fff2, #0002, 50%);
     }
 
     a&,

package/coms/zimoli/contextmenu.js

@@ -47,6 +47,7 @@ function contextmenu(target, menuItems) {
         start(event) {
             if (event.defaultPrevented || event.type === 'mousedown') return;
             clearTimeout(menuHandle);
+            if (tm) remove(tm);
             menuHandle = setTimeout(function () {
                 var e = createEvent("contextmenu", true);
                 e.clientX = event.clientX;
@@ -77,8 +78,15 @@ function contextmenu(target, menuItems) {
         if (document.activeElement === this) return;
         _remove(this);
     }, 60);
+    var lastMenuTime = 0;
     on("contextmenu")(target, function (event) {
         if (event.defaultPrevented) return;
+        var now = +new Date;
+        if (lastMenuTime + 300 > now) {
+            event.preventDefault();
+            return;
+        }
+        lastMenuTime = now;
         event.preventDefault();
         if (tm) remove(tm), tm = null;
         tm = showContext(event);

package/coms/zimoli/on.js

@@ -491,24 +491,34 @@ var invoke = function (event, type, pointerType) {
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");
-    var pointerX, pointerY, lasttime_click;
+    var mouseX, mouseY, touchX, touchY, lasttime_click;
     var needFireClick = false;
     var isClickWithPointer = false;
     var touchendFired = false;
-    function clickstart(event) {
+    function clickstart() {
         needFireClick = true;
         touchendFired = false;
         isClickWithPointer = true;
         onclick.preventClick = false;
-        pointerX = event.clientX, pointerY = event.clientY;
     }
     var dis = (a, b) => a * a + b * b
     function clickcancel(event) {
-        if (!event || (event.which || event.touches) && dis(event.clientX - pointerX, event.clientY - pointerY) >= MOVELOCK_DELTA * MOVELOCK_DELTA) {
+        if (!event
+            || event.touches && dis(event.clientX - touchX, event.clientY - touchY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+            || event.which && dis(event.clientX - mouseX, event.clientY - mouseY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+        ) {
             onclick.preventClick = true;
         }
     }
-    onmousedown(window, clickstart, true);
+    function mousestart(event) {
+        clickstart();
+        mouseX = event.clientX, mouseY = event.clientY;
+    }
+    function touchstart(event) {
+        clickstart();
+        touchX = event.clientX, touchY = event.clientY;
+    }
+    onmousedown(window, mousestart, true);
 
     onmousemove(window, clickcancel, true);
     if (window.addEventListener) {
@@ -522,7 +532,7 @@ var invoke = function (event, type, pointerType) {
                 return;
             }
             extendTouchEvent(event);
-            clickstart.call(this, event);
+            touchstart.call(this, event);
         }, true);
         window.addEventListener("touchend", function (event) {
             if (event.touches.length > 1) return;

package/coms/zimoli/pending.less

@@ -0,0 +1,12 @@
+@pending(@line, @back, @sep: 80%) {
+    @hep: @sep / 2;
+    @aep: 50% + @hep;
+    background-image:
+        linear-gradient(53.13deg,
+            @back, @hep,
+            @line, @hep, @line, 50%,
+            @back, 50%, @back, @aep,
+            @line, @aep, @line );
+    background-size: 15px 20px;
+    background-repeat: repeat;
+}