efront 2.46.0 → 2.47.0

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/basic/refilm_decode.js

@@ -260,16 +260,31 @@ function parse(piece) {
     }
     var [name, type, options] = piece, key, repeat;
     if (piece.length === 1 && isObject(name)) {
-        var { name, needs, required, checks, type, key, size, unit, endwith, ratio, value, repeat, comment, options } = name;
+        var {
+            name, type, key, value, comment, options,
+            size, unit, ratio,
+            needs, checks, repeat, endwith,
+            required, inlist, hidden, readonly,
+            delete_onempty, delete_onsubmit,
+        } = name;
     } else {
-        var is_require = a => {
-            if (/^\*|\*$/.test(a)) {
-                required = true;
-                return a.replace(/^\*|\*$/, '');
+        var test = (reg,a) => {
+            if (reg.test(a)) {
+                return true;
             }
-            return a;
         };
-        type = is_require(type);
+        var is = function (a) {
+            var reg = /^[\*\+\-\!\-\$&\?\~]|[\*\+\-\!\-\$&\?\~]$/;
+            if (!reg.test(a)) return a;
+            required = test(/^\*|\*$/, a);
+            inlist = test(/^[\+\!]|[\+\!]$/, a);
+            hidden = test(/^\-|\-$/, a);
+            readonly = test(/^[\$&]|[\$&]$/, a);
+            delete_onempty = test(/^\?|\?$/, a);
+            delete_onsubmit = test(/^\~|\~$/, a);
+            return a.replace(reg, '');
+        };
+        type = is(type);
         if (typeof name === 'string') {
             if (!isContainer) {
                 if (!type) {
@@ -370,17 +385,23 @@ function parse(piece) {
             type = type.slice(1);
         }
         if (typeof options === "string") {
-            options = is_require(options);
+            options = is(options);
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');
             if (/,/.test(options)) options = scanSlant(options, ',');
             else options = scanSlant(options, "");
             if (needUnfold) unfoldOptions(size, options);
         }
-        name = is_require(name);
-        key = is_require(key);
+        name = is(name);
+        key = is(key);
     }
-    var field = { name, checks, required, needs, type, key, size, unit, endwith, ratio, value, repeat, comment, options };
+    var field = {
+        name, type, key, value, comment, options,
+        size, unit, ratio,
+        needs, checks, repeat, endwith,
+        required, inlist, hidden, readonly,
+        delete_onempty, delete_onsubmit,
+    };
     var parent = piecepath[piecepath.length - 1];
     if (parent) {
         field.parent = parent;

package/coms/crypt/encode62.js

@@ -1,5 +1,7 @@
 "use strict";
 module.exports = encode62;
+var encodeUTF8 = require("../basic/encodeUTF8");
+var decodeUTF8 = require("../basic/decodeUTF8");
 var src = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 var map = {};
 src.split("").forEach((s, i) => map[s] = i);
@@ -7,7 +9,7 @@ src.split("").forEach((s, i) => map[s] = i);
 function encode62(string) {
     string = String(string)
     string = string.length + string + "2017-08-19";
-    var buff = Buffer.from(src);
+    var buff = src.split('');
     for (var cx = 0, dx = buff.length + src.length, sl = string.length, cl = buff.length; cx < dx; cx++) {
         var s1 = string.charCodeAt(cx % sl) % cl;
         var s2 = cx % cl;
@@ -15,7 +17,7 @@ function encode62(string) {
         buff[s1] = buff[s2];
         buff[s2] = btemp;
     }
-    return buff.toString();
+    return buff.join('');
 };
 
 
@@ -31,13 +33,29 @@ Object.assign(encode62, {
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        return this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
     },
     timeencode(string) {
         var { time_delta } = this;
-        var time_stamp = +new Date();
+        var time_free = time_delta / 6 | 0;
+        var time_stamp = +new Date() - time_free;
         var time_rest = time_stamp % time_delta;
-        return this.encode62(string, time_stamp.toString(36)) + time_rest.toString(36).padStart(time_delta.toString(36).length, '0');
+        var time_rest_str = time_rest.toString(36);
+        var time_delta_str = time_delta.toString(36);
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
+        return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+    },
+    timeupdate(string) {
+        var { time_delta } = this;
+        var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
+        var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
+        var time_stamp = time_start + parseInt(time_rest, 36);
+        if (time_stamp + (time_delta >> 1) > +new Date()) {
+            return string;
+        } else {
+            return this.timeencode(this.timedecode(string));
+        }
     },
     encode62(data, sign) {
         if (!sign) return data;
@@ -53,14 +71,19 @@ Object.assign(encode62, {
         });
         return result;
     },
-    encode(data, sign) {
+    encodestr(data, sign) {
         if (!sign) return data;
-        var result = Buffer.from(data);
+        var result = encodeUTF8(data);
         sign = Buffer.from(sign);
+        var delta = 0, c = 0;
         for (var cx = 0, dx = data.length; cx < dx; cx++) {
-            result[cx] = result[cx] ^ sign[cx % sign.length];
+            if (result[cx] < 128) result[cx] = result[cx] ^ sign[cx % sign.length];
+            else if (result[cx] < 192) {
+                var c = c << 8 | sign[(delta += 6) / 8 % sign.length | 0];
+                result[cx] = result[cx] ^ (c >> 8 - delta % 8 & 0x3f);
+            }
         }
-        return result;
+        return decodeUTF8(result);
     },
     decode(data, sign) {
         if (!sign) return data;
@@ -75,7 +98,7 @@ Object.assign(encode62, {
         return encode62(string);
     },
     genb() {
-        return encode62(Date.now() + "" + Math.random());
+        return encode62(Date.now() * Math.random() + "" + Math.random().toString(36) + Math.random().toString(36).toUpperCase());
     },
     huan(x, y) {
         return x.split("").map(s => y[map[s]]).join("");
@@ -90,24 +113,10 @@ Object.assign(encode62, {
         y.split("").forEach((a, j) => y_map[a] = j);
         return z.split("").map(c => src[y_map[c]]).join("");
     },
-    ab2c(a, b) {
-        return this.huan(a, b);
-    },
-    ba2d(a, b) {
-        return this.huan(b, a);
-    },
-    ca2b(c, a) {
-        return this.yuan(c, a);
-    },
-    cb2a(c, b) {
-        return this.suan(c, b);
-    },
-    da2b(d, a) {
-        return this.suan(d, a);
-    },
-    db2a(d, b) {
-        return this.yuan(d, b);
-    }
 });
-
+encode62.ab2c = encode62.ba2d = encode62.huan;
+encode62.db2a = encode62.ca2b = encode62.yuan;
+encode62.da2b = encode62.cb2a = encode62.suan;
+encode62.decodestr = encode62.encodestr;
+encode62.encode = encode62.decode;
 encode62.decode62 = encode62.encode62;

package/coms/crypt/encode62_test.js

@@ -32,7 +32,8 @@ describe("encode62_test", function () {
         c = encode62.ab2c(a, b);
     });
     it("ba2d", function () {
-        d = encode62.ba2d(a, b);
+        // 注意，参数顺序已变更
+        d = encode62.ba2d(b, a);
     });
     it("ca2b", function () {
         expect(encode62.ca2b(c, a)).to.be.eq(b);

package/coms/zimoli/action.js

@@ -3,8 +3,7 @@ function main(config, item, params) {
         if (!config) return ok();
         if (isObject(config)) {
             if (config.do instanceof Function) {
-                config.do();
-                return;
+                return ok(config.do(item, params));
             }
             if (config.modal) {
                 var path = isString(config.modal) ? config.modal : config.modal.path;

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);
             };
         }
     };
@@ -337,7 +337,7 @@ function addhook() {
     }
     if (!mousedownEvent) return;
     var target = targetElement || mousedownEvent.currentTarget;
-    hooka(function (target) {
+    hooka.call(targetElement, function (target) {
         var res = [].filter.call(allowdrops || (matcher ? matcher(target) : document.querySelectorAll("[allowdrop]")), function (child) {
             return target && overlap(child, target);
         }).filter(e => {

package/coms/zimoli/button.less

@@ -14,9 +14,9 @@
     display: inline-block;
     white-space: nowrap;
     text-align: center;
-    // cursor: default;
     overflow: hidden;
     outline: none;
+    user-select: none;
 }
 >.label{
     position: relative;
@@ -177,7 +177,6 @@
 
 a&,
 &[type$=anchor] {
-    padding: 0;
     box-shadow: none;
     text-shadow: none;
     background: none;

package/coms/zimoli/contextmenu.js

@@ -3,23 +3,28 @@ var createMenu = function (event, items) {
     var menulist = sampleElement.cloneNode();
     menulist.setAttribute("mode", "v");
     menulist.tabIndex = 0;
-
-    var elem = menuList(menulist, items, function () {
-        if (action.apply(this, arguments) !== false) {
+    items = items.filter(item => {
+        if (!item.when) return true;
+        if (!item.when(event)) return false;
+        return true;
+    });
+    var elem = menuList(menulist, items, async function (item) {
+        if (await action.call(this, item, event.target) !== false) {
             remove(elem);
         }
     });
 
     return elem;
 }
-function contextmenu(target, menu) {
+function contextmenu(target, menuItems) {
     on("contextmenu")(target, function (event) {
         event.preventDefault();
-        if (menu instanceof Function) {
-            menu = menu.call(this, event);
+        var menu;
+        if (menuItems instanceof Function) {
+            menu = menuItems.call(this, event);
         }
-        if (menu instanceof Array) {
-            menu = createMenu.call(this, event, menu);
+        if (menuItems instanceof Array) {
+            menu = createMenu.call(this, event, menuItems);
         }
         if (!menu) return;
         css(menu, {

package/coms/zimoli/cross.js

@@ -175,8 +175,8 @@ function cross(method, url, headers) {
                             onerror({ status: "网络断开" });
                             break;
                         }
-                        if (!navigator.response) {
-                            onerror({ status: "服务器无响应" });
+                        if (!xhr.response) {
+                            onerror({ status: "无法访问服务器" });
                             break;
                         }
                     case 200:
@@ -268,7 +268,7 @@ function cross(method, url, headers) {
         var then = xhr.then;
         delete xhr.then;
         if (loaded) onloads.splice(0, onloads.length).map(e => e instanceof Function && e(xhr));
-        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(xhr));
+        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(errored));
         xhr.then = then;
     };
     var onloads = [], onerrors = [];

package/coms/zimoli/data.js

@@ -333,25 +333,23 @@ function fixApi(api, href) {
             }
             api.base = href;
             api.path = api.url;
-            if (/^\.([\?\#][\s\S]*)?$/.test(api.url)) {
-                api.url = href + api.url.replace(/^\./, "");
-            } else {
-                api.url = href + api.url;
+            if (/^\.([\?\#][\s\S]*)?$/.test(api.path)) {
+                api.path = api.path.replace(/^\./, "");
             }
             if (extraSearch || extraHash) {
                 if (/[\?#]/.test(api.url)) {
                     var [, search, hash] = paramReg.exec(api.url);
                 }
-                var url = api.url.replace(paramReg, '');
+                var path = api.path.replace(paramReg, '');
                 if (extraSearch) {
                     search = search ? extraSearch + '&' + search : extraSearch;
                 }
                 if (extraHash) {
                     hash = hash ? extraHash + '&' + hash : extraHash;
                 }
-                if (search) url += '?' + search;
-                if (hash) url += "#" + hash;
-                api.url = url;
+                if (search) path += '?' + search;
+                if (hash) path += "#" + hash;
+                api.path = path;
             }
         }
     }
@@ -404,6 +402,12 @@ function createApiMap(data) {
 }
 var _configfileurl;
 var configPormise;
+function LoadingArray_then(ok, oh) {
+    if (this.loading_promise) this.loading_promise.then(ok, oh);
+    else if (this.is_errored) oh(this.error_message);
+    else ok();
+}
+
 var privates = {
     loadAfterConfig(serviceId, params) {
         var promise = this.getApi(serviceId).then((api) => {
@@ -434,7 +438,8 @@ var privates = {
     },
     fromApi(api, params) {
         let url = api.url;
-
+        var base = api.base;
+        if (base) url = base + api.path;
         if (this.validApi(api, params)) {
             params = this.repare(api, params);
             return this.loadIgnoreConfig(api.method, url, params, api);
@@ -623,6 +628,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = true;
             response.is_loading = false;
+            if (response.then === LoadingArray_then) delete response.then;
         }
         this.loading_count--;
     },
@@ -631,6 +637,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = false;
             response.is_loading = true;
+            response.then = LoadingArray_then;
         }
         this.loading_count++;
     },
@@ -657,6 +664,9 @@ var data = {
         data = this.parseConfig(data);
         configPormise = Promise.resolve(data);
     },
+    getConfig() {
+        return privates.getConfigPromise();
+    },
     parseConfig(o) {
         if (o instanceof Promise) {
             return o.then(createApiMap);

package/coms/zimoli/dispatch.js

@@ -9,15 +9,22 @@ var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, even
     }
 };
 function main() {
-    var target, event;
+    var target, event, value;
     for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
         var arg = arguments[cx];
-        if (isString(arg)) {
-            event = createEvent(arg);
-        } else if (isNode(arg) || arg === window || arg === document) {
+        if (isNode(arg) || arg === window || arg === document) {
             target = arg;
-        } else {
-            event = arg;
+        }
+        else if (!event) {
+            if (isString(arg)) {
+                event = createEvent(arg);
+            }
+            else {
+                event = arg;
+            }
+        }
+        else {
+            event.value = arg;
         }
     }
     if (dispatch(target || window, event)) {

package/coms/zimoli/encode62.js

@@ -23,8 +23,8 @@ var encode62 = {
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-
-        return this.encode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = this.encode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -33,6 +33,7 @@ var encode62 = {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
         return this.encode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {

package/coms/zimoli/field.js

@@ -16,7 +16,7 @@ function main(elem) {
     }, false);
     elem.setAttribute("field", '');
     elem.renders = [function () {
-        if (!this.src) return;
+        if (!(this.src instanceof Array)) return;
         var [f, data] = this.src;
         if (!f || !data) return;
         var v = data[f.key];

package/coms/zimoli/input.js

@@ -66,12 +66,6 @@ function input(element) {
                     on("keydown")(element, number);
                     break;
             }
-            if (format) {
-                var picker = selectDate(format, input.value);
-                on("change")(element, picker.update);
-                select(element, picker);
-                element.readonly = "readonly";
-            }
         }
         return element;
     }

package/coms/zimoli/input.less

@@ -30,13 +30,13 @@
     display: none;
 }
 
-&::-webkit-calendar-picker-indicator {
-    display: none;
-}
+// &::-webkit-calendar-picker-indicator {
+//     display: none;
+// }
 
-&::-webkit-calendar-picker-indicator:hover {
-    display: none;
-}
+// &::-webkit-calendar-picker-indicator:hover {
+//     display: none;
+// }
 
 &::-webkit-clear-button {
     display: none;

package/coms/zimoli/menuList.html

@@ -1,3 +1,4 @@
-<menu-item ng-repeat="menu in menus" ng-click="open(menu,event)" ng-mouseleave="clearTimeout(popTimer)"
-    ng-mouseenter="popTimer=popMenu(menu,event)" ng-class="{'has-children':menu.children&&menu.children.length}">
+<menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open(menu,event)"
+    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,event)"
+    ng-class="{'has-children':menu.children&&menu.children.length,'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red'}">
 </menu-item>

package/coms/zimoli/menuList.less

@@ -1,38 +1,42 @@
 & {
-    display         : inline-block;
-    width           : auto;
-    height          : auto;
+    display: inline-block;
+    width: auto;
+    height: auto;
     background-color: #fff;
-    box-shadow      : 0 0 20px -6px rgba(0, 0, 0, .6);
-    line-height     : 28px;
-    padding         : 6px 0;
+    box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
+    border: 1px solid #0003;
+    line-height: 28px;
+    padding: 6px 0;
 
     >menu-item {
-        display         : block;
-        position        : relative;
-        padding         : 0 16px;
-        border-radius   : 0;
+        display: block;
+        position: relative;
+        padding: 0 16px;
+        border-radius: 0;
         background-color: inherit;
-        color           : inherit;
-        box-shadow      : none;
-        text-align      : inherit;
+        color: inherit;
+        box-shadow: none;
+        text-align: inherit;
+        &.warn{
+            color: #c28;
+        }
 
         &.has-children {
             padding: 0 24px 0 16px;
 
             &:after {
-                content    : ">";
-                display    : block;
-                width      : 20px;
-                height     : 20px;
+                content: ">";
+                display: block;
+                width: 20px;
+                height: 20px;
                 line-height: 20px;
-                font-size  : 18px;
-                transform  : scaleX(.56);
-                position   : absolute;
-                right      : 6px;
-                top        : 50%;
-                margin-top : -10px;
-                text-align : right;
+                font-size: 18px;
+                transform: scaleX(.56);
+                position: absolute;
+                right: 6px;
+                top: 50%;
+                margin-top: -10px;
+                text-align: right;
             }
         }
 
@@ -41,5 +45,5 @@
 
 i {
     display: inline-block;
-    width  : 20px;
+    width: 20px;
 }