efront 3.18.0 → 3.18.3

package/apps/pivot/link/chat.js

@@ -12,14 +12,11 @@ async function link(id, page) {
     var xhr = null;
     while (true) {
         if (removed) break;
-        xhr = data.from("care", { id }, function (data) {
-            page.$scope.msglist.push.apply(page.$scope.msglist, data);
-        });
-        await xhr;
+        xhr = data.from("care", { id });
+        page.push(await xhr);
     }
 }
 function main(id) {
-    console.log(id)
     var page = frame$chat();
     care(page, 'send', function (msg) {
         data.from("cast", { id: page.roomid, msg });

package/apps/pivot/link/list.html

@@ -1,11 +1,9 @@
-<btn @click="chat()">新建连接</btn>
-<div>
-    自动刷新<swap -model="autoreload"></swap>
-</div>
 <div class="clusters">
     <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">
         <span -text="c"></span>
     </a>
+    自动刷新<swap -model="autoreload"></swap>
+    <btn @click="chat()">新建连接</btn>
 </div>
 <lattice -src="c in clients">
     <padding>

package/apps/pivot/link/list.js

@@ -4,7 +4,7 @@ function main() {
     page.innerHTML = template;
     renderWithDefaults(page, {
         load: lazy(async function () {
-            this.clusters = data.asyncInstance("cluster", { opt: "list" });
+            this.clusters = data.lazyInstance("cluster", { opt: "list" });
             await this.clusters;
             this.active();
         }, -1000),

package/apps/pivot/link/list.less

@@ -1,9 +1,14 @@
 .clusters a {
     display: inline-block;
-    margin-right: 20px;
     padding: 0 6px;
 }
-
+.clusters>*{
+    vertical-align: top;
+    margin-right: 12px;
+}
+.clusters{
+    padding-left: 6px;
+}
 .time {
     color: #bbb;
 }

package/coms/basic/cross_.js

@@ -230,12 +230,16 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     }
                 }
             }
+            var is_gb2312 = /^[gbk][^e]/i.test(method);
+            if (is_gb2312) method = method.slice(1);
             if (nocross) {
                 extend(realHeaders, _headers);
                 xhr.open(method, url);
             } else {
                 xhr.open(method, getCrossUrl(url, _headers));
             }
+            if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
+
             Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
             if (!isEmpty(datas)) send.call(xhr, datas);
             else send.call(xhr);
@@ -286,7 +290,10 @@ function addDirect(a) {
     if (typeof a === 'string' || a instanceof RegExp) cors_hosts.push(a);
 }
 function notCross(domain) {
-    if (!base || location_href && location_href === domain.slice(0, location_href.length) || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
+    if (!base ||
+        location_href && location_href === domain.slice(0, location_href.length) ||
+        !/^https?\:\/\/|^s?\/\//.test(domain) ||
+        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2')) return true;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/frame/chat.html

@@ -1,13 +1,19 @@
-<div head -html="title">
+<div head>
+    <template -src="title">
+    </template>
+    <close @click="remove()"></close>
 </div>
-<grid body>
+<grid body #body>
     <chat -src="m in msglist">
-        <msg class="msg" -src="m"></msg>
+        <padding>
+            <msg class="msg"></msg>
+            <div style="clear: both;"></div>
+        </padding>
     </chat>
-    <div textarea>
-        <div contenteditable="true" -model="text"></div>
+    <div textarea @mousedown="this.firstChild.focus()">
+        <div @keydown.alt.enter="send()" contenteditable="true" -model="text"></div>
     </div>
 </grid>
 <div foot>
-    <btn @click="send()">发送</btn>
+    <btn @click="send();">发送</btn>
 </div>

package/coms/frame/chat.js

@@ -1,22 +1,36 @@
 
-function msg(elem) {
-    care(elem, function (data) {
-        if (!data) return;
-        var m = JSAM.parse(data);
-        if (m) switch (m.type) {
-            case "html":
-                elem.innerHTML = m.content;
-                break;
-            default:
-                elem.innerText = data;
-        }
-    })
+function msg(elem, { m: data }, parentScopes) {
+    if (!data) return;
+    data = encode62.timedecode(data);
+    var m = JSAM.parse(data);
+    if (m.sender === parentScopes[parentScopes.length - 1].localid) {
+        elem.setAttribute("self", "");
+    }
+    if (m) switch (m.type) {
+        case "html":
+            elem.innerHTML = m.content;
+            break;
+        default:
+            elem.innerText = data;
+    }
 }
 function chat(title = '会话窗口') {
     var page = view();
     page.innerHTML = template;
-    drag.on(page.firstChild, page);
+    drag.on(page.firstElementChild, page);
     resize.on(page);
+    page.push = function (msgs) {
+        var { msglist } = this.$scope;
+        msglist.push.apply(msglist, msgs);
+        var chat = page.querySelector("chat");
+        var lastmsg = chat.getLastVisibleElement();
+        if (msgs.length && (!lastmsg || lastmsg.offsetTop + lastmsg.offsetHeight === chat.scrollHeight)) {
+            chat.go(msglist.length ? msglist.length - 1 : 0);
+        }
+    };
+    page.renders = [function () {
+        this.$scope.resize(this.$scope.body);
+    }];
     renderWithDefaults(page, {
         chat: list,
         title,
@@ -25,13 +39,32 @@ function chat(title = '会话窗口') {
         text: '',
         localid: Math.random(),
         msg,
+        remove() {
+            remove(page);
+        },
+        resize(body) {
+            var textarea = body.querySelector("[textarea]");
+            var lastElementChild = textarea.lastElementChild;
+            var targetHeight = Math.min(textarea.scrollHeight, body.clientHeight * .6, lastElementChild.offsetTop + lastElementChild.offsetHeight);
+            if (Math.abs(targetHeight - textarea.clientHeight) < 2) return;
+
+            body.resizeCell(textarea, 'top', textarea.clientHeight - targetHeight - 2);
+        },
         send() {
             if (!this.text) return;
-            cast(page, "send", JSAM.stringify({
+            var data = JSAM.stringify({
                 type: 'html',
                 sender: this.localid,
                 content: this.text,
-            }));
+            });
+
+            data = encode62.timeencode(data);
+            if (this.text.length > 2000) {
+                alert("信息太长，无法发送！");
+                return;
+            }
+            cast(page, "send", data);
+            this.body.lastElementChild.focus();
             this.text = '';
         }
     });

package/coms/frame/chat.less

@@ -1,5 +1,5 @@
-@height: 320px;
-@width: 360px;
+@height: 420px;
+@width: 480px;
 @margin-top: -160px;
 @margin-left: -180px;
 
@@ -18,9 +18,56 @@
     max-height: 100%;
 }
 
+padding {
+    display: block;
+    position: relative;
+
+    &:after {
+        display: "";
+        display: block;
+        clear: both;
+    }
+}
 
 msg {
     display: block;
+    border-radius: 4px;
+    padding: 6px 12px;
+    line-height: 20px;
+    white-space: normal;
+    word-break: break-all;
+    background: #fff;
+    position: relative;
+    margin: 0 10px;
+    float: left;
+
+    &:before {
+        content: "";
+        display: block;
+        position: absolute;
+        border: 6px solid transparent;
+        top: 22px;
+        margin: -12px;
+    }
+
+    &:not([self]):before {
+        display: block;
+        left: 0;
+        border-right-color: #fff;
+    }
+
+    &[self] {
+        &:before {
+            right: 0;
+            border-left-color: #77ddaa;
+        }
+
+        margin-left: 20px;
+
+        float: right;
+        background-color: #77ddaa;
+        color: #333;
+    }
 }
 
 
@@ -55,7 +102,7 @@ chat {
     height: 100%;
 }
 
-.editor-height(80px);
+.editor-height(96px);
 
 [textarea] {
     display: block;
@@ -67,14 +114,17 @@ chat {
     border: none;
     outline: none;
     border-top: 1px solid #000;
+    border-bottom: 28px solid transparent;
     ime-mode: active;
+    overflow: auto;
 
     >div {
-        height: 100%;
+        height: auto;
+        min-height: 52px;
         width: 100%;
         vertical-align: top;
-        padding: 6px 16px 30px;
-        overflow: auto;
+        padding: 6px 16px;
+        box-sizing: border-box;
         outline: none;
     }
 }
@@ -104,10 +154,12 @@ chat {
     .editor-height(36px);
 
     [textarea] {
-        border: none;
+        border-bottom: none;
         outline: none;
-        >div{
-            padding-right: 80px;
+
+        >div {
+            min-height: 30px;
+            padding-right: 110px;
         }
     }
 }

package/coms/frame/list.js

@@ -2,11 +2,20 @@ function main(title, { fields, options: options0, load, remove }, edit_ref) {
     prepare(edit_ref);
     var page = document.createElement("div");
     var edit = function (o) {
+        if (!edit_ref) {
+            return;
+        }
+        var callback = function () {
+            page.$scope.load();
+        };
+        if (isFunction(edit_ref)) {
+            var p = edit_ref(o, callback);
+            if (p) on('submited')(p, callback);
+            return;
+        }
         zimoli.prepare(edit_ref, function () {
-            var p = popup(edit_ref, { fields, data: o })
-            on("submited")(p, function () {
-                page.$scope.load();
-            })
+            var p = popup(edit_ref, { fields, data: o})
+            on("submited")(p, callback);
         })
     };
     page.innerHTML = template;

package/coms/maps/baidu.js

@@ -27,14 +27,19 @@ var baidu = {
     getURL: function (x, y, z) {
         if (x < 0) x = "M" + -x;
         if (y < 0) y = "M" + -y;
-        return `http://online0.map.bdimg.com/tile/?qt=tile&x=${x}&y=${y}&z=${z}&styles=pl&scaler=1&udt=20180721`;
+        return `https://maponline2.bdimg.com/tile/?qt=tile&x=${x}&y=${y}&z=${z}&styles=pl&scaler=1&udt=20180721`;
     },
     lat2y,
     lng2x,
     x2lng,
     y2lat,
+    minLng: -180,
+    maxLng: 180,
     direction: -1,
     lat2tile(lat, zoom) {
         return Math.ceil(this.lat2y(lat, zoom));
+    },
+    lng2tile(lng, zoom) {
+        return Math.floor(this.lng2x(lng, zoom));
     }
 }

package/coms/maps/gaode.js

@@ -0,0 +1,3 @@
+return {
+    url:'http://webst04.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'
+};

package/coms/maps/google.js

@@ -1,4 +1,4 @@
 var google = {
-    url: `http://mt{1-3}.google.cn/vt/lyrs=h&hl=zh-CN&gl=cn&x={x}&y={y}&z={z}`,
-    url: `http://mt{1-3}.google.cn/vt/lyrs=s&hl=zh-CN&gl=cn&x={x}&y={y}&z={z}`
+    url: `https://mt{1-3}.google.cn/vt/lyrs=h&hl=zh-CN&gl=cn&x={x}&y={y}&z={z}`,
+    url: `https://gac-geo.googlecnapps.cn/maps/vt?lyrs=s%40781&hl=zh-CN&gl=CN&x={x}&y={y}&z={z}&src=app&scale=1&from=app`
 };

package/coms/maps/osm.js

@@ -1,5 +1,5 @@
 var osm = {
-    url: `http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png`,
+    url: `https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png`,
     loadImage(image, src) {
         var img = new Image;
         img.crossOrigin = "anonymous";

package/coms/pivot/pedit.less

@@ -0,0 +1,3 @@
+&{
+    position: absolute;
+}

package/coms/pivot/plist.js

@@ -9,5 +9,11 @@ function main(title, type, fields, edit_ref, options, idkey = fields[0].key) {
         },
         fields,
         options,
-    }, edit_ref);
+    }, edit_ref ? edit_ref : function (o) {
+        var p = pedit(title, type, { data: o, fields });
+        p.initialStyle = popup.style;
+        popup(p, true);
+        move.setPosition(p, [.5, .5]);
+        return p;
+    });
 }

package/coms/random/sfz.js

@@ -0,0 +1,154 @@
+// data.setConfig(data.parseConfig(`
+// https://shenfen.supfree.net/:
+//   sheng:   gget:[].bblue #title=!title&href=!href&short=!innerText
+//   shi: gget:[].bblue sheng.asp?sheng#title=!title&href=!href&short=!innerText
+//   qu:   gget:[].bblue shi.asp?sheng&shi#title=!title&href=!href&short=!innerText
+// `));
+// var setid = function (a) {
+//     a = a.filter(a => a.title);
+//     for (var o of a) {
+//         o.name = o.title.replace(/身份证|号码/g, "").replace(/市县/, '市');
+//         o.id = o.href.replace(/^([^\d]+)\.asp\?[\s\S]*\1\=(\d+)[\s\S]*?$/g, "$2");
+//         delete o.href;
+//         delete o.title;
+//     }
+//     return a;
+// };
+// var prefix = {};
+// var tree = {};
+// await queue.call(await data.from("sheng", setid), async function (h) {
+//     var shi = await data.from("shi", { sheng: h.id }, setid);
+//     var so = {};
+//     tree[h.short] = so;
+//     while (shi.length) {
+//         var s = shi.pop();
+//         var qu = await data.from("qu", { sheng: h.id, shi: s.id }, setid);
+//         var qo = {};
+//         so[s.short] = qo;
+//         while (qu.length) {
+//             var q = qu.pop();
+//             var id = +`${h.id}${s.id}${q.id}`;
+//             qo[q.short] = id;
+//             prefix[id] = { id, sheng: h.short, shi: s.short, qu: q.short };
+//         }
+//     }
+// }, 9);
+// prefix = Object.keys(prefix).sort((a, b) => a - b).map(k => prefix[k]);
+// console.log(tree)
+// var prefix = [...];
+// console.log(prefix)
+// for (var cx = 0, ci = 0, cs = prefix[0]; cx < prefix.length; cx++) {
+//     if (prefix[cx + 1] !== prefix[cx] + 1) {
+//         prefix.splice(ci + 1, cx - ci, prefix[cx] - prefix[ci]);
+//         if (ci > 1) {
+//             var temp = prefix[ci];
+//             prefix[ci] -= cs;
+//             cs = temp;
+//         }
+//         cx = ci + 1;
+//         ci = cx + 1;
+//     };
+// }
+// console.log(prefix)
+
+var prefix = function (source) {
+    var src = [];
+    do {
+        var s = source[0];
+        src.push(s);
+        if (source[1] === 0) {
+            if (source.length <= 2) break;
+            source[2] += source[0], source.shift(), source.shift();
+        }
+        else source[0]++, source[1]--;
+    } while (source.length);
+    return src;
+}([110101, 8, 10, 6, 117, 1, 9873, 14, 120, 0, 2, 0, 2, 0, 9876, 7, 20, 0, 2, 10, 58, 4, 20, 7, 20, 0, 2, 2, 4, 0, 2, 1, 52, 2, 20, 3, 20, 3, 80, 3, 5, 0, 15, 0, 2, 12, 58, 0, 20, 2, 20, 14, 60, 1, 20, 3, 20, 17, 60, 3, 20, 2, 4, 1, 16, 12, 80, 3, 20, 7, 80, 2, 20, 9, 60, 3, 20, 2, 21, 4, 6, 0, 53, 1, 20, 1, 20, 7, 60, 1, 8920, 0, 4, 5, 16, 2, 60, 0, 20, 2, 10, 1, 10, 6, 80, 2, 10, 0, 10, 1, 80, 1, 10, 0, 10, 0, 2, 8, 58, 0, 20, 1, 20, 1, 3, 1, 57, 0, 20, 2, 20, 3, 80, 1, 20, 8, 60, 0, 20, 1, 20, 9, 60, 1, 20, 1, 20, 11, 60, 0, 20, 1, 20, 13, 60, 1, 20, 1, 20, 9, 60, 1, 1020, 1, 21, 1, 3, 9, 176, 1, 20, 3, 6, 0, 2, 2, 4, 0, 168, 2, 20, 2, 4, 0, 2, 9, 74, 2, 22, 4, 6, 4, 7372, 4, 20, 4, 80, 6, 20, 2, 80, 3, 100, 3, 20, 5, 7, 2, 73, 1, 20, 5, 60, 0, 21, 0, 19, 6, 80, 1, 20, 6, 60, 4, 20, 1, 20, 5, 80, 1, 20, 8, 60, 0, 1120, 5, 21, 1, 5, 4, 74, 1, 20, 3, 80, 1, 21, 5, 179, 1, 21, 9, 79, 1, 23, 3, 5, 3, 5, 0, 67, 0, 21, 6, 79, 0, 21, 5, 99, 2, 57180, 5, 10, 3, 11, 2, 59, 0, 20, 3, 10, 2, 13, 0, 57, 2, 20, 3, 10, 0, 10, 0, 2, 0, 58, 0, 20, 3, 10, 0, 10, 2, 80, 4, 20, 1, 80, 3, 23, 0, 57, 1, 20, 2, 10, 0, 15, 1, 55, 1, 20, 3, 10, 0, 70, 1, 20, 4, 10, 0, 10, 1, 80, 4, 10, 0, 10, 0, 60, 0, 20, 2, 20, 1, 80, 1, 3, 0, 17, 0, 2, 1, 58, 1, 20, 2, 20, 1, 3, 0, 57, 1, 20, 3, 20, 1, 60, 0, 8620, 5, 11, 0, 10, 0, 59, 2, 20, 3, 10, 0, 10, 0, 60, 3, 20, 2, 21, 1, 59, 1, 20, 2, 20, 1, 80, 2, 20, 0, 2, 1, 58, 1, 20, 1, 20, 2, 4, 0, 56, 0, 20, 1, 20, 3, 80, 1, 20, 1, 60, 1, 1520, 5, 23, 0, 2, 0, 7675, 7, 20, 0, 2, 6, 58, 3, 20, 7, 20, 0, 2, 2, 4, 0, 2, 2, 52, 0, 20, 6, 20, 0, 60, 1, 20, 6, 20, 1, 80, 2, 4, 1, 16, 3, 80, 5, 20, 3, 80, 15, 21, 0, 59, 0, 20, 4, 10, 0, 11, 0, 4, 0, 2, 0, 5, 0, 48, 1, 20, 3, 20, 0, 80, 4, 23, 1, 57, 0, 2, 2, 18, 1, 20, 0, 2, 1, 58, 1, 20, 1, 20, 5, 60, 2, 1020, 3, 23, 2, 6, 2, 391, 2, 77380, 0, 2, 7, 9, 8, 118, 0, 9871, 6, 10, 5, 10, 4, 80, 5, 10, 0, 70, 2, 20, 4, 10, 0, 10, 3, 60, 1, 20, 1, 3, 1, 7, 1, 70, 2, 20, 6, 10, 0, 70, 5, 20, 1, 10, 0, 10, 0, 2, 0, 58, 3, 20, 0, 2, 3, 18, 3, 80, 3, 10, 0, 10, 0, 5, 0, 3, 2, 53, 0, 19, 2, 20, 4, 7, 0, 53, 1, 20, 2, 10, 0, 12, 0, 4, 0, 54, 0, 3, 0, 4, 0, 13, 1, 10, 1, 10, 0, 60, 2, 20, 2, 80, 3, 20, 1, 20, 3, 8780, 5, 7, 2, 14, 0, 5, 0, 54, 4, 20, 0, 2, 3, 8, 1, 14, 2, 56, 2, 20, 3, 21, 0, 2, 0, 2, 3, 55, 1, 20, 1, 10, 0, 10, 0, 3, 0, 57, 2, 20, 2, 20, 2, 80, 1, 20, 0, 3, 0, 57, 2, 20, 2, 20, 0, 2, 0, 3, 1, 55, 3, 20, 2, 20, 1, 3, 1, 57, 0, 20, 2, 20, 1, 80, 3, 20, 3, 60, 1, 20, 1, 20, 6, 60, 0, 1320, 1, 21, 1, 3, 4, 7576, 3, 10, 0, 10, 2, 80, 3, 6, 0, 14, 2, 80, 3, 10, 0, 10, 2, 80, 5, 20, 0, 80, 4, 20, 0, 80, 3, 20, 0, 80, 2, 10, 0, 10, 0, 80, 2, 10, 0, 11, 6, 59, 0, 120, 3, 20, 3, 80, 2, 21, 0, 2, 2, 57, 1, 20, 3, 20, 6, 60, 1, 20, 1, 20, 3, 80, 1, 20, 3, 80, 2, 20, 4, 80, 1, 20, 2, 80, 1, 20, 2, 80, 1, 20, 4, 60, 0, 520, 0, 21, 1, 3, 2, 76, 1, 21, 1, 7, 2, 72, 0, 21, 1, 3, 1, 276, 0, 20, 2, 7180, 4, 10, 0, 10, 4, 7, 0, 53, 1, 20, 5, 10, 2, 90, 4, 20, 1, 80, 2, 20, 0, 2, 7, 58, 0, 20, 4, 20, 0, 3, 3, 57, 2, 20, 2, 21, 7, 59, 0, 20, 1, 20, 4, 60, 3, 20, 1, 20, 4, 60, 0, 20, 1, 20, 5, 60, 1, 1220, 2, 24, 0, 2, 4, 7874, 4, 10, 0, 10, 3, 80, 2, 21, 0, 59, 0, 20, 1, 12, 0, 8, 2, 80, 2, 20, 0, 2, 7, 58, 0, 20, 1, 20, 0, 80, 1, 21, 0, 59, 0, 20, 1, 20, 14, 60, 1, 20, 2, 20, 9, 60, 0, 20, 1, 20, 5, 60, 2, 20, 1, 20, 9, 80, 1, 20, 9, 60, 0, 1020, 3, 25, 3, 6, 1, 69, 1, 20, 5, 8, 2, 5, 0, 67, 1, 20, 9, 11, 0, 70, 0, 20, 7, 9, 1, 7570, 4, 11, 1, 11, 3, 58, 0, 20, 2, 4, 0, 6, 3, 70, 4, 20, 5, 20, 2, 80, 5, 80, 0, 20, 2, 20, 2, 80, 1, 10, 2, 23, 0, 47, 6, 20, 4, 23, 1, 57, 5, 20, 1, 10, 0, 15, 6, 55, 2, 20, 2, 10, 0, 10, 0, 2, 0, 59, 1, 19, 1, 80, 2, 20, 1, 20, 1, 80, 2, 100, 1, 10, 1, 10, 8, 80, 1, 20, 7, 60, 1, 20, 1, 20, 5, 60, 0, 20, 1, 20, 5, 80, 1, 20, 7, 580, 0, 20, 0, 2, 2, 5, 0, 2, 0, 571, 0, 21, 4, 6, 2, 37173, 5, 7, 0, 14, 0, 59, 4, 20, 4, 10, 0, 10, 4, 80, 6, 10, 0, 11, 7, 59, 0, 20, 3, 10, 0, 10, 2, 4, 0, 56, 1, 20, 5, 10, 0, 11, 1, 4, 1, 55, 0, 20, 2, 10, 0, 10, 1, 80, 3, 10, 0, 10, 0, 3, 4, 57, 1, 20, 3, 10, 0, 10, 2, 4, 0, 56, 2, 20, 1, 21, 1, 4, 2, 75, 1, 22, 2, 58, 1, 20, 1, 20, 2, 80, 1, 20, 1, 3, 0, 57, 1, 20, 2, 20, 9, 60, 0, 20, 2, 20, 5, 60, 0, 20, 2, 20, 7, 80, 1, 20, 7, 60, 0, 20, 1, 20, 8, 980, 1, 20, 7, 80, 0, 20, 8, 7280, 6, 10, 6, 90, 4, 21, 0, 59, 0, 20, 2, 20, 4, 60, 0, 120, 5, 20, 0, 4, 4, 56, 2, 20, 1, 5, 1, 15, 0, 3, 2, 58, 2, 19, 3, 100, 1, 3, 0, 17, 1, 60, 0, 20, 1, 20, 2, 60, 3, 20, 2, 21, 2, 59, 0, 2, 0, 4, 0, 14, 1, 20, 6, 60, 1, 20, 1, 20, 3, 60, 0, 20, 1, 80, 0, 1420, 1, 21, 1, 3, 3, 6179, 2, 17, 0, 1080, 4, 10, 0, 10, 1, 3, 0, 57, 0, 20, 3, 10, 0, 10, 0, 2, 2, 58, 0, 20, 1, 3, 0, 17, 0, 60, 1, 20, 7, 10, 1, 10, 3, 5, 0, 55, 1, 20, 2, 10, 0, 10, 4, 6, 2, 54, 0, 20, 2, 10, 0, 10, 0, 2, 1, 3, 0, 55, 1, 20, 2, 20, 5, 60, 0, 20, 1, 10, 0, 10, 1, 80, 2, 20, 2, 60, 0, 20, 2, 20, 7, 60, 0, 20, 2, 20, 8, 80, 1, 20, 9, 60, 0, 20, 1, 20, 1, 60, 1, 1120, 2, 21, 0, 2, 0, 477, 0, 100, 0, 21, 5, 8, 0, 6971, 6, 10, 3, 70, 3, 20, 3, 20, 3, 8, 0, 3, 1, 49, 1, 20, 0, 2, 5, 98, 3, 20, 0, 80, 0, 5, 9, 17, 0, 59, 1, 19, 7, 80, 3, 20, 0, 2, 2, 78, 4, 20, 3, 10, 0, 12, 0, 2, 0, 56, 2, 20, 2, 22, 0, 58, 2, 220, 2, 22, 3, 60, 1, 18, 2, 21, 2, 59, 0, 20, 1, 20, 3, 5, 1, 55, 0, 20, 1, 20, 0, 2, 0, 58, 0, 20, 1, 20, 4, 80, 1, 20, 0, 2, 0, 58, 0, 20, 1, 20, 0, 2, 0, 2, 2, 56, 1, 20, 0, 100, 0, 3100, 1, 20, 1, 80, 1, 20, 1, 3, 0, 57, 0, 20, 1, 20, 2, 60, 0, 4720, 5, 10, 0, 10, 6, 80, 4, 10, 0, 10, 5, 80, 4, 10, 0, 10, 11, 80, 0, 2, 2, 8, 0, 10, 2, 60, 0, 20, 2, 11, 0, 9, 0, 80, 2, 20, 0, 60, 0, 20, 2, 20, 1, 80, 3, 20, 0, 60, 0, 20, 1, 20, 3, 60, 0, 20, 1, 20, 10, 80, 1, 20, 2, 80, 1, 20, 8, 60, 0, 20, 1, 20, 3, 60, 0, 20, 1, 20, 4, 60, 0, 620, 0, 21, 2, 4, 7, 75, 0, 22, 8, 179, 0, 22, 0, 3, 1, 174, 0, 21, 10, 79, 1, 22, 8, 7278, 6, 24, 3, 5, 1, 3, 3, 68, 7, 100, 0, 8800, 2, 4, 2, 20, 3, 5, 1, 3, 6, 31068, 14, 121, 16, 18, 3, 141, 3, 9720, 0, 3, 4, 8, 3, 9, 4, 8, 0, 2, 1, 50, 3, 120, 3, 10, 0, 10, 1, 80, 2, 10, 0, 10, 1, 80, 3, 20, 1, 3, 1, 77, 0, 2, 0, 20, 0, 3, 0, 55, 2, 20, 0, 2, 1, 19, 5, 59, 0, 20, 1, 10, 1, 10, 3, 80, 3, 20, 2, 80, 1, 10, 0, 13, 1, 4, 0, 73, 1, 10, 2, 12, 1, 3, 0, 3, 0, 3, 1, 49, 0, 120, 3, 20, 4, 60, 0, 20, 1, 20, 4, 80, 1, 20, 8, 80, 1, 20, 2, 60, 0, 20, 1, 20, 4, 60, 0, 20, 1, 20, 6, 80, 1, 20, 2, 80, 1, 20, 1, 60, 0, 920, 1, 20, 2, 8, 1, 72, 0, 21, 6, 99, 12, 100, 17, 80, 0, 21, 15, 279, 0, 20, 2, 100, 5, 6280, 2, 10, 3, 10, 2, 60, 0, 20, 2, 20, 1, 80, 2, 20, 9, 60, 1, 20, 1, 20, 4, 1780, 0, 21, 8, 79, 0, 21, 6, 79, 0, 21, 6, 79, 0, 25, 4, 75, 0, 21, 14, 79, 1, 21, 1, 3, 7, 7376, 2, 10, 2, 10, 1, 3, 5, 57, 0, 120, 1, 20, 5, 7, 0, 53, 0, 20, 1, 20, 7, 80, 1, 20, 3, 80, 1, 20, 9, 80, 1, 20, 3, 80, 1, 20, 8, 80, 1, 20, 6, 1180, 0, 21, 9, 179, 0, 21, 7, 9, 0, 170, 1, 21, 10, 99, 7, 80, 0, 21, 8, 79, 0, 21, 1, 79, 0, 21, 10, 79, 0, 21, 3, 79, 2, 21, 2, 99, 3, 100, 0, 2, 2, 98, 2, 100, 7, 6580, 1, 20, 6, 2000, 8, 11, 5, 89, 8, 10, 2, 70, 0, 21, 16, 99, 9, 100, 7, 100, 6, 67480, 3, 10, 5, 10, 1, 3, 2, 77, 3, 20, 1, 80, 3, 20, 3, 5, 5, 75, 3, 21, 9, 59, 0, 20, 1, 20, 7, 60, 1, 20, 1, 20, 11, 80, 1, 20, 9, 80, 1, 20, 10, 80, 1, 20, 8, 80, 1, 20, 5, 1380, 0, 21, 8, 79, 0, 21, 5, 179, 0, 21, 10, 7379, 4, 10, 0, 10, 2, 80, 0, 100, 1, 20, 0, 80, 2, 20, 2, 80, 2, 20, 4, 80, 1, 20, 2, 80, 1, 20, 4, 80, 1, 20, 5, 80, 1, 20, 3, 60, 1, 20, 1, 20, 6, 80, 1, 20, 5, 980, 2, 22, 3, 78, 0, 21, 4, 79, 0, 21, 1, 4, 0, 95, 0, 3, 5, 197, 0, 2, 7, 78, 0, 21, 5, 79, 0, 20, 6, 80, 0, 20, 6, 80, 0, 20, 6, 7080, 4, 20, 2, 2000, 7, 100, 3, 100, 3, 200, 4, 100, 5, 100, 5, 80, 1, 20, 2, 7280, 5, 10, 0, 10, 1, 60, 0, 20, 4, 20, 2, 80, 1, 20, 3, 60, 1, 20, 1, 21, 3, 79, 1, 20, 1, 1700, 5, 7880, 7, 20, 0, 80, 4, 1900, 0, 21, 1, 79, 0, 21, 1, 79, 2, 22, 2, 4, 1, 374, 0, 21, 1, 79, 0, 21, 7, 79, 0, 21, 7, 79, 0, 21, 2, 79, 0, 20, 10, 80, 0, 20, 6, 780, 2, 20, 7, 180, 1, 20, 0, 2, 3, 78, 0, 20, 5, 4680, 3]);
+// var prefix = function (source) {
+//     var src = [];
+//     do {
+//         var sheng = source[0]++;
+//         src.push(sheng);
+//         if (source[0] > source[1]) source.shift(), source.shift();
+//     } while (source.length);
+//     return src;
+// }([11, 15, 21, 23, 31, 37, 41, 46, 50, 54, 61, 65, 71, 71, 81, 82]);
+var birth = function (q) {
+    var d = new Date(1000, q % 12, 1 + q % 31);
+    d = new Date(+d + (Date.now() - d) * (1 - Math.pow(.5, q % 9 + 2)));
+    return d;
+}
+/**
+ * @param {Date} d;
+ */
+var date = function (d = birth(), y = d.getFullYear()) {
+    return y * 10000 + (d.getMonth() + 1) * 100 + d.getDate();
+};
+var order = function (r = Math.random(), q = r * 20220309 | 0) {
+    return (Math.pow(r, q % 10 + 4) * 498 + 1 | 0);
+};
+var code = function (q = Math.random() * 202203091636) {
+    return String(prefix[q % prefix.length]);
+};
+var parse = function (r) {
+    var p, y, m, d, o, s, x;
+    if (typeof r === 'string') switch (r.length) {
+        case 18:
+            s = r.slice(17, 18);
+        case 17:
+            o = r.slice(14, 17);
+        case 14:
+            d = r.slice(12, 14);
+        case 12:
+            m = r.slice(10, 12);
+        case 10:
+            y = r.slice(6, 10);
+        case 6:
+            p = r.slice(0, 6);
+            break;
+        case 8:
+            y = r.slice(0, 4);
+            m = r.slice(4, 6);
+            d = r.slice(6, 8);
+            break;
+        case 4:
+            y = r.slice(0, 4);
+            break;
+        case 3:
+            o = r >> 1;
+        case 1:
+            x = o & 1;
+            break;
+        case 2:
+            m = r;
+    }
+    else if (r === 1 || r === 0) x = r;
+    return [p, y, m, d, o, x, s];
+}
+function sex(r = Math.random()) {
+    return r < .5 | 0;
+}
+function sfz(r) {
+    var p17, middle;
+    if (typeof r === 'string' || r === 1 || r === 0) {
+        var r0 = Math.random();
+        var q = r0 * 20220309 | 0;
+        var d = birth(q);
+        var [p = code(q), y = d.getFullYear(), m = d.getMonth() + 1, d = d.getDate(), o = order(r0), x = sex(r0)] = parse(r);
+        middle = (y * 10000 + m * 100 + d) * 1000 + (o << 1 | x);
+        p17 = p + middle;
+    }
+    if (!p17) {
+        var q = r * 20220309 | 0;
+        var d = birth(q);
+        middle = (d.getFullYear() * 10000 + (d.getMonth() + 1) * 100 + d.getDate()) * 1000 + (order(r) << 1 | sex(r))
+        p17 = code(q) + middle;
+    }
+    var s = 0;
+    var a = [2, 4, 8, 5, 10, 9, 7, 3, 6, 1, 2, 4, 8, 5, 10, 9, 7];
+    for (var p of p17) {
+        s += p * a.pop();
+    }
+    var end = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2][s % 11];
+    return p17 + end;
+}

package/coms/reptile/cross.js

@@ -1,5 +1,5 @@
 return cross_.bind(function (callback, onerror) {
-    var response, responseObject, responseType = "", error;
+    var response, responseObject, responseType = "", decoder, error;
     var xhr = {
         status: 0,
         readyState: 0,
@@ -11,7 +11,7 @@ return cross_.bind(function (callback, onerror) {
         get response() {
             if (responseType === "" || responseType === "text") {
                 if (this.readyState !== 4) return '';
-                return String(response);
+                return decoder ? decoder(response) : String(response);
             }
             else if (error) return null;
             if (responseObject !== null) return responseObject;
@@ -20,7 +20,7 @@ return cross_.bind(function (callback, onerror) {
                     return response.buffer;
                 case "json":
                     if (!response) return null;
-                    responseObject = JSON.parse(String(response));
+                    responseObject = JSON.parse(decoder ? decoder(response) : String(response));
                     return responseObject;
             }
             return responseObject;
@@ -103,7 +103,12 @@ return cross_.bind(function (callback, onerror) {
         setRequestHeader(key, value) {
             this.headers[key] = value;
         },
-
+        overrideMimeType(type) {
+            responseType = type;
+            if (/gb(k|2312|18030)/.test(type)) {
+                decoder = require("../efront/gbk2utf8");
+            }
+        },
     };
     return xhr;
 }, null, undefined);

package/coms/zimoli/HexEditor.js

@@ -41,6 +41,7 @@ var filterKey = function (event) {
         if (c === s) break;
     }
     if (keyCode === 8) {
+        if (!s) return;
         event.preventDefault();
         if (s.nextSibling) {
             if (s.nextSibling.innerText === '_') {

package/coms/zimoli/HexEditor.less

@@ -7,7 +7,7 @@
     min-height: 100px;
     padding: 0 0 10px 16px;
     font-family: 宋体;
-    width: 422px;
+    width: 438px;
 
     >a {
         display: inline-block;
@@ -32,7 +32,7 @@
     &:before {
         position: relative;
         white-space: nowrap;
-        box-sizing: border-box;
+        box-sizing: content-box;
         color: #ccc;
         word-spacing: 2px;
         font-size: inherit;

package/coms/zimoli/Item.js

@@ -22,6 +22,11 @@ Item.prototype = extend([], {
             this.color = value.color;
             this.test = value.test;
             this.line = value.line;
+            if (value.path) this.path = value.path;
+            if (value.id) this.id = value.id;
+            if (value.url) this.url = value.url;
+            if (value.href) this.href = value.href;
+            if (value.src) this.src = value.src;
         }
         else {
             this.name = value;