efront 4.24.1 → 4.24.2

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -16,12 +16,6 @@
 - zh-CN: 返回
   en:    Back
 
-- zh-CN: 路径不存在
-  en:    Path does not exist
-
-- zh-CN: 路径不存在
-  en:    path does not exist
-
 - zh-CN: "参数异常: $1"
   en:    "Parameter exception: $1"
 
@@ -46,11 +40,20 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: 拥有注册号的用户可查看商品
+  en:    Users with registration numbers can view products
+
+- zh-CN: 获取
+  en:    Obtain
+
+- zh-CN: 获取注册号时，请确保您的服务器可以通过公网访问。暂不支持非公网服务器获取注册号。
+  en:    "When obtaining the registration number, please ensure that your server can be accessed through the public network. We currently do not support obtaining registration numbers from non-public servers."
+
 - zh-CN: 删除
   en:    Delete
 
-- zh-CN: 删除
-  en:    delete
+- zh-CN: 路径不存在
+  en:    Path does not exist
 
 - zh-CN: 当前服务器不可注册用户
   en:    The current server is unable to register users
@@ -62,7 +65,7 @@
   en:    The database does not exist
 
 - zh-CN: 非法访问
-  en:    illegal access
+  en:    Illegal Access
 
 - zh-CN: 您已注册过，无法重新注册！
   en:    You have already registered and cannot register again!
@@ -71,10 +74,10 @@
   en:    Registration No
 
 - zh-CN: 注销
-  en:    log off
+  en:    Unregister
 
 - zh-CN: 注册
-  en:    register
+  en:    Register
 
 - zh-CN: 标记不匹配
   en:    Tag mismatch
@@ -239,7 +242,7 @@
   en:    Node.js version
 
 - zh-CN: 操作系统
-  en:    operating system
+  en:    Operating system
 
 - zh-CN: 处理器
   en:    Processor

package/apps/pivot/home/welcome.html

@@ -1,35 +1,35 @@
 <block>
     <padding>
         <span>
-            ${i18n`注册号`}
+            ${i18n`注册号`}:
         </span>
         <template -if="usercode">
             <span -text="String(usercode)"></span>
             <!-- <a @click="unregister">${i18n`注销`}</a> -->
         </template>
-        <a -else @click="register">${i18n`注册`}</a>
+        <a -else @click="register">${i18n`获取`}</a>
     </padding>
     <padding>
         <span>
-            ${i18n`服务器版本`}
+            ${i18n`服务器版本`}:
         </span>
         <span -text="String(version)"></span>
     </padding>
     <padding>
         <span>
-            ${i18n`nodejs版本`}
+            ${i18n`nodejs版本`}:
         </span>
         <span -text="String(nodeVersion)"></span>
     </padding>
     <padding>
         <span>
-            ${i18n`操作系统`}
+            ${i18n`操作系统`}:
         </span>
         <span -text="String(platform)"></span>
     </padding>
     <padding>
         <span>
-            ${i18n`处理器`}
+            ${i18n`处理器`}:
         </span>
         <span -text="String(arch)"></span>
     </padding>
@@ -37,13 +37,13 @@
 <block>
     <padding>
         <span>
-            ${i18n`清理服务器缓存`}
+            ${i18n`清理服务器缓存`}:
         </span>
         <btn @click="run('clear-cache',this)">${i18n`清理`}</btn>
     </padding>
     <padding>
         <span>
-            ${i18n`重启服务器`}
+            ${i18n`重启服务器`}:
         </span>
         <btn @click="run('rehost',this)" confirm type="danger">${i18n`重启`}</btn>
     </padding>
@@ -51,13 +51,13 @@
 <block>
     <padding>
         <span>
-            ${i18n`启动时间`}
+            ${i18n`启动时间`}:
         </span>
         <span -text="filterTime(hrtime)"></span>
     </padding>
     <padding>
         <span>
-            ${i18n`内存`}
+            ${i18n`内存`}:
         </span>
         <span>
             <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>

package/apps/pivot/home/welcome.js

@@ -15,6 +15,7 @@ function main() {
         progbar,
         usercode: null,
         async register() {
+            await yousure(i18n`获取注册号时，请确保您的服务器可以通过公网访问。暂不支持非公网服务器获取注册号。`, [i18n`继续` + "(C)", i18n`取消` + "(Q)#white"]);
             var usercode = await data.from("register");
             serverStatus.userid = scope.usercode = usercode;
         },

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

@@ -179,10 +179,36 @@
         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) {
@@ -201,14 +227,10 @@
                 if (inc + tl > col) {
                     col -= inc;
                     inc = 0;
-                    if (!spacing && t.charAt(col - 1) === " ") {
-                        col++;
-                    }
                     break;
                 }
                 else if (inc + tl === col) {
-                    if (!spacing && t.charAt(col - inc - 1) === " ") col++;
-                    else break;
+                    break;
                 }
                 inc += tl;
                 c = c.nextSibling;
@@ -430,13 +452,17 @@
                         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];
                     }
                 }

package/package.json

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