efront 4.32.3 → 4.33.0

package/coms/compile/Javascript.js

@@ -877,6 +877,206 @@ Javascript.prototype.newVar = function (used, string_template) {
     used[name] = [];
     return name;
 }
+var newSpreadDeclared = false;
+var newSpread = function (code) {
+    var c = code.first;
+    while (c) {
+        var n = c.next, q = null;
+        if (c.type === STRAP && c.text === "new") {
+            var t = snapExpressFoot(c);
+            if (n) do {
+                if (n.type === SCOPED) {
+                    if (n.entry === '{') break;
+                    if (n.entry === "(") {
+                        q = n;
+                        break;
+                    }
+                }
+                if (n === t) break;
+                n = n.next;
+            } while (n);
+            if (q) {
+                convertNewSpread(c, q);
+                c = q;
+                continue;
+            }
+            c = c.next;
+            continue;
+        }
+        if (c.type & (SCOPED | QUOTED) && c.length) {
+            newSpread(c);
+        }
+        c = n;
+    }
+};
+var convertNewSpread = function (c, q) {
+    var qf = q.first;
+    if (!qf) return;
+    if (qf.text !== "...") return;
+    var qfn = qf.next;
+    if (qfn.type !== SCOPED || qfn.entry !== "{" || qfn !== q.last) return;
+    var qfi = q.indexOf(qf);
+    var qni = q.indexOf(qfn, qfi);
+    splice(q, qfi, qni + 1 - qfi);
+    var o = qfn.first;
+    if (!o) {
+        splice(q, qfi, 0, ...qfn);
+        setqueue(q);
+        return;
+    }
+    var nq = [];
+    var dist = nq;
+    var pushProps = function (qfn) {
+        var inProperty = true;
+        var doted = function () {
+            var ext = scan(`&extend("\\new",)`);
+            nq.push(ext[0], ext[1]);
+            dist = ext[1];
+            inProperty = false;
+        }
+        var defines = Object.create(null);
+        var get = false, set = false, async = null, aster = null, name;
+        for (var o of qfn) {
+            if (o.type === STAMP && o.text === ',') {
+                inProperty = true;
+                get = false, set = false, async = false, aster = false;
+                name = undefined;
+                if (dist !== nq) relink(dist), setqueue(dist), dist = nq;
+                nq.push(o);
+                continue;
+            }
+            if (!inProperty) {
+                dist.push(o);
+                continue;
+            }
+            if (o.type & (STRAP | STAMP)) {
+                switch (o.text) {
+                    case "get": get = true; break;
+                    case "set": set = true; break;
+                    case "async": async = o; break;
+                    case "*": aster = o; break;
+                    case "...":
+                        doted();
+                        break;
+                    case ":":
+                        inProperty = false;
+                        nq.push(
+                            { type: EXPRESS, text: "\\new" },
+                            name,
+                            { type: STAMP, text: '=' }
+                        );
+                        break;
+                }
+                continue;
+            }
+            if (o.type & (PROPERTY | EXPRESS)) {
+                if (/^\.\.\./.test(o.text)) {
+                    o.text = o.text.slice(3);
+                    doted();
+                    dist.push(o);
+                    continue;
+                }
+                if (o.short) {
+                    delete o.short;
+                    nq.push(
+                        { type: EXPRESS, text: "\\new." + o.text },
+                        { type: STAMP, text: "=" },
+                        o
+                    );
+                }
+                else {
+                    o.type = EXPRESS;
+                    o.text = "." + o.text;
+                    name = o;
+                }
+                continue;
+            }
+            if (o.type === SCOPED) {
+                if (o.entry = "[") {
+                    name = o;
+                    continue;
+                }
+                if (o.entry = "(") {
+                    if (get || set) {
+                        var key = name.type !== SCOPED || name.first === name.last ? createString(name) : null;
+                        dist = key ? defines[key] : null;
+                        if (!dist) {
+                            dist = scan(`&defineProperty(\\new,,{})`);
+                            nq.push(dist[0], dist[1]);
+                            if (name.type === SCOPED) {
+                                if (name.first === name.last) dist[1].splice(2, 0, ...name);
+                                else {
+                                    name.entry = "(";
+                                    name.leave = ")";
+                                    dist[1].splice(2, 0, name);
+                                    relink(dist[1]);
+                                    setqueue(dist[1]);
+                                }
+                            }
+                            dist = dist[1].last;
+                            if (key) defines[key] = dist;
+                        }
+                        if (dist.length) {
+                            dist.push({ type: STAMP, text: ',' });
+                        }
+                        if (get) {
+                            dist.push(
+                                { type: PROPERTY, text: "get" }
+                            );
+                        }
+                        if (set) {
+                            dist.push(
+                                { type: PROPERTY, text: "set" }
+                            )
+                        }
+                        dist.push(
+                            { type: STAMP, text: ":" },
+                        )
+                    }
+                    else {
+                        nq.push(
+                            { type: EXPRESS, text: '\\new' },
+                            name,
+                            { type: STAMP, text: "=" }
+                        );
+                    }
+                    if (async) dist.push(async);
+                    dist.push(
+                        { type: STRAP, text: "function" },
+                    )
+                    if (aster) dist.push(aster);
+                    inProperty = false;
+                    continue;
+                }
+            }
+            if (o.type & (COMMENT | SPACE)) {
+                nq.push(o);
+                continue;
+            }
+            throw new Error('代码结构异常！');
+        }
+    }
+    pushProps(qfn);
+    var i = nq.length - 1;
+    while (i > 0 && nq[i].type & (COMMENT | SPACE)) i--;
+    var nqe = nq[i];
+    if (nqe.type !== STAMP || nqe.text !== ',') nq.push({ type: STAMP, text: ',' });
+    newSpreadDeclared = true;
+    var cq = c.queue;
+    var ci = cq.indexOf(c);
+    var qi = cq.indexOf(q, ci);
+    var cn = splice(cq, ci, qi - ci);
+    splice(q, 0, 0, { type: EXPRESS, text: "\\new" }, { type: STAMP, text: "=" }, ...cn, { type: STAMP, text: ',' }, ...nq, { type: EXPRESS, text: '\\new' });
+    relink(q);
+    setqueue(q);
+};
+Javascript.prototype.newSpread = function (code) {
+    newSpreadDeclared = false;
+    newSpread(code);
+    if (newSpreadDeclared) {
+        splice(code, code.length, 0, { type: STRAP, text: 'var' }, { type: EXPRESS, text: "\\new" }, { type: STAMP, text: ";" });
+    }
+};
 Javascript.prototype.fix = function (code) {
     var hasExport = false;
     backEach(code, function (o, i) {

package/coms/compile/scanner2.js

@@ -102,6 +102,9 @@ class Code extends Array {
         var last = skipSentenceQueue(this.first);
         return this.last === last || !last;
     }
+    newSpread() {
+        return this.program.newSpread(this);
+    }
     fix() {
         return this.program.fix(this);
     }

package/coms/compile/translate.js

@@ -163,7 +163,6 @@ function translate([imap, supports], code) {
                             var a = scanner2(`[]`);
                             v.map(function (o) {
                                 var name = o.name;
-                                if (!name) return o;
                                 if (!name) return scanner2(`(${JSON.stringify(o)})`)[0];
                                 delete o.name;
                                 name = ctn('i18n' + getm(name, t.nodup, t.warn), t);

package/coms/frame/payment.html

@@ -5,7 +5,7 @@
 <div class="body">
     <item>
         <label>原始价格：</label>
-        <span v-model="(+price).toFixed(2)"></span>元
+        <span -bind="(+price).toFixed(2)"></span>元
     </item>
     <item>
         <label>支付渠道：</label>
@@ -22,7 +22,7 @@
     <item ng-if="+paytype">
         <label>应支付：</label>
         <span style="color: red;">
-            <span v-model=finalpay></span>元
+            <span -bind=finalpay></span>元
         </span>
     </item>
     <item ng-if="+paytype">

package/coms/frame/route.js

@@ -16,7 +16,7 @@
     var parseName = function (k) {
         var icon, name, hotkey;
         if (/(^|\s+)\./.test(k)) {
-            k = k.replace(/(?:^|\s+)\.([^\s,"'`]+)/, (_, m) => {
+            k = k.replace(/(^\s*\.[^\s,"'`]+\s*|\s+\.[^\s,"'`]+)/, (_, m) => {
                 icon = m;
                 return '';
             });
@@ -41,7 +41,7 @@
         }
         if (!name) name = k;
         var item = {};
-        if (icon) item.icon = icon.replace(/\./g, ' ');
+        if (icon) item.icon = icon.replace(/\./g, ' ').trim();
         item.name = name;
         if (hotkey) {
             hotkey = hotkey.split(',');

package/coms/pivot/acme2.js

@@ -57,32 +57,7 @@ var request = async function (id, params) {
     var account = await data1.from(id, params);
     return account;
 };
-var ASN1 = function (type) {
-    var length = 0;
-    var bytesarr = [];
-    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
-        var bytes = arguments[cx];
-        if (bytes.constructor !== Array) {
-            bytes = Array.apply(null, bytes);
-        }
-        bytesarr.push(bytes);
-        length += bytes.length;
-    }
-    var asn1 = [type];
-    if (length > 127) {
-        var nums = [];
-        while (length > 0) {
-            nums.unshift(length & 0xff);
-            length = length >>> 8;
-        }
-        asn1.push(0x80 | nums.length, ...nums);
-    }
-    else {
-        asn1.push(length);
-    }
-    asn1 = asn1.concat(...bytesarr);
-    return asn1;
-};
+
 var packUint = function (bytes) {
     if (bytes[0] & 0x80) {
         return ASN1(0x02, [0], bytes);

package/coms/third-party/lzma.js

@@ -1,4 +1,4 @@
-
+var URL = this.URL;
 var Module = typeof Module != "undefined" ? Module : {};
 var quit_ = (status, toThrow) => { throw toThrow };
 var scriptDirectory = "";
@@ -19,8 +19,6 @@ readAsync = async (filename, binary = true) => {
     var ret = fs.readFileSync(filename, binary ? undefined : "utf8");
     return ret
 };
-if (process.argv.length > 1) { thisProgram = process.argv[1].replace(/\\/g, "/") }
-arguments_ = process.argv.slice(2);
 if (typeof module != "undefined") { module["exports"] = Module }
 quit_ = (status, toThrow) => {
     process.exitCode = status;
@@ -45,7 +43,6 @@ function preRun() {
     callRuntimeCallbacks(onPreRuns)
 }
 function initRuntime() {
-    runtimeInitialized = true;
     wasmExports["c"]()
 }
 function postRun() {

package/coms/zimoli/appendChild.js

@@ -20,13 +20,20 @@ function _onappend(node, append = createEvent("append"), mount = createEvent("mo
     dispatch(node, mount);
 }
 
+var unremove = function (o) {
+    if (o.removeTimer) {
+        clearTimeout(o.removeTimer);
+        delete o.removeTimer;
+    }
+}
+
 function appendChild(parent, obj, transition) {
     var children = getArgsChildren(arguments);
     if (parent.appendChild) {
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var o = release(children[cx]);
             if (!o) continue;
-            if (o.removeTimer) clearTimeout(o.removeTimer);
+            unremove(o);
             if (hasEnterStyle(o) && transition !== false) {
                 isFunction(appendChild.transition) && appendChild.transition(o);
             }
@@ -44,7 +51,7 @@ function insertBefore(alreadyMounted, obj, transition) {
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
-        if (o.removeTimer) clearTimeout(o.removeTimer);
+        unremove(o);
         parent.insertBefore(o, alreadyMounted);
         o.with && insertBefore(alreadyMounted, o.with, transition);
         if (isMounted(parent)) _onappend(o);
@@ -64,7 +71,7 @@ function insertAfter(alreadyMounted, obj, transition) {
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
-        if (o.removeTimer) clearTimeout(o.removeTimer);
+        unremove(o);
         parent.insertBefore(o, nextSibling);
         o.with && insertBefore(nextSibling, o.with, transition);
         if (isMounted(parent)) _onappend(o);

package/coms/zimoli/marker.js

@@ -11,8 +11,9 @@ function marker(e) {
     if (!e) e = document.createElement("marker");
     on("changes")(e, function () {
         remove(e.childNodes);
-        if (isEmpty(this.source)) return;
-        var source = mark(this.source, this.search, wrap);
+        var source = this.source;
+        if (isEmpty(source)) source = '';
+        else if (typeof source === 'string') source = mark(source, this.search, wrap);
         if (isArray(source)) appendChild(this, source);
         else this.innerText = source;
     });

package/coms/zimoli/menu.less

@@ -101,10 +101,10 @@ body:active & {
     menu-item {
         line-height: 24px;
         display: inline-block;
-
+        
         &.has-children:after {
-            padding-top: 3px;
             content: "﹀";
+            padding-top: .3em;
         }
     }
 
@@ -155,7 +155,8 @@ body:active & {
         line-height: 20px;
         font-size: 14px;
         border-radius: 0;
-/*
+
+        /*
 狗物业弄了电子门禁还嫌不够，连人行道也弄个一人一杆。
 住在这里就像住在监狱，随时都可能被限制人身自由。
 狗日的共产党还和狗物业尿到一个壶里。
@@ -190,12 +191,12 @@ body:active & {
 
         &.open {
             background: #1e282c;
-            
+
             & s:after {
                 top: -9.2px;
             }
         }
-        
+
         &.checked,
         &.actived,
         &.selected {

package/coms/zimoli/menuList.less

@@ -46,6 +46,7 @@
             padding-left: 16px;
 
             &:after {
+                font-family: monospace;
                 content: ">";
                 display: block;
                 width: 20px;

package/coms/zimoli/password.js

@@ -9,7 +9,7 @@ function password() {
                 if (numhide !== null) numhide = !numhide; break;
             case 20/*capslock*/: if (capslock !== null) capslock = !capslock; break;
         }
-        if (!numhide && /^Numpad/.test(event.code)) {
+        if (!numhide && /^Numpad/.test(event.code) && which !== 13) {
             numhide = which < 96;
         }
         if (which >= 65 && which <= 90) {

package/coms/zimoli/password.less

@@ -82,7 +82,14 @@
 
     >holder {
         color: #777;
-        position: relative;
+        pointer-events: none;
+        top: 50%;
+        line-height: 1;
+        left: 0;
+        right: 0;
+        text-align: inherit;
+        margin-top: -.5em;
+        position: absolute;
     }
 
     >input[type=password] {

package/coms/zimoli/popup.js

@@ -329,7 +329,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             css(_rhomb, temp);
             _rhomb.setSide(side);
         }
-        var targetX = position.left - parseFloat(getComputedStyle(element).paddingLeft);
+        var targetX = position.left;
         if (targetX < 0) {
             css(element, `left:0;right:auto`);
             if (_rhomb) css(_rhomb, `left:${fromOffset(position.left + position.width / 2)};right:auto`);

package/coms/zimoli/remove.js

@@ -5,11 +5,13 @@ function remove(node, transition) {
         node = args[cx];
         if (!node) continue;
         if (node.removeTimer) clearTimeout(node.removeTimer);
+        delete node.removeTimer;
         if (hasLeaveStyle(node) && transition !== false && isFunction(remove.transition)) {
             var duration = remove.transition(node, true);
             if (duration) {
                 node.removeTimer = setTimeout(function (node) {
                     return function () {
+                        delete node.removeTimer;
                         remove(node, false);
                     };
                 }(node), +duration || 100);

package/coms/zimoli/render.js

@@ -429,7 +429,7 @@ var ifset = function (shouldMount) {
         var c = elements[cx];
         if (cx === shouldMount) {
             var e = c.$template;
-            if (c.nextSibling !== e) appendChild.after(c, e);
+            if (c.nextSibling !== e || e.removeTimer) appendChild.after(c, e);
             if (renderIds.get(e) < 0) {
                 renderIds.set(e, this.$id);
                 e = c.$template = render(e);

package/debug.log

@@ -0,0 +1,3 @@
+[1106/041816.465:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[1114/175715.384:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[1115/022347.226:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.32.3",
+    "version": "4.33.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {