efront 4.24.1 → 4.24.3

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,
         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();
     });

package/coms/frame/route.js

@@ -138,17 +138,22 @@
         idmap = Object.create(null);
         firstMenu = null;
         items = result.parse(items);
-        items.map(getChildren);
+        migrate(result, items);
+        result.map(getChildren);
         var opened = data.getInstance("menu-opened");
         var historys = zimoli.getCurrentHistory();
         var map = {}, mmap = {};
         historys.forEach((a, i) => map[a] = i + 1);
-        result.splice(0, result.length);
         var actived, actived_value = 0;
-        var a = function (menu) {
+        var a = function (menu, i, arr) {
             var res = checkroles(user.roles, menu.roles);
-            if (res) {
-                if (savedChildren[menu.id] instanceof Array) menu.children = savedChildren[menu.id].filter(a);
+            if (!res) arr.splice(i, 1);
+            else {
+                if (savedChildren[menu.id] instanceof Array) {
+                    var children = savedChildren[menu.id];
+                    backEach(children, a);
+                    menu.children = children;
+                }
                 if (menu.path) {
                     if (!firstMenu) firstMenu = menu;
                     if (map[menu.path] > actived_value) {
@@ -161,7 +166,7 @@
             }
             return res;
         };
-        result.push.apply(result, items.filter(a));
+        backEach(result, a);
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
         var active = result.active;
         if (!active || result.indexOf(active) < 0) {

package/coms/pivot/plist.js

@@ -9,8 +9,7 @@ function plist() {
     var parse = function (a) {
         switch (typeof a) {
             case "string":
-                if (!title) title = a;
-                else if (!type) type = a;
+                if (!type) type = a;
                 else if (!edit_ref) edit_ref = a;
                 else idkey = a;
                 break;
@@ -31,11 +30,16 @@ function plist() {
                     } = a);
                 }
                 break;
+            case "function":
+                if (!title) title = a;
+                else if (!fields) fields = a;
+                else if (!options) options = a;
+                else if (!buttons) buttons = a;
         }
     }
     for (var a of arguments) parse(a);
     if (!fields) parse(this);
-    if (!idkey) idkey = fields[0].key;
+    if (!idkey) idkey = (isFunction(fields) ? fields() : fields)[0].key;
     return frame$list(title, {
         load() {
             return load(type, idkey);
@@ -49,8 +53,7 @@ function plist() {
     }, edit_ref ? edit_ref : function (o) {
         var p = pedit(title, type, o);
         p.initialStyle = popup.style;
-        popup(p, true);
-        move.setPosition(p, [.5, .5]);
+        popup(p, [.5, .5]);
         return p;
     });
 }

package/coms/zimoli/autodragchildren.js

@@ -353,7 +353,11 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var copyZIndex = function (e) {
                 e.style.zIndex = zIndex;
                 var z = zIndex - 1;
-                if (e.with) for (var w of e.with) w.style.zIndex = z;
+                var ws = e.with;
+                if (ws){
+                    if (isNode(ws)) ws = [ws];
+                    for (var w of ws) w.style.zIndex = z;
+                } 
             };
             if (zIndex > 2) {
                 previousElements.forEach(copyZIndex);

package/coms/zimoli/render.js

@@ -435,6 +435,7 @@ var ifset = function (shouldMount) {
                 e = c.$template = render(e);
                 e.$comment = c;
             }
+            c.with = [e];
         }
         else {
             remove(c.$template);

package/coms/zimoli/yousure.js

@@ -3,7 +3,11 @@
  * 确定就继续，取消就中断
  */
 function yousure(title = i18n`您确定要这么做吗？`, content = i18n`当前操作需要您再次确认`) {
-    var options = [button(i18n`确定` + "(Y)"), button(i18n`取消` + "(N)", "white")];
+    var options = isArray(content) ? content : arguments[2] || [button(i18n`确定` + "(Y)"), button(i18n`取消` + "(N)", "white")];
+    options = options.map(a => {
+        if (typeof a === 'string') a = button(a);
+        return a;
+    });
     options[0].tabindex = -1;
     options[1].tabindex = -1;
     var changeFocus = function (event) {

package/coms/zimoli/zimoli.js

@@ -430,7 +430,7 @@ function create(pagepath, args, from, needroles, zimolidata) {
             isRecover = isR;
             addGlobal(this, history_name, isRecover);
         }
-        _page.$reload = function () {
+        _page.$reload = _page.$reload || _page.reload || function () {
             var _page = create(pagepath, undefined, from, undefined, zimolidata);
             _page.mount(history_name, isRecover);
             return _page;
@@ -891,7 +891,7 @@ zimoli.enableTouchBack = function () {
         }
     }, 'x')
 };
-zimoli.reload = function () {
+var reloadFully = function () {
     for (var k in history) {
         var h = history[k];
         if (!h) continue;
@@ -913,6 +913,17 @@ zimoli.reload = function () {
     current_history = default_history;
     body = document.body;
     zimoli();
+}
+var reloadMounted = function () {
+    for (var k in global) {
+        var o = global[k];
+        if (!o || !o.$reload) continue;
+        if (isMounted(o)) o.$reload();
+    }
+}
+zimoli.reload = function (reloadAll = true) {
+    if (!reloadAll) reloadMounted();
+    else reloadFully();
 };
 zimoli.alert = function () {
     var ae = alert.apply(this, arguments);

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -179,10 +179,36 @@
         render.refresh(nlist);
     };
     var spacing = false;
+    var isEqual = function (a, b) {
+        return a === b || !a && !b;
+    };
+    var getNodeText = function (node) {
+        if (!node) return '';
+        if (node.nodeType === 3) return node.nodeValue;
+        if (node.nodeType === 1) return node.innerText;
+        return '';
+    }
     var getNodeAt = function (row, col) {
         var d = clist.at(row);
         if (!d) return [];
         var c = d.firstChild;
+        if (!spacing) {
+            var t = d.innerText;
+            var tbb = t.charAt(col - 3);
+            var tb = t.charAt(col - 2);
+            var ta = t.charAt(col - 1);
+            var tf = t.charAt(col);
+            var tff = t.charAt(col + 1);
+            if (ta === " " && isEqual(tb, anchorChar)) {
+                col++;
+            }
+            else if (isEqual(ta, anchorChar) && !isEqual(tb, anchorChar)) {
+                col++;
+            }
+            else if (anchorChar === " " && isEqual(ta, followChar) && !isEqual(tf, followChar)) {
+                col--;
+            }
+        }
         var inc = 0;
         while (c) {
             if (c.nodeType === 1) {
@@ -201,14 +227,10 @@
                 if (inc + tl > col) {
                     col -= inc;
                     inc = 0;
-                    if (!spacing && t.charAt(col - 1) === " ") {
-                        col++;
-                    }
                     break;
                 }
                 else if (inc + tl === col) {
-                    if (!spacing && t.charAt(col - inc - 1) === " ") col++;
-                    else break;
+                    break;
                 }
                 inc += tl;
                 c = c.nextSibling;
@@ -430,13 +452,17 @@
                         document.execCommand('forwardDelete');
                     }
                     else if (data in pairsmap) {
-                        if (inText || beforeText) return;
+                        if (inText) {
+                            if (/^'/.test(data)) return;
+                        }
                         patchAfter = pairsmap[data];
                     }
                 }
                 else {
                     if (data in pairsmap) {
-                        if (inText || beforeText) return;
+                        if (inText) {
+                            if (/^'/.test(data)) return;
+                        }
                         patchAfter = pairsmap[data];
                     }
                 }

package/docs/main.xht

@@ -172,8 +172,10 @@
 <div1 #content></div1>
 <open #switch @click="switchMenu()" insert></open>
 <script>
-    i18n.setReloader(zimoli.reload);
-    var menus = [
+    i18n.setReloader(function () {
+        initMenus();
+    });
+    var menus = () => [
         {
             name: i18n`efront简介`,
             children: [
@@ -214,12 +216,12 @@
             }
         ]);
     });
-    var initVersionInfo = async function () {
+    var initVersionInfo = async function (menus) {
         var xhr = await cross("get", "version");
         var version = xhr.response.split(",");
         menus[0].name += ` <v>${version[0]}</v>`;
     };
-    var initCommandsDocs = async function () {
+    var initCommandsDocs = async function (menus) {
         delete modules['docs$helps'];
         var helps = await init("docs$helps");
         var m = {
@@ -244,7 +246,7 @@
         });
         menus.splice(1, 0, m);
     };
-    var initComponentDocs = async function () {
+    var initComponentDocs = async function (menus) {
         var m = await cross("get", "components");
         m = JSON.parse(m.response);
         for (var c of m) {
@@ -280,17 +282,19 @@
         menus[2].children = m;
     };
     var initMenus = async function () {
-        menus[0].children.forEach(c => { c.path = "/mark/" + c.md });
-        zimoli.switch('', scope.content, menus[0].children[0].path);
-        await initVersionInfo();
-        await initCommandsDocs();
-        await initComponentDocs();
-        var route = await init("frame$route");
-        scope.menus = route.update(menus);
+        var ms = menus();
+        ms[0].children.forEach(c => { c.path = "/mark/" + c.md });
+        zimoli.switch('', scope.content, ms[0].children[0].path);
+        await initVersionInfo(ms);
+        await initCommandsDocs(ms);
+        await initComponentDocs(ms);
+        var route = frame$route;
+        scope.menus = route;
+        route.update(ms);
         route.open(route.active);
     };
     var scope = {
-        menus,
+        menus: [],
         div2(elem, scope) {
             if (scope.m.data?.mark) elem.setAttribute("mark", '');
             if (scope.m.data?.test) elem.setAttribute("test", '');
@@ -326,10 +330,10 @@
         drag.on(close, window);
     }
     render(page, scope);
-    var s = scrollbar();
+    var scrbar = scrollbar();
     on("mounted")(page, initMenus);
-    s.bindTarget(scope.content);
-    page.with = s;
+    scrbar.bindTarget(scope.content);
+    page.with = scrbar;
     resizingList.set(page, function () {
         if (page.adapted === true) return;
         if (calcPixel(page.offsetWidth) < 720) return;
@@ -338,7 +342,7 @@
     });
     bind("render")(page, function () {
         requestAnimationFrame(function () {
-            s.reshape();
+            scrbar.reshape();
         })
     });
     drag.on(scope.switch);

package/docs//345/221/275/344/273/244.xht

@@ -66,41 +66,42 @@
 </div>
 <script>
     var position = [.2, .2];
-    var page = view();
-    page.innerHTML = template;
-    once("append")(page, function () {
-        move.setPosition(this, position);
-    });
-    var scope = {
-        help: null,
-        dict: helps.topics,
-        cmds(elem, scope) {
-            var topics = scope.topics = [];
-            var cmds = scope.c.split(/\s+/).map(a => a.split("|"));
-            cmds = combine(...cmds).map(a => "<efront></efront>" + a.join("&ensp;")).join("<br/>");
-            elem.innerHTML = cmds.replace(/[A-Z]+(\_[A-Z]+)*/g, m => {
-                if (topics.indexOf(m) < 0) topics.push(m);
-                return `<w>${m}</w>`;
-            });
-        },
-        topic(elem, s) {
-            var topics = s.topics.filter(a => scope.dict[a]);
-            if (!topics.length) return;
-            elem.innerHTML = i18n`其中，` + topics.map(a => {
-                var d = scope.dict[a];
-                var t = i18n`${a}是${d[0]}`;
-                if (d.length > 1) t += i18n`，可取值有${d.slice(1).join('、')}`;
-                if (d.default) t += i18n`，默认值是${d.default}`;
-                return t;
-            }).join('；');
-        }
-    }
-    drag.on(page, page.firstElementChild);
-    resize.on(page);
-    render(page, scope);
     function main(dict) {
+        var page = view();
+        var helps = init('docs$helps');
+        once("append")(page, function () {
+            move.setPosition(this, position);
+        });
+        var scope = {
+            help: null,
+            dict: helps.topics,
+            cmds(elem, scope) {
+                var topics = scope.topics = [];
+                var cmds = scope.c.split(/\s+/).map(a => a.split("|"));
+                cmds = combine(...cmds).map(a => "<efront></efront>" + a.join("&ensp;")).join("<br/>");
+                elem.innerHTML = cmds.replace(/[A-Z]+(\_[A-Z]+)*/g, m => {
+                    if (topics.indexOf(m) < 0) topics.push(m);
+                    return `<w>${m}</w>`;
+                });
+            },
+            topic(elem, s) {
+                var topics = s.topics.filter(a => scope.dict[a]);
+                if (!topics.length) return;
+                elem.innerHTML = i18n`其中，` + topics.map(a => {
+                    var d = scope.dict[a];
+                    var t = i18n`${a}是${d[0]}`;
+                    if (d.length > 1) t += i18n`，可取值有${d.slice(1).join('、')}`;
+                    if (d.default) t += i18n`，默认值是${d.default}`;
+                    return t;
+                }).join('；');
+            }
+        }
         var [help] = helps.helps.filter(h => dict === h.info);
         scope.help = help;
+        drag.on(page, page.firstElementChild);
+        resize.on(page);
+        page.innerHTML = template;
+        render(page, scope);
         return page;
     }
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.24.1",
+    "version": "4.24.3",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {