efront 4.23.9 → 4.24.1

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

@@ -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

@@ -128,7 +128,6 @@ 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)) {
@@ -137,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);
@@ -152,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";
@@ -167,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) {
@@ -480,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) {
@@ -673,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);
@@ -752,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);
@@ -883,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//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,6 +178,7 @@
         selection = getSelection();
         render.refresh(nlist);
     };
+    var spacing = false;
     var getNodeAt = function (row, col) {
         var d = clist.at(row);
         if (!d) return [];
@@ -192,13 +201,13 @@
                 if (inc + tl > col) {
                     col -= inc;
                     inc = 0;
-                    if (t.charAt(col - 1) === " ") {
+                    if (!spacing && t.charAt(col - 1) === " ") {
                         col++;
                     }
                     break;
                 }
                 else if (inc + tl === col) {
-                    if (t.charAt(col - inc - 1) === " ") col++;
+                    if (!spacing && t.charAt(col - inc - 1) === " ") col++;
                     else break;
                 }
                 inc += tl;
@@ -246,10 +255,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,7 +424,7 @@
         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');
@@ -429,6 +440,7 @@
                         patchAfter = pairsmap[data];
                     }
                 }
+                spacing = false;
                 break;
             case "insertParagraph":
                 var i = getFocusRow();
@@ -444,11 +456,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 +489,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 +527,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 +558,7 @@
         keytab(1);
     });
     bind('selectionchange', document)(coder, function () {
+        if (isInput) return isInput = false;
         markAnchorOffset();
     });
     var updo = function () {

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;

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

@@ -371,47 +371,14 @@
     //     "庄，庄": ["za", "Zhuang, Chuang"],
     //     祖鲁语: ["zu", "Zulu"]
     // };
-    var supports = [
-        { name: `汉语`/*中文简体*/, id: "zh", lang: "zh-CN" },
-        { name: `漢語`/*中文繁体*/, id: "cht", lang: "zh-TW" },
-        { name: `English`/*英文*/, id: "en", lang: "en" },
-        // { name: i18n`文言文`, id: "wyw" },
-        // { name: i18n`粤语`, id: "yue" },
-        { name: `日本語`/*日语*/, id: "jp", lang: "ja" },
-        { name: `Français`/*法语*/, id: "fra", lang: 'fr' },
-        { name: `Русский язык`/*俄语*/, id: "ru", lang: 'ru' },
-        { name: `한국어`/*韩语*/, id: "kor", lang: "ko" },
-        { name: `Deutsch`/*德语*/, id: "de", lang: "de" },
-        { name: `Italiano`/*意大利语*/, id: "it", lang: 'it' },
-        { name: `ภาษาไทย`/*泰语*/, id: "th", lang: "th" },
-        { name: `Tiếng Việt`/*越南语*/, id: "vie", lang: 'vi' },
-        { name: `بالعربية`/*阿拉伯语*/, id: "ara", lang: "ar" },
-        { name: `Nederlands`/*荷兰语*/, id: "nl", lang: "nl" },
-        { name: `suomi`/*芬兰语*/, id: "fin", lang: "fi" },
-        { name: `Ελληνικά`/*希腊语*/, id: "el", lang: "el" },
-        { name: `Español`/*西班牙语*/, id: "spa", lang: "es" },
-        { name: `Português`/*葡萄牙语*/, id: "pt", lang: /pt\-(BR|PT)/ },
-        { name: `Húngaro`/*匈牙利语*/, id: "hu", lang: 'hu' },
-        { name: `Svenska`/*瑞典语*/, id: "swe", lang: 'sv' },
-        { name: `Dansk`/*丹麦语*/, id: "dan", lang: 'da' },
-        { name: `Čeština`/*捷克语*/, id: "cs", lang: 'cs' },
-        { name: `Polski`/*波兰语*/, id: "pl" },
-        { name: `Български`/*保加利亚语*/, id: "bul", lang: "bg" },
-        { name: `Eesti keel`/*爱沙尼亚语*/, id: "est", lang: 'et' },
-        { name: `Română`/*罗马尼亚语*/, id: "rom", lang: 'ro' },
-        { name: `slovenski jezik`/*斯洛文尼亚语*/, id: "slo", lang: 'sl' },
-    ];
-    supports.forEach(s => s.key = s.id);
+    var supports = i18nSupports;
     var getAllText = function (data, f) {
         try {
             if (/^\s*(\<\!--[\s\S]*?--\>\s*)*<!doctype\s/i.test(data)) return [];
-            if (/\.(xht|vue)$/i.test(f.name)) {
+            if (/\.(xht|html?|jsp|asp|php|vue)$/i.test(f.name)) {
                 var { scripts, innerHTML, outerHTML: htmltext = innerHTML, attributes = '', tagName, styles } = compile$scanner2(data, 'html').scoped;
                 data = compile$wraphtml(htmltext) + ";\r\n" + scripts.join("\r\n");
             }
-            else if (/\.html?$/i.test(f.name)) {
-                data = compile$wraphtml(data);
-            }
             var code = compile$scanner2(String(data));
             return compile$translate.getI18nPrefixed(code);
         }
@@ -598,7 +565,7 @@
                 }
                 else {
                     if (/^[\.]|^node_modules|_test\.js$/i.test(name)) continue;
-                    if (e.kind === "file" && !/\.([mc]?[tj]sx?|xht|vue|html?)$/i.test(name)) continue;
+                    if (e.kind === "file" && !/\.([mc]?[tj]sx?|xht|html?|jsp|asp|php|vue)$/i.test(name)) continue;
                 }
                 e.path = path + e.name;
                 if (e.kind === 'directory') {
@@ -637,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);
+                        })
                     });
                 }
             }
@@ -644,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.23.9",
+    "version": "4.24.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {