efront 2.46.3 → 2.47.0

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/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/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/model.js

@@ -37,6 +37,17 @@ var renderModel = function (field, data) {
 var constructors = {
     input,
     raw: input,
+    swap(e) {
+        var { field } = e;
+        e = swap(e);
+        if (field.options) {
+            e.getValue = function () {
+                return field.options[+this.checked].value;
+            };
+        }
+        return e;
+    },
+    switch: swap,
     row: textarea,
     password,
     text: textarea,
@@ -72,9 +83,26 @@ var constructors = {
         cast(elem, field);
         return elem;
     },
-    select() {
-        var elem = select();
-        elem.innerHTML = `<option ng-repeat="(o,i) in field.options" ng-bind="o.name||o" _value="o.key!==undefined?o.key:o"></option>`;
+    select(_, t) {
+        if (!t) {
+            var elem = select();
+            elem.innerHTML = `<option ng-repeat="(o,i) in field.options" ng-bind="o.name||o" _value="o.key!==undefined?o.key:o"></option>`;
+        }
+        else if (t === 'a') {
+            var { field, data } = _;
+            var pad = selectList(field.options, field.multi, true);
+            var e = document.createElement('select');
+            var opt = null;
+            for (var o of field.options) {
+                if (o.key === data[field.key]) {
+                    opt = o;
+                    break;
+                }
+            }
+            e.innerHTML = `<option selected value="${opt ? opt.key : ''}">${opt ? opt.name : '请选择'}</option>`;
+            e.value = opt ? opt.key : '';
+            elem = select(e, pad);
+        }
         return elem;
     },
     "repeat"(_, field_type) {
@@ -117,8 +145,18 @@ var readonly_types = {
     "size"({ field }, data) {
         var f = data[field.key];
         return size(f);
-    }
+    },
+    swap(e, data) {
+        var { field } = e;
+        var v = data[field.key];
+        if (field.options) {
+            var o = field.options[v];
+            if (o) return o.name;
+        }
+        return v;
+    },
 };
+readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {
         var { data, readonly, field } = elem;
@@ -205,7 +243,6 @@ function main(elem) {
         }
     };
     on("changes")(elem, function ({ changes }) {
-
         if (changes.data || changes.field || changes.readonly) {
             build();
         }

package/coms/zimoli/popup.js

@@ -4,8 +4,10 @@
 onkeydown(document, function (e) {
     if (e.which === 27 && rootElements.length) {
         var r = rootElements.pop();
-        r.blur();
-        remove(r);
+        if (r) {
+            r.blur();
+            remove(r);
+        }
     }
 });
 var animationStyle = "opacity:0;transform:scale(1.2);transition:.1s opacity ease-out,.2s transform ease-out;";
@@ -162,24 +164,27 @@ var popup_with_mask = function (element, mask = createMask(element)) {
     return element;
 };
 var isypop = function (target) {
+    if (!target) return false;
     var { offsetParent, nextSibling, previousSibling } = target;
     if (
-        nextSibling
+        nextSibling && nextSibling.tagName === target.tagName
         && (
             nextSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - nextSibling.offsetLeft >= nextSibling.offsetWidth / 2
         )
-        || previousSibling
+        || previousSibling && previousSibling.tagName === target.tagName
         && (
             previousSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - previousSibling.offsetLeft >= previousSibling.offsetWidth / 2
         )
     ) return true;
-    if (offsetParent && target.offsetTop / target.offsetHeight < .2 && offsetParent.offsetWidth / target.offsetWidth > 1.5) return true;
+    var padding = parseFloat(getComputedStyle(offsetParent).paddingTop) + parseFloat(getComputedStyle(offsetParent).paddingBottom);
+    if (offsetParent && target.offsetTop / target.offsetHeight < .2 && (offsetParent.clientWidth - padding) / target.offsetWidth > 1.5) return true;
 
 };
 var isxpop = arriswise(isypop, arguments);
 var popup_as_extra = function (element, target, style) {
+    element.target = target;
     if (style) {
         if (/^[vy]/i.test(style)) {
             popup_as_yextra(element, target, style);
@@ -195,9 +200,9 @@ var popup_as_extra = function (element, target, style) {
         popup_as_yextra(element, target, style);
     } else if (isxpop(target)) {
         popup_as_xextra(element, target, style);
-    } else if (isypop(target.parentNode)) {
+    } else if (isypop(target.offsetParent)) {
         popup_as_yextra(element, target, style);
-    } else if (isxpop(target.parentNode)) {
+    } else if (isxpop(target.offsetParent)) {
         popup_as_xextra(element, target, style);
     } else {
         if (/inline|cell/i.test(getComputedStyle(target).display)) {
@@ -266,10 +271,10 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         }
 
         css(element, `min-width:auto;`);
-        var aimedWidth = element.offsetWidth;
+        var aimedWidth = getScreenPosition(element).width;
         //如果宽度不足其附着元素的宽度
-        if (aimedWidth < target.offsetWidth) {
-            aimedWidth = target.offsetWidth;
+        if (aimedWidth < position.width) {
+            aimedWidth = position.width;
         }
 
         //如果宽度超出可视区，调整宽度

package/coms/zimoli/prompt.js

@@ -0,0 +1,40 @@
+function prompt(msg = "请输入", check) {
+    var ipt = input();
+    var oked, ohed;
+    var oks = [], ohs = [];
+    var fire = function () {
+        if (!oked && !ohed) return;
+        if (oked) oks.forEach(o => o(ipt.value));
+        if (ohed) ohs.forEach(o => o(ipt.value));
+        oks.splice(0, oks.length);
+        ohs.splice(0, ohs.length);
+    };
+    var c = confirm(msg, ipt, ["确认", "取消"], function (_) {
+        if (oked || ohed) return;
+        if (_ === "确认") {
+            if (check && check(ipt.value) === false) return false;
+            oked = true;
+        } else {
+            ohed = true;
+        }
+        fire();
+    });
+    on('append')(ipt, function () {
+        setTimeout(function () {
+            ipt.focus();
+        });
+    })
+    on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
+    on("keydown.enter")(c, function () {
+        if (check && check(ipt.value) === false) return;
+        oked = true;
+        remove(c);
+        fire();
+    });
+    c.then = function (ok, oh) {
+        oks.push(ok);
+        ohs.push(oh);
+        fire();
+    };
+    return c;
+}

package/coms/zimoli/render.js

@@ -90,7 +90,7 @@ var initialComment = function (renders, type, expression) {
 var parseRepeat = function (expression) {
     var reg =
         // /////////////////////////////////////////// i //       r       /////////////////////////  o  ///// a ///////////////////// t /////
-        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(\s+?:track\s*by\s+(.+?))?$/i;
+        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(?:\s+track\s*by\s+(.+?))?$/i;
     var res = reg.exec(expression);
     if (!res) return res;
     var [_, i, k, r, s, t] = res;
@@ -125,7 +125,7 @@ var createRepeat = function (search, id = 0) {
     var [context, expression] = search;
     var res = parseRepeat(expression);
     if (!res) throw new Error(`不能识别循环表达式: ${expression} `);
-    var { keyName, itemName, indexName, srcName } = res;
+    var { keyName, itemName, indexName, srcName, trackBy } = res;
     // 懒渲染
     var getter = createGetter([context, srcName]).bind(this);
     var element = this, clonedElements = [], savedValue, savedOrigin;
@@ -151,17 +151,26 @@ var createRepeat = function (search, id = 0) {
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
             var k = isArrayResult ? cx : key;
-            var c = changes[k];
-            if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
-            var clone = element.cloneNode();
-            clone.innerHTML = element.innerHTML;
-            clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             var $scope = {
                 [keyName || '$key']: k,
                 [itemName || '$item']: result[k],
                 [indexName || '$index']: cx
             };
+            if (trackBy) {
+                k = seek($scope, trackBy);
+                if (clonedElements[k]) {
+                    clonedElements[k].$scope = $scope;
+                    return clonedElements1[k] = clonedElements[k];
+                }
+            }
+            else {
+                var c = changes[k];
+                if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
+            }
+            var clone = element.cloneNode();
+            clone.innerHTML = element.innerHTML;
+            clone.renderid = id;
+            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;
@@ -556,7 +565,8 @@ function getFromScopes(key, scope, parentScopes) {
     if (key in scope) {
         return scope[key];
     }
-    if (parentScopes) for (var o of parentScopes) {
+    if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
+        var o = parentScopes[cx];
         if (key in o) {
             return o[key];
         }

package/coms/zimoli/rootElements.js

@@ -25,6 +25,7 @@ rootElements.pop = function (elem) {
     if (cx < 0) {
         cx = rootElements.length - 1;
     }
+    if (isFunction(rootElements[cx].onback) && rootElements[cx].onback() === false) return;
     return rootElements.splice(cx, 1)[0];
 };
 rootElements.mount = function (elem) {

package/coms/zimoli/search.js

@@ -0,0 +1,15 @@
+function search(seartext, options) {
+    if (options instanceof Array) {
+        var hasFullmatch = false;
+        var a = options.map(o => {
+            if (o.name === seartext) hasFullmatch = true;
+            var [power, m] = mark.power(o.name, seartext);
+            return { power, name: m, value: o.value };
+        }).filter(a => a.power > 0);
+        a.sort(function (a, b) {
+            return b.power - a.power;
+        });
+        a.hasFullmatch = hasFullmatch;
+        return a;
+    }
+}

package/coms/zimoli/select.js

@@ -2,21 +2,22 @@ var saved_list;
 var _remove = function () {
     var removing_list = saved_list;
     if (removing_list) {
-        var target = this;
-        setTimeout(function () {
+        setTimeout(function run() {
             if (removing_list !== saved_list) return remove(removing_list);
             var { activeElement } = document;
-            if (!getTargetIn(removing_list, activeElement)) {
+            a: if (!getTargetIn(removing_list, activeElement)) {
+                var extras = [].concat(removing_list.with);
+                for (var e of extras) {
+                    if (getTargetIn(e, activeElement)) break a;
+                }
                 remove(removing_list);
                 if (removing_list === saved_list) saved_list = null;
-            } else {
-                once('blur')(activeElement, function () {
-                    setTimeout(function () {
-                        if (document.activeElement === target) return;
-                        _remove();
-                    });
-                });
+                return;
             }
+            once('blur')(activeElement, function () {
+                if (!isMounted(this)) return removing_list.target.focus();
+                run();
+            });
         });
     }
 };
@@ -48,10 +49,23 @@ function select(target, list, removeOnSelect, direction) {
     onblur(target, removeByBlur);
     if (/select/i.test(target.tagName)) {
         onmousedown(target, preventDefault);
+        care(target, 'add-option', function (a) {
+            var o = document.createElement('option');
+            o.value = a.value || a;
+            o.innerHTML = a.name || a;
+            this.appendChild(o);
+        });
+        care(target, 'set-options', function (options) {
+            this.innerHTML = options.map(o => `<option value="${o.value}">${o.name}</option>`).join("");
+        });
+        on('focus')(target, preventDefault);
     }
     var onlistchange = function () {
         if (target.multiple) {
         } else {
+            if (!savedOptions) {
+                target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+            }
             target.value = this.value;
             dispatch(target, "change");
         }
@@ -114,9 +128,9 @@ function select(target, list, removeOnSelect, direction) {
             var allOptions = [].concat.apply([], target.querySelectorAll("option"));
             if (deepEqual.shallow(allOptions, savedOptions)) return;
             savedOptions = allOptions;
-            list = selectList(allOptions, target.multiple);
+            list = selectList(allOptions, target.multiple, target.editable);
             if (!target.multiple) {
-                onclick(list, _remove);
+                onclick(list, onlistclick);
             }
             bindEvent();
         };