efront 4.22.14 → 4.22.16

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

@@ -1,3 +1,6 @@
+- zh-CN: 无法存入数据到$1
+  en:    Unable to deposit data to $1
+
 - zh-CN: "参数异常: $1"
   en:    "Parameter exception: $1"
 

package/apps/pivot/cert/main.xht

@@ -21,7 +21,7 @@
         }
     }
 
-    :root {
+    :scope {
         height: 100%;
         overflow: auto;
     }

package/apps/pivot/db/config.xht

@@ -72,8 +72,10 @@
     (用户互访/visit/,open=false) swap // 不公开时检查此项`;
     var [db] = arguments;
     if (!db.fields) {
-        var [da1] = await data.from('dbfind', { dbid: db.name, size: 1 });
-        db.fields = da1 ? Object.keys(da1).map(k => ({ key: k })) : [];
+        try {
+            var [da1] = await data.from('dbfind', { dbid: db.name, size: 1 });
+            db.fields = da1 ? Object.keys(da1).map(k => ({ key: k })) : [];
+        } catch { }
     }
     var editAction = function (a) {
         popup('#/db/act', [db, a]);

package/apps/pivot/db/list.xht

@@ -41,6 +41,7 @@
     var a = button;
     var load = async function name(params) {
         dbs = await data.from("dball");
+        dbs.forEach(db => db.name = db.name || db.id);
     };
     load();
     var adddb = async function () {

package/coms/basic/JSAM.js

@@ -1,14 +1,14 @@
-var isEmpty = require("./isEmpty");
-var convertReg = /^(?:object|function)$/;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+var strings = require("./strings");
+var spaces = require("./spaces");
+var isArrayLike = require("./isArrayLike");
 var check = function (o) {
-    return o === null || typeof o === 'bigint' || o instanceof BigInt || typeof o === 'number' || typeof o === "boolean";
+    return o === null || o === false || o === true || o === Infinity || o !== o;
 };
 var string = function (a) {
-    return "\"" + String(a).replace(/\\/g, "\\\\").replace(/"/g, '\\$&') + "\"";
+    return strings.encode(a, '"', false);
 };
 var symbol = function (a) {
-    return "\'" + String(a).replace(/^\w*\(([\s\S]*)\)$/, '$1').replace(/\\/g, "\\\\").replace(/'/g, '\\$&') + "\'";
+    return strings.encode(String(a).replace(/^\w*\(([\s\S]*)\)$/, '$1'), "'");
 };
 var date = function (d) {
     return d.toISOString();
@@ -17,288 +17,224 @@ var regrep = a => a === '/' ? "\\/" : a;
 var regexp = function (r) {
     return '/' + r.source.replace(/\\[\s\S]|\//g, regrep) + '/' + r.flags;
 };
-var join = function (o) {
-    if (o === undefined) return '';
-    if (check(o)) return String(o);
-    if (typeof o === 'symbol' || o instanceof Symbol) return symbol(o);
-    if (typeof o !== 'object') return string(o);
-    if (o instanceof Date) return date(o);
-    if (o instanceof RegExp) return regexp(o);
-    var arr = o[""];
-    delete o[""];
-    var typeid = o._;
-    delete o._;
-    var pairs = [].concat(arr);
-    for (var k in o) {
-        pairs.push(k + ':' + o[k]);
-    }
-    var s;
-    if (o instanceof Array) {
-        s = `[${pairs.join(',')}]`;
-    }
-    else {
-        s = `{${pairs.join(',')}}`;
-    }
-    if (typeid > 0) s = typeid + s;
-    return s;
+var isValidK = function (k) {
+    return k.length < 16 && !/^\d|[,:'"\\\/`\-\[\]\{\}\(\)\.\+\#\@\&^]/.test(k) && spaces.trim(k) === k;
 };
-function stringify(memery, preload) {
-    if (!isEmpty(preload)) {
-        preload = [].concat(preload);
-        var i = preload.indexOf(memery) + 1;
-        if (i > 0) return i + ',';
-    }
+var extractK = function (k) {
+    return k.length < 16 && isFinite(k);
+};
+var noDulp = false, plength = 0;
+function _tostring(memery, preload, dist) {
     if (memery === undefined) return '';
     if (check(memery)) return String(memery);
-    if (typeof memery === 'symbol') return symbol(memery);
-    if (memery instanceof Date) return date(memery);
-    if (memery instanceof RegExp) return regexp(memery);
-    if (!convertReg.test(typeof memery)) return string(memery);
+    if (typeof memery === 'number') {
+        if (memery < 0) return String(memery);
+        return "+" + String(memery);
+    }
+    if (typeof memery === 'string') return string(memery);
+    if (typeof memery === 'symbol' || memery instanceof Symbol) return symbol(memery);
+    if (typeof memery === 'bigint' || memery instanceof BigInt) return String(memery) + "n";
     m: if (typeof memery === 'function') {
         for (var k in memery) break m;
         return '';
     }
-    var dist = [memery];
-    var rest = [memery];
-    var trimed = [memery instanceof Array ? [] : {}];
-    var objects = [trimed[0]];
-    if (!isEmpty(preload)) dist = dist.concat(preload);
-    var preload_used = false;
-    while (rest.length) {
-        var memery = rest.shift();
-        var o = objects.shift();
-        var inc = 0, arr = [];
-        o[""] = arr;
-        o._ = dist.indexOf(memery.constructor);
-        if (o._ > 0) preload_used = true;
-        for (var k in memery) {
-            var m = memery[k];
-            f: if (typeof m === 'function') {
-                for (var k in m) break f;
-                if (dist.indexOf(m) >= 0) {
-                    preload_used = true;
-                    break f;
-                }
-                continue;
-            }
-            if (inc === +k && k !== '') {
-                var kindex = "";
-                inc++;
-            } else {
-                var kindex = dist.indexOf(k);
-                if (!~kindex) {
-                    kindex = dist.length;
-                    dist.push(k);
-                    trimed.push(k);
-                }
-            }
-            var index = dist.indexOf(m);
-            if (!~index) {
-                index = dist.length;
-                dist.push(m);
-                if (m !== null) {
-                    if (m instanceof Date) {
-                        trimed.push(m);
-                    }
-                    else if (m instanceof RegExp) {
-                        trimed.push(m);
-                    }
-                    else if (convertReg.test(typeof m)) {
-                        rest.push(m);
-                        var t = m instanceof Array ? [] : {};
-                        trimed.push(t);
-                        objects.push(t);
-                    }
-                    else {
-                        trimed.push(m);
-                    }
-                } else {
-                    trimed.push(m);
-                }
+    if (memery instanceof Date) return date(memery);
+    if (memery instanceof RegExp) return regexp(memery);
+    var d = preload.indexOf(memery.constructor);
+    var pre = memery instanceof Array ? "[" : "{";
+    var aft = pre === "{" ? "}" : "]"
+    if (d >= 0) pre = d + pre;
+    var inc = 0, arr = [];
+    var index = dist.length;
+    dist.push(undefined);
+    for (var k in memery) {
+        var v = memery[k];
+        if (v && typeof v === 'object' || typeof v === 'function') {
+            var i = preload.indexOf(v);
+            if (i >= 0) {
+                if (noDulp) throw new Error(i18n`数据异常`);
+                v = i;
             }
-            if (kindex === '') {
-                arr.push(index);
-            } else {
-                o[kindex] = index;
+            else {
+                i = plength;
+                preload.push(v);
+                plength++;
+                _tostring(v, preload, dist);
+                if (noDulp) preload.pop();
+                v = i;
             }
         }
+        else {
+            v = _tostring(v, preload);
+        }
+
+        if (k && +k === inc) {
+            arr.push(v);
+        }
+        else {
+            if (extractK(k)) k = "+" + k;
+            else if (!isValidK(k)) k = string(String(k));
+            arr.push(k + ":" + v);
+        }
+        inc++;
     }
-    var result = trimed.map(join).join(',');
-    if (trimed.length === 1 && preload_used) result += ',';
-    return result;
+    dist[index] = pre + arr.join(',') + aft;
+    return dist[index];
 }
-var create = function (a, dst) {
-    if (!a) return;
-    var arr = a.split(',');
-    var rest = [];
-    for (var cx = 0, dx = arr.length; cx < dx; cx++) {
-        var s = arr[cx].split(":");
-        var k = s[0], v = s[1];
-        if (v === undefined) {
-            rest.push(k);
-        } else {
-            dst[k] = +v;
-        }
+
+function stringify(memery, preload, hasDulp = true) {
+    noDulp = preload === false || hasDulp === false;
+    if (isArrayLike(hasDulp)) preload = hasDulp;
+    if (isArrayLike(preload)) {
+        preload = Array.apply(null, preload);
+        var i = preload.indexOf(memery) + 1;
+        if (i > 0) return i + ',';
+        preload.unshift(memery);
     }
-    dst[""] = rest;
-};
-function parse(string, preload) {
-    string = String(string);
-    var trimed = [];
-    var reg0 = /\d+/g;
-    var reg1 = /\}/g;
-    var reg2 = /\]/g;
-    var reg3 = /\\[\s\S]|"/g;
-    var reg4 = /,|$/g;
-    var reg5 = /\\[\s\S]|\//g;
-    var reg6 = /\\[\s\S]|'/g;
-    var marked = [];
-    for (var cx = 0, dx = string.length; cx < dx; cx++) {
-        var s = string.charAt(cx);
-        var reg = null, o = null;
-        reg0.lastIndex = 0;
-        var typeid = 0;
-        var m = reg0.test(string.charAt(cx));
-        if (m) {
-            reg0.lastIndex = cx;
-            var m = reg0.exec(string);
-            if (/^[\[\{]$/.test(string.charAt(reg0.lastIndex))) {
-                typeid = +m[0];
-                cx = reg0.lastIndex;
-                s = string.charAt(reg0.lastIndex);
+    else preload = [memery];
+    var dist = [];
+    plength = preload.length;
+    dist[0] = _tostring(memery, preload, dist);
+    return dist.join(',');
+}
+function parseValue(v) {
+    if (/^"/.test(v)) return strings.decode(v);
+    if (/^[\+\-]?\d+n$/.test(v)) return BigInt(v.slice(0, v.length - 1));
+    if (/^[\+\-]\d/.test(v)) return parseFloat(v);
+    if (/^\d+[\-\/]/.test(v)) return new Date(v);
+    if (/^\d/.test(v)) return parseFloat(v);
+    switch (v) {
+        case "true": return true;
+        case "false": return false;
+        case "null": return null;
+        case "": return undefined;
+        case "Infinity": return Infinity;
+        case "NaN": return NaN;
+    }
+    if (/^\//.test(v)) {
+        var flag = /\/(\w*)$/.exec(v);
+        return new RegExp(v.slice(1, flag.index), flag[1]);
+    }
+    if (/^'/.test(v)) return Symbol(strings.decode(v));
+    return v;
+}
+function setkd([obj, kds]) {
+    if (!isjsam) return kds.forEach(setkv, obj);
+    for (var [k, d] of kds) {
+        if (typeof k === 'number');
+        else if (/^\d+$/.test(k)) k = this[k];
+        else k = parseValue(k);
+        if (d instanceof Object);
+        else if (d.length <= 16 && /^\d+$/.test(d)) d = this[d];
+        else d = parseValue(d);
+        obj[k] = d;
+    }
+}
+function setkv([k, v]) {
+    if (typeof k === 'number');
+    else if (/^\d+$/.test(k));
+    else k = parseValue(k);
+    if (v instanceof Object);
+    else v = parseValue(v);
+    this[k] = v;
+}
+var blocks = [];
+var isjsam = false;
+function scanblock(string, index, preload, obj) {
+    var reg = /\\[\s\S]|[\:,'"\}\]\{\[\/]/g;
+    reg.lastIndex = index;
+    var instr = false;
+    var inc = index === 0 ? preload.length : 1, k = 0, d = null;
+    var start = index;
+    var kds = [];
+    a: while (index < string.length) {
+        var match = reg.exec(string);
+        if (!match) {
+            index = string.length;
+            break;
+        }
+        var m = match[0];
+        index = match.index + m.length;
+        if (/^['"\/]$/.test(m)) {
+            if (instr === m) {
+                instr = false;
             }
+            else if (instr) continue;
+            else instr = m;
         }
-        switch (s) {
+        else if (instr) continue;
+        switch (m) {
+            case ":":
+                if (index > start + 10 && /^\d+[\/\-]/.test(string.slice(start, start + 10))) {
+                    continue;
+                }
+                k = spaces.trim(string.slice(start, match.index));
+                start = index;
+                continue;
             case ",":
-                trimed.push(undefined);
-                break;
+                d = spaces.trim(string.slice(start, match.index));
+                if (preload === obj) isjsam = true;
+                if (!d && typeof k === 'number') {
+                    start = index;
+                    k = inc++;
+                    continue;
+                }
+                if (preload === obj) {
+                    preload[k] = parseValue(d);
+                }
+                else kds.push([k, d]);
+                k = inc++;
+                start = index;
+                continue;
             case "{":
-                reg = reg1;
-                o = {};
+                var o = {};
             case "[":
-                o = o || [];
-                reg = reg || reg2;
-                reg.lastIndex = cx + 1;
-                reg.exec(string);
-                var index = reg.lastIndex;
-                var s = string.slice(cx + 1, index - 1);
-                create(s, o);
-                marked.push(trimed.length);
-                trimed.push(o);
-                cx = reg.lastIndex;
-                if (typeid) {
-                    o._ = typeid;
+                var o = o || [];
+                d = spaces.trim(string.slice(start, match.index));
+                if (d) {
+                    d = preload[d];
+                    if (!d) throw new Error('数据异常！');
+                    if (Object.setPrototypeOf) Object.setPrototypeOf(o, d.prototype);
+                    else o = Object.create(d.prototype);
                 }
-                if (/\d/.test(string.charAt(cx))) {
-                    reg4.lastIndex = cx;
-                    var m = reg4.exec(string);
-                    o._ = typeid || string.slice(cx, m.index);
-                    cx = m.index;
+                if (preload === obj) {
+                    preload[k] = o;
                 }
-                break;
-            case "/":
-                reg = reg5;
-                o = 1;
-            case "'":
-                reg = reg || reg6;
-                o = o || 2;
-            case "\"":
-                reg = reg || reg3;
-                reg.lastIndex = cx + 1;
-                do {
-                    var s = reg.exec(string);
-                } while (s && s[0].length === 2);
-                var index = reg.lastIndex;
-                s = string.slice(cx + 1, index - 1).replace(/\\([\s\S])/g, '$1');
-                cx = index;
-                if (o == 2) {
-                    s = Symbol(s);
-                } else if (o == 1) {
-                    reg4.lastIndex = index;
-                    var m = reg4.exec(string);
-                    index = m.index;
-                    var flag = string.slice(cx, index);
-                    cx = index;
-                    s = new RegExp(s, flag);
+                else {
+                    kds.push([k, o]);
                 }
-                trimed.push(s);
+                index = start = scanblock(string, index, preload, o, isjsam);
+                o = null;
+                k = inc;
+                reg.lastIndex = index;
                 break;
-            default:
-                reg4.lastIndex = cx;
-                var match = reg4.exec(string);
-                var index = match.index;
-                var s = string.slice(cx, index);
-                switch (s) {
-                    case "null":
-                        s = null;
-                        break;
-                    case "true":
-                        s = true;
-                        break;
-                    case "false":
-                        s = false;
-                        break;
-                    default:
-                        if (/^\d+[\/\-]/i.test(s)) {
-                            s = new Date(s);
-                        }
-                        else if (/^\-?\d+$/.test(s)) {
-                            if (s.length > 15) {
-                                s = BigInt(s);
-                            } else {
-                                s = parseInt(s);
-                            }
-                        } else {
-                            s = parseFloat(s);
-                        }
-
-                }
-                trimed.push(s);
-                cx = index;
+            case "}": case "]":
+                index = match.index;
+                break a;
         }
     }
-    if (string.charAt(string.length - 1) === ',') trimed.push(undefined);
-    var dist = [trimed[0]];
-    if (!isEmpty(preload)) dist = dist.concat(preload);
-    var preloads_length = dist.length - 1;
-    dist = dist.concat(trimed.slice(1, trimed.length));
-
-    for (var cx = 0, dx = marked.length; cx < dx; cx++) {
-        var index = marked[cx];
-        var o = trimed[index];
-        if (index > 0) index += preloads_length;
-        if (o._ > 0) dist[index] = Object.create(dist[o._].prototype);
-        else dist[index] = o instanceof Array ? [] : {};
-    }
-    for (var cx = 0, dx = marked.length; cx < dx; cx++) {
-        var index = marked[cx];
-        var o = trimed[index];
-        if (index > 0) index += preloads_length;
-        var t = dist[index];
-        var arr = o[""];
-        delete o[""];
-        delete o._;
-        if (arr) for (var k in arr) {
-            if (hasOwnProperty.call(arr, k)) t[k] = dist[arr[k]];
+    if (start < index) {
+        var d = spaces.trim(string.slice(start, index));
+        if (typeof k !== 'number' || d) {
+            if (obj === preload) preload[k] = parseValue(d);
+            else kds.push([k, d]);
         }
-        for (var k in o) {
-            if (hasOwnProperty.call(o, k)) {
-                var v = o[k];
-                t[dist[k]] = dist[v];
-            }
-        }
-    }
-    if (trimed.length > 1 && typeof trimed[0] === 'number') {
-        return dist[trimed[0]];
     }
-    return dist[0];
+    blocks.push([obj, kds]);
+    return reg.lastIndex;
+}
+function parse(string, preload) {
+    if (isArrayLike(preload)) preload = Array.apply(null, preload);
+    else preload = [];
+    isjsam = false;
+    preload.unshift(void 0);
+    string = String(string);
+    scanblock(string, 0, preload, preload);
+    blocks.forEach(setkd, preload);
+    blocks = [];
+    return preload[0];
 }
 module.exports = {
     stringify,
-    parse(data, preload) {
-        if (/^\s*[^\{\[\s]|^\s*(?:\[\s*\]|\{\s*\}|)\s*$/.test(data)) return parse(data, preload);
-        if (/^\s*\{[\d\,\:\s]*\}\s*,/.test(data)) return parse(data, preload);
-        if (/^\s*\[[\d\,\:\s]*\]\s*,/.test(data)) return parse(data, preload);
-        return JSON.parse(data);
-    }
+    parse,
 };

package/coms/basic/JSAM_test.js

@@ -37,6 +37,8 @@ var test_self = function () {
     test({ a: false }) // {1:2},"a",false
     test({ a: null }) // {1:2},"a",null
     test({ a: 0 }) // {1:2},"a",0
+    test({ a: [0] }) // {a:2},"a",0
+    test({ 2: [0] }) // {a:2},"a",0
     test({ a: NaN }) // {1:2},"a",NaN
     test({ a: { b: { c: [3], d: [2] } } }) // {1:2},"a",{3:4},"b",{5:6,7:8},"c",[9],"d",[10],3,2
     test({ a: { b: { c: [3, o], d: [2] } } }) // {1:2},"a",{3:4},"b",{5:6,7:8},"c",[9,10],"d",[11],3,{12:10},2,"o"
@@ -46,6 +48,8 @@ var test_self = function () {
         d = { c };
     a.d = d;
     test(a); // {1:2},"d",{3:4},"c",[5],{6:0},"a"
+    test([{ "name": "用户", "open": true }, { "name": "导航", "open": true }, { "name": "商品", "open": true },]);
+    console.log(JSAM.parse(`[1:2,3:2,4:5,6:7,8:2,9:2,10:2,11:2,12:13,14:13,15:16],"is_errored",null,"error_message","is_loading",false,"is_loaded",true,"is_readonly","loading","loading_promise","data","appid",,"sign","smap",{17:7,18:7},"zh","en"`))
 };
 function test2(obj) {
     var data = JSAM.parse(JSON.stringify(obj));
@@ -55,8 +59,31 @@ function test_json() {
     test2({ 1: 2 });
     test2({ "adfasdf": 22 });
     test2([12, 23]);
+    test2({ "uptime": 15.602063, "memery": [22244769792, 38478614528], "arch": "x64", "platform": "win32", "nodeVersion": "v22.14.0", "version": "4.22.13", "machine": "x86_64" });
+    test2([{ "name": "用户", "open": true }, { "name": "导航", "open": true }, { "name": "商品", "open": true },]);
+}
+function gettime(f) {
+    var timestart = Date.now();
+    f();
+    return Date.now() - timestart;
+}
+function test_time() {
+    var data = Array(10000).fill(0).map((a, i) => (
+        { obj: { obj: { [i >>> 6]: i }, obj2: ["您好，这是速度测试"], obj3: { key2: {} } }, key: 'asad' }
+    ));
+    var t1 = gettime(() => basic_$JSON.stringify(data));
+    console.log(t1);
+    var t2 = gettime(() => JSON.stringify(data));
+    console.log(t2);
+    var t3 = gettime(() => JSAM.stringify(data));
+    console.log(t1, t2, t3);
+    var t4 = gettime(() => JSAM.stringify(data, false));
+    console.log(t1, t2, t3, t4);
 }
 function JSAM_test() {
+    JSAM.debug = true;
     test_self();
     test_json();
+    JSAM.debug = false;
+    test_time();
 }

package/coms/basic/data.js

@@ -375,7 +375,7 @@ var parseData = function (sourceText) {
         sourceText = sourceText.replace(/^[^\(]+\(([\s\S]*)\)[^\)]*$/, "$1");
     }
     try {
-        if (/^[\[\{][\d\:,]+[\}\]],|^(Infinity|''|NaN|\d+|)$|^\/[\s\S]*?\/\w*$/.test(sourceText)) {
+        if (/^[\[\{]|^[+\-]\d|^\d+[\/\-]|\dn$|^(Infinity|''|NaN|\d+|)$|^\/[\s\S]*?\/\w*$/.test(sourceText)) {
             sourceText = JSAM.parse(sourceText);
         } else {
             sourceText = parseYML(sourceText);
@@ -1061,6 +1061,12 @@ var data = {
         fireListener(instanceId, data);
         return instanceDataMap[instanceId];
     },
+    wetInstance(instanceId, data, rememberWithStorage) {
+        instanceHasDulpData = false;
+        var res = this.setInstance(instanceId, data, rememberWithStorage);
+        instanceHasDulpData = true;
+        return res;
+    },
     patchInstance(instanceId, data, rememberWithStorage = 0) {
         var instance = this.getInstance(instanceId);
         extend(instance, data);
@@ -1136,14 +1142,21 @@ var data = {
         extend(instance, data);
     }
 };
-
+var instanceHasDulpData = true;
 function setItem(instanceId, data, rememberWithStorage = 0) {
     const storageId = userPrefix + instanceId + pagePathName;
+    var buff = null;
     if (rememberWithStorage !== false) {
-        sessionStorage.setItem(storageId, JSAM.stringify(data));
+        try {
+            sessionStorage.setItem(storageId, buff = JSAM.stringify(data, instanceHasDulpData));
+        } catch (e) { console.error(i18n`无法存入数据到${"sessionStorage"}`, instanceId, e) }
     }
     if (rememberWithStorage) {
-        localStorage.setItem(storageId, JSAM.stringify(data));
+        try {
+            localStorage.setItem(storageId, buff || JSAM.stringify(data, instanceHasDulpData));
+        } catch (e) {
+            console.error(i18n`无法存入数据到${"localStorage"}`, instanceId, e)
+        }
     }
 }
 

package/coms/basic/isArrayLike.js

@@ -1,6 +1,6 @@
 var window = this;
 function isArrayLike(a) {
-    if (a === null || a === window || typeof a !== 'object' || isNode(a)) return false;
+    if (a == null || typeof a !== 'object' || a.window === a || isNode(a)) return false;
     if (isFinite(a.length)) {
         if (a.length > 0) {
             return a.length - 1 in a;
@@ -8,4 +8,5 @@ function isArrayLike(a) {
         return true;
     }
     return false;
-}
+}
+module.exports = isArrayLike;