efront 4.9.1 → 4.9.2

package/coms/basic/filterTime.js

@@ -87,7 +87,8 @@ function filterTime(time, formater) {
     var [year1, month1, date1, hour1, minute1, second1, milli1, day1] = getSplitedDate(now);
     var today = new Date(year1, month1 - 1, date1);
     var thatday = new Date(year, month - 1, date);
-    var delta = (today - thatday) / 24 / 3600000;
+    var delta = (today - thatday) / 24 / 3600000 | 0;
+    var deltaSeconds = (new Date(year1, month1 - 1, date1, hour1, minute1, second1) - new Date(year, month - 1, date, hour, minute, second)) / 1000;
     if (minute === 0 && second === 0) var time = hour + "点整";
     else if (minute === 30 && second === 0) time = hour + "点半";
     else time = `${hour}:${fixLength(minute)}`;
@@ -103,18 +104,25 @@ function filterTime(time, formater) {
         }
         return `星期` + days[day] + time;
     }
+    if (deltaSeconds >= 0 && deltaSeconds < 60) {
+        return `刚刚`;
+    }
+    if (deltaSeconds < 0) {
+        if (deltaSeconds > -60) {
+            return `${-deltaSeconds | 0}秒后`;
+        }
+        if (deltaSeconds >= -3600) {
+            return `还有${-deltaSeconds / 60 | 0}分钟`;
+        }
+        if (deltaSeconds > -86400) {
+            var a = -deltaSeconds / 3600 | 0;
+            var b = (-deltaSeconds + (deltaSeconds / 3600 | 0) * 3600) / 60 | 0;
+            if (b === 0) return `还有${a}小时`;
+            return `还有${a}小时${b}分钟`;
+        }
+    }
     switch (delta) {
         case 0:
-            if (minute === minute1 && hour === hour1) {
-                if (second <= second1) return `刚刚`;
-                return `${second - second1}秒后`;
-            }
-            else if (value > now) {
-                if (hour === hour1) {
-                    return `${minute - minute1}分钟后`;
-                }
-                return `还有${hour - hour1}小时${minute - minute1}分钟`;
-            }
             return time;
         case -1:
             return "明天" + time;

package/coms/basic/filterTime_test.js

@@ -2,6 +2,17 @@ assert(filterTime(''), ``);
 assert(filterTime(null), '');
 assert(filterTime(undefined), '');
 assert(filterTime("我出生的第二年"), `我出生的第二年`);
+assert(filterTime(+new Date + 86300000), '还有23小时58分钟');
+assert(filterTime(+new Date + 110000), '还有1分钟');
+assert(filterTime(+new Date + 120000), '还有2分钟');
+assert(filterTime(+new Date + 60000), '还有1分钟');
+assert(filterTime(+new Date + 59000), '59秒后');
+assert(filterTime(+new Date + 58000), '58秒后');
+assert(filterTime(+new Date + 8000), '8秒后');
+assert(filterTime(+new Date + 1000), '1秒后');
+assert(filterTime(+new Date), '刚刚');
+assert(filterTime(+new Date), '刚刚');
+assert(filterTime(+new Date - 59000), '刚刚');
 assert(filterTime(new Date(2024, 3, 3), `y年M月d日 h:mm`), '2024年4月3日 0:00');
 assert(filterTime(new Date(2024, 3, 3), `y年M月d日 h:mm`), '2024年4月3日 0:00');
 assert(filterTime(new Date(2024, 3, 3, 19, 26, 2, 100), `y年M月d日 h:mm:ss.SSS`), '2024年4月3日 19:26:02.100');

package/coms/docs/codetext.xht

@@ -7,6 +7,7 @@
         color: #d4d4d4;
         font-family: Consolas, "Courier New", monospace;
         vertical-align: top;
+        text-decoration-line: none;
     }
 
     stamp {

package/coms/zimoli/createElement.js

@@ -27,7 +27,10 @@ var prototype = {
         return child;
     },
     appendChild(child) {
+        var _appendChild = this.appendChild
+        delete this.appendChild;
         appendChild(this, child, false);
+        if (_appendChild) this.appendChild = _appendChild;
         return child;
     },
     appendTo(target) {

package/coms/zimoli/slider.js

@@ -12,7 +12,7 @@ var abs = Math.abs;
  */
 function slider() {
     var [autoplay, circle = true] = arguments;
-    var outter = container.cloneNode();
+    var outter = null;
     {
         for (let cx = 0, dx = arguments.length; cx < dx; cx++) {
             let arg = arguments[cx];
@@ -25,6 +25,7 @@ function slider() {
             }
         }
     }
+    if (!outter) outter = container.cloneNode();
     var _imageMain = _slider.cloneNode();
     var _imageHelp = _slider.cloneNode();
     outter.src = function (index) {

package/coms/zimoli/slider_test.js

@@ -5,7 +5,7 @@ render(page, {
     btn: button,
     slider(element) {
         var images = [1, 2, 3].map(function (i) {
-            var ele = createElement(div);
+            var ele = document.createElement("div");
             text(ele, i);
             return ele;
         });

package/coms/zimoli/slider_test.less

@@ -1,12 +1,11 @@
 & {
-    height: 100px;
     width: 100%;
     background: #000;
     color: #fff;
     text-align: center;
     line-height: 100px;
     font-size: 60px;
-    position: absolute;
+    position: relative;
     >div{
         position: relative;
         display: inline-block;
@@ -14,6 +13,9 @@
         height: 80px;
     }
 }
+btn{
+    font-size: 14px;
+}
 
 .slider {
     width: 100%;

package/docs//347/273/204/344/273/266.xht

@@ -99,7 +99,7 @@
         z-index: 1;
     }
 </style>
-<form onclick="event.preventDefault()">
+<form onsubmit="event.preventDefault()">
     <xmenu -src="(t,i) in tags" @active="saveTagIndex(i)"></xmenu>
     <h2 head>
         <span -bind="name"></span>
@@ -125,8 +125,8 @@
             </span>
         </p4>
     </div>
-    <div body onkeyup="!event.isComposing&&updatecode()" onkeydown.tab="keytab(event)" #coder codearea
-        -elseif="tags[1].actived">
+    <div body onkeyup="!event.isComposing&&updatecode(event)" onkeydown.tab="keytab(event)" onkeyup.enter="ontab(false)"
+        #coder codearea -elseif="tags[1].actived">
     </div>
     <resultpad -if="tags[1].actived" .result #coderesult></resultpad>
     <div foot -if="tags[1].actived">
@@ -370,7 +370,42 @@
         c.contentEditable = true;
     };
     var trimspace = (_, a) => a ? "" : " ";
-    var updatecode = lazy(function () {
+    var ensp = s => Array(s + 1).join("\u2002"/*&ensp*/);
+    var getEnspBefore = function (node) {
+        if (!node) return 0;
+        while (node && (node.nodeType !== 1 || !/^br$/i.test(node.tagName))) {
+            console.log(node)
+            node = node.previousSibling;
+        }
+        if (node) {
+            var next = node.nextSibling;
+            if (next) {
+                next = /^\u2002+/.exec(next.nodeValue);
+                if (next) return next[0].length;
+            }
+        }
+    };
+    var ontab = function (forcetab) {
+        var selection = document.getSelection();
+        var { anchorNode, anchorOffset } = selection;
+        if (anchorNode.nodeType === 1) {
+            var child = anchorNode.childNodes[anchorOffset];
+            var spaceSize = 4;
+            if (child.nodeType === 1) spaceSize = getEnspBefore(child?.previousSibling?.previousSibling || anchorNode);
+            if (!spaceSize && forcetab !== false) spaceSize = 4;
+            if (!spaceSize) return;
+            var space = document.createTextNode(ensp(spaceSize));
+            anchorNode.insertBefore(space, child);
+            selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
+        }
+        else if (anchorNode.nodeType === 3) {
+            if (forcetab === 0) return;
+            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(4) + anchorNode.nodeValue.slice(anchorOffset);
+            anchorOffset += 4;
+            selection.setBaseAndExtent(anchorNode, anchorOffset, anchorNode, anchorOffset);
+        }
+    };
+    var updatecode = lazy(function (event) {
         var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
         var innerText = coder.innerText;
         if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
@@ -424,6 +459,7 @@
     };
     var keytab = function (event) {
         event.preventDefault();
+        ontab();
     };
 
     var saveTagIndex = function (i) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.9.1",
+    "version": "4.9.2",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {