efront 4.24.2 → 4.25.0

package/coms/compile/Program.js

@@ -64,6 +64,46 @@ var trimDulp = function (list) {
     }
     return dist;
 }
+var setObject = function (o) {
+    o.isObject = true;
+    var needproperty = true;
+    for (var cx = 0; cx < o.length; cx++) {
+        var m = o[cx];
+        if (!needproperty) {
+            if (m.type === SCOPED && m.entry === '{') {
+                if (!m.isObject) setObject(m);
+                continue;
+            }
+            if (m.type !== STAMP || m.text !== ',') continue;
+        }
+        if (m.type === STAMP && m.text === ':') {
+            needproperty = false;
+            continue;
+        }
+        if (m.type === LABEL) {
+            o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = {
+                prev: m,
+                text: ':',
+                type: STAMP,
+                next: m.next,
+            });
+            m.type = PROPERTY;
+            m.text = m.text.replace(/\:$/, '');
+            m.isprop = true;
+            m.end--;
+            needproperty = false;
+            continue;
+        }
+        m.isprop = true;
+        if (m.type === EXPRESS || m.type === STRAP) {
+            if (!/\./.test(m.text)) m.type = PROPERTY;
+        }
+        if (m.prev && m.prev.type === PROPERTY) {
+            m.prev.type = STRAP;
+        }
+    }
+};
+
 
 var spaceDefined = require("../basic/spaces");
 
@@ -101,17 +141,130 @@ class Program {
     powermap = powermap;
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/;
     straps = "if,for".split(',');
-    forceend_reg = /^(return|break|continue)$/;
+    colonstrap_reg = /^(case|default)$/;
+    forceend_reg = /^(return|break|continue|end[psm])$/;
     funcstrap_reg = /^(class|function|fn|func|async|interface|struct|enum|impl|pub)$/;
     extends_reg = /^(extends|implements)$/;
     structstrap_reg = /^(class|interface|struct|enum)$/;
     control_reg = /^(if|else|switch|case|do|while|for|loop|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
-    type_reg = /^(var|let|const|function|fn|func|class|interface|type|struct|enum|impl)$/;
+    type_reg = /^(var|let|const|function|fn|func|class|interface|type|struct|enum|impl|local)$/;
     nocase = false
     keepspace = false;
     lastIndex = 0
+    detectLabel(o) {
+        var queue = o.queue;
+        var last = queue.last;
+        var m = o.text;
+        var type = o.type;
+        var end = o.end;
+        var inExpress = queue.inExpress;
+        if (type === SPACE);
+        else if (type !== STAMP);
+        else if (m === ";") {
+            if (last && last.isend === false) last.isend = true;
+            inExpress = false;
+        }
+        else if (last) check: switch (m) {
+            case "?":
+                if (last.isprop) {
+                    o.type = EXPRESS;
+                    o.isprop = true;
+                    break;
+                }
+                if (last.type & (STAMP | STRAP) || last.istype) break;
+                inExpress = true;
+                if (!queue.question) queue.question = 1;
+                else queue.question++;
+                break;
+            case "=":
+                if (last.type === SCOPED && last.brace) {
+                    if (!last.isObject) {
+                        setObject(last);
+                    }
+                }
+                var lp = last.prev;
+                if (lp?.type === STRAP && lp.text === 'type') {
+                    o.istype = true;
+                }
+            case ",":
+                if (queue.isObject) {
+                    if (last.type === PROPERTY) {
+                        var lp = last.prev;
+                        if (!lp || lp.type === STAMP && lp.text === ',') last.short = true;
+                    }
+                }
+                inExpress = true;
+                break;
+            case "|":
+            case "&":
+                var p = o.prev;
+                if (p?.istype) o.istype = true;
+                inExpress = true;
+                break;
+            case ":":
+                if (queue.question) {
+                    queue.question--;
+                    if (last.type === STAMP && last.text === '?') {
+                        inExpress = false;
+                        o.istype = true;
+                        last.istype = true;
+                        last.type = EXPRESS;
+                    }
+                    else {
+                        inExpress = true;
+                    }
+                    break;
+                }
+                if (queue.isObject) {
+                    if (last.isprop) {
+                        o.isExpress = false;
+                        queue.inExpress = true;
+                        return;
+                    }
+                }
+                inExpress = false;
+                if (queue.entry && (!queue.brace || queue.isClass)) {
+                    o.istype = true;
+                    break;
+                }
+                var temp = last;
+                var colonstrap_reg = this.colonstrap_reg;
+                while (temp) {
+                    if (temp.type === STRAP && colonstrap_reg.test(temp.text)) {
+                        break check;
+                    }
+                    if (!temp.isExpress) break;
+                    temp = temp.prev;
+                }
+                if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
+                    // label
+                    var lp = last.prev;
+                    if (lp && lp.type === STAMP && lp.text === ',') {
+                        o.istype = true;
+                        break;
+                    }
+                    if (!lp || lp.type !== STRAP || !lp.transive || lp.isend) {
+                        last.type = LABEL;
+                        last.text += ":";
+                        last.end = end;
+                        queue.inExpress = false;
+                        return o;
+                    }
+                }
+                o.istype = true;
+                break;
+            default:
+                inExpress = true;
+        }
+        else {
+            inExpress = true;
+        }
+        if (inExpress !== queue.inExpress) {
+            o.isExpress = queue.inExpress = inExpress;
+        }
+    }
     twain(o1, o2) {
-        if (o1.istype || o1.needle || o2.needle) return;
+        if (o1.type === STRAP || o1.istype || o1.needle || o2.needle) return;
         o2.istype = true;
     }
     compile2(s) {
@@ -144,7 +297,8 @@ class Program {
         if (source.length > 1) return new RegExp(`^(${s})$`, flag);
         return new RegExp(`^${s}$`, flag);
     }
-    setType() {
+    setType(scope) {
+        if (this.detectLabel(scope)) return false;
     }
 
     exec(text) {
@@ -244,7 +398,7 @@ class Program {
             }
             else if (last.type === STRAP && !last.isend
                 || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text)
-                || last.type === SCOPED && !last.isExpress
+                || last.type === SCOPED && !last.isExpress && !last.istype
             ) {
                 o.unary = /^[^=;,\:]$/.test(o.text);
                 if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
@@ -261,7 +415,7 @@ class Program {
             }
 
             if (!o.unary && /^(\.\.\.|\*)$/.test(o.text)) {
-                if (powermap[o.text] === powermap.new) o.unary = true;
+                if (powermap[o.text] === powermap.void) o.unary = true;
                 if (last?.isarg || last?.isargl || last?.isprop) {
                     o.unary = true;
                     o.istype = true;
@@ -275,7 +429,7 @@ class Program {
                 o.needle = true;
             }
             if (o.needle);
-            else if (powermap[o.text] > powermap.new && !o.unary) {
+            else if (powermap[o.text] > powermap.void && !o.unary) {
                 o.needle = true;
             }
             queue_push(cache_stamp);
@@ -443,7 +597,7 @@ class Program {
                 start = index = scope.start + scope.text.length;
             }
             var last = queue.last;
-            if (last.type === PIECE) {
+            if (last?.type === PIECE) {
                 this.lastIndex = 0;
                 var thist = this.type;
                 this.type = undefined;
@@ -467,7 +621,12 @@ class Program {
         }
         var closeTag = function () {
             queue.inTag = false;
-            if (text.charAt(index) === m) {
+            a: if (text.charAt(index) === m) {
+                var qp = queue.prev;
+                if (!qp) break a;
+                var ptype = qp.type;
+                if (ptype & (ELEMENT | STRAP | PROPERTY | LABEL)) break a;
+                if (ptype === STAMP && !/^(\+\+|\-\-)$/.test(qp.text)) break a;
                 if ((m + m) in powermap) {
                     if (!parents[parents.length - 1].tag) {
                         undefTag();
@@ -565,7 +724,6 @@ class Program {
                         break loop;
                     }
                     var m = match[0];
-
                     index = match.index + m.length;
                     if (quote.tag && queue.inTag === 0) {
                         if (openTag()) {
@@ -644,6 +802,7 @@ class Program {
                         push_piece();
                         var scope = [];
                         scope.entry = m;
+                        if (queue.istype) scope.istype = true;
                         scope.type = QUOTED;
                         push_parents(scope);
                         continue loop;
@@ -723,6 +882,9 @@ class Program {
                         case QUOTED:
                             if (!last.tag) break test;
                             break;
+                        case VALUE:
+                        case EXPRESS:
+                            break test;
                         case SCOPED:
                             if (queue.inExpress && !iscomment) break test;
                             break;
@@ -851,7 +1013,7 @@ class Program {
                 queue.inExpress = true;
                 if (isdigit && lasttype === STAMP) {
                     var prev = last.prev;
-                    if ((!prev || prev.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(prev.text)) && /^[+\-]+$/.test(last.text)) {
+                    if ((!prev || prev.istype || prev.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(prev.text)) && /^[+\-]+$/.test(last.text)) {
                         last.type = VALUE;
                         last.text += m;
                         lasttype = VALUE;
@@ -870,7 +1032,13 @@ class Program {
                 continue;
             }
 
-            if (scope_entry[m]) {
+            if (scope_entry[m]) scope: {
+                if (stamp_reg.test(m)) {
+                    var last = queue.last;
+                    if (last) {
+                        if (last.isExpress && !last.istype) break scope;
+                    }
+                }
                 var scope = [];
                 scope.entry = m;
                 scope.type = SCOPED;
@@ -879,8 +1047,8 @@ class Program {
                 scope.row = row;
                 if (m === "{") {
                     if (!last) {
-                        if (queue.istype) scope.isClass = true;
-                        else scope.isObject = queue.inExpress;
+                        scope.isObject = queue.inExpress;
+                        if (queue.istype) scope.istype = true;
                     }
                     else if (queue.classed) {
                         if (last.type !== STAMP || last.text !== "=>") {
@@ -893,17 +1061,12 @@ class Program {
                             scope.inExpress = false;
                         }
                     }
-                    else if (last.type === SCOPED && last.istype) {
-                        scope.isClass = true;
-                    }
                     else if (last.type === STAMP) {
-                        if (last.istype) {
-                            scope.isClass = true;
-                        }
-                        else if (last.text === ':') {
+                        if (last.text === ':') {
                             scope.isObject = queue.inExpress;
                         }
                         else queue.inExpress = scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
+                        if (last.istype && scope.isObject) scope.istype = true;
                     }
                     else if (last.type === EXPRESS) a: {
                         if (last.text === '...') {
@@ -960,7 +1123,8 @@ class Program {
                 continue;
             }
             if (this.scope_leave[m]) {
-                console.warn(
+                var last = queue.last;
+                if (!stamp_reg.test(m) || last && !last.isExpress) console.warn(
                     i18n`标记不匹配：`, queue.entry, m,
                     i18n`\r\n文件位置：`, this.mindpath + ":" + `${row}:${index - colstart}`,
                     i18n`\r\n摘要：\r\n`,

package/coms/compile/common.js

@@ -1328,7 +1328,10 @@ var createString = function (parsed) {
                 || prev.type === STAMP && !prev.unary && !prev.needle && !prev.isprop
             ) {
                 if (intag || prev.type === ELEMENT && o.type === ELEMENT) break a;
-                if ((o.type & ~(EXPRESS | PROPERTY) || !needhead_reg.test(o.text)) && (!prev.tag && !o.tag || prev.type === STAMP || o.type === STAMP)) {
+                if (
+                    (o.type & ~(EXPRESS | PROPERTY) || !needhead_reg.test(o.text))
+                    && (!prev.tag && !o.tag || prev.type === STAMP || o.type === STAMP)
+                ) {
                     result.push(" ");
                     lasttype = SPACE
                 }
@@ -1426,6 +1429,7 @@ var createString = function (parsed) {
                 break;
             case QUOTED:
                 if (!o.length && o.text) {
+                    if (prev?.istype && lasttype !== SPACE) result.push(" ");
                     if (helpcolor) o.text = color.transform(o.text);
                     result.push(o.text);
                     break;
@@ -1468,11 +1472,19 @@ var createString = function (parsed) {
                     if (intag || o.needle || o.type & (EXPRESS | PROPERTY) && (needhead_reg.test(o.text) || lasttype & EXPRESS && needfoot_reg.test(prev?.text))) {
                         if (prev?.isdigit && !/^0[\dxbo]|[mni]$|[e\.]/.test(prev.text) && lasttype & ~(SPACE | COMMENT)) result.push(" ");
                     }
-                    else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
-                        if (autospace || o.prev?.isdigit) result.push(" ");
+                    else if (
+                        (STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype
+                        && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type
+                    ) {
+                        if (autospace || prev?.isdigit) result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^[,;]/.test(o.text)) {
-                        if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
+                        if (result[result.length - 1] === " ");
+                        else if (o.text === ':') {
+                            var p = o.prev;
+                            if ((lasttype === PROPERTY || p && p.isprop || !o.isExpress));
+                            else if (autospace) result.push(' ');
+                        }
                         else if (lasttype === STAMP) {
                             var prev = o.prev;
                             if (autospace) if (!prev.unary || /[\+\-]$/.test(prev.text) && prev.text === o.text) result.push(" ");

package/coms/compile/powermap.js

@@ -7,8 +7,8 @@ var powermap = {
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
     '++,--'/* 11 */,
-    "typeof,await,yield,new,delete,void,..."/*12*/,
-    '!,~,#'/* 13 */,
+    "typeof,await,yield,delete,void,..."/*12*/,
+    '!,~,#,new'/* 13 */,
     "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {
     pp.split(",").forEach(p => {

package/coms/compile/unstruct.js

@@ -282,7 +282,7 @@ var isunary = function (o) {
     var f = o.first;
     if (!f) return false;
     while (f) {
-        if (f.type & (STAMP | STRAP) && powermap[f.text] < powermap.new) return false;
+        if (f.type & (STAMP | STRAP) && powermap[f.text] < powermap.void) return false;
         f = f.next;
     }
     return true;
@@ -643,7 +643,7 @@ var _invoke = function (t, getname) {
     else if (t.length) {
         if (!isAequalA(t)) {
             var t0 = t[0];
-            if ((t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) && result.length) {
+            if ((t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.void) && result.length) {
                 t.unshift(...rescan`${qname}=${qname}`);
                 relink(t);
             }
@@ -980,7 +980,7 @@ var _express = function (body, getname, ret) {
             continue;
         }
         if (o.type & (STRAP | STAMP)) {
-            if (o.needle) {
+            if (o.needle || o.text === 'new') {
                 exps.push(o);
                 continue;
             }
@@ -1002,7 +1002,7 @@ var _express = function (body, getname, ret) {
                 if (maxindex < nameindex) maxindex = nameindex;
             }
             bx = cx + 1;
-            if (!isor) if (!cache.length || p > cache[cache.length - 1] || p >= powermap.new) {
+            if (!isor) if (!cache.length || p > cache[cache.length - 1] || p >= powermap.void) {
                 cache.push(b, p);
                 continue;
             }
@@ -1241,7 +1241,7 @@ function toqueue(body, getname, ret = false, result = []) {
             continue;
         }
         a: if (o.type === STRAP) {
-            if (/^(new|typeof|delete|await|void|debugger)$/.test(o.text)) {
+            if (/^(typeof|delete|await|void|debugger)$/.test(o.text)) {
                 break a;
             }
             if (/^(var|let|const)$/i.test(o.text)) {

package/coms/compile/unstruct_test.js

@@ -165,7 +165,9 @@ test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return
 test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);
 test(`if (a() > a+b);`, '_ = a(), _0 = a + b, _ = _ > _0; if (!_) return [1, 0]; return [1, 0]', true);
 test(`index > start && result.length < pageSize`, '_ = index > start; if (!_) return [1, 0]; _ = result.length, _ < pageSize', true);
-unstruct.debug = true; r++;
 test(`menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1`);
 test(`a.b.c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1; _2 = a.b.c, _2 = _2 + _1; a.b.c = _2`);
 test(`menus[0].c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = menus[0]; _1 = str__v_; _2 = version[0]; _3 = str__v_1; _1 = [_1, _2, _3]; _1 = _1[str_join](""); _2 = _0[str_name], _2 = _2 + _1; _0[str_name] = _2; _3 = _.c, _3 = _3 + _2; _.c = _3`);
+unstruct.debug = true; r++;
+test(`new Array(2).join("") + 1`, `_0 = new Array(2); _ = _0.join(""), _ + 1`);
+test(`new window.Array(2).join("") + 1`, `_0 = new window.Array(2); _ = _0.join(""), _ + 1`);

package/coms/explorer/context.js

@@ -58,7 +58,7 @@ var popupEdit = function ($scope, active) {
     })
 
 };
-return extend([
+return () => [
     {
         name: i18n`返回` + `(O)`,
         hotkey: "backspace",
@@ -213,4 +213,4 @@ return extend([
             $scope.open();
         }
     }
-])
+];

package/coms/explorer/main.js

@@ -220,7 +220,7 @@ function main() {
     renderWithDefaults(page, scope);
     bind('drop')(scope.listview, ondrop);
     bindkey(scope.listview);
-    contextmenu(scope.listview, explorer$context);
+    contextmenu(scope.listview, explorer$context());
     on("pointerdown")(scope.listview, function () {
         if (document.activeElement !== scope.listview) scope.listview.focus();
     })

package/coms/frame/edit.html

@@ -1,5 +1,5 @@
 <div head>
-    <span v-text="origin?'${i18n`修改`}':'${i18n`添加`}'"></span><span -text="title"></span>
+    <span -text="title"></span>
 </div>
 <div body>
     <field v-if="!f.hidden" -repeat="f in fields" ng-src="[f,data]"></field>

package/coms/frame/edit.js

@@ -1,22 +1,29 @@
 function main(title, { submit }, { data: origin, fields, }) {
     var page = view();
     var item = Object.assign({}, origin);
-    page.innerHTML = edit;
-    drag.on(page.firstChild, page);
-    resize.on(page);
     page.onback = function () {
         if (page.querySelector('[dirty]')) return false;
     };
-    renderWithDefaults(page, {
+    var page_scope = {
         fields,
-        title,
+        get title() {
+            var t = title;
+            if (isFunction(t)) t = t();
+            t = (origin ? i18n`修改` : i18n`添加`) + t;
+            return t;
+        },
         origin,
         scrollbar,
         data: item,
         remove() {
             remove(page);
         },
-    });
+    };
+    page.innerHTML = template;
+    renderWithDefaults(page, page_scope);
+    drag.on(page.firstChild, page);
+    resize.on(page);
+
     on('submit')(page, async function (e) {
         e.preventDefault();
         var res = await submit(item, fields, origin);

package/coms/frame/list.js

@@ -1,6 +1,68 @@
-function main(title, { fields, options: options0, load, remove, buttons }, edit_ref) {
+function main(gtTitle, { fields: gtFields, options: gtOptions, load, remove, buttons: gtButtons }, edit_ref) {
+    var title, fields, fieldsL, options, options, buttons;
+    var gt = function (gt, o) {
+        if (isFunction(gt)) gt = gt();
+        if (isArray(o)) {
+            o.splice(0, o.length);
+            o.push.apply(o, gt);
+        }
+        else o = gt;
+        return o;
+    }
+    var update = function () {
+        title = gt(gtTitle, title);
+        var options0 = gt(gtOptions);
+        var options1 = [
+            {
+                name: i18n`修改`,
+                async do(o) {
+                    await edit(o);
+                },
+            },
+            {
+                type: "danger",
+                name(o) {
+                    return this.confirm === o ? i18n`确认删除` : i18n`删除`;
+                },
+                type(o) {
+                    return this.confirm === o ? "dark" : "danger";
+                },
+                confirm: false,
+                timer: 0,
+                async do(o) {
+                    if (this.confirm !== o) {
+                        this.confirm = o;
+                        clearTimeout(this.timer);
+                        var that = this;
+                        this.timer = setTimeout(function () {
+                            that.confirm = null;
+                            render.refresh();
+                        }, 2000);
+                        return;
+                    }
+                    await remove(o);
+                    page_scope.load();
+                }
+            }
+        ];
+        if (options1) options1.push.apply(options1, options0);
+        options = gt(options1, options);
+        buttons = gt(gtButtons, buttons);
+        fields = gt(gtFields, fields);
+        var fields1 = fields.filter(f => !f.hidden && f.inlist !== false).concat({
+            name: i18n`操作`,
+            options
+        });
+        fieldsL = gt(fields1, fieldsL);
+    };
     if (isString(edit_ref)) prepare(edit_ref);
     var page = document.createElement("div");
+    on('append')(page, function () {
+        i18n.addReloader(update);
+    });
+    on('remove')(page, function () {
+        i18n.removeReloader(update);
+    });
     var edit = async function (o) {
         if (!edit_ref) {
             return;
@@ -24,58 +86,29 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
             on("submited")(p, callback);
         })
     };
-    page.innerHTML = template;
-    var options = [
-        {
-            name: i18n`修改`,
-            async do(o) {
-                await edit(o);
-            },
-        },
-        {
-            type: "danger",
-            name(o) {
-                return this.confirm === o ? i18n`确认删除` : i18n`删除`;
-            },
-            type(o) {
-                return this.confirm === o ? "dark" : "danger";
-            },
-            confirm: false,
-            timer: 0,
-            async do(o) {
-                if (this.confirm !== o) {
-                    this.confirm = o;
-                    clearTimeout(this.timer);
-                    var that = this;
-                    this.timer = setTimeout(function () {
-                        that.confirm = null;
-                        render.refresh();
-                    }, 2000);
-                    return;
-                }
-                await remove(o);
-                page_scope.load();
-            }
-        }
-    ];
-    if (options0) options = options.concat(options0);
+    update();
     var page_scope = {
-        title,
+        get title() {
+            return title
+        },
         load() {
             this.data = load();
         },
-        fields: fields.filter(f => !f.hidden && f.inlist !== false).concat({
-            name: i18n`操作`,
-            options
-        }),
+        fields: fieldsL,
         buttons,
         hasedit: !!edit_ref,
         data: [],
         async add() {
             await edit();
         },
-    }
+    };
+    page.innerHTML = template;
     renderWithDefaults(page, page_scope);
+    page.reload = function () {
+        update();
+        page.innerHTML = template;
+        renderWithDefaults(page, page_scope);
+    };
     on("append")(page, function () {
         page_scope.load();
     });