efront 3.35.9 → 3.35.11

package/coms/basic/Matrix.js

@@ -58,9 +58,10 @@ class Matrix extends Array {
         return this;
     }
     translate(vector) {
-        if (!isFinite(vector.length)) vector = arguments;
+        var v = vector;
+        if (!isFinite(v.length)) v = arguments;
         this.dirty();
-        return this.constructor.translate(this, vector);
+        return this.constructor.translate(this, v);
     }
     scale(ratio, center) {
         this.dirty();

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/coms/reptile/cross.js

@@ -110,7 +110,7 @@ var cross = cross_.bind(function (callback, onerror) {
         overrideMimeType(type) {
             responseType = type;
             if (/gb(k|2312|18030)/.test(type)) {
-                decoder = require("../efront/gbk2utf8");
+                decoder = require("./gbk2utf8");
             }
         },
     };

package/coms/reptile/gbk2utf8.js

@@ -0,0 +1,68 @@
+"use strict";
+var fs = require("fs");
+var points = [
+    0x3000, 0x3003,
+    0x3005, 0x3017,
+    0x301d, 0x301e,
+    0x3021, 0x3029,
+    0x3041, 0x3093,
+    0x309b, 0x309e,
+    0x30a1, 0x30f6,
+    0x30fc, 0x30fe,
+    0x3105, 0x3129,
+    0x3220, 0x3229,
+    0x3231, 0x3231,
+    0x32a3, 0x32a3,
+    0x32a3, 0x32a3,
+    0x338e, 0x338f,
+    0x339c, 0x339e,
+    0x33a1, 0x33a1,
+    0x33c4, 0x33c4,
+    0x33ce, 0x33ce,
+    0x33d1, 0x33d2,
+    0x33d5, 0x33d5,
+    0x4e00, 0x9fa5,
+    0xe76c, 0xe76c,
+    0xe78d, 0xe796,
+    0xe7e7, 0xe7f3,
+    0xe815, 0xe864,
+    0xff01, 0xff5e
+];
+var gbk = fs.readFileSync(require("path").join(__dirname, "../../data/gbk.txt"));
+var index = 0;
+var map = [];
+while (points.length) {
+    for (var cx = points.shift(), dx = points.shift() + 1; cx < dx; cx++) {
+        var code = gbk[index++] << 8 | gbk[index++];
+        map[code] = String.fromCharCode(cx);
+    }
+}
+// var map2 = [], saved = -1;
+// for (var cx = 0, dx = map.length; cx < dx; cx++) {
+//     if (map[cx]) {
+//         var start = cx;
+//         while (map[++cx]);
+//         var end = cx - 1;
+//         map2.push(start - saved - 1, end - start);
+//         saved = end;
+//     }
+// }
+// console.log(map2.join());
+// fs.writeFileSync("bb.txt",map.join(""));
+
+module.exports = function gbk2utf8(buff) {
+    var temp = 0;
+    var res = [];
+    for (var cx = 0, dx = buff.length; cx < dx; cx++) {
+        var buf = buff[cx];
+        if (temp) {
+            res.push(map[temp << 8 | buf]);
+            temp = 0;
+        } else if (buf > 0x7f) {
+            temp = buf;
+        } else {
+            res.push(String.fromCharCode(buf));
+        }
+    }
+    return res.join("");
+}

package/package.json

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