efront 4.24.0 → 4.24.2

package/apps/pivot/task/invoke.less

@@ -13,6 +13,7 @@
     >jscode,
     >pre {
         height: 100%;
+        margin: 0;
     }
 
     &.top {
@@ -23,7 +24,8 @@
 
     &.left,
     &.right {
-        height: 100%;
+        border-radius: 0;
+        height: 260px;
         width: 50%;
     }
 

package/coms/basic/parseURL.js

@@ -17,8 +17,8 @@
 // │                                              href                                              │
 // └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
-// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6------------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
-var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[^\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
+// -------/// ----------------1----------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6----------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
+var reg = /^([^\:\/\\\?#\[\.]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[^\@\/\\\?#]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
 class URL {
     resolve(url) {
         var u = new URL;

package/coms/basic/parseURL_test.js

@@ -1,5 +1,5 @@
 var parseURL = require("./parseURL");
-require("../efront/console");
+var console = efront$console;
 var test = function (url, key, value) {
     var parsed = parseURL(url);
     if (parsed[key] !== value) console.log(parsed), console.fail(`url:${url}, key:${key}, expect:${value}, result:${parsed[key]}`);
@@ -50,6 +50,7 @@ test("http://[::]/", "host", "[::]")
 test("http://[::%12]/", "host", "[::%12]")
 test("http://[::]:80/", "hostname", "[::]")
 test("[::]:80/", "hostname", "[::]")
+test("[::ffff:127.0.0.1]:80/", "hostname", "[::ffff:127.0.0.1]")
 test("[fd64:f52:f52:f52:f52:f52:f52:97]", "hostname", "[fd64:f52:f52:f52:f52:f52:f52:97]")
 test("./cluster-opt.html", "pathname", "./cluster-opt.html")
 test(":cluster-opt.html", "pathname", ":cluster-opt.html")

package/coms/compile/translate.js

@@ -158,6 +158,29 @@ function translate([imap, supports], code) {
                         if (a in t) v = t[a];
                         else v = scanner2(`(${JSON.stringify(v)})`)[0];
                     }
+                    else if (k === 'options') {
+                        if (v instanceof Array) {
+                            var a = scanner2(`[]`);
+                            v.map(function (o) {
+                                var name = o.name;
+                                if (!name) return scanner2(`(${JSON.stringify(o)})`)[0];
+                                delete o.name;
+                                name = ctn('i18n' + getm(name, t.nodup, t.warn), t);
+                                o = scanner2(`(${JSON.stringify(o)})`)[0];
+                                splice(o[0], 0, 0,
+                                    { type: PROPERTY, isprop: true, text: `"name"` },
+                                    { type: STAMP, text: ":" }, ...name,
+                                    { type: STAMP, text: "," });
+                                setqueue(o);
+                                return o;
+                            }).forEach(function (o) {
+                                a[0].push(...o, { type: STAMP, text: ',' });
+                            });
+                            a[0].pop();
+                            setqueue(a);
+                            v = a;
+                        }
+                    }
                     else if (/^(name|holder|comment)$/.test(k)) v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
                     else v = scanner2(`(${JSON.stringify(v)})`)[0];
                     o.push({

package/coms/explorer/context.js

@@ -60,7 +60,7 @@ var popupEdit = function ($scope, active) {
 };
 return extend([
     {
-        name: i18n`返回(O)`,
+        name: i18n`返回` + `(O)`,
         hotkey: "backspace",
         when: never,
         do() {
@@ -68,7 +68,7 @@ return extend([
         }
     },
     {
-        name: i18n`打开(O)`,
+        name: i18n`打开` + `(O)`,
         hotkey: "Enter",
         when: never,
         do(d) {
@@ -78,7 +78,7 @@ return extend([
         }
     },
     {
-        name: i18n`剪切(C)`,
+        name: i18n`剪切` + `(C)`,
         hotkey: "Ctrl+X",
         when: getStable,
         do(d) {
@@ -88,7 +88,7 @@ return extend([
         }
     },
     {
-        name: i18n`复制(R)`,
+        name: i18n`复制` + `(R)`,
         hotkey: "Ctrl+C",
         when: getStable,
         do(d) {
@@ -98,7 +98,7 @@ return extend([
         }
     },
     {
-        name: i18n`全选(A)`,
+        name: i18n`全选` + `(A)`,
         hotkey: "Ctrl+A",
         when: never,
         do(d) {
@@ -108,11 +108,11 @@ return extend([
         }
     },
     {
-        name: i18n`替换(R)`,
+        name: i18n`替换` + `(R)`,
         when: never,
     },
     {
-        name: i18n`粘贴(V)`,
+        name: i18n`粘贴` + `(V)`,
         hotkey: "Ctrl+V",
         when(e) {
             var copyed = getPageScope(e.target).copyed;
@@ -162,12 +162,12 @@ return extend([
         }
     },
     {
-        name: i18n`新建文件夹(D)`,
+        name: i18n`新建文件夹` + `(D)`,
         when: notGetActive,
         do: popupAdd
     },
     {
-        name: i18n`添加文件(F)`,
+        name: i18n`添加文件` + `(F)`,
         when: notGetActive,
         async do(d) {
             var $scope = getPageScope(d);
@@ -176,13 +176,13 @@ return extend([
     },
     {
         hotkey: "F2",
-        name: i18n`重命名(R)`,
+        name: i18n`重命名` + `(R)`,
         when: getStable,
         do: popupRen
     },
     {
         get name() {
-            return this.confirm ? i18n`确认删除(D)` : i18n`删除(D)`;
+            return this.confirm ? i18n`确认删除` + `(D)` : i18n`删除` + `(D)`;
         },
         hotkey: "Shift+Del",
         confirm: false,

package/coms/frame/dict.js

@@ -1,6 +1,6 @@
 function main(types, elem) {
     var { field, data, readonly } = elem;
-    elem.innerHTML = `<span -text="text()"></span>` + (readonly ? "" : '<a @click="edit()">修改</a>');
+    elem.innerHTML = `<span -text="text()"></span>` + (readonly ? "" : `<a @click="edit()">${i18n`修改`}</a>`);
     renderWithDefaults(elem.children, {
         text() {
             if (data[field.key]) return data[field.key].map(k => `${k.name} ${isEmpty(k.key) ? "" : `(${k.key})`}`).join(", ");

package/coms/frame/edit.html

@@ -1,11 +1,11 @@
 <div head>
-    <span v-text="origin?'修改':'添加'"></span><span -text="title"></span>
+    <span v-text="origin?'${i18n`修改`}':'${i18n`添加`}'"></span><span -text="title"></span>
 </div>
 <div body>
     <field v-if="!f.hidden" -repeat="f in fields" ng-src="[f,data]"></field>
 </div>
 <scrollbar></scrollbar>
 <div foot>
-    <btn @click="remove()" class="white">取消</btn>
-    <button type="submit">保存</button>
+    <btn @click="remove()" class="white">${i18n`取消`}</btn>
+    <button type="submit">${i18n`保存`}</button>
 </div>

package/coms/frame/list.js

@@ -27,7 +27,7 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
     page.innerHTML = template;
     var options = [
         {
-            name: "修改",
+            name: i18n`修改`,
             async do(o) {
                 await edit(o);
             },
@@ -35,7 +35,7 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
         {
             type: "danger",
             name(o) {
-                return this.confirm === o ? "确认删除" : "删除";
+                return this.confirm === o ? i18n`确认删除` : i18n`删除`;
             },
             type(o) {
                 return this.confirm === o ? "dark" : "danger";

package/coms/frame/route.js

@@ -207,7 +207,6 @@
         var menu = getChild(zimoli);
         if (!menu) return;
         if (menu !== result.active) {
-            console.log(zimoli, menu);
             setActive(result.active, false);
             setActive(menu, true);
             result.active = menu;

package/coms/pivot/server-status.js

@@ -0,0 +1 @@
+data.from("status");

package/coms/reptile/cross.js

@@ -44,6 +44,7 @@ var cross = cross_.bind(function (callback, onerror) {
                 data = Buffer.from(data);
                 this.headers["Content-Length"] = data.length;
             }
+            if (/^\[/.test(hostname)) hostname = hostname.replace(/^\[(.*?)\]$/, "$1");
             var options = {
                 method: this.method,
                 hostname,

package/coms/zimoli/prompt.less

@@ -15,6 +15,7 @@ tip {
 >[body],
 >.body {
     height: 100%;
+
     >[textarea] {
         height: 100%;
     }
@@ -23,11 +24,12 @@ tip {
         margin: 0 -16px;
         width: auto;
         height: 100%;
-        >list{
+        >list {
             min-height: auto;
         }
     }
 }
+
 textarea,
 [textarea] {
     width: 100%;

package/coms/zimoli/table.js

@@ -627,7 +627,7 @@ function table(elem) {
             render.digest();
         };
     })
-    var tableScopes = render.getScopes(this);
+    var tableScopes = render.getScopes(table);
     autodragchildren(
         table,
         cellMatchManager,

package/coms/zimoli/table.less

@@ -249,8 +249,7 @@ thead {
 tbody,
 [tbody] {
 
-    [type=jscode],
-    [type=function] {
+    [type=jscode] {
         display: -webkit-box;
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 2;

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//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -36,12 +36,6 @@
                 display: inline-block;
                 vertical-align: top;
                 outline: none;
-
-                >n,
-                >d {
-                    display: block;
-                }
-
             }
 
             >[clist] {
@@ -90,6 +84,14 @@
             outline: none;
             border: none;
 
+            &:after {
+                content: "";
+                pointer-events: none;
+                user-select: none;
+                display: inline-block;
+                width: 16px;
+            }
+
             &:focus {
                 outline: 1px solid #fff3;
             }
@@ -110,13 +112,19 @@
     <list contenteditable="false" nlist# :src="(r,i) in coderows" -style="{height:codeHeight}">
         <n current:="isCurrent(i)" -bind="i+1"></n>
     </list>
-    <list clist# body contenteditable="true" :src="(r,i) in coderows" -style="{height:codeHeight}">
+    <list clist# body contenteditable:="contenteditable" :src="(r,i) in coderows" -style="{height:codeHeight}">
         <d -html="r"></d>
     </list>
 </编辑框>
 <script>
     var coder = this;
     vbox(this);
+    var contenteditable = !this.readonly;
+    watch(coder, {
+        readonly(v) {
+            contenteditable = !v;
+        }
+    })
     if (!('oninput' in document)) {
         on('focus')(this, function () {
             if (this.contentEditable) addClass(this, "noinput");
@@ -170,10 +178,37 @@
         selection = getSelection();
         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) {
@@ -192,14 +227,10 @@
                 if (inc + tl > col) {
                     col -= inc;
                     inc = 0;
-                    if (t.charAt(col - 1) === " ") {
-                        col++;
-                    }
                     break;
                 }
                 else if (inc + tl === col) {
-                    if (t.charAt(col - inc - 1) === " ") col++;
-                    else break;
+                    break;
                 }
                 inc += tl;
                 c = c.nextSibling;
@@ -246,10 +277,12 @@
     var anchorChar = null, inText = false;
     var followChar = null, beforeText = false;
     var fixpace = function (event) {
+        spacing = true;
         event.preventDefault();
         insertText(' ', false);
         markAnchorOffset();
         unmarkAnchorOffset();
+        spacing = false;
     };
     var updatechar = function (event) {
         if (event.defaultPrevented) return;
@@ -413,22 +446,27 @@
         var patchAfter = '';
         switch (inputType) {
             case "insertText":
-                if (data === ' ') return;
+                if (data === ' ') return false;
                 if (anchorChar in pairsmap) {
                     if (followChar === pairsmap[anchorChar] && data === followChar) {
                         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];
                     }
                 }
+                spacing = false;
                 break;
             case "insertParagraph":
                 var i = getFocusRow();
@@ -444,11 +482,14 @@
         }
         if (patchAfter) {
             insertText(patchAfter, true);
+            markAnchorOffset();
         }
         return patchAfter;
     };
     var document_selection = document.getSelection();
+    var isInput = false;
     var insertText = function (text, isPatch) {
+        isInput = true;
         markAnchorOffset();
         var [an, ai, fn, fi] = selection;
         var [n, i] = getNodeAt(fn, fi);
@@ -474,7 +515,7 @@
             [an, ai] = getNodeAt(an, ai);
             document_selection.setBaseAndExtent(an, ai, n, i + d);
         }
-
+        markAnchorOffset();
     }
     var removeEndBR = function (d) {
         var e = d.lastChild;
@@ -512,8 +553,11 @@
     };
     on("input")(coder, function (event) {
         if (event.isComposing) return;
+        isInput = true;
         var id = ++coderid;
-        if (updatecode(event) == null) {
+        spacing = true;
+        var patch = updatecode(event);
+        if (patch == null) {
             if (id !== coderid) return;
             // codetext = getCodeText();
             updateCodeHtml();
@@ -540,6 +584,7 @@
         keytab(1);
     });
     bind('selectionchange', document)(coder, function () {
+        if (isInput) return isInput = false;
         markAnchorOffset();
     });
     var updo = function () {

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -604,6 +604,10 @@
                         addTranslate(f.name);
                         addTranslate(f.holder);
                         addTranslate(f.comment);
+                        var options = f.options;
+                        if (options instanceof Array) options.forEach(o => {
+                            addTranslate(o.name);
+                        })
                     });
                 }
             }
@@ -611,26 +615,47 @@
         msg.setText(i18n`提取完成`);
         var result = [];
         var preMap = Object.create(null);
+        var againstid = 0;
         for (var e of pretrans) {
             var data = await readText(e);
             data = parseYML(data);
             loop: for (var d of data) {
                 for (var k in d) {
-                    d[k] = d[k].replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
+                    var s = d[k];
+                    if (typeof s === 'string') d[k] = s.replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
                 }
                 var liang = 0, fanyi = {};
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;
-                    if (preMap[d[k]] && preMap[d[k]] !== d) {
-                        console.log(i18n`发现不同的翻译`, k, preMap[d[k]], d);
+                    var pd = preMap[d[k]];
+                    if (pd && pd !== d) {
+                        if (shallowEqual(pd, d)) continue loop;
+                        if (!pd.against) {
+                            pd.against = ++againstid;
+                        }
+                        d.against = pd.against;
+                        console.log(i18n`发现不同的翻译`, k, pd, d);
                     }
                     preMap[d[k]] = d;
                     liang++;
                     fanyi[id] = d[k];
                 }
-                result.push({ text: d[supports[0].lang], fanyi, liang });
+                d = { text: d[supports[0].lang], fanyi, liang, d };
+                result.push(d);
             }
         }
+        var againsts = [];
+        result = result.filter(a => {
+            var ag = a.d.against;
+            delete a.d;
+            if (!ag) return true;
+            var aga = againsts[ag];
+            if (!aga) aga = againsts[ag] = [];
+            aga.push(a);
+        });
+        againsts.forEach(a => {
+            result.unshift.apply(result, a);
+        });
         var untrans = [];
         Object.keys(textMap).map(k => {
             var texts = textMap[k];

package/package.json

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