efront 4.24.2 → 4.25.0

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/moveupon.js

@@ -29,7 +29,9 @@ if (/Firefox/.test(navigator.userAgent)) on('dragstart')(document, function (e)
         return false;
     }
 });
-var locktouch = function (target) {
+var locktouch = function (target, handles) {
+    var resizing = moveupon.resizing;
+    if (resizing) return resizing !== handles;
     if (target.resizable) return false;
     if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => String(a.contentEditable) === 'true' || a.draggable, target)) {
         return true;
@@ -49,7 +51,8 @@ var locktouch = function (target) {
     }
 };
 
-function moveupon(target, { start, move, end }, initialEvent) {
+function moveupon(target, handles, initialEvent) {
+    var { start, move, end } = handles;
     var touchLocked = false;
     var offmouseup, offtouchend, offtouchcancel;
     var mousemove = function (event) {
@@ -83,7 +86,7 @@ function moveupon(target, { start, move, end }, initialEvent) {
     };
 
     if (initialEvent) {
-        if (locktouch(initialEvent.target)) return;
+        if (locktouch(initialEvent.target, handles)) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
             initialEvent.preventDefault();
@@ -96,14 +99,14 @@ function moveupon(target, { start, move, end }, initialEvent) {
     }
     onmousedown(target, function (event) {
         if (touchLocked) return;
-        if (locktouch(event.target)) return;
+        if (locktouch(event.target, handles)) return;
         touchLocked = true;
         hookmouse(event);
         if (isFunction(start)) start.call(this, event);
     });
     ontouchstart(target, function (event) {
         if (touchLocked) return;
-        if (locktouch(event.target)) return;
+        if (locktouch(event.target, handles)) return;
         touchLocked = true;
         extendTouchEvent(event);
         hooktouch(event);

package/coms/zimoli/prompt.js

@@ -42,6 +42,7 @@ function prompt() {
         else if (isFunction(arg) || arg instanceof RegExp) check = arg;
         else if (isObject(arg)) {
             if (isFunction(arg.test)) check = arg;
+            if (isFunction(arg.check)) check = arg.check;
             if (isFunction(arg.submit)) submit = arg;
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
             if (isHandled(arg.value)) value = arg.value;

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/resize.js

@@ -1,5 +1,7 @@
 var resizingElements = [];
+var currentResizing = null;
 var getResizer = function (event) {
+    moveupon.resizing = null;
     if (dragging) return;
     var rect = getTargetIn(a => ~resizingElements.indexOf(a), event.target);
     if (!rect) {
@@ -46,6 +48,7 @@ var getResizer = function (event) {
         resize.height = parseFloat(computedStyle.height);
         resize.rect = rect;
         resize.cursor = fringe.cursor;
+        moveupon.resizing = handle;
         return resize;
     }
 };

package/coms/zimoli/tree.js

@@ -201,6 +201,7 @@ function tree() {
                 css(banner, { paddingBottom: '' });
             };
             var time = size => (Math.log(-size / 30 + 2) * 100 | 0) / 1000;
+            var maxAnimateHeight = Math.min(element.clientHeight >> 1, screen.height >> 1) || 100;
             if (com.isClosed() && com.length) {
                 z0();
                 setState(true);
@@ -213,6 +214,7 @@ function tree() {
                 } else {
                     marginTop = top.offsetTop - bottom.offsetTop - bottom.offsetHeight;
                 }
+                if (maxAnimateHeight && marginTop < -maxAnimateHeight) marginTop = -maxAnimateHeight | 0;
                 var res = transition(top, {
                     transition: `margin-top ${time(marginTop)}s ease-out`,
                     marginTop: fromOffset(marginTop)
@@ -231,7 +233,8 @@ function tree() {
                 }
                 setState(false);
                 z0();
-                var paddingBottom = -margin_top;
+                var maxAnimateHeight = 100;
+                if (maxAnimateHeight && margin_top < -maxAnimateHeight) margin_top = -maxAnimateHeight | 0;
                 var res = transition(change_elem, { transition: `margin-top ${time(margin_top)}s ease-out`, marginTop: fromOffset(margin_top) }, false);
                 timeout(z1, res + 60);
             }

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//346/240/207/347/255/276/345/214/226.js

@@ -50,17 +50,22 @@ var codecolor = function (c, encode) {
         isConstValue = a => strap_reg.test(a) || value_reg.test(a);
     }
     var isInvoke = function (o) {
-        var o = o.next;
+        var p = o.prev;
+        if (p?.type === STRAP && /^(invoke|call)$/i.test(p.text)) return true;
+        o = o.next;
+        if (o?.type === STRAP && /^(proc|endp)$/i.test(o.text)) return true;
         if (o?.type === EXPRESS && needhead_reg.test(o.text)) o = o.next;
         if (o?.type === ELEMENT && o.istype) o = o.next;
         if (o?.type === STAMP && o.needle) o = o.next;
         if (o?.type === SCOPED && o.entry === "(") return true;
+
         return false;
     };
     var setExpress = function (o, label) {
         if (!o.text || o.wraped) return;
         o.wraped = true;
         var keys = o.text.split(".");
+        if (!keys[0] && keys.length > 1) keys.shift(), keys[0] = "." + keys[0];
         var invoked = null;
         var endi = keys.length - 1;
         if (isInvoke(o)) {
@@ -86,7 +91,7 @@ var codecolor = function (c, encode) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
     if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
-    if (spaceReg) var unspaceReg = new RegExp(`(?:${spaces.avoid(光标)}+)`, 'g');
+    if (spaceReg) var unspaceReg = new RegExp(`(?:${spaces.avoid(光标)})+`, 'g');
     var wraptext = function (t, l) {
         if (unspaceReg) t = t.replace(unspaceReg, a => {
             if (encode) a = encode(a);
@@ -159,7 +164,6 @@ var codecolor = function (c, encode) {
                     setExpress(o, 'method');
                 }
                 else setExpress(o, 'property');
-
                 break;
             case EXPRESS:
                 setExpress(o, o.istype || o.isdef || o.next?.needle ? 'predef' : 'express');

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

@@ -202,7 +202,7 @@
             if (ta === " " && isEqual(tb, anchorChar)) {
                 col++;
             }
-            else if (isEqual(ta, anchorChar) && !isEqual(tb, anchorChar)) {
+            else if (anchorChar && tb && isEqual(ta, anchorChar) && !isEqual(tb, anchorChar)) {
                 col++;
             }
             else if (anchorChar === " " && isEqual(ta, followChar) && !isEqual(tf, followChar)) {
@@ -286,6 +286,8 @@
     };
     var updatechar = function (event) {
         if (event.defaultPrevented) return;
+        anchorChar = "";
+        followChar = '';
         coderid++;
         var { anchorNode, anchorOffset } = document_selection;
         if (!coder || !anchorNode) return;
@@ -452,7 +454,7 @@
                         document.execCommand('forwardDelete');
                     }
                     else if (data in pairsmap) {
-                        if (inText) {
+                        if (inText && anchorChar) {
                             if (/^'/.test(data)) return;
                         }
                         patchAfter = pairsmap[data];
@@ -460,7 +462,7 @@
                 }
                 else {
                     if (data in pairsmap) {
-                        if (inText) {
+                        if (inText && anchorChar) {
                             if (/^'/.test(data)) return;
                         }
                         patchAfter = pairsmap[data];
@@ -482,6 +484,7 @@
         }
         if (patchAfter) {
             insertText(patchAfter, true);
+            followChar = patchAfter;
             markAnchorOffset();
         }
         return patchAfter;

package/coms//350/214/250/350/217/260//350/257/255/350/250/200.js

@@ -1,26 +1,5 @@
 var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
-var asm = new compile$Javascript;
-asm.straps = [
-    "include", "includelib",
-    "typedef",
-    "proto",
-    'equ', "and", 'or', 'not', "sizeof",
-    "invoke", "offset", 'addr',
-    "end", "start",
-    "proc", "endp", "uses",
-    "macro", 'struct', "ends",
-    ".if", ".elseif", '.else', '.break', '.endif', '.while', '.endw', "db", 'real4', 'real8', 'dw', 'dd', 'dq', 'byte', 'word', 'dword', 'qword', 'tword', 'dt',
-];
-asm.control_reg = /^\.[\w]+$/;
-asm.stamps = [",", ":", "<", ">", "=", "&", "|", "*", "~", "!", "+", "-", '/'];
-asm.quotes = [
-    ["'", "'"],
-    ['"', '"']
-];
-asm.comments = [
-    [";", /(?=[\r\n\u2028\u2029])/]
-];
-
+var asm = new compile$Asm;
 var go = new compile$Javascript;
 go.straps = ["var", 'for', 'package', "import", 'type', 'func', 'struct', 'return', 'go', 'const', 'if', 'else', 'switch', 'case', 'default', 'range'];
 go.istype = function (o) {

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.2",
+    "version": "4.25.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {