efront 4.22.19 → 4.23.3

package/coms/explorer/main.js

@@ -6,11 +6,11 @@ var selectRected = on("resize")(rect, function () {
     if (!lattice) return;
     var selected = [];
     if (touchitems) for (var m of touchitems) {
-        var file = m.$scope.d;
+        var file = $scoped.get(m).d;
         file.selected = overlap(m, rect);
         if (file.selected) selected.push(file);
     }
-    lattice.$scope.selected = selected;
+    $scoped.get(lattice).selected = selected;
     render.refresh();
 });
 var dragger = null;
@@ -21,11 +21,13 @@ var touch = {
          */
         var t = this;
         var start = () => {
-            var a = t.$scope.toActive(e);
+            var ts = $scoped.get(t);
+            var a = ts.toActive(e);
+            var as = $scoped.get(a);
             touchitems = t.querySelectorAll("fileitem");
-            if (a && t.$scope.selected.indexOf(a.$scope.d) >= 0) {
+            if (a && ts.selected.indexOf(as.d) >= 0) {
                 dragger = e;
-                if (!drag.target) drag(t.$scope.selected.length === 1 ? a : t.querySelectorAll(".focused"), e);
+                if (!drag.target) drag(ts.selected.length === 1 ? a : t.querySelectorAll(".focused"), e);
                 return;
             }
             var pos = getScreenPosition(t.parentNode);
@@ -52,7 +54,7 @@ var touch = {
         if (dragger) {
             var tiped = null;
             for (var c of touchitems) {
-                var d = c.$scope.d;
+                var d = $scoped.get(c).d;
                 if (d.isfolder && !d.selected && overpos(c, e)) {
                     if (!c.hasAttribute('dropping')) {
                         if (!drag.tip) {
@@ -74,7 +76,7 @@ var touch = {
                             });
                         }
                         css(drag.tip, 'display:block');
-                        drag.tip.innerHTML = `<b style="color:#169;font-weight:400">移动到</b> ${c.$scope.d.name}`;
+                        drag.tip.innerHTML = `<b style="color:#169;font-weight:400">移动到</b> ${d.name}`;
                         c.setAttribute('dropping', '');
                     }
                     tiped = c;
@@ -103,8 +105,9 @@ var touch = {
             var p = this.querySelector("[dropping]");
             if (p) {
                 p.removeAttribute("dropping");
-                var $scope = this.$scope;
-                var base = $scope.pathlist.concat(p.$scope.d.name).join("/");
+                var $scope = $scoped.get(this);
+                var ps = $scoped.get(p);
+                var base = $scope.pathlist.concat(ps.d.name).join("/");
                 for (var s of $scope.selected) {
                     await $scope.mov(s, base + "/" + s.name);
                 }
@@ -115,7 +118,7 @@ var touch = {
     },
 };
 var moveFocus = function (delta) {
-    var { selected, data } = this.$scope;
+    var { selected, data } = $scoped.get(this);
     var index, targetIndex;
     var boxCount = this.group;
     if (delta === 'home') targetIndex = 0;
@@ -127,7 +130,7 @@ var moveFocus = function (delta) {
         else {
             index = data.indexOf(selected[selected.length - 1]);
             var e = this.getLastVisibleElement(0);
-            if (e) targetIndex = data.indexOf(e.$scope.d);
+            if (e) targetIndex = data.indexOf($scoped.get(e).d);
             else targetIndex = data.length - 1;
             targetIndex = (targetIndex / boxCount | 0) * boxCount + index % boxCount;
             if (targetIndex >= data.length) targetIndex = data.length - 1;
@@ -141,13 +144,13 @@ var moveFocus = function (delta) {
             var f = this.getFirstVisibleElement();
             var index = data.indexOf(selected[0]);
             if (!f) targetIndex = 0;
-            else if (f.$scope.d !== selected[0]) {
-                targetIndex = index + ((data.indexOf(f.$scope.d) - index) / boxCount | 0) * boxCount;
+            else if ($scoped.get(f).d !== selected[0]) {
+                targetIndex = index + ((data.indexOf($scoped.get(f).d) - index) / boxCount | 0) * boxCount;
             }
             else {
                 var e = this.getLastVisibleElement(0);
-                var fi = data.indexOf(f.$scope.d);
-                var ei = data.indexOf(e.$scope.d)
+                var fi = data.indexOf($scoped.get(f).d);
+                var ei = data.indexOf($scoped.get(e).d);
                 targetIndex = fi - ((ei - fi) / boxCount | 0) * boxCount;
 
             }
@@ -194,7 +197,7 @@ var moveFocus = function (delta) {
         s.selected = false;
     }
     var d = data[targetIndex];
-    if (d) d.selected = true, this.$scope.selected = [d];
+    if (d) d.selected = true, $scoped.get(this).selected = [d];
     this.setFocus(targetIndex);
     render.refresh();
 };
@@ -207,7 +210,7 @@ var bindkey = function (lattice) {
 async function ondrop(event) {
     event.preventDefault();
     var files = event.dataTransfer.files;
-    this.$scope.uploadAll(files);
+    $scoped.get(this).uploadAll(files);
 }
 function main() {
     var page = document.createElement('explorer');

package/coms/frame/chat.js

@@ -7,7 +7,7 @@ function clickfile(event) {
             break;
         }
     }
-    this.$eval(`pullFile(m.content[${cx}])`);
+    $eval.call(this, `pullFile(m.content[${cx}])`);
 }
 
 function msg(elem, { m }, parentScopes) {
@@ -50,7 +50,7 @@ var dragpage = {
         moving = null;
         saved_event = null;
         if (getTargetIn(a => /^(msg)$/i.test(a.tagName), event.target)) return;
-        if (!this.$scope.users.length) return;
+        if (!$scoped.get(this).users.length) return;
         saved_event = event;
     },
     move(event) {
@@ -91,11 +91,11 @@ var dragpage = {
         var menuWidth = target.children[1].offsetWidth;
         target.style.paddingLeft = '';
         if (moving.deltaX < 0 && left > menuWidth * .1 || moving.deltaX > 0 && left > menuWidth * .9 || !moving.deltaX && left > menuWidth >> 1) {
-            target.$scope.showList = true;
+            $scoped.get(target).showList = true;
             addClass(target, "showList")
         }
         else {
-            target.$scope.showList = false;
+            $scoped.get(target).showList = false;
             removeClass(target, "showList")
         }
         render.refresh();
@@ -110,20 +110,20 @@ function chat(title = '会话窗口') {
     var users = [];
     var addToMsgList = function (list, msgs) {
         list.push.apply(list, msgs);
-        if (list === page.$scope.msglist) {
+        if (list === ps.msglist) {
             var chat = page.querySelector("chat");
             var lastmsg = chat.getLastVisibleElement();
             if (msgs.length && (!lastmsg || lastmsg.offsetTop + lastmsg.offsetHeight === chat.scrollHeight)) {
                 chat.go(list.length ? list.length - 1 : 0);
             }
-            if (page.$scope.user) page.$scope.user.msgread = list.length;
+            if (ps.user) ps.user.msgread = list.length;
         }
         else {
-            page.$scope.totalunread += msgs.length;
+            ps.totalunread += msgs.length;
         }
     }
     page.push = function (msgs) {
-        var { msglist } = this.$scope;
+        var { msglist } = ps;
         var userMap = null;
         msgs = msgs.filter(m => {
             if (!m) return false;
@@ -138,15 +138,15 @@ function chat(title = '会话窗口') {
             return false;
         }).map(m => JSAM.parse(encode62.packdecode(m))).filter(m => {
             if (m.type === 'accept') {
-                page.$scope.pushFile(m.content);
+                ps.pushFile(m.content);
                 return false;
             }
             return true;
         });
         if (userMap) {
             userManager(users, userMap);
-            if (users.indexOf(page.$scope.user) < 0) page.$scope.user = users[0];
-            if (users.length > 0 && page.$scope.showList === 0) page.$scope.showList = true;
+            if (users.indexOf(ps.user) < 0) ps.user = users[0];
+            if (users.length > 0 && ps.showList === 0) ps.showList = true;
         }
         if (msgs.length) {
             var msgMap = Object.create(null);
@@ -169,19 +169,19 @@ function chat(title = '会话窗口') {
         }
     };
     page.$renders = [function () {
-        this.$scope.resize(this.$scope.body);
+        ps.resize(ps.body);
     }];
     page.localid = localid;
     Object.defineProperty(page, 'userid', {
         get() {
-            var user = this.$scope.user;
+            var user = ps.user;
             if (user) return user.id;
         }
     });
     page.setAttribute('ng-class', "{showList:showList}");
     var fid = 0;
     var filesMap = Object.create(null);
-    renderWithDefaults(page, {
+    var ps = {
         chat: zimoli$list,
         title,
         msglist: [],
@@ -271,14 +271,15 @@ function chat(title = '会话窗口') {
             this.body.lastElementChild.focus();
             this.text = '';
         }
-    });
+    };
+    renderWithDefaults(page, ps);
     var headHeight = 0;
     resizingList.set(page, function () {
         var height = page.firstElementChild.offsetHeight;
         if (height !== headHeight) {
             headHeight = height;
             css(page.firstElementChild, { marginBottom: fromOffset(-headHeight) });
-            css(page.$scope.body.firstElementChild, { paddingTop: fromOffset(headHeight) });
+            css(ps.body.firstElementChild, { paddingTop: fromOffset(headHeight) });
         }
     });
     moveupon(page, dragpage);

package/coms/frame/list.js

@@ -6,7 +6,7 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
             return;
         }
         var callback = function () {
-            page.$scope.load();
+            page_scope.load();
         };
         if (isFunction(edit_ref)) {
             var p = await edit_ref({ fields, data: o, callback });
@@ -54,12 +54,12 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
                     return;
                 }
                 await remove(o);
-                page.$scope.load();
+                page_scope.load();
             }
         }
     ];
     if (options0) options = options.concat(options0);
-    renderWithDefaults(page, {
+    var page_scope = {
         title,
         load() {
             this.data = load();
@@ -74,9 +74,10 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
         async add() {
             await edit();
         },
-    });
+    }
+    renderWithDefaults(page, page_scope);
     on("append")(page, function () {
-        page.$scope.load();
+        page_scope.load();
     });
     return page;
 }

package/coms/kugou/bindScroll.js

@@ -53,6 +53,5 @@ function bindScroll(titlebar, page) {
         setOpacity(label, 1 - (titlebar.offsetHeight - topHeight) / (offsetHeight - topHeight));
         return {};
     };
-    if (!page.$renders) page.$renders = [];
     page.onscroll = refresh;
 }

package/coms/kugou/buildScroll.js

@@ -3,7 +3,7 @@ function Main(dataid, datapath, titleid) {
     var page = createVboxWithState(state);
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = buildScroll;
-    render(page, {
+    var pgscope = {
         list: lattice,
         song,
         padding,
@@ -20,7 +20,8 @@ function Main(dataid, datapath, titleid) {
         config: {},
         player: kugou$player,
         datas: []
-    });
+    };
+    render(page, pgscope);
     bindScroll(_titlebar, page);
     var loadedId, requested = false;
     function main(params) {
@@ -31,8 +32,8 @@ function Main(dataid, datapath, titleid) {
             var ranklist = data.from(dataid, {
                 id
             }, parseSongsList);
-            page.$scope.config = params;
-            page.$scope.datas = ranklist;
+            pgscope.config = params;
+            pgscope.datas = ranklist;
             if (titleid) {
                 data.from(titleid, {
                     id

package/coms/kugou/krc.js

@@ -120,7 +120,7 @@ function createLRC(lrc) {
                     setClass(krcList, index);
                 }
             }
-            if (ele && firstChild && firstChild.$mounted) {
+            if (ele && firstChild && isMounted(firstChild)) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 css(firstChild, `margin-top:${marginTop | 0}px;`);
             }
@@ -166,7 +166,7 @@ function createKRC(krc) {
             var current_row_word = current_words[current_row_index];
             var ele = krcList[index];
             var firstChild = krcList[0];
-            if (ele && firstChild && firstChild.$mounted) {
+            if (ele && firstChild && isMounted(firstChild)) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 if (index > 0) {
                     if (markerLabel.parentNode !== ele) {

package/coms/kugou/player.js

@@ -87,7 +87,7 @@ var oncanplay = on("canplay"), ondataloaded = on("loadeddata");
 on("keydown")(window, function (event) {
     var { target } = event;
     if (/^(input|select|textarea)$/i.test(target.tagName)) return;
-    var $scope = player.$scope;
+    var $scope = $scoped.get(player);
     if (!$scope.audio && !kugou$musicList.getActived()) return;
     switch (event.keyCode || event.which) {
         case 32:
@@ -418,7 +418,7 @@ var createControls = function () {
     moveupon(player, {
         end() {
             var currentHeight = calcPixel(this.offsetHeight), windowHeight = calcPixel(window.innerHeight);
-            var $scope = this.$scope;
+            var $scope = $scoped.get(this);
             var { deltaTop } = this;
             removeClass(this, "dragging");
             if (deltaTop) {

package/coms/kugou/song.js

@@ -1,5 +1,5 @@
 function dplay() {
-    this.firstChild.$scope.play();
+    $scoped.get(this.firstChild).play();
 }
 function main(elem) {
     elem = elem || document.createElement("song");

package/coms/layer/leftCenter.js

@@ -38,12 +38,12 @@ function setCurrentPage(page) {
     var currentLayer = getCurrentLayer();
     if (page !== leftPage) {
         if (currentLayer !== leftLayer) {
-            if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
+            if (!isMounted(leftPage)) appendChild(leftLayer, leftPage);
         } else {
             remove(leftPage, false);
         }
         if (page.parentNode !== currentLayer) appendChild(currentLayer, page, false);
-    } else if (!leftPage.$mounted) {
+    } else if (!isMounted(leftPage)) {
         appendChild(leftLayer, leftPage, false);
     }
 }
@@ -54,16 +54,16 @@ function main(_leftPage) {
 layer.layer = function (child, old) {
     remove(old);
     if (child === leftPage) {
-        if (!leftPage.$mounted) appendChild(leftLayer, child);
+        if (!isMounted(leftPage)) appendChild(leftLayer, child);
     } else if (child) {
         var currentLayer = getCurrentLayer();
         appendChild(currentLayer, child);
         if (currentLayer === leftLayer) {
             if (arguments.length > 1) remove(leftPage);
-        } else if (!leftPage.$mounted) {
+        } else if (!isMounted(leftPage)) {
             appendChild(leftLayer, leftPage);
         }
     } else {
-        if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
+        if (!isMounted(leftPage)) appendChild(leftLayer, leftPage);
     }
 };

package/coms/pivot/checkGeo.js

@@ -20,7 +20,6 @@ return async function (a) {
     var m = /(\d+\.){3}\d+$/.exec(ip);
     ip = m ? m[0] : ip;
     var res = await data.from("ipcn", { ip });
-    console.log(res)
     if (!res.address && !res.data) res = await baidu(ip);
     var msg = '加载错误';
     if (res.message && !res.data && !res.content && !res.address) {

package/coms/reptile/alert.js

@@ -1 +1,5 @@
-a => console.warn(a);
+(title, type) => {
+    if (console[type]) console[type](title);
+    else if (console[title]) console[title](type);
+    else console.warn(title);
+}

package/coms/reptile/data.js

@@ -0,0 +1,3 @@
+basic$data.setReporter(alert);
+basic$data.setEnvs(cross);
+return basic$data;

package/coms/zimoli/$cared.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$casted.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$eval.js

@@ -0,0 +1 @@
+render.eval;

package/coms/zimoli/$mounted.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$parented.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$renders.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$scoped.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$structed.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$upwith.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$watches.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/HexEditor.js

@@ -1,5 +1,5 @@
 var toHex = lazy(function (event) {
-    var data = this.$scope.data;
+    var data = $scoped.get(this).data;
     data.splice(0, data.length);
     this.innerText.replace(/[a-f\d]{2}/g, function (a) {
         a = parseInt(a, 16);

package/coms/zimoli/alert.js

@@ -72,7 +72,7 @@ function alert() {
             }
             close_timer = setTimeout(function () {
                 remove(elem);
-            }, autoclose);
+            }, +autoclose);
         }
     };
     var setContent = function (elem) {
@@ -83,7 +83,9 @@ function alert() {
         } else {
             elem = _text(elem, styles.log, t);
         }
-        if (!isMounted(container)) popup(container);
+        Promise.resolve().then(function () {
+            if (!isMounted(container)) popup(container);
+        });
         if (!isMounted(elem)) appendChild(container, elem);
         waitclose(autoclose, 400);
         return elem;

package/coms/zimoli/appendChild.js

@@ -9,9 +9,9 @@ function hasEnterStyle(e) {
 }
 
 function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
-    if (node.$mounted) return;
+    if ($mounted.get(node)) return;
     if (node.nodeType !== 1 && node.nodeType !== 8) return;
-    node.$mounted = true;
+    $mounted.set(node, true);
     dispatch(node, append);
     var children = Array.apply(null, node.childNodes);
     for (var c of children) {

package/coms/zimoli/autodragchildren_test.js

@@ -11,7 +11,7 @@ function main() {
         xsrc: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
     })
     autodragchildren(xList, xList, function (src, dst) {
-        var xsrc = xList.$scope.xsrc;
+        var xsrc = $scoped.get(xList).xsrc;
         var src = src.target.index || 0;
         var dst = xList.children[dst].index || 0;
         var [e] = xsrc.splice(src, 1);

package/coms/zimoli/care.js

@@ -6,16 +6,18 @@
  * @param {Function} listener 
  */
 function care() {
-    var [target, type, listener, allowMultiHandle] = parse.apply(this, arguments);
-    if (!target[type]) {
-        target[type] = [];
-    }
-    var listeners = target[type];
+    var [listeners, listener, target, type, allowMultiHandle] = parse.apply(this, arguments);
     if (listeners.length && !allowMultiHandle) return;
     if (listener instanceof Function && !~listeners.indexOf(listener)) {
         if (listeners.length > 600) throw new Error(i18n`请不要在同一个对象上使用过多的同类型的care!`);
         listeners.push(listener);
     }
+    var casted = $casted.get(target);
+    if (!casted) return;
+    var datas = casted[type];
+    if (!datas) return;
+    delete casted[type];
+    datas.forEach(listeners.cast, listeners);
 }
 function parse() {
     var [target, type, listener] = arguments;
@@ -46,12 +48,28 @@ function parse() {
             throw new Error(i18n`参数数量不正确`);
     }
     if (!isObject(target)) throw new Error(i18n`care只能使用在对象上！`);
-    type = `care(${type})`;
-    return [target, type, listener, allowMultiHandle];
+    var cared = $cared.get(target);
+    if (!cared) {
+        cared = {};
+        $cared.set(target, cared);
+    }
+    var listeners = cared[type];
+    if (!listeners) listeners = cared[type] = [], listeners.cast = cast(target);
+    return [listeners, listener, target, type, allowMultiHandle];
 }
+function cast(target) {
+    var newdata, olddata;
+    var call = function (listener) {
+        listener.call(target, newdata, olddata);
+    }
+    return function (data) {
+        newdata = data;
+        this.forEach(call);
+        olddata = data;
+    }
+};
 function clean() {
-    var [target, type, listener] = parse.apply(this, arguments);
-    var listeners = target[type];
+    var [listeners, listener] = parse.apply(this, arguments);
     if (listener instanceof Function) {
         for (var cx = listeners.length - 1; cx >= 0; cx--) {
             if (listeners[cx] === listener) listeners.splice(cx, 1);

package/coms/zimoli/cast.js

@@ -20,20 +20,19 @@ function cast(target, type, data) {
             throw new Error(i18n`参数数量不正确`);
     }
     if (!isObject(target)) return;
-
-    var datakey = `cast(${type})`;
-    type = `care(${type})`;
-    if (target[type] instanceof Array) {
-        var listeners = target[type];
-        if (!listeners.datas) listeners.datas = [];
-        var datas = listeners.datas;
-        datas.push(data);
-        if (datas.length === 1) {
-            while (datas.length) target[type].forEach(function (listener) {
-                if (listener instanceof Function) {
-                    listener.call(target, datas[0], target[datakey]);
-                }
-            }), target[datakey] = datas.shift();
+    var cared = $cared.get(target);
+    if (cared) var listeners = cared[type];
+    if (listeners) listeners.cast(data);
+    else {
+        var casted = $casted.get(target);
+        if (!casted) {
+            casted = {};
+            $casted.set(target, casted);
+        }
+        var datas = casted[type];
+        if (!datas) {
+            datas = casted[type] = [];
         }
+        datas.push(data);
     }
 }

package/coms/zimoli/checkbox.js

@@ -46,7 +46,7 @@ function main(elem = document.createElement("checkbox-group")) {
         value.checked = checked;
     };
     elem.setValue = function (value) {
-        var { options } = this.$scope;
+        var { options } = $scoped.get(this);
         buildValue(value, options);
     };
     return elem;

package/coms/zimoli/container.js

@@ -2,8 +2,9 @@ var change = async function (src) {
     if (src !== this.$src) return;
     if (!src) remove(this.with);
     else if (isNode(src)) {
-        if (isElement(src) && this.$struct.copys) {
-            for (var c of this.$struct.copys) {
+        var struct = $structed.get(this);
+        if (isElement(src) && struct.copys) {
+            for (var c of struct.copys) {
                 if (c.name === 'class') {
                     addClass(src, c.value);
                 }
@@ -35,7 +36,7 @@ var onparams = function (params) {
 };
 function container(element) {
     var comment = document.createComment('container');
-    comment.$struct = element.$struct;
+    $structed.set(comment, $structed.get(element));
     care(comment, gosrc);
     if (element.hasAttribute && element.hasAttribute('src')) {
         var src = element.getAttribute('src');

package/coms/zimoli/createItemTarget.js

@@ -1,13 +1,17 @@
+
 function createItemTarget(item, target) {
     var $scope = {};
     var { itemName, indexName, keyName } = this.$src;
     if (itemName) $scope[itemName] = item;
     else $scope.$item = item;
-    if (target && target.$scope) {
-        if (indexName) $scope[indexName] = target.$scope[indexName];
-        if (keyName) $scope[keyName] = target.$scope[keyName];
-        $scope.$index = target.$scope.$index;
-        $scope.$key = target.$scope.$key;
+    var element = document.createComment('active');
+    var tscope = target && $scoped.get(target);
+    if (tscope) {
+        if (indexName) $scope[indexName] = tscope[indexName];
+        if (keyName) $scope[keyName] = tscope[keyName];
+        $scope.$index = tscope.$index;
+        $scope.$key = tscope.$key;
     }
-    return { $scope };
+    $scoped.set(element, $scope);
+    return element;
 }

package/coms/zimoli/cross.js

@@ -7,7 +7,7 @@ var location_href = parseURL(location.href);
 location_href = `${location_href.protocol}//${location_href.host}/`;
 cross_.setLocation(location_href);
 
-var cookieItemsInSessionStorageKey = "--zimoli-coms-cross";
+var cookieItemsInSessionStorageKey = "紫茉莉:得特呢勒";
 var cookiesData = sessionStorage.getItem(cookieItemsInSessionStorageKey);
 if (cookiesData) {
     try {