efront 4.23.8 → 4.24.0

package/coms/zimoli/field.js

@@ -27,6 +27,7 @@ var reshape = function () {
     }
     if (!body) body = head;
     if (foot && body) {
+        console.log(foot)
         var right = foot.offsetWidth + 1;
         if (isInlineBlock && right < (this.break || body.offsetWidth >> 2)) {
             css(foot, {

package/coms/zimoli/field.less

@@ -6,7 +6,9 @@
     padding: 8px 0;
     border-bottom: 1px solid #0001;
 }
-
+&:empty{
+    display: none;
+}
 >.head,
 >.foot {
     padding: 2px 16px;

package/coms/zimoli/getCursorPosition.js

@@ -13,9 +13,9 @@ var getCursorPosition = function () {
         focusNode.nodeValue = nodeValue.slice(0, focusOffset);
         focusNode.parentNode.insertBefore(cursor, focusNode.nextSibling);
         position = getScreenPosition(cursor);
-        cursor.parentNode.removeChild(cursor);
         focusNode.nodeValue = nodeValue;
     }
+    if (cursor.parentNode) cursor.parentNode.removeChild(cursor);
     selection.setBaseAndExtent(anchorNode, anchorOffset, focusNode, focusOffset)
     return position;
 };

package/coms/zimoli/menu.js

@@ -187,7 +187,7 @@ function main() {
                         if (s.actived) {
                             elem.selected = s.actived;
                         }
-                        else if (direction === 't') {
+                        else if (direction === 't' || istag) {
                             elem.selected = s[0];
                             if (elem.selected) elem.selected.setActive(true);
                         }

package/coms/zimoli/menuItem.js

@@ -6,6 +6,8 @@ function main(elem, scope, hasIcon) {
     if (isObject(scope) && scope !== ms) {
     }
     else if (ms) {
+        var parentScopes = hasIcon;
+        hasIcon = null;
         var scope = ms;
     }
     var menu = scope;
@@ -21,7 +23,7 @@ function main(elem, scope, hasIcon) {
         checker,
     };
     if (hasIcon || menu.icon) scope.hasIcon = true;
-    render(item.children, scope);
+    render(item.children, scope, parentScopes);
     if (menu.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;
 }

package/coms/zimoli/prompt.js

@@ -17,6 +17,18 @@ var validate = function (text, checker, tip) {
     valid = settip(tip, valid);
     return valid;
 };
+var fixContainer = function (elem, ipt) {
+    var lastChild = ipt.lastChild;
+    if (!lastChild) return;
+    var deltaHeight = lastChild.offsetHeight + lastChild.offsetTop - ipt.clientHeight;
+    if (Math.abs(deltaHeight) < 1) return;
+    var offsetHeight = elem.offsetHeight;
+    var targetHeight = offsetHeight + deltaHeight;
+    if (targetHeight > innerHeight) targetHeight = +innerHeight;
+    else if (offsetHeight > 260 && targetHeight < 260) targetHeight = 260;
+    css(elem, { height: targetHeight });
+    move.fixPosition(elem);
+};
 function prompt() {
     var msg = i18n`请输入`, check, ipt;
     var opts = [];
@@ -53,30 +65,7 @@ function prompt() {
     var getValue = () => isFunction(ipt.getValue) ? ipt.getValue() : ipt.value;
     if (check || wrap) {
         var setDisable = function (event) {
-            var bd = c.body;
-            if (wrap && bd) {
-                if (p) move.setPosition(c, p);
-                var cp = getCursorPosition();
-                var bp = getScreenPosition(bd);
-                var s = getComputedStyle(ipt);
-                var pl = parseFloat(s.paddingLeft) * 2 + ipt.clientLeft + ipt.offsetLeft;
-                var pr = parseFloat(s.borderRightWidth) + parseFloat(s.paddingRight) * 2 + (bd.scrollWidth - ipt.offsetLeft - ipt.offsetWidth);
-                var pt = parseFloat(s.paddingTop) * 2 + ipt.clientTop + ipt.offsetTop;
-                var pb = parseFloat(s.borderBottomWidth) + parseFloat(s.paddingBottom) * 2 + (bd.scrollHeight - ipt.offsetTop - ipt.offsetHeight);
-
-                if (cp.left < bp.left + pl) {
-                    bd.scrollLeft -= bp.left + pl - cp.left;
-                }
-                if (cp.right > bp.right - pr) {
-                    bd.scrollLeft += cp.right + pr - bp.right;
-                }
-                if (cp.top < bp.top + pt) {
-                    bd.scrollTop -= bp.top + pt - cp.top;
-                }
-                if (cp.bottom > bp.bottom - pb) {
-                    bd.scrollTop += cp.bottom + pb - cp.bottom;
-                }
-            }
+            fixContainer(c, ipt);
             if (!check) return;
             var valid = validate(getValue(), check, tip);
             if (event) attr(body, "error", !valid);
@@ -120,11 +109,15 @@ function prompt() {
         oncemount(c, function () {
             requestAnimationFrame(function () {
                 p = move.getPosition(c);
+                css(c, {
+                    height: c.offsetHeight
+                });
             });
             once('dragend')(c, function () {
                 p = move.getPosition(c);
-            })
-        })
+            });
+        });
+        resize.on(c);
     }
     return c;
 }

package/coms/zimoli/prompt.less

@@ -12,23 +12,36 @@ tip {
     }
 }
 
-[body],
-.body {
-    >div {
+>[body],
+>.body {
+    height: 100%;
+    >[textarea] {
         height: 100%;
     }
-}
 
+    >.编辑框 {
+        margin: 0 -16px;
+        width: auto;
+        height: 100%;
+        >list{
+            min-height: auto;
+        }
+    }
+}
 textarea,
 [textarea] {
     width: 100%;
     resize: none;
+    border: 1px solid #ddd;
+
+    &:focus {
+        border-color: #09c;
+        outline: none;
+    }
 }
 
 >[body],
->.body {
-    max-height: 360px;
-}
+>.body {}
 
 [textarea] {
     min-height: 80px;

package/coms/zimoli/render.js

@@ -32,7 +32,8 @@ var createTemplateNodes = function (text) {
         this.with = [node];
         return;
     } else {
-        var node = document.createElement(this.parentNode.tagName || "div");
+        var parentNode = this.parentNode;
+        var node = parentNode ? parentNode.cloneNode(false) : document.createElement("div");
         node.innerHTML = text;
         this.with = Array.apply(null, node.childNodes);
     }
@@ -53,7 +54,10 @@ var createCloner = function (node) {
 };
 
 presets.template = function (t) {
-    var comment = document.createComment('template');
+    var comment = document.createComment('');
+    // <!--
+    comment = document.createComment('template');
+    // -->
     $scoped.set(comment, $scoped.get(t));
     $parented.set(comment, $parented.get(t));
     t.$comment = comment;
@@ -215,7 +219,10 @@ var createGetter = function (target, search, isprop = true) {
     return toUndefined;
 };
 var createComment = function (type, expression) {
-    var comment = document.createComment(`${type} ${expression}`);
+    var comment = document.createComment(``);
+    //<!--
+    comment = document.createComment(`${type} ${expression}`);
+    // -->
     $scoped.set(comment, $scoped.get(this));
     $structed.set(comment, $structed.get(this));
     $parented.set(comment, $parented.get(this));
@@ -402,9 +409,10 @@ var createRepeat = function (search, id = 0, struct) {
     initialComment(comment, renders, struct);
     return comment;
 };
+var $elements = new WeakMap;
 
 var ifget = function () {
-    var elements = this.$elements;
+    var elements = $elements.get(this);
     var shouldMount = -1;
     for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
         var getter = elements[cx + 1];
@@ -416,7 +424,7 @@ var ifget = function () {
     return shouldMount;
 }
 var ifset = function (shouldMount) {
-    var elements = this.$elements;
+    var elements = $elements.get(this);
     for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
         var c = elements[cx];
         if (cx === shouldMount) {
@@ -444,7 +452,7 @@ var createIf = function (search, id = 0, struct) {
     var renders = [new Binder2(ifget, ifset)];
     var comment = elements[0] = createComment.call(element, 'if', search);
     comment.$id = id;
-    comment.$elements = elements;
+    $elements.set(comment, elements);
     if (struct.once) renders.r1 = true;
     initialComment(comment, renders, struct);
     return comment;
@@ -771,8 +779,9 @@ var directives = {
         return src2.call(this, parsedSrc && /[\{\[\s]/.test(src) ? parsedSrc.srcName : src);
     },
     model(search, target, change) {
-        var getter = createGetter(this, search);
-        var setter = createSetter(this, search);
+        search = search.split(',');
+        var getter = search.length > 1 ? createGetter(this, search[0])(this) : createGetter(this, search[0]);
+        var setter = search.length > 1 ? createGetter(this, search[1] || search[0])(this) : createSetter(this, search[0]);
         var model = new Model(getter, setter, target);
         return model.hook(this, change !== false);
     },

package/coms/zimoli/selectList.js

@@ -173,7 +173,7 @@ function main() {
     })
     if (addable) {
         var adder = document.createElement("div");;
-        adder.innerHTML = "<a>添加</a><a>管理</a>";
+        adder.innerHTML = `<a>${i18n`添加`}</a><a>${i18n`管理`}</a>`;
         adder.setAttribute('insert', '');
         button(adder.firstChild);
         button(adder.children[1]);
@@ -182,10 +182,10 @@ function main() {
             var target = getTargetIn(this, event.target, false);
             switch (target) {
                 case this.children[0]:
-                    var a = prompt("请输入", a => {
+                    var a = prompt(i18n`请输入`, a => {
                         if (!a) return false;
                         if (a in itemMap) {
-                            return `选项 ${a} 已存在！`;
+                            return i18n`选项 ${a} 已存在！`;
                         }
                     });
                     page.with = a;

package/coms/zimoli/selectListEdit.html

@@ -1,15 +1,15 @@
 <div head>管理选项</div>
 <div body>
     <div>
-        <input placeholder="搜索或添加" v-model="search" @keydown.enter="add()" /><a @click="add()"
-            -if="search&&!filtered.hasFullmatch">添加</a>
+        <input placeholder="${i18n`搜索或添加`}" v-model="search" @keydown.enter="add()" /><a @click="add()"
+            -if="search&&!filtered.hasFullmatch">${i18n`添加`}</a>
     </div>
     <div class="item" -repeat="o in (search?filtered:options)">
         <span -html=o.name||o.innerHTML></span>
-        <a type="danger" @click="del(o)">删除</a>
+        <a type="danger" @click="del(o)">${i18n`删除`}</a>
     </div>
 </div>
 <div foot>
-    <btn @click="save()">确定</btn>
-    <btn type="white" @click="remove()">取消</btn>
+    <btn @click="save()">${i18n`确定`}</btn>
+    <btn type="white" @click="remove()">${i18n`取消`}</btn>
 </div>

package/coms/zimoli/yousure.js

@@ -2,8 +2,8 @@
 /**
  * 确定就继续，取消就中断
  */
-function yousure(title = "您确定要这么做吗？", content = "当前操作需要您再次确认") {
-    var options = [button("确定(Y)"), button("取消(N)", "white")];
+function yousure(title = i18n`您确定要这么做吗？`, content = i18n`当前操作需要您再次确认`) {
+    var options = [button(i18n`确定` + "(Y)"), button(i18n`取消` + "(N)", "white")];
     options[0].tabindex = -1;
     options[1].tabindex = -1;
     var changeFocus = function (event) {

package/coms/zimoli/zimoli.js

@@ -136,7 +136,11 @@ function go(pagepath, args, history_name, oldpagepath) {
         history_name.activate = pgpath;
         history_name.activateNode = page;
     }
-    else if (isString(pgpath)) {
+    if (!page) {
+        addGlobal(null, history_name, isRecover);
+        return;
+    }
+    if (isString(pgpath)) {
         page.disptch();
     }
     if (isRecover) setWithStyle(page, false);
@@ -151,6 +155,7 @@ var page_generators = {};
  */
 var loading_tree = {};
 var pathmaped = Object.create(null);
+var realmaped = Object.create(null);
 var getpgpath = function (pagepath) {
     pagepath = /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
     if (pagepath === 'main') pagepath = modules.efrontPath || "/main";
@@ -166,8 +171,10 @@ var getpgpath = function (pagepath) {
             for (var m of mparams) argobj[m] = params.pop();
             if (params.length) argobj[m] += "/" + params.reverse().join("/");
         }
+        pagepath = realmaped[pagepath] || pagepath;
         return [pagepath, argobj];
     }
+    pagepath = realmaped[pagepath] || pagepath;
     return [pagepath];
 };
 function createState(pgpath) {
@@ -479,12 +486,19 @@ var history = {};
 var current_history, default_history = current_history = "";
 history[current_history] = createEmptyHistory('/main', false);
 var history_session_object_key = `紫茉莉:${location_pathname}`;
-try {
-    history = JSAM.parse(historyStorage.getItem(history_session_object_key)) || history;
-} catch (e) {
-}
+var setStorage = function (storage) {
+    historyStorage = storage;
+    try {
+        var history1 = JSAM.parse(historyStorage.getItem(history_session_object_key));
+        if (history1 && history1.wlength === window_history.length) history = history1;
+        else savestate();
+    } catch (e) {
+    }
+};
+setStorage(historyStorage);
 var root_path;
 var savestate = function () {
+    history.wlength = window_history.length;
     historyStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
 };
 var pushstate = function (path_name, history_name) {
@@ -511,6 +525,7 @@ var pushstate = function (path_name, history_name) {
         if (_history[_history.index] !== path_name) {
             _history.splice(_history.index, _history.length - _history.index);
             _history[_history.index] = path_name;
+            index = _history.index;
         }
         _history.lastIndex = index;
     }
@@ -671,7 +686,7 @@ function addGlobal(element, name = null, isBack) {
             if (oldElement) {
                 var oldPrev = oldElement.previousSibling, oldPare = oldElement.parentNode;
                 remove(oldElement);
-                oldElement = oldPrev || oldPare.firstChild;
+                oldElement = oldPrev || oldPare?.firstChild;
             }
             if (isBack || !oldElement) appendChild.insert(body, element);
             else appendChild.after(oldElement, element);
@@ -750,20 +765,15 @@ remove.transition = transition;
 zimoli.prepare = prepare;
 var upwith = [];
 zimoli.upwith = popup.upwith(upwith);
-zimoli.setStorage = function (storage) {
-    historyStorage = storage;
-    try {
-        history = JSAM.parse(historyStorage.getItem(history_session_object_key)) || history;
-    } catch (e) {
-    }
-};
-zimoli.register = function (pathlike) {
+zimoli.setStorage = setStorage;
+zimoli.register = function (pathlike, realpath) {
     var params = [];
     pathlike = pathlike.replace(/\/\:([^\/\:\-]+)/g, function (_, id) {
         params.push(id);
         return '';
     });
     pathmaped[pathlike] = params;
+    if (realpath) realmaped[pathlike] = realpath;
 };
 zimoli.clearHistory = function () {
     historyStorage.removeItem(history_session_object_key);
@@ -881,6 +891,29 @@ zimoli.enableTouchBack = function () {
         }
     }, 'x')
 };
+zimoli.reload = function () {
+    for (var k in history) {
+        var h = history[k];
+        if (!h) continue;
+        if (h instanceof Array) h.forEach(a => {
+            [a] = getpgpath(a);
+            delete modules[a];
+            delete page_generators[a];
+        })
+        var g = global[k];
+        if (g) remove(g);
+        delete global[k];
+
+    }
+    var loginpath = user.loginPath;
+    if (loginpath) {
+        delete modules[loginpath];
+        delete page_generators[loginpath];
+    }
+    current_history = default_history;
+    body = document.body;
+    zimoli();
+};
 zimoli.alert = function () {
     var ae = alert.apply(this, arguments);
     zimoli.upwith(ae.parentNode);

package/coms//350/214/250/350/217/260/tab.js

@@ -137,6 +137,7 @@ return function (elem, forcetab) {
         return;
     }
     if (forcetab === false) {
+        if (!rowNode) return;
         if (!rowNode.innerText) remove(rowNode.childNodes);
         [parentNode, child, spaceSize] = getPrevEnsp(rowNode);
         if (!spaceSize) return;

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

@@ -5,6 +5,8 @@
         border-bottom: 0;
         display: block;
         padding: 0;
+        max-height: 100%;
+        min-height: 6em;
     }
 
     &.noinput {
@@ -33,7 +35,6 @@
             >[clist] {
                 display: inline-block;
                 vertical-align: top;
-                min-height: 100%;
                 outline: none;
 
                 >n,
@@ -48,7 +49,7 @@
                 margin-left:-@{w}em;
                 border-left: @{w}em solid transparent;
                 width: 100%;
-                overflow-x: scroll;
+                overflow-x: auto;
             }
 
             >[nlist] {
@@ -73,6 +74,7 @@
 
     >list {
         display: inline-block;
+        min-height: 100%;
         border-top: 6px solid #2c2d2c;
 
         &[nlist] {
@@ -80,6 +82,10 @@
             border-color: #222;
         }
 
+        &[clist] {
+            border-right: 2px solid transparent;
+        }
+
         >d {
             outline: none;
             border: none;
@@ -104,7 +110,7 @@
     <list contenteditable="false" nlist# :src="(r,i) in coderows" -style="{height:codeHeight}">
         <n current:="isCurrent(i)" -bind="i+1"></n>
     </list>
-    <list clist# contenteditable="true" :src="(r,i) in coderows" -style="{height:codeHeight}">
+    <list clist# body contenteditable="true" :src="(r,i) in coderows" -style="{height:codeHeight}">
         <d -html="r"></d>
     </list>
 </编辑框>
@@ -130,8 +136,10 @@
             if (typeof text === 'string') coder.innerHTML = 渲染.encode(text);
         }
     });
-    var refresh = function () {
-        codeHeight = coderows.length * 1.36 + 10 + 'em';
+    var reshape = function () {
+        codeHeight = coderows.length * 1.36 + 2;
+        if (codeHeight < 6) codeHeight = 6;
+        codeHeight += 'em';
         codeSpan = (coderows.length).toString().length;
     };
     on('scroll')(coder, function () {
@@ -142,7 +150,7 @@
         if (!selection) return false;
         return i >= selection[0] && i <= selection[2];
     };
-    var coderows = [], codetext = '';
+    var coderows = [""], codetext = '';
     coder.setValue = async function (text) {
         codetext = text;
         var id = ++coderid;
@@ -151,7 +159,7 @@
         coderows = colored;
         codeHistory = [[codetext]];
         historyIndex = 0;
-        refresh();
+        reshape();
         render.refresh(coder);
     };
     coder.getValue = function () {
@@ -200,17 +208,37 @@
         if (!c) return [d, d.childNodes.length];
         return [c, col - inc];
     }
+    var anchor = document.createElement('span');
     var unmarkAnchorOffset = function () {
         if (!selection) return;
         var [an, ai, fn, fi] = selection;
         [fn, fi] = getNodeAt(fn, fi);
         [an, ai] = fn === an && fi === ai ? [fn, fi] : getNodeAt(an, ai);
-        document_selection.setBaseAndExtent(an, ai, fn, fi);
+        if (an && an === fn && ai === fi) {
+            var d = getTargetIn(clist, an, false);
+            if (an === d) {
+                d.insertBefore(anchor, d.childNodes[ai]);
+            }
+            else {
+                an.parentNode.insertBefore(anchor, an.nextSibling);
+            }
+            if (anchor.offsetLeft > clist.clientWidth + clist.scrollLeft + d.offsetLeft) {
+                clist.scrollLeft = anchor.offsetLeft - clist.clientWidth + 6;
+            }
+            else if (anchor.offsetLeft < clist.scrollLeft) {
+                clist.scrollLeft = anchor.offsetLeft;
+            }
+            anchor.parentNode.removeChild(anchor);
+            if (d.offsetTop < coder.scrollTop + clist.offsetTop) {
+                coder.scrollTop = d.offsetTop - clist.offsetTop;
+            }
+        }
+        if (an && fn) document_selection.setBaseAndExtent(an, ai, fn, fi);
     }
     var trimspace = (_, a) => a ? "" : " ";
     var 更新 = function () {
         var { scrollTop, scrollLeft } = clist;
-        refresh();
+        reshape();
         render.refresh(coder);
         clist.scrollTop = scrollTop;
         clist.scrollLeft = scrollLeft;
@@ -220,6 +248,8 @@
     var fixpace = function (event) {
         event.preventDefault();
         insertText(' ', false);
+        markAnchorOffset();
+        unmarkAnchorOffset();
     };
     var updatechar = function (event) {
         if (event.defaultPrevented) return;
@@ -242,6 +272,7 @@
                 }
                 else {
                     anchorNode = anchorNode.previousSibling;
+                    if (!anchorNode) return;
                     if (anchorNode.nodeType === 1) anchorOffset = anchorNode.childNodes.length;
                     else anchorOffset = anchorNode.nodeValue.length;
                 }
@@ -318,7 +349,7 @@
         var [k, p] = a.split('');
         pairsmap[k] = p;
     });
-    var codeHistory = [""];
+    var codeHistory = [[""]];
     var historyIndex = 0;
     var getRow = function (node) {
         var d = getTargetIn(clist, node, false);
@@ -545,5 +576,13 @@
     on('keydown.ctrl.z.prevent.only')(coder, undo);
     on('keydown.ctrl.shift.z.prevent.only')(coder, redo);
     on('keydown.ctrl.y.prevent.only')(coder, redo);
-    on('keydown')(coder, updatechar)
+    on('keydown.backspace')(coder, function (event) {
+        var { firstChild, lastChild } = clist;
+        if (firstChild === lastChild && !firstChild.childNodes.length) {
+            event.preventDefault();
+            return;
+        }
+    });
+    on('keydown')(coder, updatechar);
+    reshape();
 </script>

package/docs/main.xht

@@ -154,22 +154,33 @@
             padding: 0px !important;
         }
     }
+
+    &>menu {
+        >i18n-chooser {
+            display: block;
+            z-index: 2;
+            position: relative;
+            background: inherit;
+        }
+    }
 </style>
 
 <menu #mulu open@="menued" inline -src="m in menus" @active="openMenu(m)">
+    <i18n-chooser insert></i18n-chooser>
     <div2></div2>
 </menu>
 <div1 #content></div1>
 <open #switch @click="switchMenu()" insert></open>
 <script>
+    i18n.setReloader(zimoli.reload);
     var menus = [
         {
             name: i18n`efront简介`,
             children: [
-                { name: i18n`使用说明`, md: i18n`readme.md` },
-                { name: i18n`兼容性说明`, md: i18n`coms/basic_/readme.md` },
-                { name: i18n`版本说明`, md: i18n`docs/版本说明.md` },
-                { name: i18n`与前端框架对比`, md: i18n`docs/compare.md` },
+                { name: i18n`使用说明`, id: 'readme', md: i18n`readme.md` },
+                { name: i18n`兼容性说明`, id: 'adaption', md: i18n`coms/basic_/readme.md` },
+                { name: i18n`版本说明`, id: 'version', md: i18n`docs/版本说明.md` },
+                { name: i18n`与前端框架对比`, id: 'compare', md: i18n`docs/compare.md` },
                 // { name: i18n`notive`, md: "docs/notive.md" },
             ]
         },
@@ -209,6 +220,7 @@
         menus[0].name += ` <v>${version[0]}</v>`;
     };
     var initCommandsDocs = async function () {
+        delete modules['docs$helps'];
         var helps = await init("docs$helps");
         var m = {
             name: i18n`命令参考`,
@@ -225,6 +237,7 @@
             a.children = helps.helps.filter(h => h.type === a.a);
             a.children.forEach(c => {
                 c.name = c.info;
+                c.id = c.cmds[0];
                 c.path = `/命令/${c.name}`;
             });
             a.closed = true;
@@ -274,8 +287,7 @@
         await initComponentDocs();
         var route = await init("frame$route");
         scope.menus = route.update(menus);
-        zimoli();
-        render.refresh();
+        route.open(route.active);
     };
     var scope = {
         menus,
@@ -286,6 +298,7 @@
         },
         grid,
         menu,
+        i18nChooser,
         menued: false,
         switchMenu() {
             scope.menued = !scope.menued;