efront 3.36.2 → 3.36.5

package/coms/docs/markdown.js

@@ -81,149 +81,10 @@ function richtext(line) {
     else a = p(line);
     if (a) content.push(a);
 }
-var codecolor = function (c) {
-    var envs = c.envs;
-    var predefs = Object.create(null);
-    predefs.module = true;
-    predefs.exports = true;
-    predefs["module.exports"] = true;
-    predefs.Promise = true;
-    [Boolean, Number, String, Function, Object, Array, Date, RegExp, Error].forEach(p => predefs[p.name] = true);
-    var { STRAP, SCOPED, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
-    var deep = 0;
-    var setcolor = function (o) {
-        switch (o.type) {
-            case LABEL:
-                o.text = `<label>${o.text}</label>`;
-                break;
-            case QUOTED:
-            case PIECE:
-                if (!o.length) {
-                    if (/^\//.test(o.text)) {
-                        o.text = `<regexp>${encode(o.text)}</regexp>`;
-                    }
-                    else o.text = `<text>${encode(o.text)}</text>`;
-                    break;
-                }
-                o.forEach(setcolor);
-                o.entry = "<text>" + o.entry;
-                o.leave = o.leave + "</text>";
-                break;
-            case SCOPED:
-                deep++;
-                o.forEach(setcolor);
-                deep--;
-                o.entry = `<deep${deep}>${o.entry}</deep${deep}>`;
-                o.leave = `<deep${deep}>${o.leave}</deep${deep}>`;
-                break;
-            case VALUE:
-                if (o.isdigit) o.text = `<digit>${o.text}</digit>`;
-                else o.text = `<value>${o.text}</value>`;
-                break;
-            case PROPERTY:
-                var next = o.next;
-                if (next && next.type === c.SCOPED && next.entry === '(') {
-                    o.text = `<method>${o.text}</method>`;
-                }
-                else o.text = `<property>${o.text}</property>`;
-
-                break;
-            case EXPRESS:
-                var keys = o.text.split(".");
-                var next = o.next;
-                if (next && next.type === c.SCOPED && next.entry === '(') {
-                    keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
-                }
-                var [name] = keys;
-                if (/^</.test(name));
-                else if (/^(arguments|this|super|Infinity|NaN)$/.test(name)) name = `<strap>${name}</strap>`;
-                else if (name in envs) name = name in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
-
-                keys[0] = name;
-                o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
-                break;
-            case STRAP:
-                if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(o.text))
-                    o.text = `<flow>${o.text}</flow>`;
-                else o.text = `<strap>${o.text}</strap>`;
-                break;
-            case STAMP:
-                if (/^(=>)$/.test(o.text) || o.text === "*" && o.prev && o.prev.type === c.STRAP) o.text = `<strap>${encode(o.text)}</strap>`;
-                else if (!/^[<\/>]+$/.test(o.text));
-                else o.text = `<stamp>${encode(o.text)}</stamp>`;
-                break;
-            case COMMENT:
-                o.text = `<comment>${encode(o.text)}</comment>`;
-                break;
-        }
-    };
-    c.forEach(setcolor);
-
-}
-var typescript = new compile$Javascript;
-typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
-var codesupports = {
-    javascript(a) {
-        var c = compile$scanner2(a);
-        codecolor(c);
-        return c.toString();
-    },
-    typescript(a) {
-        var c = compile$scanner2(a, typescript);
-        codecolor(c);
-        return c.toString();
-    },
-    html(a) {
-        var code = compile$scanner2(a, 'html');
-        var scoped = code.scoped;
-        codecolor(code);
-        backEach(scoped.richNodes, n => {
-            if (n.isScript) {
-                var js = compile$scanner2(n.innerText);
-                codecolor(js);
-                code.splice(n.innerStart, n.innerEnd - n.innerStart, { text: js.toString() });
-            }
-        })
-        return code.toString();
-    },
-    css(a) {
-        var c = compile$scanner2(a);
-        codecolor(c);
-        return c.toString();
-    }
-};
-codesupports.cmd = codesupports.bat;
-codesupports.jsx = codesupports.js = codesupports.javascript;
-codesupports.tsx = codesupports.ts = codesupports.typescript;
-codesupports.xml = codesupports.html;
-function codetext(type, text) {
-    try {
-        type = type.toLowerCase();
-        if (type in codesupports) text = codesupports[type](text);
-        else text = encode(text);
-
-    } catch (e) {
-        console.error(e);
-    }
-    text = text.replace(/^(\r\n|\r|\n)|\s+$/g, '');
-    var codes = text.split(/\r\n|\r|\n/);
-    var minSpace = 0;
-    for (var c of codes) {
-        var m = /^\s*/.exec(c);
-        if (m && m[0].length < c.length) {
-            minSpace = m[0].length;
-        }
-    }
-    if (minSpace > 0) codes = codes.map(c => c.slice(minSpace));
-    return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code> `;
-}
 /**
  * @type {Element}
  */
 var content;
-var encode = function (text) {
-    return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
-};
 function markdown(text) {
     var c = content = [];
     text.replace(/ *(`+|\*+)(\S[\s\S]*?)\1 */g, function (_, q, c, i) {
@@ -233,16 +94,20 @@ function markdown(text) {
             if (m & 2) c = `<b>${c}</b>`;
             return c;
         }
-        _ = encode(_.trim()).slice(1, -1);
+        _ = codetext.encode(_.trim()).slice(1, -1);
         if (/[\*#\.]\s/.test(text.slice(i - 1, i + 1))) _ = " " + _;
         if (q.length === 1) return `<m>${_}</m>`;
         var t = /^\S+/.exec(c);
-        if (t) t = t[0]; c = c.slice(t.length);
-        return codetext(t, c);
+        if (t) t = t[0]; c = c.slice(t.length).replace(/^(\r\n|\r|\n)|\s+$/g, '');
+        try {
+            return codetext(t, c);
+        } catch (e) {
+            console.error(e);
+            return c;
+        }
     }).replace(/\s*((&nbsp;\s*)+)/g, "$1").split(/\r\n|\r|\n/).forEach(richtext);
     list_elem = null;
     list_tag = null;
     content = null;
     return c.join('');
-}
-markdown.javascript = codetext.bind(null, 'javascript');
+}

