efront 4.5.13 → 4.5.15

package/apps/pivot/log/boot.js

@@ -1,4 +1,3 @@
-cross.addDirect(/^https?\:\/\/([[a-z\.\d\:\/%]+\]|[\d\.]+)(\:\d+)?\//);
 var checkPort = async function (p, ip) {
     if (!p.host) {
         if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
@@ -11,10 +10,13 @@ var checkPort = async function (p, ip) {
     }
     try {
         p.locate("/:version");
-        var { response } = await cross("options", p.href);
-        if (/^efront/.test(response)) {
+        var xhr = await cross("@options", p.href);
+        if (/^efront/.test(xhr.response)) {
             p.ok = true;
         }
+        else {
+            p.error = '异常';
+        }
     } catch (e) {
         p.error = e;
     }
@@ -50,7 +52,7 @@ function main() {
     page.innerHTML = template;
     var items = data.from("bootlog", datas => {
         datas.forEach(a => {
-            var [v, p] = a.ppid.split("/");
+            var [v, p] = String(a.ppid).split("/");
             a.version = v;
             a.pid = p;
         });

package/coms/basic/Table.js

@@ -77,7 +77,7 @@ class Table extends Array {
             var [p, m] = mark.power(name, searchtext);
             if (p > power) power = p;
             if (p >= searchtext.length) this.coverCount++;
-            if (!isEmpty(f.key)) o[f.key] = m;
+            if (!isEmpty(f.key) && !isFunction(f.key)) o[f.key] = m;
             else o.name = m, o.toString = returnName, o.valueOf = returnName;
         }
         o.power = power;

package/coms/basic/cross_.js

@@ -195,7 +195,9 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     else {
         var isencrypt = /^[夏商周秦xszq]/i.test(method);
         if (isencrypt) method = method.slice(1);
-        var nocross = notCross(url, isencrypt);
+        var nocross = /^@/.test(method);
+        if (nocross) method = method.slice(1);
+        else nocross = notCross(url, isencrypt);
         if (nocross) isencrypt = false;
         var callback = async function () {
             if (xhr.getResponseHeader) {

package/coms/basic/filterTime.js

@@ -4,7 +4,7 @@ function fixLength(minute, length = 2) {
     if (minute.length >= length) return minute;
     return new Array(length - minute.length + 1).join("0") + minute;
 }
-var days = "天一二三四五六";
+var days = "日一二三四五六天";
 function format(formater) {
     var v = getSplitedDate(this);
     var o = {};
@@ -39,8 +39,25 @@ function format(formater) {
 }
 function filterTime(time, formater) {
     if (!isHandled(time)) return '';
-    if (isFinite(time)) time = +time;
-    var value = new Date(time);
+    var value = time;
+    if (isFinite(value)) value = +value;
+    if (typeof value === 'string') value = value.replace(/[\\\/]/g, "-")
+        .replace(/[年月](\d+)/g, '-$1')
+        .replace(/[日号]/, ' ')
+        .replace(/[时点分]/g, ":")
+        .replace(/[半]/g, "30")
+        .replace(/[整]/g, "00")
+        .replace(/[一1]刻/g, "15")
+        .replace(/[三3]刻/g, "45")
+        .replace(/凌晨|早上|上午/g, ' ')
+        .replace(/(?:傍?晚上?|下午)(\d+)/g, (_, d) => " " + (+d + 12))
+        .replace(/秒/g, '.')
+        .replace(/毫/, "")
+        .replace(/\.+$/, '')
+        .replace(/\s+$/, '')
+        .replace(/\s+/g, " ")
+        .replace(/^([^\s]+)\s+(\d+)$/g, "$1 $2:00");
+    var value = new Date(value);
     if (!+value) {
         return time;
     }
@@ -48,7 +65,7 @@ function filterTime(time, formater) {
         return format.call(value, formater);
     }
     if (formater) {
-        formater = format.charAt(0);
+        formater = formater.charAt(0);
     }
     var splited = getSplitedDate(value);
     var now = new Date;
@@ -67,6 +84,7 @@ function filterTime(time, formater) {
         return `星期` + days[day] + time;
     }
     else if (delta > -7 && delta < -2) {
+        console.log(day, day1)
         if (day <= day1) {
             return `下星期` + days[day] + time;
         }
@@ -97,12 +115,12 @@ function filterTime(time, formater) {
             switch (year1 - year) {
                 case 0:
                     if (value > now) {
-                        return `今年${month}${format || '月'}${date}${format ? '' : '日'} ${time}`;
+                        return `今年${month}${formater || '月'}${date}${formater ? '' : '日'} ${time}`;
                     }
-                    return `${month}${format || '月'}${date}${format ? '' : '日'} `;
+                    return `${month}${formater || '月'}${date}${formater ? '' : '日'} `;
                 case 1:
                     if (month1 < month) {
-                        return `${month}${format || '月'}${date}${format ? '' : '日'} `;
+                        return `${month}${formater || '月'}${date}${formater ? '' : '日'} `;
                     }
                     return "去年" + month + "月";
                 case -1:
@@ -112,6 +130,6 @@ function filterTime(time, formater) {
                 case -2:
                     return "后年" + month + "月" + date + "日";
             }
-            return `${year}${format || '年'}${month}${format || "月"}`;
+            return `${year}${formater || '年'}${month}${formater || "月"}`;
     }
 }

package/coms/basic/filterTime_test.js

@@ -2,7 +2,17 @@ assert(filterTime(''), ``);
 assert(filterTime(null), '');
 assert(filterTime(undefined), '');
 assert(filterTime("我出生的第二年"), `我出生的第二年`);
-assert(filterTime(new Date(new Date - 100)), `刚刚`);
-assert(filterTime(new Date(new Date - 60000), `h:mm`), "");
-assert(filterTime(new Date(new Date - 86400000), `M月d日 h:mm`), "");
-assert(filterTime(new Date(new Date().setFullYear(new Date().getFullYear() - 1)), `y年M月d日 h:mm`), '');
+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("2024年4月3号", `y年M月d日h:mm`), '2024年4月3日0:00');
+assert(filterTime("2024年4月3号8点半", `y年M月d日h:mm`), '2024年4月3日8:30');
+assert(filterTime("2024年4月3号9点三刻", `y年M月d日h:mm`), '2024年4月3日9:45');
+assert(filterTime("2024年4月3号9点一刻", `y年M月d日h:mm`), '2024年4月3日9:15');
+assert(filterTime("2024年4月3号下午3点一刻", `y年M月d日h:mm`), '2024年4月3日15:15');
+assert(filterTime("2024年4月3号上午9点一刻", `y年M月d日h:mm`), '2024年4月3日9:15');
+assert(filterTime("2024年4月3号晚上9点一刻", `y年M月d日h:mm`), '2024年4月3日21:15');
+assert(filterTime("2024年4月3号傍晚6点一刻", `y年M月d日h:mm`), '2024年4月3日18:15');
+assert(filterTime("2024年4月3号凌晨6点", `y年M月d日h:mm`), '2024年4月3日6:00');
+assert(filterTime("2024年4月3号凌晨6点整", `y年M月d日h:mm`), '2024年4月3日6:00');
+assert(filterTime("2024/4/3凌晨6点整", `y年M月d日h:mm`), '2024年4月3日6:00');
+assert(filterTime("2024-4-3早上6点整", `y年M月d日h:mm`), '2024年4月3日6:00');

package/coms/basic/getSplitedDate.js

@@ -1,3 +1,3 @@
 function getSplitedDate(date) {
-    return [date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds(), date.getDay()];
+    return [date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds(), date.getDay() || 7];
 }

package/coms/pivot/acme2.js

@@ -69,7 +69,6 @@ var ASN1 = function (type) {
         length += bytes.length;
     }
     var asn1 = [type];
-    if (length === (2 << 8 | 36)) console.log(arguments)
     if (length > 127) {
         var nums = [];
         while (length > 0) {
@@ -354,7 +353,7 @@ var acme2 = new class {
     async autoUpdate(saveUnique, domain, setauth, upload) {
         if (!domain.length) return;
         if (acme2.orders.length >= 20) acme2.orders.pop();
-        this.lastUpdateTime = parseDate(Date.now());
+        this.lastUpdateTime = filterTime(Date.now(), 'y-MM-dd hh:mm');
         this.updateTime();
         var o = await acme2.newOrder({ domain });
         await saveUnique();// 及时保存订单信息以便后续查看

package/coms/zimoli/selectDate.js

@@ -280,7 +280,7 @@ var render = function (value, models = "年月日", message = "") {
         if (_value instanceof Event) {
             _value = _value.target.value;
         }
-        _value = parseDate(_value);
+        _value = filterTime(_value, "y-M-d h:mm:ss");
         _value = InternelDate(_value);
         value = _value;
     };
@@ -289,7 +289,7 @@ var render = function (value, models = "年月日", message = "") {
 };
 
 function main(models = "年月日", value, title) {
-    value = parseDate(value);
+    value = filterTime(value, 'y-M-d h:mm:ss');
     value = InternelDate(value);
     var datebox = render(value, models, title);
     addClass(datebox, 'date-' + models.length);

package/coms/zimoli/selectList.js

@@ -171,7 +171,6 @@ function main() {
                 case this.children[0]:
                     var a = prompt("请输入", a => {
                         if (!a) return false;
-                        console.log(itemMap, a);
                         if (a in itemMap) {
                             return `选项 ${a} 已存在！`;
                         }

package/coms/zimoli/table.html

@@ -9,7 +9,7 @@
     </tr>
 </thead>
 <tbody -src="(d,i) in data" :style="tbodyHeight(this,hasFoot)">
-    <tr inline-block :style="{width:adapter.style.width}" @click="rowClick(d,i,event)">
+    <tr inline-block :style="{width:adapter.style.width}" @click="rowClick(d,i,event)" @mounted="resizeR(this)">
         <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">

package/coms/zimoli/table.js

@@ -68,11 +68,29 @@ var getRowsOfTdsByCol = function (table, start, end) {
 var getTdsByCol = function (table, start, end) {
     return [].concat.apply([], getRowsOfTdsByCol(table, start, end));
 };
+var resizeR = function (t) {
+    var h = 0;
+    var children = [];
+    for (var c of t.children) {
+        if (getColspan(c) > 1) continue;
+        children.push(c);
+    }
+    for (var c of children) {
+        var height = c.offsetHeight;
+        if (h < height) h = height;
+    }
+    for (var c of children) {
+        var height = c.offsetHeight;
+        if (h > height) {
+            css(c, { height: h });
+        }
+    }
+}
 var resizeT = function (t, w) {
     if (!w) {
         var w = 0;
-        for (var cx = 0, dx = t.children.length; cx < dx; cx++) {
-            w += t.children[cx].offsetWidth;
+        for (var c of t.children) {
+            w += c.offsetWidth;
         }
     }
     css(t, { width: w });
@@ -328,9 +346,7 @@ var removeYIng = function (activeCols) {
     });
 };
 var removeXIng = function (activeRows) {
-    activeRows.forEach(function (td) {
-        removeClass(td, 'x-ing');
-    });
+    for (var td of activeRows) removeClass(td, 'x-ing');
 };
 
 var getTdsOfSameRow = function (td) {
@@ -517,6 +533,7 @@ function table(elem) {
             data,
             adapter: null,
             resizeT,
+            resizeR,
             model,
             sort(f) {
                 this.data.sort(f);

package/coms/zimoli/table.less

@@ -54,6 +54,7 @@ td {
         top: 0;
         bottom: 0;
         right: 0;
+        pointer-events: none;
         background-color: rgba(0, 60, 69, .06);
     }
 

package/package.json

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