efront 4.22.19 → 4.23.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,9 @@
+- zh-CN: $1仅在开发环境存在，供开发者调试查看，$2
+  en:    "$1 only exists in the development environment for developers to debug and view, $2"
+
+- zh-CN: 项目发布后将没有这个属性！
+  en:    "After the project is released, this attribute will no longer exist!"
+
 - zh-CN: 无法存入数据到$1
   en:    Unable to deposit data to $1
 

package/apps/kugou/search/search.js

@@ -9,7 +9,7 @@ function main(params, from) {
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = search;
     document.title = "搜索";
-    var $scope = render(page, {
+    var $scope = {
         titlebar,
         back,
         btn: button,
@@ -35,7 +35,7 @@ function main(params, from) {
         resultMap: null,
         addResult(info) {
             var resultMap = this.resultMap;
-        var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
+            var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
             var songName = info.songname;
             var id = `${singerName}:${info.songname}`;
             if (!resultMap[id]) resultMap[id] = Object.assign([], { singer: singerName, song: songName });
@@ -92,7 +92,8 @@ function main(params, from) {
             this.search(void 0, 0);
         },
         keyword: state().keyword,
-    }).$scope;
+    };
+    render(page, $scope);
     $scope.keyword && $scope.search();
     return page;
 }

package/apps/noice/main.js

@@ -86,7 +86,7 @@ function init() {
         render.refresh();
     };
     onmounted(_block, function () {
-        _block.$scope.start();
+        recoder.start();
     })
     return _block;
 

package/apps/pivot/auth/login.js

@@ -19,11 +19,11 @@ function main(host) {
     });
     on("submit")(page, async function () {
         data.setInstance("hosts", hosts, true);
-        var { password } = submit(fields, this.$scope.data);
-        this.$scope.pending = true;
+        var { password } = submit(fields, $scoped.get(this).data);
+        $scoped.get(this).pending = true;
         page.disabled = true;
         try {
-            var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
+            var base = location.protocol + "//" + parseURL($scoped.get(this).data.host).host + "/";
             if (!host) data.setInstance("base", { base, host: parseURL(base).host });
             var api = Object.assign({}, await data.getApi("login"));
             api.base = base;
@@ -42,7 +42,7 @@ function main(host) {
         } catch (e) {
             console.log(e);
         }
-        this.$scope.pending = false;
+        $scoped.get(this).pending = false;
     })
     return page;
 }

package/apps/pivot/dht/list.js

@@ -17,9 +17,10 @@ return plist.bind({
         name: "从文件读取", async do() {
             var FileReader = window.FileReader;
             if (!FileReader) return alert('当前浏览器无法读取文件', 'warn')
-            var f = await chooseFile(".torrent",true);
+            var f = await chooseFile(".torrent", true);
             var pg = await popup("/dht/rent");
-            pg.$scope.pending = true;
+            var scope = $scoped.get(pg);
+            scope.pending = true;
             for (var f of f) await new Promise(function (ok, oh) {
                 var r = new FileReader;
                 r.onload = function () {
@@ -28,8 +29,8 @@ return plist.bind({
                     } catch (e) {
                         return;
                     }
-                    pg.$scope.load(t);
-                    pg.$scope.pending = false;
+                    scope.load(t);
+                    scope.pending = false;
                     ok();
                 };
                 r.onerror = function () {
@@ -38,7 +39,6 @@ return plist.bind({
                 };
                 r.readAsArrayBuffer(f);
             });
-            console.log(pg.$scope.pending)
         }
     }]
 })

package/apps/pivot/link/chat.js

@@ -2,7 +2,7 @@ async function link(id, page) {
     if (!id) {
         id = await data.from("link");
     }
-    if (!page.name) page.$scope.title = `会话窗口(<span nodrag>${id}</span>)`;
+    if (!page.name) $scoped.get(page).title = `会话窗口(<span nodrag>${id}</span>)`;
     page.roomid = id;
     var removed = false;
     on("remove")(page, function () {

package/apps/pivot/link/index.js

@@ -11,6 +11,6 @@ function index() {
         },
         menu,
     });
-    page.$scope.menus[+data.getInstance("link-index")].actived = true;
+    $scoped.get(page).menus[+data.getInstance("link-index")].actived = true;
     return page;
 }

package/apps/pivot/link/list.js

@@ -2,7 +2,7 @@ var autoreload = true;
 function main() {
     var page = div();
     page.innerHTML = template;
-    renderWithDefaults(page, {
+    var scope = {
         load: lazy(async function () {
             this.clusters = data.lazyInstance("cluster");
             await this.clusters;
@@ -32,16 +32,17 @@ function main() {
             if (c) this.clients = [];
             this.clients = await data.asyncInstance("clients", { id: clusters[index] });
         },
-    });
+    };
+    renderWithDefaults(page, scope);
     var loadid = 0;
     on("append")(page, function () {
         if (autoreload) loadid = setInterval(function () {
-            page.$scope.load();
+            scope.load();
         }, 30);
     });
     on('remove')(page, function () {
         clearInterval(loadid);
     });
-    page.$scope.load();
+    scope.load();
     return page;
 }

package/apps/pivot/share/list.js

@@ -18,13 +18,13 @@ function main() {
                     return;
                 }
                 await data.from('share', { opt: 'delete', path: e.path }).loading_promise;
-                page.$scope.load();
+                scope.load();
             }
         }
     ];
     var page = div();
     page.innerHTML = list;
-    renderWithDefaults(page, {
+    var scope = {
         data: [],
         load() {
             this.data = data.from("share", { opt: 'list' }, a => {
@@ -37,8 +37,9 @@ function main() {
             type: 'button',
             options,
         }),
-    });
-    page.$scope.load();
+    };
+    renderWithDefaults(page, scope);
+    scope.load();
     contextmenu(page, [
         {
             name: "添加",
@@ -46,7 +47,7 @@ function main() {
                 zimoli.prepare("/share/edit", function () {
                     var p = popup("/share/edit", { fields });
                     on('submited')(p, function () {
-                        page.$scope.load();
+                        scope.load();
                     })
                 })
             }

package/apps/pivot/wow/root.js

@@ -75,7 +75,8 @@ class File {
 }
 function main(path) {
     var page = explorer$main();
-    extend(page.$scope, {
+    var ps = $scoped.get(page);
+    extend(ps, {
         pathlist: path ? path.split('/') : [],
         read(from, start, size) {
             var authorization = data.getSource(data.getInstance("base").base);
@@ -131,6 +132,6 @@ function main(path) {
             await data.from("folder", { opt: 'mov', path: from, to: distpath }).loading_promise;
         }
     });
-    page.$scope.open();
+    ps.open();
     return page;
 }

package/coms/basic/LoadingArray.js

@@ -5,5 +5,6 @@ class LoadingArray extends Array {
     is_loaded = false;
     is_readonly = null;
     loading = null;
+    rw_storage = 0;
     loading_promise = null;
 }

package/coms/basic/cross_.js

@@ -385,7 +385,10 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             }
             if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
             if (location_href) delete realHeaders.Cookie;
-            Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
+            Object.keys(realHeaders).forEach(key => {
+                var value = realHeaders[key];
+                if (isHandled(value)) setRequestHeader.call(xhr, key, value);
+            });
             if (!isEmpty(datas)) send.call(xhr, !isencrypt ? datas : encode62.safeencode(datas, code));
             else send.call(xhr);
             digest();

package/coms/basic/data.js

@@ -50,7 +50,7 @@ function encodeStructure(array) {
 var { location, navigator, window, document } = this;
 const pagePathName = location ? location.pathname : '';
 const dataSourceMap = {};
-const sourceDataId = 'datasource' + pagePathName;
+const sourceDataId = '波泼摸佛';
 const userPrefix = ';';
 const instanceDataMap = {};
 const cachedLoadingPromise = {};
@@ -1022,19 +1022,14 @@ var data = {
     setSource(sourceid, value) {
         var rememberWithStorage;
         if (isObject(sourceid)) {
-
             this.rebuildInstance(dataSourceMap, sourceid);
             rememberWithStorage = value;
         } else {
             dataSourceMap[sourceid] = value;
             rememberWithStorage = arguments[2];
         }
-        if (rememberWithStorage !== false) {
-            sessionStorage.setItem(sourceDataId, JSAM.stringify(dataSourceMap));
-        }
-        if (rememberWithStorage) {
-            localStorage.setItem(sourceDataId, JSAM.stringify(dataSourceMap));
-        }
+        if (rememberWithStorage === undefined) rememberWithStorage = 0;
+        setItem(sourceDataId, dataSourceMap, rememberWithStorage);
     },
     getSource(sourceid) {
         if (sourceid) return dataSourceMap[sourceid];
@@ -1057,18 +1052,21 @@ var data = {
         } else {
             instanceDataMap[instanceId] = data;
         }
+        instance.rw_storage = rememberWithStorage;
         setItem(instanceId, data, rememberWithStorage);
         fireListener(instanceId, data);
         return instanceDataMap[instanceId];
     },
-    wetInstance(instanceId, data, rememberWithStorage) {
+    // rememberWithStorage =null 生产环境不存储，开发环境存到sessionStorage
+    wetInstance(instanceId, data, rememberWithStorage = null) {
         instanceHasDulpData = false;
         var res = this.setInstance(instanceId, data, rememberWithStorage);
         instanceHasDulpData = true;
         return res;
     },
-    patchInstance(instanceId, data, rememberWithStorage = 0) {
+    patchInstance(instanceId, data, rememberWithStorage) {
         var instance = this.getInstance(instanceId);
+        if (rememberWithStorage === undefined) rememberWithStorage = instance.rw_storage;
         extend(instance, data);
         return this.setInstance(instanceId, instance, rememberWithStorage);
     },
@@ -1143,9 +1141,15 @@ var data = {
     }
 };
 var instanceHasDulpData = true;
-function setItem(instanceId, data, rememberWithStorage = 0) {
+function setItem(instanceId, data, rememberWithStorage) {
     const storageId = userPrefix + instanceId + pagePathName;
     var buff = null;
+    if (rememberWithStorage === null) {
+        rememberWithStorage = false;
+        // <!--
+        rememberWithStorage = 0;
+        // -->
+    }
     if (rememberWithStorage !== false) {
         try {
             sessionStorage.setItem(storageId, buff = JSAM.stringify(data, instanceHasDulpData));
@@ -1184,5 +1188,4 @@ data.setItem = data.setInstance;
 data.getItem = data.getInstance;
 data.seekResponse = seekResponse;
 data.removeItem = data.removeInstance;
-extend(dataSourceMap, loadInstance(localStorage, sourceDataId));
-extend(dataSourceMap, loadInstance(sessionStorage, sourceDataId));
+extend(dataSourceMap, getItem(sourceDataId));

package/coms/basic_/WeakMap.js

@@ -0,0 +1,23 @@
+var WeakMap = this.WeakMap;
+if (WeakMap) return WeakMap;
+var id = 0;
+WeakMap = class WeakMap {
+    id = "#" + ++id;
+    get(o) {
+        return o[this.id];
+    }
+    set(o, v) {
+        Object.defineProperty(o, this.id, {
+            value: v,
+            enumerable: false,
+            configurable: true
+        });
+    }
+    has(o) {
+        return this.id in o;
+    }
+    delete(o) {
+        delete o[this.id];
+    }
+}
+return WeakMap;

package/coms/compile/Javascript.js

@@ -65,7 +65,8 @@ var isProperty = function (o) {
         }
         if (prev.type === STAMP) {
             if (prev.isprop) return true;
-            return /^(\+\+|\-\-|[,;])$/.test(prev.text) && (o.type !== STAMP || !/^[,;\=\:]$/.test(o.text));
+            if (/^[,;]$/.test(prev.text) || !prev.unary && /^(\+\+|\-\-)$/.test(prev.text)) return o.type !== STAMP || !/^[,;\=\:]$/.test(o.text);
+            return false;
         }
         if (prev.type === EXPRESS && !/\.$/.test(prev.text)) {
             return prev.text !== 'async' || o.text !== 'function';

package/coms/explorer/context.js

@@ -1,34 +1,37 @@
 var getActive = e => {
-    var s = e.currentTarget.$scope;
+    var s = $scoped.get(e.currentTarget);
     return s.toActive(e);
 };
 var notGetActive = e => !getActive(e);
 var getStable = e => {
     var a = getActive(e);
     if (!a) return;
-    return !a.$scope.d.pending;
+    return !$scoped.get(a).d.pending;
 };
 var getSelected = function (d) {
     var p = getPageScope(d);
     return p.selected;
 }
 var getPageScope = function (d) {
-    var $scope = d.$scope.d ? d.$parentScopes[d.$parentScopes.length - 1] : d.$scope;
-    return $scope;
+    var scopes = render.getScopes(d);
+    var s = scopes[scopes.length - 1];
+    if (s.d) return scopes[scopes.length - 2];
+    return s;
 };
 var never = function () { return false };
 var popupRen = function (d) {
     var $scope = getPageScope(d);
     var selected = $scope.selected;
     var active;
-    if (d.$scope === $scope) {
+    var ds = $scoped.get(d);
+    if (ds === $scope) {
         if (selected.length !== 1) return;
         active = selected[0];
     }
     else {
-        active = d.$scope.d;
+        active = ds.d;
     }
-    if (d.$scope.pending) return;
+    if (ds.pending) return;
     popupEdit($scope, active);
 };
 var popupAdd = function (d) {

package/coms/explorer/edit.js

@@ -30,7 +30,7 @@ function main({ path: root, rename, isfolder, add, name, hasName }) {
     });
     on('submit')(a, async function (e) {
         e.preventDefault();
-        var path = root + "/" + a.$scope.data.name;
+        var path = root + "/" + $scoped.get(a).data.name;
         if (origin) {
             var to = path;
             path = root + '/' + origin;

package/coms/explorer/fileitem.js

@@ -28,11 +28,13 @@ e.stopMarquee = function (sp) {
 
 function fileitem(elem) {
     elem.innerHTML = template;
-    var e = elem.children[0];
-    e.$scope = new Fileitem;
-    var ext = /\.([^\.]+)$/.exec(elem.$scope.d.name);
-    if (ext) e.$scope.ext = ext[1];
-    else e.$scope.ext = '';
-    extend(e.$scope, elem.$scope);
-    return e;
+    var c = elem.children[0];
+    var cs = new Fileitem;
+    $scoped.set(c, cs);
+    var es = $scoped.get(elem);
+    var ext = /\.([^\.]+)$/.exec(es.d.name);
+    if (ext) cs.ext = ext[1];
+    else cs.ext = '';
+    extend(cs, es);
+    return c;
 }

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);