package/coms/zimoli/AudioContext_test.less

@@ -60,7 +60,7 @@
             }
 
             span {
-                writing-mode: horizontal-tb;
+                writing-mode: vertical-rl;
             }
 
 

package/coms/zimoli/alert.js

@@ -9,24 +9,15 @@ styles.info = styles.blue;
 styles.error = styles.danger = styles.red;
 styles.warn = styles.orange;
 styles.default = '#000a';
-var alerts = [];
-var clean = Cleanup(alerts);
-var build = function () {
-    var sum = 0;
-    alerts.forEach(function (elem) {
-        if (elem.offsetTop !== sum) {
-            elem.style.top = fromOffset(sum);
-        };
-        sum += elem.offsetHeight;
-    });
-};
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
+var container = document.createElement('alert-container');
+css(container, 'top:0;height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
 var _text = function (bgcolor, parameters) {
-    var box = div();
-    css(box, `top:${fromPixel(alerts.length ? Math.max.apply(Math, alerts.map(e => e.offsetTop + e.children[0].offsetHeight)) : 0)};height:0;line-height:${fromPixel(singleHeight - 20)};left:0;right:0;font-size:${fromPixel(fontSize)}; transition: all 0.2s ease-out;position:absolute;text-align:center;`);
-    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor, 1)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
-    box.initialStyle = `margin-top:-${fromPixel(singleHeight)};opacity:0;`;
+    var box = document.createElement('div');
+    css(box, `background-color:${bgcolor};color:${color.pair(bgcolor, 1)};`);
+    box.innerHTML = [].slice.call(parameters, 0).join(", ");
+    box.initialStyle = `margin-top:-${fromPixel(singleHeight)};`;
     return box;
 };
 function alert() {
@@ -65,14 +56,12 @@ function alert() {
     } else {
         elem = _text(styles.log, [text]);
     }
-    var _onclose = function (event) {
+    var _onclose = lazy(function (event) {
         if (onclose) {
             onclose.call(this, event);
         }
-        clean(this);
-        build();
         if (close_timer) clearTimeout(close_timer);
-    }
+    });
     onremove(elem, _onclose);
     var close_timer;
     var waitclose = function (autoclose, deltaTime) {
@@ -97,8 +86,8 @@ function alert() {
             waitclose(timeout, -100);
         }
     };
-    alerts.push(elem);
-    popup(elem);
+    if (!container.parentNode) popup(container);
+    if (!elem.parentNode) appendChild(container, elem);
     return elem;
 }
 for (var k in styles) {

package/coms/zimoli/alert.less

@@ -0,0 +1,12 @@
+& {
+    width: 720px;
+    white-space: pre-wrap;
+    max-width: 100%;
+    display: block;
+    margin: 0 auto;
+    height: auto;
+    line-height: 1.2;
+    padding: 10px 20px;
+    text-align: center;
+    position: relative;
+}

package/coms/zimoli/data_test.js

@@ -1,8 +1,5 @@
 function data_test1() {
     var array = [{
-        name: "王勇慧",
-        birthday: "1992-11-13",
-    }, {
         name: "李时珍",
         birthday: "1518-7-3"
     }, {

package/coms/zimoli/getGenerator.js

@@ -24,7 +24,7 @@ var getGenerator = function (container, tagName = 'item') {
     var template = document.createElement(container.tagName);
     var templates = [];
     for (let a of container.childNodes) {
-        if (a.hasAttribute('insert')) {
+        if (a.nodeType === 1 && a.hasAttribute('insert')) {
             if (!templates.length) a.$isbefore = true;
             else a.$isafter = true;
         }

package/coms/zimoli/render.js

@@ -503,7 +503,7 @@ var directives = {
     }),
     src(src) {
         var parsedSrc = this.$src;
-        return src2.call(this, parsedSrc ? parsedSrc.srcName : src);
+        return src2.call(this, parsedSrc && /[\{\[\s]/.test(src) ? parsedSrc.srcName : src);
     },
     model(search, target) {
         var getter = createGetter(this, search);
@@ -886,6 +886,7 @@ class Struct {
 function createStructure(element) {
     if (isArrayLike(element)) return Array.prototype.map.call(element, createStructure);
     if (element.$struct) return element.$struct;
+    if (element.nodeType !== 1) return;
     // 处理结构流
     var attributes = element.attributes;
     var attrs = Array.apply(null, attributes);

package/coms/zimoli/zimoli.js

@@ -58,7 +58,8 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            targetpath = decodeURI(targetpath);
             go(targetpath);
             return;
         }

package/docs/components.jsp

@@ -2,7 +2,7 @@
 
     var fs = require("fs").promises;
     var path = require("path");
-    var comm_file_reg = /\.([tj]sx?|xht|md|less)$/i;
+    var comm_file_reg = /\.([tj]sx?|xht|md|less|html)$/i;
     var basepath = path.join(String(__efront), 'coms');
     if (req.id) {
         var compath = path.join(basepath, req.id);

package/docs/main.xht

@@ -150,7 +150,13 @@
             var map = Object.create(null);
             var children = [];
             for (var a of c.children) {
-                if (!/\.([jt]sx?|xht)$/i.test(a) || /_test\.([tj]sx?|xht)$/i.test(a)) {
+                if (/_test\.([tj]sx?|xht|html|less|css|md)$/i.test(a)) {
+                    var testName = a.replace(/\.\w+$/g, '');
+                    if (!map[testName]) map[testName] = [];
+                    map[testName].push(a);
+                    continue;
+                }
+                else if (!/\.([jt]sx?|xht)$/i.test(a)) {
                     map[a.replace(/\.\w+$/g, a => a.toLowerCase())] = a;
                     continue;
                 }
@@ -159,7 +165,7 @@
             for (var cc of children) {
                 cc.data = {
                     mark: !!map[cc.name.replace(/\.[tj]sx?$/i, ".md")],
-                    test: !!map[cc.name.replace(/\.[tj]sx?$/i, "_test.js")],
+                    test: map[cc.name.replace(/\.[tj]sx?$/i, "_test")],
                     less: !!map[cc.name.replace(/\.[tj]sx?$/i, ".less")]
                 }
                 if (cc.data.less) cc.name += "<f less></f>"
@@ -169,7 +175,7 @@
             c.children = children;
             c.closed = true;
         }
-
+        data.setInstance('components', m);
         menus[2].children = m;
     };
     var initMenus = async function () {

package/docs/mark.xht

@@ -55,86 +55,6 @@
         border: 1.2px solid #0007;
     }
 
-    code {
-        padding: 10px 20px;
-        border-radius: 3px;
-        display: inline-block;
-        background: #333;
-        color: #d4d4d4;
-        vertical-align: top;
-    }
-
-    strap,
-    value {
-        color: #569cd6;
-    }
-
-    regexp {
-        color: #d16969;
-    }
-
-    text {
-        color: #ce9178;
-    }
-
-    flow {
-        color: #c586c0;
-    }
-
-    digit {
-        color: #b5cea8;
-    }
-
-    label {
-        color: #569cd6;
-    }
-
-    @deep(@num, @color) {
-        deep@num {
-            color: @color;
-        }
-    }
-
-    @deep(0, #ffd700);
-    @deep(1, #da70d6);
-    @deep(2, #179fff);
-    @deep(3, #ffd700);
-    @deep(4, #da70d6);
-    @deep(5, #179fff);
-    @deep(6, #ffd700);
-    @deep(7, #da70d6);
-    @deep(8, #179fff);
-    @deep(9, #ffd700);
-    @deep(10, #da70d6);
-    @deep(11, #179fff);
-    @deep(12, #ffd700);
-    @deep(13, #da70d6);
-    @deep(14, #179fff);
-    @deep(15, #ffd700);
-    @deep(16, #da70d6);
-    @deep(17, #179fff);
-
-    express,
-    property {
-        color: #9cdcfe;
-    }
-
-    invoke,
-    method {
-        color: #dcdcaa;
-    }
-
-    predef {
-        color: #4ec9b0;
-    }
-
-    outside {
-        color: #4fc1ff;
-    }
-
-    comment {
-        color: #6a9955;
-    }
 </style>
 <script>
     var history = [];

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -524,7 +524,7 @@
                 var liang = 0, fanyi = {};
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;
-                    if (preMap[d[k]]) continue loop;
+                    if (preMap[d[k]] && preMap[d[k]] !== d) continue loop;
                     preMap[d[k]] = d;
                     liang++;
                     fanyi[id] = d[k];