efront 3.13.1 → 3.14.0

package/coms/compile/scanner2.js

@@ -15,38 +15,11 @@ const {
     number_reg,
     skipAssignment,
     createScoped,
+    createString,
 } = require("./common");
 
 
 
-var needBreak = function (prev, next) {
-    if (!prev || !next) return;
-    if (prev.type === STAMP && /^[,;]$/.test(prev.text)) return;
-    if (next.type === STAMP && /^[,;]$/.test(next.text)) return;
-    if (prev.type === EXPRESS && /\.$/.test(prev.text)) return;
-    if (next.type === EXPRESS && /^\./.test(next.text)) return;
-    if (next.type === PROPERTY) return ";";
-    if (next.type === STAMP && next.text === "*") return ";";
-    if (
-        [EXPRESS, VALUE, QUOTED].indexOf(prev.type) >= 0
-        || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
-        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
-    ) {
-        if ([EXPRESS, VALUE, QUOTED, LABEL].indexOf(next.type) >= 0) return ";";
-        if (next.type === STRAP) {
-            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
-            return " ";
-        }
-        if (next.type === SCOPED) {
-            if (!next.isExpress) return ";";
-        }
-        return;
-    }
-    if (prev.type === STRAP) {
-        if ([STRAP, EXPRESS, VALUE, QUOTED].indexOf(next.type) >= 0) return " ";
-        if (next.type === LABEL) return ";";
-    }
-};
 
 
 var compress = function (scoped, maped) {
@@ -266,95 +239,7 @@ class Program extends Array {
     }
 
     toString() {
-        var lasttype;
-        var result = [];
-        var run = (o, i, a) => {
-            if (!~[SPACE, COMMENT, STAMP, PIECE].indexOf(o.type) && lasttype !== SPACE && !this.pressed) {
-                var prev = o.prev;
-                if (~[QUOTED, SCOPED, STRAP].indexOf(lasttype)
-                    || prev && prev.type === STAMP && !/(\+\+|\-\-|~|!)$/.test(prev.text) && prev.prev && prev.prev.type !== STAMP) {
-                    if (o.type !== SCOPED && (o.type !== EXPRESS || !/^\./.test(o.text))) {
-                        result.push(" ");
-                        lasttype = SPACE
-                    }
-                }
-            }
-            switch (o.type) {
-                case COMMENT:
-                    // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
-                    if (!this.pressed) {
-                        result.push(o.text);
-                        if (this.pressed && /^\/\//.test(o.text)) {
-                            result.push("\r\n");
-                        }
-                    }
-                    break;
-                case SPACE:
-                    if (!this.pressed) {
-                        result.push(o.text);
-                        break;
-                    }
-                    var b = needBreak(o.prev, o.next);
-                    if (b) result.push(b);
-                    break;
-                case QUOTED:
-                    if (!o.length) {
-                        result.push(o.text);
-                        break;
-                    }
-                case SCOPED:
-                    if (!this.pressed && (lasttype === STRAP || lasttype === STAMP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
-                    result.push(o.entry);
-                    if (o.length > 0) {
-                        if (o.entry === "{" && result[0].type !== SPACE) {
-                            if (!this.pressed) {
-                                result.push(" ");
-                            }
-                        }
-                        lasttype = undefined;
-                        o.forEach(run);
-                        if (/^[,;]$/.test(result[result.length - 1]) && this.pressed) {
-                            if (!o.prev || o.prev.text !== 'for') result.pop();
-                        }
-                        if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
-                            if (!this.pressed) result.push(" ");
-                        }
-                    }
-                    result.push(o.leave);
-                    break;
-                default:
-                    if (o instanceof Object) {
-                        if ([STRAP, EXPRESS, PROPERTY, VALUE].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, PROPERTY, VALUE].indexOf(o.type) >= 0) {
-                            result.push(" ");
-                        }
-                        else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
-                            if (result[result.length - 1] === " " || lasttype === PROPERTY && o.text === ':') { }
-                            else if (lasttype === STAMP) {
-                                result.push(" ");
-                            }
-                            else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
-                                var prev_prev = o.prev.prev;
-                                if (
-                                    prev_prev.type === STRAP && !prev_prev.isExpress
-                                    || prev_prev.type === EXPRESS
-                                    || prev_prev.type === VALUE
-                                ) result.push(";");
-                            }
-                            else if (!/^(\+\+|\-\-)$/.test(o.text)) {
-                                if (!this.pressed && lasttype !== SPACE) result.push(" ");
-                            }
-                        }
-                        result.push(o.text);
-                    }
-                    else {
-                        result.push(o);
-                    }
-            }
-            lasttype = o.type;
-            if (o.isprop) lasttype = PROPERTY;
-        };
-        this.forEach(run);
-        return result.join("");
+        return createString(this);
     }
     get envs() {
         return this.scoped.envs;

package/coms/compile/washcode.js

@@ -0,0 +1,313 @@
+const {
+    /*-1 */COMMENT,
+    /* 0 */SPACE,
+    /* 1 */STRAP,
+    /* 2 */STAMP,
+    /* 3 */VALUE,
+    /* 4 */QUOTED,
+    /* 5 */PIECE,
+    /* 6 */EXPRESS,
+    /* 7 */SCOPED,
+    /* 8 */LABEL,
+    /* 9 */PROPERTY,
+    skipAssignment,
+    getDeclared,
+    createScoped,
+    createString,
+} = require("./common");
+var strings = require("../basic/strings");
+
+/**
+ * 按语句分割代码
+ */
+var createExpressList = function (parsed) {
+    var list = [];
+    for (var cx = 0, dx = parsed.length; cx < dx; cx++) {
+        var o = parsed[cx];
+        switch (o.type) {
+            case LABEL:
+                var exp = [o];
+                exp.first = exp[0];
+                list.push(exp);
+                break;
+            case STRAP:
+            case SCOPED:
+            case EXPRESS:
+            case VALUE:
+            case QUOTED:
+                var o0 = skipAssignment(o);
+                var exp = [];
+                do {
+                    exp.push(o);
+                    o = parsed[++cx];
+                } while (o0 !== o);
+                cx--;
+                patchExpress(exp);
+                list.push(exp);
+                break;
+            case COMMENT:
+            case SPACE:
+            case STAMP:
+                list.push([o]);
+                break;
+            default:
+                console.log(o.type, 'type');
+        }
+    }
+    return list;
+};
+var getFunctionEnd = function (first) {
+    if (!first) return false;
+    var o = first.next;
+    if (!o) return false;
+    if (first.type === STRAP && first.text === 'function') {
+        if (o.type === EXPRESS) o = o.next;
+        if (!o) return false;
+        if (o.next && !o.next.next) return o.next;
+    }
+    return false;
+}
+var patchExpress = function (exp) {
+    if (!exp.first) {
+        exp.first = exp[0];
+    }
+    if (!exp.lastUncomment) {
+        exp.lastUncomment = exp[exp.length - 1];
+    }
+    if (exp.first) {
+        delete exp.first.prev;
+    }
+    if (exp.lastUncomment) {
+        delete exp.lastUncomment.next;
+    }
+    var first = exp.first;
+    if (first && first.type === QUOTED && /^(['"`])use strict\1/i.test(first.text)) {
+        exp.saved = true;
+    }
+    if (first && first.type === SCOPED && first.entry === '(') {
+        var ff = first.first;
+        var fn = first.next;
+        if (fn && fn.type === SCOPED && fn.entry === '(') {
+            var fe = getFunctionEnd(ff);
+            if (fe) {
+                first.push(fn);
+                var fnn = fn.next;
+                if (fnn) {
+                    first.next = fnn;
+                    fnn.prev = first;
+                }
+                fn.prev = fe;
+                fe.next = fn;
+                delete fn.next;
+                exp.splice(1, 1);
+            }
+        }
+    }
+};
+
+function createExpressKey(exp) {
+    var keys = [];
+    for (var e of exp) {
+        if (e.type === EXPRESS) {
+            var t = e.text;
+            while (t.length > 0) {
+                if (/^\./.test(t)) {
+                    if (!keys.length) keys.push('');
+                    t = t.slice(1);
+                }
+                var m = /[^\.\[]+/.exec(t);
+                if (m) {
+                    m = m[0];
+                    keys.push(m);
+                    t = t.slice(m.length);
+                    continue;
+                }
+                var m = /^\[(['"`])([\s\S]*?)\1\]/.exec(t)
+                if (m) {
+                    m = m[0];
+                    t = t.slice(m.length);
+                    m = m.slice(1, m.length - 1);
+                    m = strings.decode(m);
+                    keys.push(m);
+                    continue;
+                }
+                break;
+            }
+        }
+    }
+    return keys.join('.');
+}
+function needLeft(o) {
+    if (o.type === EXPRESS && /^[\.\[]/.test(o.text)) return true;
+    if (o.type === SCOPED && o.entry === '[') return true;
+    return false;
+}
+function needRight(o) {
+    if (o.type === EXPRESS && /[\.\]]$/.test(o.text)) return true;
+    if (o.type === SCOPED && o.entry === '[') return true;
+    return false;
+}
+function renameId(id, amap) {
+    var m = /^[^\.]+/.exec(id);
+    if (m) {
+        var id0 = m[0];
+        var w = amap[id0];
+        if (w) return w + id.slice(id0.length);
+    }
+};
+function checkRefered(scope) {
+    var { used } = scope;
+    var map = Object.create(null);
+    for (var k in used) {
+        var u = used[k];
+        for (var o of u) {
+            var right = [];
+            var e = o;
+            while (e) {
+                if (right.length) {
+                    if (!needRight(right[right.length - 1]) && !needLeft(e)) break;
+                }
+                right.push(e);
+                e = e.next;
+            }
+            if (right.length) {
+                var key = createExpressKey(right);
+                var iswrite = false;
+                iswrite = !!o.kind || !!e && e.type === STAMP && /=$/.test(e.text);
+                if (key) map[key] = map[key] | 1 + iswrite;
+            }
+        }
+    }
+    var readed, writed;
+    for (var k in map) {
+        if (map[k] >> 1) {
+            if (!writed) writed = Object.create(null);
+            writed[k] = true;
+        }
+        if (map[k] & 1) {
+            if (!readed) readed = Object.create(null);
+            readed[k] = true;
+        }
+    }
+    for (var s of scope) {
+        if (s.isfunc && s.pass) {
+            var [writed0, readed0] = checkRefered(s);
+            var { pass, args } = s;
+            var amap = {};
+            for (var cx = 0, dx = pass.length; cx < dx; cx++) {
+                amap[args[cx]] = pass[cx];
+            }
+            for (var w in writed0) {
+                var id = renameId(w, amap);
+                if (id) writed[id] = true;
+            }
+            for (var r in readed0) {
+                var id = renameId(r, amap);
+                if (id) readed[id] = true;
+            }
+        }
+    }
+
+    return [writed, readed];
+}
+
+var getroot = function (pick) {
+    if (pick) {
+        var match = /^[^\.]+/.exec(pick);
+        if (match) match = match[0];
+        return match;
+    }
+}
+
+function washcode(code, pick) {
+    var avoid = getroot(pick);
+    var needs = Object.assign(Object.create(null), pick ? { [pick]: true } : code.envs);
+    var explist = createExpressList(code);
+    var maped = Object.create(null);
+    for (var exp of explist) {
+        exp.scoped = createScoped(exp, true);
+        if (avoid && avoid in exp.scoped.used) {
+            if (code.vars[avoid] && !code.envs[avoid] && !maped[avoid]) {
+                exp.saved = true;
+                maped[avoid] = true;
+            }
+        }
+        var [writed, readed] = checkRefered(exp.scoped);
+        exp.writed = writed;
+        exp.readed = readed;
+    }
+    var count = 0;
+    while (count < explist.length) {
+        var saved_count = count;
+        for (var exp of explist) {
+            if (exp.saved) continue;
+            if (!exp.first) {
+                exp.saved = true;
+                count++;
+                break;
+            }
+            var { writed, readed } = exp;
+            for (var w in writed) {
+                if (w === avoid) continue;
+                if (needs[w] || getroot(w) in code.envs) {
+                    exp.saved = true;
+                    for (var r in readed) {
+
+                        var rs = r.split('.');
+                        while (rs.length) {
+                            needs[rs.join('.')] = true;
+                            rs.pop();
+                        }
+                    }
+                    count++;
+                    break;
+                }
+            }
+        }
+        if (saved_count === count) break;
+    }
+    for (var cx = 0, dx = explist.length; cx < dx; cx++) {
+        var exp = explist[cx];
+        var prev = explist[cx - 1], next = explist[cx + 1];
+        if (!exp.first) {
+            if (!exp.saved) continue;
+            if (exp.length !== 1 || !prev && !next) continue;
+            if (exp[0].type === STAMP) {
+                if (prev && !prev.saved || next && !next.saved) {
+                    exp.saved = false;
+                }
+                continue;
+            }
+            if (next && !next.saved) {
+                exp.saved = false;
+            }
+            continue;
+        }
+        if (!exp.saved) {
+            if (exp[0].type === STRAP && /^(let|var|const)$/.test(exp[0].text)) {
+                var save = false, inc = 2;
+                while (next && next[0].type === STAMP && /^,$/.test(next[0].text)) {
+                    next.saved = false;
+                    next = explist[cx + inc++];
+                    if (!next) break;
+                    if (next.saved) {
+                        save = true;
+                        break;
+                    }
+                    next = explist[cx + inc++];
+                }
+                exp.saved = save;
+                if (exp.saved) {
+                    if (!prev.saved) prev.saved = true;
+                    exp.splice(1, exp.length - 1, ' ');
+                    patchExpress(exp);
+                }
+            }
+        }
+    }
+    explist = explist.filter(e => e.saved);
+    var text = explist.map(createString).join("");
+    return text;
+}
+
+module.exports = washcode;

package/coms/frame/route.js

@@ -75,6 +75,7 @@
                 if (/,/.test(name)) {
 
                 }
+                item.closed = true;
                 return item;
             });
             return items;
@@ -114,6 +115,7 @@
             actived = mmap[opened.active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
+                    setActive(actived, true);
                     result.active = actived;
                 };
             }
@@ -123,6 +125,7 @@
     var setActive = function (p, active) {
         while (p) {
             p.active = active;
+            if (active) p.closed = false;
             p = p.parent;
         }
     };

package/coms/pivot/plist.js

@@ -2,7 +2,7 @@
 function main(title, type, fields, edit_ref, options) {
     return frame$list(title, {
         load() {
-            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a)));
+            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
         },
         remove(o) {
             return data.from("edit", { type, key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;

package/coms/typescript-helpers/__classPrivateFieldIn.js

@@ -0,0 +1,11 @@
+/**
+ * typescript:classPrivateFieldIn
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2022-02-04T17:45:54.577Z
+ */
+var __classPrivateFieldIn = (this && this.__classPrivateFieldIn) || function(state, receiver) {
+    if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function")) throw new TypeError("Cannot use 'in' operator on non-object");
+    return typeof state === "function" ? receiver === state : state.has(receiver);
+};

package/coms/zimoli/cross.js

@@ -17,9 +17,9 @@ if (cookiesData) {
     }
 }
 
-var digest = function () {
+var digest = lazy(function () {
     dispatch('render', window);
-};
+}, 0);
 
 var cross = cross_.bind(function (callback, onerror) {
     var xhr = new XMLHttpRequest;
@@ -32,7 +32,6 @@ var cross = cross_.bind(function (callback, onerror) {
 
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {
-            dispatch(window, 'render');
             switch (xhr.status) {
                 case 0:
                     if (!navigator.onLine) {

package/coms/zimoli/data.js

@@ -75,8 +75,24 @@ const formulaters = {
 var seekFromSource = function (obj, base) {
     var source = dataSourceMap;
     if (base && base in dataSourceMap) source = source[base];
-    obj = seek(source, obj);
-    if (isObject(obj)) for (var k in obj) if (obj[k] === dataSourceMap) delete obj[k];
+    if (isObject(obj)) {
+        var dist = {};
+        for (var k in obj) {
+            var v = obj[k];
+            if (/^\:/.test(k)) {
+                k = seek(source, k.slice(1));
+            }
+            if (v === '') {
+                if (source !== dataSourceMap) v = source;
+                else v = seek(source, k);
+            }
+            else if (/^\:/.test(v)) {
+                v = seek(source, v.slice(1));
+            }
+            dist[k] = v;
+        }
+        obj = dist;
+    }
     return obj;
 };
 function getErrorMessage(error = this) {
@@ -553,8 +569,10 @@ var privates = {
                     headers = seekFromSource(headers, api.base);
                 }
                 cross(realmethod, uri, headers).send(params).done(e => {
+                    updateLoadingCount();
                     ok(e.response || e.responseText);
                 }).error(xhr => {
+                    updateLoadingCount();
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
                         oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
@@ -627,7 +645,6 @@ function responseCrash(e, data) {
         data.error = e;
     }
     error_report(e, e.status < 500 ? 'warn' : 'error');
-    updateLoadingCount();
 }
 var getData = function () { return this.data };
 var updateLoadingCount = function () {
@@ -643,7 +660,6 @@ var data = {
             response.is_loading = false;
             if (response.then === LoadingArray_then) delete response.then;
         }
-        updateLoadingCount();
     },
     responseCrash,
     responseLoading(response) {
@@ -865,10 +881,12 @@ var data = {
                     headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
+                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     ok(xhr.responseText || xhr.response);
                 }).error(xhr => {
+                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     try {

package/coms/zimoli/field.html

@@ -1,11 +1,16 @@
-<div class="head">
-    <span ng-bind=field.name></span>
-    <span class="required" ng-if="field.required">*</span>
-</div>
-<div class="body">
+<template v-if='field?.key'>
+    <div class="head">
+        <span ng-bind=field.name></span>
+        <span class="required" ng-if="field.required">*</span>
+    </div>
+    <div class="body">
+        <model _data=data _field=field></model>
+        <span class="error" ng-bind="error"></span>
+    </div>
+    <div class="foot" ng-if="field.msg">
+        <span ng-bind=field.msg></span>
+    </div>
+</template>
+<template v-else>
     <model _data=data _field=field></model>
-    <span class="error" ng-bind="error"></span>
-</div>
-<div class="foot" ng-if="field.msg">
-    <span ng-bind=field.msg></span>
-</div>
+</template>

package/coms/zimoli/model.js

@@ -48,6 +48,12 @@ var constructors = {
         }
         return e;
     },
+    success(e) {
+        success(e);
+        e.innerHTML = `<span ng-html="field.comment"></span>`;
+        render(e.children, e.$scope, e.$parentScopes);
+        return e;
+    },
     switch: swap,
     row: textarea,
     password,
@@ -149,16 +155,31 @@ var readonly_types = {
         var f = data[field.key];
         return size(f);
     },
+    html(a, data) {
+        var t = document.createElement("span");
+        t.innerHTML = seek(data, a.field.key);
+        return t;
+    },
     swap(e, data) {
         var { field } = e;
         var v = data[field.key];
         if (field.options) {
-            var o = field.options[v];
+            if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
+            var o = field.optionsMap[v];
             if (o) return o.name;
         }
+        if (isEmpty(v)) v = '';
         return v;
     },
 };
+readonly_types.anchor = readonly_types.url;
+var createOptionsMap = function (options) {
+    var map = Object.create(null);
+    for (var o of options) {
+        map[o.key] = o;
+    }
+    return map;
+}
 readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {

package/coms/zimoli/prompt.js

@@ -25,8 +25,10 @@ function prompt(msg = "请输入", check) {
         });
     })
     on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
-    on("keydown.enter")(c, function () {
+    on("keydown.enter")(c, function (event) {
+        if (event.defaultPrevented) return;
         if (check && check(ipt.value) === false) return;
+        event.preventDefault();
         oked = true;
         remove(c);
         fire();