efront 4.36.2 → 4.36.3

package/coms/pivot/todo.xht

@@ -0,0 +1,69 @@
+<todo>
+    <div .id>
+        <span -bind="m.id"></span>
+    </div>
+    <div .detail>
+        <span -bind="m.name"></span>
+        <span -bind="states[m.state]"></span>
+    </div>
+    <div .circle -bind="index"></div>
+</todo>
+<style>
+    .circle {
+        border-radius: 50%;
+        width: 32px;
+        height: 32px;
+        font-size: 16px;
+        line-height: 24px;
+        text-align: center;
+        position: absolute;
+        display: block;
+        left: -6px;
+        top: 6px;
+        border: 4px double;
+    }
+
+    .id {
+        size: 0;
+        font-size: 12px;
+        color: #666;
+        padding-left: 32px;
+    }
+
+    & {
+        padding: 4px 12px 4px 0px;
+        display: block;
+        color: #ccc;
+        border: 1px solid;
+        border-left: 6px solid;
+        position: relative;
+        background: #fff;
+        margin: 0 0 10px 0;
+    }
+
+    .detail {
+        color: #000;
+        text-indent: 32px;
+    }
+
+    &.new {
+        color: #629;
+    }
+
+    &.ing {
+        color: #263;
+    }
+
+    &.done {
+        color: #26c;
+    }
+</style>
+<script>
+    var m = {};
+    var index;
+    var states = [];
+    care(this, function ([a, i]) {
+        m = a;
+        index = +i + 1;
+    });
+</script>

package/coms/reptile/cross.js

