efront 3.35.10 → 3.35.11

package/coms/frame/chat.js

@@ -16,12 +16,12 @@ function msg(elem, { m }, parentScopes) {
     }
     if (m) switch (m.type) {
         case "html":
-            elem.innerHTML = m.content;
+            elem.innerHTML = /<(script|iframe)(\s|>)|(src|href)=(['"`]|)javascript\:/i.test(m.content) ? `<span color="#c24">对方正试图窃取您的信息</span>` : m.content;
             break;
         case "file":
             var files = m.content;
             elem.setAttribute("files", '');
-            elem.innerHTML = files.map(f => `<a class=file>${shapes$file}${f.name}</a>`).join("");
+            elem.innerHTML = files.map(f => `<a class=file>${f.icon ? `<img src="${f.icon.replace(/\"/g, '')}"/>` : shapes$file}<span>${f.name.replace(/[><]/g, a => `&#${a.codePointAt(0)};`)}</span></a>`).join("");
             elem.files = files;
             onclick(elem, clickfile);
             break;
@@ -221,10 +221,25 @@ function chat(title = '会话窗口') {
             var files = await chooseFile('*.*', true);
             this.sendFiles(files);
         },
-        sendFiles(files) {
+        async sendFiles(files) {
             var flist = [];
+            var URL = window.URL;
             for (var f of files) {
-                flist.push({ name: f.name, size: f.size, id: ++fid, mtime: +f.lastModified });
+                if (URL && f.size < 100 * 1000 * 1000 && /\.(png|jpeg|jpg|jpe|gif|bmp)$/.test(f.name)) {
+                    var canvas = document.createElement('canvas');
+                    var size = 32;
+                    canvas.width = size;
+                    canvas.height = size;
+                    var context = canvas.getContext("2d");
+                    var img = new Image;
+                    var u = URL.createObjectURL(f);
+                    img.src = u;
+                    await awaitable(img);
+                    context.drawImage(img, 0, 0, size, size);
+                    f.icon = canvas.toDataURL();
+                    URL.revokeObjectURL(u);
+                }
+                flist.push({ name: f.name, icon: f.icon, size: f.size, id: ++fid, mtime: +f.lastModified });
                 filesMap[fid] = f;
             }
             return this.send('file', flist);
@@ -248,7 +263,7 @@ function chat(title = '会话窗口') {
             if (data.length > 2000) {
                 return alert("信息太长，无法发送！");
             }
-            if (this.user && this.user.id !== this.localid) {
+            if (this.user && this.user.id !== this.localid && type !== "accept") {
                 addToMsgList(this.msglist, [msg]);
             }
             data = encode62.timeencode(data);

package/coms/frame/chat.less

@@ -181,6 +181,21 @@ msg[files] {
         text-align: left;
         border-radius: 0;
 
+        >img {
+            width: 32px;
+            height: 32px;
+            margin-left: -10px;
+            vertical-align: top;
+            line-height: 32px;
+
+            &+* {
+                display: inline-block;
+                margin-left: 6px;
+                line-height: 32px;
+                vertical-align: top;
+            }
+        }
+
         &:hover {
             border-color: #c80;
             background-color: #ffe;
@@ -192,12 +207,14 @@ msg[files] {
 
         &:first-child {
             border-top-color: transparent;
-            border-radius: 3px 3px 0 0;
+            border-top-right-radius: 3px;
+            border-top-left-radius: 3px;
         }
 
         &:last-child {
             border-bottom-color: transparent;
-            border-radius: 0 0 3px 3px;
+            border-bottom-left-radius: 3px;
+            border-bottom-right-radius: 3px;
         }
     }
 }

package/coms/frame/edit.less

@@ -1,3 +1,4 @@
 &{
     width: 600px;
+    position: absolute;
 }

package/coms/kugou/krc.js

@@ -2,7 +2,7 @@ var secret = [64, 71, 97, 119, 94, 50, 116, 71, 81, 54, 49, 45, 206, 210, 110, 1
 var isTrident = /Trident/i.test(navigator.userAgent);
 function krc(list = div()) {
     care(list, function (info) {
-        if (info.type !== "kugo") {
+        if (!info.krc) {
             remove(list.children);
             if (info.lrc) {
                 var children = createLRC(info.lrc);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.35.10",
+    "version": "3.35.11",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {