efront 4.23.8 → 4.23.9

package/apps/pivot/db/edit.xht

@@ -80,7 +80,6 @@
     var modify = async function (m) {
         var elem = document.createElement('jsoncode');
         elem.type = 'json';
-        elem.contentEditable = true;
         elem.setAttribute('nodrag', '');
         茨菰$编辑框(elem);
         elem.setValue(JSON.stringify(m, null, 4));
@@ -105,9 +104,9 @@
     var add = async function () {
         var elem = document.createElement('jsoncode');
         elem.type = 'json';
-        elem.contentEditable = true;
+        茨菰$编辑框(elem);
         var changed = false;
-        await prompt(茨菰$编辑框(elem), '输入JSON格式的数据', function (text) {
+        await prompt(elem, '输入JSON格式的数据', function (text) {
             try {
                 JSON.parse(text);
                 return true;

package/coms/compile/translate.js

@@ -156,11 +156,19 @@ function translate([imap, supports], code) {
                         var a = v.replace(/^[\$&]+/, '');
                         var a = (a << 1) - 1;
                         if (a in t) v = t[a];
-                        else v = scanner2(JSON.stringify(v));
+                        else v = scanner2(`(${JSON.stringify(v)})`)[0];
                     }
                     else if (/^(name|holder|comment)$/.test(k)) v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
-                    else v = scanner2(JSON.stringify(v));
-                    o.push({ type: PROPERTY, isprop: true, text: JSON.stringify(k) }, { type: STAMP, text: ':' }, ...v, { type: STAMP, text: ',' });
+                    else v = scanner2(`(${JSON.stringify(v)})`)[0];
+                    o.push({
+                        type: PROPERTY,
+                        isprop: true,
+                        text: JSON.stringify(k),
+                    }, {
+                        type: STAMP, text: ':'
+                    }, ...v, {
+                        type: STAMP, text: ','
+                    });
                 })
                 o.pop();
                 setqueue(o);

package/coms/zimoli/confirm.js

@@ -56,7 +56,13 @@ function confirm() {
         element.style.width = fromPixel(width + 260);
         body.innerHTML = message;
     } else if (isNode(message)) {
-        appendChild(body, message);
+        if (message.nodeType === 1) {
+            addClass(message, 'body');
+            appendChild.replace(body, message);
+        }
+        else {
+            appendChild(body, message);
+        }
     } else {
         throw new Error(i18n`消息体不合法！`);
     }

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/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;

package/coms/zimoli/zimoli.js

@@ -128,6 +128,7 @@ function go(pagepath, args, history_name, oldpagepath) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
     var page = create(pagepath, args, oldpagepath, roles, params, history_name);
+    if (!page) return;
     zimoliad = zimoliid;
     var isRecover = pushstate(pagepath, history_name, oldpagepath);
     if (isNode(history_name)) {
@@ -511,6 +512,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;
     }

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//347/273/204/344/273/266.xht

@@ -10,7 +10,7 @@
         z-index: 2;
     }
 
-    [body] {
+    >[body] {
         border-top: 42px solid transparent;
         padding-top: 40px;
         overflow: auto;

package/package.json

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