efront 4.36.6 → 4.37.0

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

@@ -40,6 +40,15 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: $1数据库不存在！
+  en:    The $1 database does not exist!
+
+- zh-CN: 数据已过期！
+  en:    The data has expired!
+
+- zh-CN: 未登录脚本可写
+  en:    Unregistered script can be written
+
 - zh-CN: 加载$1失败，引用队列为
   en:    "Loading $1 failed, reference queue is"
 

package/apps/pivot/db/config.xht

@@ -69,6 +69,7 @@
     `;
     var fields = refilm`
     是否公开/open swap // 允许所有人检索全部内容
+    未登录脚本可写/dis401 swap
     (用户互访/visit/,open=false) swap // 不公开时检查此项`;
     var [db] = arguments;
     if (!db.fields) {

package/apps/pivot/main.js

@@ -15,6 +15,7 @@ data.setReporter(function (m, t) {
 });
 data.bindInstance("base", async function (base) {
     if (!base.base) return;
+    DB.base = base.base;
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {

package/apps/pivot/todo/edit.xht

@@ -26,7 +26,6 @@
         remove(window);
     };
     view(this);
-    console.log(data);
     var data1 = {
         id: data?.id,
         name: data?.name,

package/apps/pivot/todo/list.xht

@@ -103,7 +103,7 @@
                 icon: "fa-plus",
                 sign: "+",
                 do() {
-                    var elem = popup('/todo/edit');
+                    edit();
                 },
             }
         ]);
@@ -112,16 +112,20 @@
         var target = getTargetIn(a => a.tagName === 'TODO', event.target);
         if (!target) return;
         var obj = $scoped.get(target).m;
-        autodragchildren.hook(target, event, true, function (index, targetBox) {
+        autodragchildren.hook(target, event, true, async function (index, targetBox) {
             var state = targetBox.state;
             if (obj.state === state) return;
+            var state_ = obj.state;
             obj.state = state;
-            DB.update("待办", {
-                name: obj.name,
-                id: obj.id,
-                state: state
-            });
-            render.refresh();
+            try {
+                await DB.update("待办", {
+                    name: obj.name,
+                    id: obj.id,
+                    state: state
+                });
+            } catch {
+                obj.state = state_;
+            }
         });
     })
     var edit = function (m) {

package/coms/basic/#loader.js

@@ -823,7 +823,6 @@ var modules = {
     undefined: void 0,
     start_time,
     MOVELOCK_DELTA: 3 * renderPixelRatio,
-    SAFE_CIRCLE_DEPTH: 300,
     init,
     efrontPath,
     versionTree,

package/coms/basic/SAFE_CIRCLE_DEPTH.js

@@ -0,0 +1 @@
+300

package/coms/basic/cross_.js

@@ -180,12 +180,14 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     var flush = function () {
         var then = xhr.then;
         delete xhr.then;
-        if (loaded) onloads.forEach(e => e instanceof Function && e(xhr));
-        if (errored) onerrors.forEach(e => e instanceof Function && e(errored));
-        if (loaded || errored) {
-            onloads.splice(0, onloads.length);
+        if (loaded) {
+            onloads.splice(0, onloads.length).forEach(e => e instanceof Function && e.call(xhr, xhr));
             onerrors.splice(0, onerrors.length);
         }
+        if (errored) {
+            onerrors.splice(0, onerrors.length).forEach(e => e instanceof Function && e.call(xhr, errored));
+            onloads.splice(0, onloads.length);
+        }
         xhr.then = then;
     };
     if (/^jsonp/i.test(method)) {

package/coms/basic/encode62.js

@@ -1,6 +1,6 @@
-var src = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+var src = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".split('');
 var map = {};
-src.split("").forEach((s, i) => map[s] = i);
+src.forEach((s, i) => map[s] = i);
 var encode62 = {
     src,
     map,
@@ -19,7 +19,7 @@ var encode62 = {
     geta(string) {
         string = String(string)
         string = string.length + string + "2017-08-19";
-        var buff = src.split('');
+        var buff = src.slice();
         for (var cx = 0, dx = buff.length + src.length, sl = string.length, cl = buff.length; cx < dx; cx++) {
             var s1 = string.charCodeAt(cx % sl) % cl;
             var s2 = cx % cl;

package/coms/basic/math.md

@@ -1,5 +1,5 @@
 # 数学公式生成工具
-在2023年及以后的浏览器(Chrome109, Firefox1, Safari5.1, ...)中可用
+在2023年及以后的浏览器(Chrome109, Firefox1, Safari5.1, ...)中可用，但最终展示效果在所有浏览器上均不一致。截止至2026年6月17日，安卓手机及苹果手机上复杂公式会洋相百出，桌面浏览器chrome以及同核心的其他套壳浏览器可以无异常展示，Firefox上求和公式的块级样式异常，Safari上方程组样式异常。
 受支持的浏览器参考 [https://developer.mozilla.org/zh-CN/docs/Web/MathML](https://developer.mozilla.org/zh-CN/docs/Web/MathML)
 使用方法有如下两种：
 1. 直接传入解析结构

package/coms/basic/randomUUID.js

@@ -0,0 +1,17 @@
+function randomUUID(sign) {
+    var random = crypto.getRandomValues(new Uint16Array(6));
+    var mask = 0;
+    for (var cx = 0, dx = sign.length + random.length; cx < dx; cx++) {
+        mask = (mask << 5 | mask >>> 27) ^ sign.charCodeAt((cx + random[cx % 6]) % dx);
+    }
+    mask = mask >>> 0;
+    return [
+        (0x100000000 + mask).toString(16).slice(1),
+        (0x10000 | random[0]).toString(16).slice(1),
+        (0x10000 | random[1]).toString(16).slice(1),
+        (0x10000 | random[2]).toString(16).slice(1),
+        (0x10000 | 0xffff & (random[3] ^ mask)).toString(16).slice(1) +
+        (0x10000 | 0xffff & (random[4] ^ mask)).toString(16).slice(1) +
+        (0x10000 | 0xffff & (random[5] ^ mask)).toString(16).slice(1),
+    ].join("-");
+}

package/coms/basic/verifyUUID.js

@@ -0,0 +1,18 @@
+function validUUID(uuid, sign) {
+    var match = /^([0-9a-f]{8})\-([0-9a-f]{4})\-([0-9a-f]{4})\-([0-9a-f]{4})\-([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})$/i.exec(uuid);
+    if (!match) return false;
+    var random = new Uint16Array(6);
+    var mask = parseInt(match[1], 16);
+    random[0] = parseInt(match[2], 16);
+    random[1] = parseInt(match[3], 16);
+    random[2] = parseInt(match[4], 16);
+    random[3] = parseInt(match[5], 16) ^ mask & 0xffff;
+    random[4] = parseInt(match[6], 16) ^ mask & 0xffff;
+    random[5] = parseInt(match[7], 16) ^ mask & 0xffff;
+    var mask1 = 0;
+    for (var cx = 0, dx = random.length + sign.length; cx < dx; cx++) {
+        mask1 = (mask1 << 5 | mask1 >>> 27) ^ sign.charCodeAt((cx + random[cx % 6]) % dx);
+    }
+    mask1 = mask1 >>> 0;
+    return mask === mask1;
+}

package/coms/basic_/&power.js

@@ -1,4 +1,4 @@
-var BigInt = window.BigInt;
+var BigInt = this.BigInt;
 return BigInt ? function power_(a, b) {
     if (typeof a !== 'bigint') {
         return Math.pow(a, b);

package/coms/basic_/JSON.js

@@ -1,5 +1,6 @@
 var stringify_failed_error_message = "stringify json failed!";
 var parse_failed_error_message = "parse json failed!";
+var strings_decode = strings?.decode;
 var scan_string = function (str, start) {
     if (str.charAt(start) !== "\"")
         return false;
@@ -11,7 +12,7 @@ var scan_string = function (str, start) {
             return false;
         if (match[0] === "\"") break;
     }
-    data = strings.decode(str.slice(start, reg.lastIndex));
+    data = strings_decode(str.slice(start, reg.lastIndex));
     return reg.lastIndex;
 };
 var scan_number = function (str, start) {
@@ -155,7 +156,7 @@ var parse = function (string) {
         data = null;
         return result;
     } else {
-        throw parse_failed_error_message;
+        throw new Error(parse_failed_error_message);
     }
 };
 
@@ -247,7 +248,7 @@ var getString = function (object, filter, space) {
             var v = get(object[key]);
             if (isObject(v)) {
                 key1[0] = cx + 1;
-                if (objects.indexOf(v) >= 0) throw stringify_failed_error_message;
+                if (objects.indexOf(v) >= 0) throw new Error(stringify_failed_error_message);
                 objects.push(v);
                 keys.push([0]);
                 break;

package/coms/basic_/JSON_test.js

@@ -1,4 +1,4 @@
-var JSON0 = window.JSON;
+var JSON0 = this.JSON;
 var test = function (JSON) {
     var parse = function (s) {
         try {
@@ -171,8 +171,7 @@ var test2 = function (JSON) {
     assert(JSON.parse(`{/*a*/"1":\r\n2}`), { "1": 2 })
     assert(JSON.parse(`{"1/*a*/":\r\n2}`), { "1/*a*/": 2 })
 }
-var test3 = function (JSON) {
-    console.log(JSON, JSON0, JSON === JSON0);
+var test3 = function (JSON, name) {
     var start_time = performance.now();
     for (var cx = 0, dx = 0xffff; cx < dx; cx++) {
         var str = String.fromCodePoint(cx);
@@ -191,13 +190,22 @@ var test3 = function (JSON) {
             process.exit(1);
         }
     }
-    console.log(performance.now() - start_time);
+    console.log(performance.now() - start_time, name);
+};
+var test4 = function (JSON) {
+    var data = {};
+    assert(JSON.stringify({ a() { } }), "{}");
+    data.refund_amount = data;
+    JSON.stringify(data);
+}
+try {
+    var JSON1 = require("./JSON.js");
+    test2(JSON1);
+    test3(JSON1, '替补JSON, basic_/JSON.js');
+    test3(JSON0, '原生JSON');
+    test3(JSAM, 'JSAM, basic/JSAM');
+    test4(JSON1);
 }
-function JSON_test() {
-    window.JSON0 = JSON0;
-    window.JSON = void 0;
-    delete modules.JSON;
-    modules.init("JSON", test2);
-    modules.init("JSON", test3);
-    window.JSON = JSON0;
+catch (e) {
+    console.log(e)
 }

package/coms/compile/Javascript.js

@@ -6,6 +6,7 @@ var backEach = require("../basic/backEach");
 var parseNumber = require('../basic/parseNumber');
 var removeFromList = require("../basic/removeFromList");
 var patchname = require("./patchname");
+var autoprop = require("./autoprop");
 const {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -490,7 +491,7 @@ function detour(o, ie) {
                     var [, varname] = match;
                     o.hidden = varname;
                 }
-                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
+                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${autoprop(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
                 break;
@@ -582,25 +583,27 @@ function detour(o, ie) {
                 if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
                 if (/^\[/.test(o.text)) break;
                 if (o.queue.isObject) {
-                    var text = strings.recode(o.text);
+                    var text = null;
                     if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || context.strap_reg.test(o.text)) {
-                        text = `[${text}]`;
+                        text = scan(`[${autoprop(o.text)}]`)[0];
+                        text.isprop = true;
                     }
                     else if (ie !== false) {
-                        collectProperty(o, text);
+                        collectProperty(o, o.text = strings.recode(o.text));
                     }
-                    if (o.short) {
-                        unshort(o, text);
-                    }
-                    else {
-                        o.text = text;
+                    if (text) {
+                        if (o.short) {
+                            unshort(o, text);
+                        }
+                        else {
+                            replace(o, o = text);
+                        }
                     }
                 }
                 else if (o.queue.isClass) {
                     if (o.text === 'constructor') break;
                     var hidden = /^#/.test(o.text);
                     if (hidden) o.hidden = true;
-                    var text = strings.recode(o.text);
                     if (o.prev) {
                         var prev = o.prev;
                         if (prev && prev.isprop && !prev.isend && propresolve_reg.test(prev.text)) {
@@ -609,7 +612,8 @@ function detour(o, ie) {
                         if (prev && prev.type === STAMP && prev.isprop) prev = prev.prev;
                         if (prev && (prev.type !== STAMP || prev.text !== ';')) insertAfter(prev, { text: ';', type: STAMP });
                     }
-                    o.text = `[${text}]`;
+                    replace(o, o = scan(`[${autoprop(o.text)}]`)[0]);
+                    o.isprop = true;
                     if (o.next && o.next.type === SCOPED && o.next.entry === "(") { }
                     else if (!o.next || o.next.type !== STAMP || o.next.text !== "=") {
                         insertAfter(o, { text: "=", type: STAMP }, { text: "undefined", type: VALUE, isExpress: true });
@@ -700,7 +704,7 @@ var removeImport = function (c, i, code) {
             var da = d.attributes[i][0];
             if (used[dn]) used[dn].forEach(u => {
                 if (used[name].indexOf(u) >= 0) return;
-                patchname(name, u, da);
+                patchname(name, u, "." + da);
                 if (u.kind !== 'remove') used[name].push(u);
             });
             delete used[dn];

package/coms/compile/auto-const.js

@@ -1,5 +1,6 @@
 var isConst = a => a.kind === 'const';
 var autoiota = require("./autoiota");
+var autoprop = require("./autoprop");
 var removeFromList = require("../basic/removeFromList");
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
@@ -29,6 +30,9 @@ var getExported = function (code) {
             a.name = a.origin;
             consts.push(a);
         }
+        else {
+            autoprop.addHideExp(a);
+        }
     }
     return consts;
 };
@@ -54,7 +58,7 @@ var getAssignedConst = function (a, used) {
 }
 var findConsts = function (code) {
     var consts = getExported(code);
-    if (!consts) return;
+    if (!consts || !consts.length) return;
     autoiota(code);
     var used = code.used;
     var vmap = Object.create(null);
@@ -62,7 +66,7 @@ var findConsts = function (code) {
         var name = a.name;
         if (/[\.\[]/.test(name)) continue;
         var c = getAssignedConst(a, used);
-        if (c) vmap[name] = c;
+        if (c) vmap[name] = [c.type, c.text, c.isdigit];
     }
     return vmap;
 };
@@ -80,8 +84,9 @@ var setEnvDefinedConsts = function (used, k, v) {
         else {
             insertBefore(a, comment);
         }
-        a.type = v.type;
-        a.text = v.text;
+        a.type = v[0];
+        a.text = v[1];
+        if (v[2]) a.isdigit = true;
     }
 };
 var setMapDefinedConsts = function (used, k, consts) {
@@ -109,9 +114,9 @@ var setMapDefinedConsts = function (used, k, consts) {
             }
             if (!t || !(t in consts)) continue;
             var c = consts[t];
-            o.type = c.type;
-            o.text = c.text;
-            if (c.isdigit) o.isdigit = true;
+            o.type = c[0];
+            o.text = c[1];
+            if (c[2]) o.isdigit = true;
             remove(e);
             continue;
         }
@@ -120,6 +125,7 @@ var setMapDefinedConsts = function (used, k, consts) {
 };
 var getMaped = require("./getMaped");
 var maped = Object.create(null);
+var simples = Object.create(null);
 var loadConsts = function (fullpath, commap) {
     if (fullpath in maped) return maped[fullpath];
     maped[fullpath] = null;
@@ -129,6 +135,17 @@ var loadConsts = function (fullpath, commap) {
     autoConst.call(commap, code, fullpath);
     var consts = findConsts(code);
     maped[fullpath] = consts;
+    if (!consts) {
+        if (code.isExpressQueue()) {
+            var last = code.last;
+            while (last?.type === STAMP && last.text === ';') last = last.prev;
+            if (!last) return;
+            var lp = last.prev;
+            if (last.isdigit && (!lp || lp.type === STAMP && /^[,\=]$/.test(lp.text))) {
+                simples[fullpath] = [last.type, last.text, last.isdigit];
+            }
+        }
+    }
     return consts;
 };
 
@@ -140,8 +157,8 @@ var getOnlyString = function (q) {
     return t;
 };
 var getCopy = function (o) {
-    var a = { type: o.type, text: o.text };
-    if (o.isdigit) a.isdigit = true;
+    var a = { type: o[0], text: o[1] };
+    if (o[2]) a.isdigit = true;
     return a;
 }
 
@@ -181,7 +198,7 @@ var isSimpleEqual = function (exp, o) {
     var eq = f.equal;
     return eq === f.next && eq?.next === o;
 }
-var setRequiredConsts = function (code, upath, commap) {
+var setRequiredConsts = function (code, upath, commap, propable) {
     var requires = code.used.require;
     if (!requires) return code;
     var used = code.used;
@@ -191,7 +208,13 @@ var setRequiredConsts = function (code, upath, commap) {
         var t = getOnlyString(q);
         if (!t) continue;
         var p = getMaped(upath, commap, t);
-        if (!p) continue;
+        if (!p) {
+            if (propable) {
+                r._debug = code._debug;
+                autoprop.addKeepEnv(r);
+            }
+            continue;
+        }
         var consts = loadConsts(p, commap);
         if (!consts) continue;
         var exp = pickAssignment(r);
@@ -225,7 +248,7 @@ var setRequiredConsts = function (code, upath, commap) {
     }
     return code;
 }
-
+var proped = new Set();
 var autoConst = function (code, fullpath, ignoreImported) {
     var vmap = this?.["&"];
     var { envs, used, envs } = code;
@@ -239,22 +262,38 @@ var autoConst = function (code, fullpath, ignoreImported) {
             continue;
         }
     }
-    var mmap = this?.["?"];
+    var mmap = this?.[":"];
     if (!mmap) return code;
     var url = mmap[fullpath];
     var upath = split(url);
     if (ignoreImported) return code;
+    var propable = !proped.has(fullpath);
+    if (propable) proped.add(fullpath);
     for (var k in envs) {
         if (k === 'require') {
-            setRequiredConsts(code, upath, this);
+            setRequiredConsts(code, upath, this, propable);
             continue;
         }
         p = getMaped(upath, this, k);
-        if (!p) continue;
+        if (!p) {
+            if (propable) {
+                code._debug = /color\.js$/.test(fullpath);
+                if (k !== 'exports') for (var o of used[k]) {
+                    o._debug = code._debug;
+                    autoprop.addKeepEnv(o);
+                }
+            }
+            continue;
+        }
         var consts = loadConsts(p, this);
-        if (!consts) continue;
+        if (!consts) {
+            var s = simples[p];
+            if (s) setEnvDefinedConsts(used, k, s);
+            continue;
+        }
         setMapDefinedConsts(used, k, consts)
     }
+    if (propable) autoprop.addKeepBody(code);
     return code;
 };
 autoConst.loadConsts = loadConsts;