@@ -1,12 +1,12 @@
 var cross = cross_.bind(function (callback, onerror) {
     var response, responseObject, responseType = "", decoder, error;
+    var headers = {};
+    var http = null;
     var xhr = {
         status: 0,
         readyState: 0,
         method: null,
         url: null,
-        http: null,
-        headers: {},
         responseHeaders: {},
         get response() {
             if (responseType === "" || responseType === "text") {
@@ -42,7 +42,7 @@ var cross = cross_.bind(function (callback, onerror) {
             if (data instanceof FormData) data = String(data);
             if (data) {
                 data = Buffer.from(data);
-                this.headers["Content-Length"] = data.length;
+                headers["Content-Length"] = data.length;
             }
             if (/^\[/.test(hostname)) hostname = hostname.replace(/^\[(.*?)\]$/, "$1");
             var options = {
@@ -51,14 +51,14 @@ var cross = cross_.bind(function (callback, onerror) {
                 port,
                 path,
                 auth,
-                headers: this.headers,
+                headers: headers,
             };
             var onerror1 = function (e) {
                 xhr.readyState = 4;
                 error = e;
                 onerror(e);
             };
-            var req = this.http.request(options, function (res) {
+            var req = http.request(options, (res) => {
                 var data = [];
                 xhr.status = res.statusCode;
                 xhr.responseHeaders = res.headers;
@@ -76,11 +76,12 @@ var cross = cross_.bind(function (callback, onerror) {
             this.readyState = 1;
             req.on("error", onerror1);
             req.on("timeout", onerror1);
-            req.setTimeout(3000);
+            req.setTimeout(120000);
             if (data) req.end(data);
             else req.end();
         },
         open(method, url) {
+            if (http) throw new Error('请不要重新打开！');
             this.method = method;
             this.url = url;
             this.status = 0;
@@ -88,14 +89,12 @@ var cross = cross_.bind(function (callback, onerror) {
             response = null;
             responseObject = null;
             error = null;
-            var http;
             if (/^http\:/i.test(url)) {
                 http = require("http");
             }
             else {
                 http = require("https");
             }
-            this.http = http;
         },
         get responseType() {
             return responseType;
@@ -106,7 +105,7 @@ var cross = cross_.bind(function (callback, onerror) {
             responseType = v;
         },
         setRequestHeader(key, value) {
-            this.headers[key] = value;
+            headers[key] = value;
         },
         overrideMimeType(type) {
             responseType = type;

package/coms/reptile/window.js

@@ -1,5 +1,4 @@
 var global1 = typeof globalThis !== 'undefined' ? globalThis : typeof global !== "undefined" ? global : {};
-var extendIfNeeded = require("../basic/extendIfNeeded");
 if (global1.window) {
     module.exports = global1.window;
 }

package/coms/zimoli/autodragchildren.js

@@ -93,13 +93,12 @@ var bindTarget = function (index, element) {
     return value;
 };
 
-var hooka = function (matcher, move, event, targetChild, isMovingSource) {
+var hooka = function (matcher, move, event, targetChild, isMovingSource, hideSource = isMovingSource !== false) {
     var boxfinder;
     var isMovingSource = isMovingSource !== false;
     if (isMovingSource === false) boxfinder = matcher, matcher = null;
     var that = this;
-
-    var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
+    var draggingSourceOpacity = hideSource ? 0 : 1;
 
     var recover = function (element) {
         moveMargin(element, 0);
@@ -151,7 +150,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     if (event.target === this) return;
     // var targetChild = getTargetIn(matcher, event.target);
     if (!targetChild) return;
-    drag(targetChild, event, false, isMovingSource);
+    drag(targetChild, event, false, hideSource);
     if (isArray(targetChild)) {
         targetChild = targetChild[0];
     }
@@ -169,7 +168,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             rebuildTargets = function () { };
             [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
             moveChildren = moveChildren.bind(null, that, previousElements, followedElements, moveMargin, recover);
-        } else {
+        }
+        else {
             previousElements = [];
             followedElements = [];
             moveChildren = () => { };
@@ -354,10 +354,10 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
                 e.style.zIndex = zIndex;
                 var z = zIndex - 1;
                 var ws = e.with;
-                if (ws){
+                if (ws) {
                     if (isNode(ws)) ws = [ws];
                     for (var w of ws) w.style.zIndex = z;
-                } 
+                }
             };
             if (zIndex > 2) {
                 previousElements.forEach(copyZIndex);
@@ -412,7 +412,7 @@ var hookEvent = function (matcher, move, event) {
     if (event.target === this) return;
     var targetChild = getTargetIn(matcher, event.target, false);
     if (!targetChild) return;
-    hooka.call(this, matcher, move, event, targetChild);
+    hooka.call(this, matcher, move, event, targetChild, true, true);
 };
 function addhook() {
     var mousedownEvent, targetElement, callback, boxfinder, dropid, allowdrops;
@@ -440,6 +440,9 @@ function addhook() {
                 }
                 if (arg !== null) mousedownEvent = arg;
                 break;
+            case "boolean":
+                dropSource = arg;
+                break;
         }
     });
     if (!targetElement && isElement(this)) {
@@ -447,22 +450,27 @@ function addhook() {
     }
     if (!mousedownEvent) return;
     var target = targetElement || mousedownEvent.currentTarget;
+    var dropSource = target && target.parentNode?.hasAttribute('allowdrop');
     hooka.call(targetElement, function () {
         var target = drag.shadow;
-        var res = Array.prototype.filter.call(allowdrops || (boxfinder ? boxfinder(target) : document.querySelectorAll("[allowdrop]")), function (child) {
-            return target && overlap(child, target);
+        if (!allowdrops) allowdrops = [...boxfinder ? boxfinder(target) : document.querySelectorAll("[allowdrop]")];
+        var ols = new WeakMap;
+        var res = allowdrops.filter(function (child, i) {
+            var o = target && overlap(child, target);
+            ols.set(child, o);
+            return o > 0;
         }).filter(e => {
             var a = e.getAttribute("allowdrop");
             if (!a || !dropid) return true;
             return a === dropid;
-        });
+        }).sort((a, b) => ols.get(a) - ols.get(b));
         if (res instanceof Array) {
             return res[res.length - 1];
         }
         return res;
     }, function (_, dst, _a, _b, parentNode) {
         if (isFunction(callback) && parentNode) callback(dst, parentNode);
-    }, mousedownEvent, target, false);
+    }, mousedownEvent, target, false, dropSource);
 }
 function autodragchildren(target, matcher, move) {
     onmousedown(target, hookEvent.bind(target, matcher, move));

package/package.json

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