efront 3.5.3 → 3.5.7

package/coms/basic/parseURL.js

@@ -1,5 +1,5 @@
-// -------/// ---------------1-------------//////////////2---3--------//////// ----4----2/////5-----------------------6------------------------//////////////-7--5///8----9----//10--11---10///--12-----8//
-var reg = /^([^\:\/\?#]+\:(?![^\:\/\?\#]*@))?(?:\/\/)?(?:(([^\:\/\?#]+)?(?:\:([^\/\?#]+))?)@)?(([^\/@\:\?\#]*(?:[^\d\@\:\/\?#]|\.)[^\/@\:\?\#]*)?(?:(?:\:|^)(\d+))?)((\/[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
+// -------/// ---------------1-------------//////////////2---3--------//////// ----4----2/////5-----------------------6-----------------------//////////////-7--5///8----9----//10--11---10///--12-----8//
+var reg = /^([^\:\/\?#\[]+\:(?![^\:\/\?\#]*@))?(?:\/\/)?(?:(([^\:\/\?#]+)?(?:\:([^\/\?#]+))?)@)?(([^\/@\:\?\#]*(?:[^\d\@\:\/\?#]|\.)[^\/@\?\#]*?)?(?:(?:\:|^)(\d+))?)((\/[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
 function parseURL(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/basic/parseURL_test.js

@@ -30,3 +30,10 @@ test('?80', 'path', '?80')
 test('?80', 'search', '?80')
 test('?80', 'query', '80')
 test('#?80', 'hash', '#?80')
+test("http://[fe80::caa:a647:ef1d:b4db]/", "host", "[fe80::caa:a647:ef1d:b4db]")
+test("http://[::1]/", "host", "[::1]")
+test("http://[::]/", "host", "[::]")
+test("http://[::%12]/", "host", "[::%12]")
+test("http://[::]:80/", "hostname", "[::]")
+test("[::]:80/", "hostname", "[::]")
+test("[fd64:f52:f52:f52:f52:f52:f52:97]", "hostname", "[fd64:f52:f52:f52:f52:f52:f52:97]")

package/coms/crypt/prime.js

@@ -0,0 +1,60 @@
+var prime = [2, 3];
+var updatePrime = function (m) {
+    var n = prime[prime.length - 1];
+    var i = 1;
+    a: while (n < m) {
+        n += 2;
+        if (prime[i] * prime[i] < n) i++;
+        for (var cx = 0, dx = i + 1; cx < dx; cx++) {
+            if (n % prime[cx] === 0) continue a;
+        }
+        prime.push(n);
+    }
+}
+var isPrime = function (s) {
+    var n = Math.sqrt(Number(s));
+    s = BigInt(s);
+    if (n > prime[prime.length - 1]) updatePrime(n);
+    for (var cx = 0; prime[cx] < n; cx++)if (s % BigInt(prime[cx]) === 0n) return false;
+    return true;
+};
+prime.isPrime = isPrime;
+prime.find = function (start, delta, end) {
+    var isBigInt = typeof start === 'bigint' || typeof end === 'bigint';
+    var n = [0, 1, 2];
+    if (isBigInt) {
+        start = BigInt(start);
+        delta = BigInt(delta);
+        n = n.map(BigInt);
+    } else {
+        start = Number(start);
+        delta = Number(delta);
+    }
+    if (!(delta > n[0]) && !(delta < n[0])) {
+        return isPrime(start);
+    }
+    if (delta != n[1] && delta != -n[1] && start % delta == n[0]) {
+        return null;
+    }
+
+    if (delta % n[1]) return null;
+    if (start % n[2] === n[0]) {
+        start += delta > n[0] ? n[1] : -n[1];
+    }
+    if (delta === n[1] || delta === -n[1]) {
+        delta *= n[2];
+    }
+    if (end) {
+        var res = [];
+        if (isBigInt) end = BigInt(end);
+        else end = Number(end);
+        for (var cx = start, dx = end + n[1], ex = delta; ex > n[0] ? cx < dx : cx > dx; cx += ex) {
+            if (isPrime(cx)) res.push(cx);
+        }
+    } else {
+        while (!isPrime(start)) start += delta;
+        var res = start;
+    }
+    return res;
+
+};

package/coms/crypt/prime_test.js

@@ -0,0 +1,10 @@
+var test = function (a, b, c) {
+    var start = new Date;
+    prime.find(a, b, c)
+    var end = new Date;
+    console.log(a, b, c, '用时', end - start);
+}
+test(19000000n, 1, 21000000n);
+test(19000000, 1, 21000000);
+test(19000000, 1, 21000000);
+test(19000000n, 1, 21000000n);

package/coms/zimoli/autodragchildren.js

@@ -152,7 +152,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             saved_opacity = targetBox.style.opacity;
             rebuildTargets = function () { };
             [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
-            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+            moveChildren = moveChildren.bind(null, that, previousElements, followedElements, moveMargin, recover);
         } else {
             previousElements = [];
             followedElements = [];
@@ -176,7 +176,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
                 previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
                 [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+                moveChildren = moveChildren.bind(null, that, previousElements, followedElements, moveMargin, recover);
             };
         }
     };

package/coms/zimoli/table.js

@@ -121,6 +121,7 @@ function table(elem) {
         move: resizeTarget,
     });
     onmousemove(tableElement, function (event) {
+        if (!thead) [thead] = table.getElementsByTagName("thead");
         if (!getTargetIn(thead, event.target)) return;
         var tds = getTargetIn(cellMatchManager, event.target);
         if (!isArray(tds)) tds = [];
@@ -159,6 +160,7 @@ function table(elem) {
         return thead;
     };
     care(table, function ([fields, data]) {
+        thead = null;
         this.innerHTML = template;
         render(this, {
             fields,
@@ -169,10 +171,7 @@ function table(elem) {
     })
     autodragchildren(
         table,
-        function (a) {
-            console.log('match')
-            return cellMatchManager.apply(this, arguments);
-        },
+        cellMatchManager,
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
                 var [fields] = table.src;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.5.3",
+    "version": "3.5.7",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {