efront 4.33.3 → 4.34.0

package/coms/frame/chat.less

@@ -25,6 +25,36 @@
     max-height: 100%;
 }
 
+.fade {
+    filter: grayscale(1);
+    opacity: .5;
+}
+
+.qrcode {
+    position: relative;
+    height: 0;
+    overflow: visible;
+    z-index: 2;
+    padding: 0;
+    width: 100%;
+    text-align: center;
+    margin-bottom: -52px;
+
+    >p {
+        background: #fff;
+    }
+
+    >canvas {
+        background: #fff;
+        border: 10px solid #fff;
+        image-rendering: pixelated;
+        display: block;
+        margin: 52px auto 10px auto;
+        width: 256px;
+        height: 256px;
+    }
+}
+
 >list {
     width: @leftwidth;
     position: absolute;

package/coms/zimoli/copyToClipboard.js

@@ -0,0 +1,46 @@
+var ClipboardItem = window.ClipboardItem;
+
+async function copyToClipboard(text, mime = 'text/plain') {
+    mime = mime.toLowerCase();
+    if (ClipboardItem && ClipboardItem.supports(mime)) {
+        const clipboardItem = new ClipboardItem({ [mime]: text });
+        try {
+            await navigator.clipboard.write([clipboardItem]);
+            alert("已复制");
+            return;
+        } catch (e) { console.log(e) };
+    }
+    var span = document.createElement('span');
+    span.setAttribute('user-select', 'all');
+    setOpacity(span, 0);
+    css(span, "position:absolute;top:-1000000px;left:-1000000px;")
+    switch (mime) {
+        case "text/plain": span.innerText = text; break;
+        case "text/html": span.innerHTML = text; removeUnsafeTags(span); break;
+        default:
+            if (/^image\//i.test(mime)) {
+                span.innerHTML = `<img src=${strings.encode(text)}/>`;
+            }
+            else {
+                return alert(i18n`复制失败!`, 'error');
+            }
+
+    }
+    document.body.appendChild(span);
+    var selection = document.getSelection();
+    var ranges = [];
+    for (var cx = 0, dx = selection.rangeCount; cx < dx; cx++) {
+        var range = selection.getRangeAt(cx);
+        ranges.push(range);
+    }
+    selection.removeAllRanges();
+    document.getSelection().setBaseAndExtent(span, 0, span, 1);
+    var res = document.execCommand('copy');
+    selection.removeAllRanges();
+    for (var range of ranges) {
+        selection.addRange(range);
+    }
+    remove(span);
+    if (res) alert("已复制");
+
+}

package/coms/zimoli/removeUnsafeTags.js

@@ -0,0 +1,21 @@
+function removeJavascript(a, attr) {
+    if (!a.hasAttribute(attr)) return;
+    var value = a.getAttribute(attr);
+    if (/^javascript\:/i.test(value)) a.removeAttribute(attr);
+}
+function removeTags(a, tagName) {
+    var scripts = a.getElementsByTagName(tagName);
+    remove(scripts);
+}
+function removeUnsafeTags(a) {
+    removeTags(a, 'script');
+    removeTags(a, 'iframe');
+    removeTags(a, 'style');
+    removeTags(a, 'meta');
+    if (a.hasAttribute('onload')) a.removeAttribute('onload');
+    if (a.hasAttribute('onerror')) a.removeAttribute('onerror');
+    removeJavascript(a, 'src');
+    removeJavascript(a, 'href');
+    for (var c of a.children) removeUnsafeTags(c);
+    return a;
+}

package/coms/zimoli/render.js

@@ -675,8 +675,17 @@ var gtValue = function () { return this.value };
 var stValue = function (v) { this.value = v };
 var gtChecked = function () { return this.checked };
 var stChecked = function (v) { this.checked = v };
-var gtHtml = function () { return this.innerHTML };
-var stHtml = function (v) { this.innerHTML = v };
+var gtHtml = function () {
+    removeUnsafeTags(this);
+    return this.innerHTML;
+};
+var stHtml = function (v) {
+    var span = document.createElement('span');
+    span.innerHTML = v;
+    removeUnsafeTags(span);
+    this.innerHTML = '';
+    appendChild(this, span.childNodes);
+};
 class Model {
     constructor(getScope, setScope, target) {
         this.gs = getScope;
@@ -713,6 +722,7 @@ class Model {
             return;
         }
         this.ss.call(this.target, value);
+        console.log(value, this.value, this.gs.call(this.target))
         this.value = value;
         this.bd.value = this.gs.call(this.target, value);
         if (isFunction(this.emit?.call)) {
@@ -734,7 +744,7 @@ class Model {
     }
 }
 var createSetter = function (elem, search) {
-    return $$eval.bind(elem, search + "=arguments[2]", scopeList, elem);
+    return $$eval.bind(elem, search + "=arguments[1]", scopeList, elem);
 };
 var directives = {
     text: createBinder2(function (value) {
@@ -812,6 +822,14 @@ var binders = {
     ""(attr, search) {
         var getter = createGetter(this, search);
         var oldValue;
+        if (/contenteditable/i.test(attr)) {
+            var v = this.value;
+            Object.defineProperty(this, 'value', {
+                get: gtHtml,
+                set: stHtml
+            });
+            if (isHandled(v)) this.value = v;
+        }
         var hook = function () {
             var value = getter(this);
             if (deepEqual(value, oldValue)) return;
@@ -1138,21 +1156,49 @@ var getDeepContext = function (deep) {
     var length = deep;
     var deepL = deepcontexts.length;
     while (deep-- > deepL) {
-        deepcontexts[deep] = `with($parentScopes[${deep}])`;
+        deepcontexts[deep] = `with($$[${deep}])`;
     }
     return deepcontexts.slice(0, length).join('');
 }
-var createEval = function (deep) {
-    return new Function("$parentScopes", "code", "event", `${getDeepContext(deep)}return eval(code)`);
+var isRowCode = function (code) {
+    var reg = /["';]/g;
+    reg.lastIndex = 0;
+    var reg1 = /\\[\s\S]|'/g;
+    var reg2 = /\\[\s\S]|"/g;
+    do {
+        var r = reg.exec(code)
+        if (!r) return true;
+        var regtmp = null;
+        if (r) switch (r[0]) {
+            case "'": regtmp = reg1; break;
+            case `"`: regtmp = reg2; break;
+            case ";": return false;
+        }
+        if (regtmp) {
+            regtmp.lastIndex = reg.lastIndex;
+            do {
+                var r = regtmp.exec(code);
+                if (r) {
+                    r = r[0];
+                    if (r.length === 1) break;
+                }
+            } while (r);
+            reg.lastIndex = regtmp.lastIndex;
+        }
+    } while (r);
+    return true;
+}
+var createEval = function (deep, code) {
+    if (isRowCode(code)) code = `return ${code}`;
+    else code = `{${code}}`;
+    return new Function("$$", 'event', `${getDeepContext(deep)}${code}`);
 };
 
-var evalcontexts = [createEval(0)];
 
 function $$eval(search, scopes, target = this, event) {
     var length = scopes.length;
-    var eval2 = evalcontexts[length];
-    if (!eval2) eval2 = evalcontexts[length] = createEval(length);
-    var res = eval2.call(target, scopes, search, event);
+    var eval2 = createEval(length, search);
+    var res = eval2.call(target, scopes, event);
     return res;
 }
 

package/package.json

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