efront 3.13.2 → 3.14.2

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/kugou/buildScroll.less

@@ -9,6 +9,10 @@
 }
 &+.titlebar>back{
     height: 44px;
+    pointer-events: all;
+}
+&+.titlebar{
+    pointer-events: none;
 }
 
 >png {

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/autodragchildren.js

@@ -216,8 +216,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             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);
+            var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
+            if (needFire && 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);
         }

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/isMounted.js

@@ -2,7 +2,10 @@ function isMounted(parent) {
     if ("isMounted" in parent) return parent.isMounted;
     var temp = parent;
     while (temp && temp !== document.documentElement) {
+        if ("isMounted" in temp) {
+            return parent.isMounted = temp.isMounted;
+        }
         temp = temp.parentNode;
     }
-    return parent.isMounted = !!temp;
+    return !!temp;
 }

package/coms/zimoli/list.js

@@ -1,5 +1,5 @@
 // 中文编码 utf8
-function ylist(container, generator, $Y) {
+function ylist(container, generator, $Y, group) {
     const cache_height = 2000;
     var restHeight = cache_height;
     var list = container || div();
@@ -118,7 +118,7 @@ function ylist(container, generator, $Y) {
         if (isNaN(itemIndex)) return;
         itemIndex = +itemIndex;
         __animated = false;
-        if (!list.offsetHeight && !list.offsetWidth && !list.isMounted) {
+        if (!list.offsetHeight && !list.offsetWidth && !isMounted(list)) {
             saved_itemIndex = itemIndex;
             return;
         }
@@ -174,7 +174,7 @@ function ylist(container, generator, $Y) {
         }
         var indexed_item = getIndexedElement(index) || bottom_item;
         if (indexed_item) {
-            list.scrollTop = indexed_item.offsetTop + indexed_item.offsetHeight * ratio - parseFloat(getComputedStyle(list).paddingTop);
+            list.scrollTop = -getFirstElement().offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
         }
     };
     var runbuild = lazy(function () {
@@ -264,8 +264,6 @@ function ylist(container, generator, $Y) {
             }
         }
         if (collection.length) {
-            var item = collection[collection.length - 1];
-            scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             var { paddingCount, paddingMax } = list;
             if (paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) {
                 let item = collection[collection.length - 1];
@@ -276,6 +274,13 @@ function ylist(container, generator, $Y) {
                     item = item.nextSibling;
                 }
             }
+            var item = collection[collection.length - 1];
+            if (item) item = item.nextSibling;
+            while (item && item.index % group) {
+                item = collection.pop();
+            }
+            var item = collection[collection.length - 1];
+            if (item) scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             remove(collection);
         }
         //滚动到相应的位置
@@ -297,7 +302,7 @@ function ylist(container, generator, $Y) {
         if (!(paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) || !(scrollTop < targetHeight)) {
             paddingCount = 0;
         }
-        while (scrollTop < targetHeight || paddingCount > 0) {
+        while (scrollTop < targetHeight || paddingCount > 0 || offset % group) {
             offset--;
             if (!(scrollTop < targetHeight)) {
                 paddingCount--;
@@ -350,7 +355,7 @@ function ylist(container, generator, $Y) {
     list.stopY = function () {
         var firstElement = getFirstVisibleElement();
         if (!firstElement) return;
-        var paddingTop = parseFloat(getComputedStyle(list).paddingTop);
+        var paddingTop = getFirstElement().offsetTop;
         var paddingBottom = parseFloat(getComputedStyle(list).paddingBottom);
 
         var scrolled_t = (list.scrollTop + paddingTop - firstElement.offsetTop) / firstElement.offsetHeight;
@@ -398,10 +403,11 @@ function ylist(container, generator, $Y) {
     list.scrollBy = scrollBy;
     list.index = function (update) {
         if (update === false) return saved_itemIndex;
-        var firstElement = getFirstVisibleElement();
-        if (!firstElement) return saved_itemIndex;
-        var index = firstElement.index;
-        var scrolled = (list.scrollTop - firstElement.offsetTop + parseFloat(getComputedStyle(list).paddingTop) + .5 | 0) / firstElement.offsetHeight;
+        var firstVisible = getFirstVisibleElement();
+        if (!firstVisible) return saved_itemIndex;
+        var index = firstVisible.index;
+        var firstElement = getFirstElement();
+        var scrolled = (list.scrollTop - firstVisible.offsetTop + firstElement.offsetTop + .5 | 0) / firstVisible.offsetHeight;
         return index + scrolled;
     };
     list.topIndex = function () {
@@ -477,8 +483,10 @@ function list() {
             $Y = container.getAttribute("direction") || container.tagName;
         }
     }
+    var groupCount = /\d+/.exec($Y);
+    if (groupCount) groupCount = +groupCount[0];
     $Y = /^[xh]|[xh]$/i.test($Y) ? "X" : "Y";
-    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y);
+    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y, groupCount || 2);
     if (bindSrc instanceof Array) {
         list.src = bindSrc;
         container.go(container.index() || 0);

package/coms/zimoli/model.js

@@ -172,6 +172,7 @@ var readonly_types = {
         return v;
     },
 };
+readonly_types.anchor = readonly_types.url;
 var createOptionsMap = function (options) {
     var map = Object.create(null);
     for (var o of options) {

package/coms/zimoli/render.js

@@ -2,12 +2,14 @@ var hasOwnProperty = {}.hasOwnProperty;
 var renderElements = Object.create(null);
 var presets = Object.create(null);
 presets.template = function (t) {
-    var node = document.createElement("div");
     var comment = document.createComment('template');
-    node.innerHTML = t.innerHTML;
-    comment.with = [].slice.call(node.childNodes, 0);
-    renderElement(comment.with, t.$scope, t.$parentScopes);
-    remove(node.childNodes);
+    once("append")(comment, function () {
+        var node = document.createElement(comment.parentNode.tagName || "div");
+        node.innerHTML = t.innerHTML;
+        comment.with = [].slice.call(node.childNodes, 0);
+        appendChild.after(comment,comment.with);
+        renderElement(comment.with, comment.$scope, comment.$parentScopes);
+    });
     return comment;
 };
 window.renderElements = renderElements;
@@ -624,7 +626,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         element.renderid = 1;
         var parentNode = element.parentNode;
         if (parentNode) {
-            if (parentNode.renderid > 1 || parentNode.isMounted) element.renderid = 2;
+            if (parentNode.renderid > 1 || isMounted(parentNode)) element.renderid = 2;
         }
         element.renders = element.renders ? [].concat(element.renders) : [];
         var { ons, copys, attrs, props, binds, context: withContext, ids } = element.$struct;
@@ -698,7 +700,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         rebuild(element);
         onappend(element, addRenderElement);
         onremove(element, removeRenderElement);
-        if (element.isMounted || element.renderid > 1) addRenderElement.call(element);
+        if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
     }
     if (elementid) scope[elementid] = element;
     for (var id of ids) {

package/coms/zimoli/search.js

@@ -5,7 +5,10 @@ function search(seartext, options, path = "name") {
             var name = seek(o, path);
             if (name === seartext) hasFullmatch = true;
             var [power, m] = mark.power(name, seartext);
-            return { power, [path]: m, value: o.value, item: o };
+            o = Object.create(o);
+            o.power = power;
+            if (path) o[path] = m;
+            return o;
         }).filter(a => a.power > 0);
         a.sort(function (a, b) {
             return b.power - a.power;

package/coms/zimoli/table.html

@@ -1,10 +1,12 @@
-<tbody -src="d in data" :style="{'max-height':((innerHeight-46)/32|0)*32+36}">
+<tbody -src="(d,i) in data" :style="tbodyHeight()">
     <tr thead #adapter insert>
+        <td row-index>序号</td>
         <td -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i -if="f.icon"
                 -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
     <tr>
+        <td row-index -bind="i+1"></td>
         <td -repeat="f in fields">
             <model -if="f.key" :field=f :data=d readonly></model>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"

package/coms/zimoli/table.js

@@ -146,7 +146,6 @@ function enrichField(f) {
     f.width = width + 60;
 }
 
-
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -214,18 +213,21 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    var tbodyHeight = e => ({ 'max-height': ((innerHeight - getScreenPosition(table).top - 46) / 32 | 0) * 32 + 36 });
     care(table, function ([fields, data]) {
         thead = null;
-        this.innerHTML = template;
         fields.forEach(enrichField);
+        remove(this.children);
+        this.innerHTML = template;
+
         render(this, {
             fields,
-            tbody: list,
-            innerHeight: {
-                valueOf() {
-                    return innerHeight - getScreenPosition(table).top;
-                }
+            tbody() {
+                var e = list.apply(null, arguments);
+                css(e, tbodyHeight());
+                return e;
             },
+            tbodyHeight,
             data,
             adapter: null,
             model,
@@ -250,9 +252,10 @@ function table(elem) {
         cellMatchManager,
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
-                var [fields] = table.src;
-                var [f] = fields.splice(src, 1);
-                fields.splice(dst, 0, f);
+                if (src < 1 || dst < 1) return false;
+                var fields = parentNode.$scope.fields;
+                var [f] = fields.splice(src - 1, 1);
+                fields.splice(dst - 1, 0, f);
             }
             var children = parentNode.children;
             var srcElement = children[src];