efront 4.4.14 → 4.5.3

package/coms/zimoli/data.js

@@ -98,7 +98,7 @@ var seekFromSource = function (obj, base) {
 function getErrorMessage(error = this) {
     if (!isObject(error)) return String(error);
     if (error instanceof Error) return String(error);
-    var words = "reason,message,desc,descption,msg,err,error,data".split(',');
+    var words = "reason,message,desc,descption,msg,err,error,detail,data".split(',');
     while (words.length) {
         var a = words.shift();
         if (error[a]) {
@@ -176,29 +176,30 @@ function getParamsFromUrl(url, s = "?") {
 function getUrlParamsForApi(api, url) {
     var r = /([\s\S]*?)/.source;
     var cap = [];
-    var base = api.url.replace(/[\?\#][\s\S]*$/, '')
+    var reg = api.url.replace(/[\?\#][\s\S]*$/, '')
         .replace(/[\.\*\+\-\[\]\{\}\(\)\\\/\!<\>\^]/g, '\\$&')
-        .replace(/\:\w+/, function (a) {
+        .replace(/\:\w+/g, function (a) {
             cap.push(a.slice(1));
             return r;
         });
-    if (api.base) base = api.base + base;
-    if (/\/$/.test(base)) base += "?";
+    if (/\/$/.test(reg)) reg += "?";
     var params = {};
-    url = url.replace(/[\?#]*$/g, function (match) {
+    url = url.replace(/[\?#][\s\S]*$/g, function (match) {
         match.split(/[&#\?]+/).forEach(function (s) {
             if (!s) return;
             var [k, v] = s.split("=");
             params[k] = v;
         });
         return '';
-    }).replace(new RegExp(`^${base}$`, 'ig'), function () {
+    });
+    if (api.base === url.slice(0, api.base.length)) url = url.slice(api.base.length), reg = new RegExp(`^${reg}$`);
+    else reg = new RegExp(reg + '$');
+    url.replace(reg, function () {
         var args = arguments;
         cap.forEach(function (a, cx) {
             params[a] = args[cx + 1];
         });
     });
-    params = serialize(params);
     return params;
 }
 
@@ -256,7 +257,7 @@ function seekResponse(data, seeker, apiMap = {}) {
                 data = JSON.parse(data);
             }
             if (next) {
-                data = (pick || next.id) + "?" + getUrlParamsForApi(next, data);
+                data = (pick || next.id) + "?" + serialize(getUrlParamsForApi(next, data));
                 if (getNextValue) {
                     data = getParamsFromUrl(data);
                     if (pick) data = data[pick];
@@ -300,9 +301,9 @@ function parseConfig(api) {
         });
         return '';
     });
-    url.replace(/[\?\#][\s\S]*$/, '').replace(/([\:\\]\:|\:\w+)/g, function (p) {
+    url.replace(/[\#][\s\S]*$/, '').replace(/([\:\\]\:|\:\w+)/g, function (p) {
         p = p.slice(1);
-        if (!required[p] && p !== ':') {
+        if (p !== ':' && required.indexOf(p) < 0) {
             required.push(p);
         }
     });
@@ -468,7 +469,43 @@ function LoadingArray_then(ok, oh) {
 function LoadingArray_abort(ok, oh) {
     if (this.loading) this.loading.abort();
 }
-
+var getApi = function (serviceId, promised_map) {
+    return promised_map.then((apiMap) => {
+        serviceId = serviceId.replace(/[\?\:][\s\S]*$/, "");
+        const api = apiMap[serviceId];
+        if (!api) throw new Error(i18n`没有找到对应的接口 id ${serviceId}.`);
+        return extend({}, api, { root: apiMap });
+    });
+};
+var prepareURL = function (url, params) {
+    var rest = [];
+    var search;
+    var uri = url.replace(/#[\s\S]*$/, "").replace(/[\\\:]\:|\:[a-z\_][\w]*/gi, function (d) {
+        d = d.slice(1);
+        if (d === ":") return d;
+        rest.push(d);
+        return seekResponse(params, d) || '';
+    });
+    if (isObject(params)) params = extend(params instanceof Array ? [] : {}, params);
+    if (/\?/.test(uri)) search = uri.replace(/^[\s\S]*?\?/, "");
+    var baseuri = uri.replace(/\?[\s\S]*$/, "");
+    var hasOwnProperty = {}.hasOwnProperty;
+    if (search) {
+        var searchParams = parseKV(search);
+        if (params) for (var k in searchParams) {
+            if (hasOwnProperty.call(searchParams, k) && hasOwnProperty.call(params, k)) {
+                searchParams[k] = params[k];
+                rest.push(k);
+            }
+        }
+        search = serialize(searchParams);
+        if (search) uri = baseuri + "?" + search;
+        else uri = baseuri;
+    } else {
+        uri = baseuri;
+    }
+    return [uri, rest, baseuri, search];
+};
 var privates = {
     pack(serviceId, params) {
         if (/\?/.test(serviceId)) {
@@ -498,7 +535,7 @@ var privates = {
             params = this.repare(api, params);
             return this.loadIgnoreConfig(api.method, url, params, api);
         }
-        return Promise.resolve();
+        return Promise.reject(ABORTED);
     },
     repare(api, params) {
         var { required, autotrim, prepared } = api;
@@ -545,12 +582,7 @@ var privates = {
         return true;
     },
     getApi(serviceId) {
-        return this.getConfigPromise().then((apiMap) => {
-            serviceId = serviceId.replace(/[\?\:][\s\S]*$/, "");
-            const api = apiMap[serviceId];
-            if (!api) throw new Error(i18n`没有找到对应的接口 id ${serviceId}.`);
-            return extend({}, api, { root: apiMap });
-        });
+        return getApi(serviceId, this.getConfigPromise());
     },
     prepare(method, url, params) {
         var spliterIndex = /[\:\|\/\~\!\?]/.exec(method), search;
@@ -558,33 +590,8 @@ var privates = {
         else spliterIndex = method.length;
         var coinmethod = method.slice(0, spliterIndex).toLowerCase();
         var realmethod = coinmethod.replace(/\W+$/g, '');
-        var rest = [];
-        var uri = url.replace(/#[\s\S]*$/, "").replace(/[\\\:]\:|\:[a-z\_][\w]*/gi, function (d) {
-            d = d.slice(1);
-            if (d === ":") return d;
-            rest.push(d);
-            return seekResponse(params, d) || '';
-        });
-        if (isObject(params)) params = extend(params instanceof Array ? [] : {}, params);
-        if (/\?/.test(uri)) search = uri.replace(/^[\s\S]*?\?/, "");
-        var baseuri = uri.replace(/\?[\s\S]*$/, "");
-        var hasOwnProperty = {}.hasOwnProperty;
-        if (search) {
-            var searchParams = parseKV(search);
-            if (params) for (var k in searchParams) {
-                if (hasOwnProperty.call(searchParams, k) && hasOwnProperty.call(params, k)) {
-                    searchParams[k] = params[k];
-                    rest.push(k);
-                }
-            }
-            search = serialize(searchParams);
-            if (search) uri = baseuri + "?" + search;
-            else uri = baseuri;
-        } else {
-            uri = baseuri;
-        }
-
-        rest.forEach(k => delete params[k]);
+        var [uri, rest, baseuri, search] = prepareURL(url, params);
+        if (params && rest.length) rest.forEach(r => delete params[r]);
         return { method: realmethod, coinmethod, selector: method.slice(spliterIndex + 1), search, baseuri, uri, params };
     },
     loadIgnoreConfig(method, url, params1, api) {
@@ -595,7 +602,7 @@ var privates = {
         var temp = JSON.stringify(params);
         var currentTime = +new Date;
         var loading = promise && promise.loading;
-        if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
+        if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search || promise.uri !== uri) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
                     headers = seekFromSource(headers, api.base);
@@ -605,12 +612,13 @@ var privates = {
                 }).error(xhr => {
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
+                        oh({ status: loading.status, api, params: params1, error: e, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }
                 });
             });
+            promise.uri = uri;
             promise.loading = loading;
             promise.search = search;
             promise.params = temp;
@@ -619,7 +627,11 @@ var privates = {
         }
         var p = promise.then(function (response) {
             if (/\*$/.test(coinmethod)) return response;
-            var data = parseData(response);
+            var type = loading.getResponseHeader?.("content-type");
+            var data = response;
+            if (/text\/plain|json|[xyt]ml/i.test(type)) {
+                data = parseData(data);
+            }
             var checked = error_check(data);
             var apiMap = api && api.root;
             var trans = api ? api.transpile : getTranspile(url);
@@ -672,6 +684,7 @@ var loadInstance = function (storage, id) {
 };
 
 function responseCrash(e, data) {
+    if (e === ABORTED || e === OUTDATE) return;
     data.is_errored = true;
     data.is_loading = false;
     data.error_message = getErrorMessage(e);
@@ -681,6 +694,10 @@ function responseCrash(e, data) {
     } else {
         data.error = e;
     }
+    if (isObject(e)) {
+        if (e.reported) return;
+        e.reported = true;
+    }
     error_report(e, e.status < 500 ? 'warn' : 'error');
 }
 var toDataString = function () { return isEmpty(this.data) ? '' : this.data };
@@ -724,8 +741,14 @@ var unbindInstance = function (instanceId, callback) {
 };
 var OUTDATE = new Error(i18n`请求被覆盖`);
 var ABORTED = new Error(i18n`请求已取消`);
+var oncatch = function (e) {
+    if (e === OUTDATE || e === ABORTED) return;
+    throw e;
+};
 var data = {
+    prepareURL,
     decodeStructure,
+    getUrlParamsForApi,
     encodeStructure,
     abortAll: cross.abortAll,
     responseLoaded(response) {
@@ -812,12 +835,15 @@ var data = {
             config = Promise.resolve(config).then(createApiMap);
         }
         return enrich({
-            from(id, params) {
-                return config.then(function (data) {
-                    var a = data[id];
-                    return privates.fromApi(a, params);
+            from(id, params, parse) {
+                return config.then(function (map) {
+                    var a = map[id];
+                    return data.fromApi(a, params, parse);
                 });
             },
+            getApi(id) {
+                return getApi(id, config);
+            },
             queue(ids, params, cb) {
                 ids = ids.slice(0);
                 config.then(function (res) {
@@ -835,86 +861,57 @@ var data = {
         });
     },
     fromApi(api, params, parse) {
-        var id = parse instanceof Function ? getInstanceId() : 0;
         var p = privates.fromApi(api, params);
-        if (id) this.removeInstance(id);
-        var url = api.url;
-        var response = this.getInstance(id || url);
-        if (!isObject(response)) response = new LoadingArray;
-        this.responseLoading(response);
-        response.loading = p.loading;
-        p = response.loading_promise = p.then((data) => {
-            response.loading = null;
-            if (id) {
-                data = parse(data);
-                this.setInstance(id, data, false);
-                this.removeInstance(id);
-            } else {
-                this.setInstance(url, data);
-            }
-            this.responseLoaded(response);
-            return data;
-        });
-        p.catch((e) => {
-            this.responseCrash(e, response);
-        });
-        return response;
-
+        p.id = api.id;
+        return this.createResponse(p, parse);
+    },
+    postURL(url, data, parse) {
+        var p = privates.loadIgnoreConfig("post", url, data);
+        p.id = "post " + url;
+        return this.createResponse(p, parse);
     },
     fromURL(url, parse) {
-        var id = parse instanceof Function ? getInstanceId() : 0;
         var p = privates.loadIgnoreConfig('get', url);
+        p.id = "get " + url;
+        return this.createResponse(p, parse);
+    },
+    createResponse(p, parse) {
+        var id = parse instanceof Function ? getInstanceId() : 0;
         if (id) this.removeInstance(id);
-        var response = this.getInstance(id || url);
+        var pid = p.id;
+        var response = this.getInstance(id || pid);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
         response.loading = p.loading;
-        p = response.loading_promise = p.then((data) => {
+        response.loading_promise = p;
+        p = p.then((data) => {
             response.loading = null;
             if (id) {
                 data = parse(data);
                 this.setInstance(id, data, false);
                 this.removeInstance(id);
             } else {
-                this.setInstance(url, data);
+                this.setInstance(pid, data);
             }
             this.responseLoaded(response);
             return data;
-        });
-        p.catch((e) => {
+        }, (e) => {
             this.responseCrash(e, response);
-        });
-
+        })
+        if (parse) response.loading_promise = p;
         return response;
     },
     asyncInstance(sid, params, parse) {
         // 不同参数的请求互不影响
         if (typeof sid !== "string") throw new Error(i18n`serviceId 只能是字符串`);
-        var id = parse instanceof Function || params ? getInstanceId() : 0;
-        if (id) this.removeInstance(id);
-        var response = this.getInstance(id || sid);
-        if (!isObject(response)) response = new LoadingArray;
-        this.responseLoading(response);
-        var p = response.loading_promise = privates.getApi(sid).then((api) => {
+        var p = privates.getApi(sid).then((api) => {
             params = privates.pack(sid, params);
             var p = privates.fromApi(api, params);
-            response.loading = p.loading;
+            p.loading = response.loading = p.loading;
             return p;
-        }).then((data) => {
-            response.loading = null;
-            if (id) {
-                data = parse instanceof Function ? parse(data) : data;
-                this.setInstance(id, data, false);
-                this.removeInstance(id);
-            } else {
-                this.setInstance(sid, data);
-            }
-            this.responseLoaded(response);
-            return data;
-        });
-        p.catch((e) => {
-            this.responseCrash(e, response);
-        });
+        }, oncatch);
+        p.id = sid;
+        var response = this.createResponse(p, parse);
         return response;
     },
 
@@ -939,77 +936,35 @@ var data = {
         });
         var id = "." + sid;
         var instance = this.getInstance(id);
-        if (!isObject(instance)) instance = new LoadingArray;
-
-        var promise1 = instance.loading_promise;
-        if (promise1) {
-            var params = promise1.params;
-            if (shallowEqual(params1, params)) {
-                return instance;
-            }
-        }
-        this.responseLoading(instance);
-        promise1 = instance.loading_promise = new Promise(function (ok) {
-            if (!instance.loading) {
-                instance.loading = false;
-            }
-            setTimeout(ok, timeout);
+        var loading_promise = instance && instance.loading_promise;
+        var p = Promise.resolve().then(function () {
+            if (loading_promise) return wait(timeout);
+            return wait(60);
         }).then(function () {
-            if (promise1 !== instance.loading_promise) throw OUTDATE;
+            if (p !== instance.loading_promise) throw OUTDATE;
             return privates.getApi(sid);
         }).then((api) => {
-            if (promise1 !== instance.loading_promise) throw OUTDATE;
+            if (p !== instance.loading_promise) throw OUTDATE;
+            if ("params" in instance && shallowEqual(instance.params, params1)) throw ABORTED;
+            instance.params = params1;
             if (instance.loading) {
                 instance.loading.abort();
             }
-            var params2 = privates.pack(sid, params1);
-            if (!privates.validApi(api, params2)) throw ABORTED;
-            let url = api.url;
-            var base = api.base;
-            if (base) url = base + api.path;
-            var { method, uri, params, selector } = privates.prepare(api.method, url, params2);
-            var promise = new Promise(function (ok, oh) {
-                var headers = api.headers;
-                if (headers) {
-                    headers = seekFromSource(headers, api.base);
-                }
-                instance.loading = cross(method, uri, headers).send(params).done(xhr => {
-                    if (instance.loading !== xhr) return oh(ABORTED);
-                    instance.loading = null;
-                    ok(xhr.responseText || xhr.response);
-                }).error(xhr => {
-                    if (instance.loading !== xhr) return oh(ABORTED);
-                    instance.loading = null;
-                    try {
-                        var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, error: e, api, params: params2, toString: getErrorMessage })
-                    } catch (error) {
-                        oh(error);
-                    }
-                });
-            }).then(function (response) {
-                return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
-            });
-            return promise;
+            var r = privates.fromApi(api, params1);
+            instance.loading = r.loading;
+            return r;
         }).then((data) => {
-            if (instance.loading_promise !== promise1) throw ABORTED;
-            if (id) {
-                data = parse instanceof Function ? parse(data) : data;
-                this.setInstance(id, data, false);
-            } else {
-                this.setInstance(sid, data);
-            }
-            this.responseLoaded(instance);
+            if (instance.loading_promise !== p) throw ABORTED;
+            if (isFunction(parse)) data = parse(data);
             return data;
-        }).catch(function (e) {
-            if (e === OUTDATE || e === ABORTED) return;
-            throw e;
+        }, oncatch);
+        p.id = id;
+        var instance = this.createResponse(p);
+        p.catch(function () { }).then(() => {
+            return wait(timeout);
+        }).then(() => {
+            if (instance.loading_promise === p) delete instance.loading_promise;
         });
-        promise1.params = params;
-        promise1.catch((e) => {
-            this.responseCrash(e, instance);
-        });
-
         return instance;
     },
     /**

package/coms/zimoli/field.js

@@ -1,8 +1,7 @@
 function main(elem) {
     elem = optionbar.apply(null, arguments);
     var scope = {};
-    care(elem, function (p) {
-        if (elem.childNodes.length) return;
+    if (!elem.childNodes.length) care(elem, function (p) {
         var [f, data] = p;
         elem.innerHTML = field;
         render(elem, scope = {
@@ -10,13 +9,14 @@ function main(elem) {
             data,
             error: null,
             field: f,
+            container,
             readonly: !!this.readonly
         });
         elem.oldValue = data[f.key];
         elem.setAttribute("field", f.key);
     }, false);
     elem.setAttribute("field", '');
-    elem.renders = [function () {
+    elem.$renders = [function () {
         if (!(this.src instanceof Array)) return;
         var [f, data] = this.src;
         if (!f || !data) return;

package/coms/zimoli/field.less

@@ -2,6 +2,11 @@
     height: auto;
     box-shadow: none !important;
 
+    >model:first-child {
+        padding: 6px 10px;
+        display: block;
+    }
+
     >.head {
         vertical-align: top;
 
@@ -47,7 +52,8 @@
         border-color: #f32;
         outline: 1px solid #f32;
     }
-    .error{
-        color:#c32;
+
+    .error {
+        color: #c32;
     }
 }

package/coms/zimoli/filterTime.js

@@ -38,6 +38,7 @@ function format(formater) {
     });
 }
 function filterTime(time, format) {
+    if (!isHandled(time)) return '';
     if (isFinite(time)) time = +time;
     var value = new Date(time);
     if (!+value) {
@@ -50,37 +51,67 @@ function filterTime(time, format) {
         format = format.charAt(0);
     }
     var splited = getSplitedDate(value);
+    var now = new Date;
     var [year, month, date, hour, minute, second, milli, day] = splited;
-    var [year1, month1, date1, hour1, minute1] = getSplitedDate(new Date);
+    var [year1, month1, date1, hour1, minute1, second1, milli1, day1] = getSplitedDate(now);
     var today = new Date(year1, month1 - 1, date1);
     var thatday = new Date(year, month - 1, date);
     var delta = (today - thatday) / 24 / 3600000;
-    var time = `${hour}:${fixLength(minute)}`;
-    if (delta < 6 && delta > 2) {
-        return `星期` + days[day] + hour + "点";
+    if (minute === 0) var time = hour + "点";
+    else if (minute === 30) time = hour + "点半";
+    else time = `${hour}:${fixLength(minute)}`;
+    if (delta < 7 && delta > 2) {
+        if (day >= day1) {
+            return `上星期` + days[day] + time;
+        }
+        return `星期` + days[day] + time;
+    }
+    else if (delta > -7 && delta < -2) {
+        if (day <= day1) {
+            return `下星期` + days[day] + time;
+        }
+        return `星期` + days[day] + time;
     }
     switch (delta) {
         case 0:
             if (minute === minute1 && hour === hour1) {
-                return `刚刚`;
+                if (second <= second1) return `刚刚`;
+                return `${second - second1}秒后`;
+            }
+            else if (value > now) {
+                if (hour === hour1) {
+                    return `${minute - minute1}分钟后`;
+                }
+                return `还有${hour - hour1}小时${minute - minute1}分钟`;
             }
             return time;
+        case -1:
+            return "明天" + time;
         case 1:
-            return '昨天' + hour + "点"
+            return '昨天' + time;
         case 2:
-            return '前天' + hour + "点"
+            return '前天' + time;
+        case -2:
+            return "后天" + time;
         default:
             switch (year1 - year) {
                 case 0:
+                    if (value > now) {
+                        return `今年${month}${format || '月'}${date}${format ? '' : '日'} ${time}`;
+                    }
                     return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                 case 1:
                     if (month1 < month) {
                         return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                     }
                     return "去年" + month + "月";
+                case -1:
+                    return "明年" + month + "月" + date + "日";
                 case 2:
                     return "前年" + month + "月";
+                case -2:
+                    return "后年" + month + "月" + date + "日";
             }
-            return `${year}${format || '年'}`;
+            return `${year}${format || '年'}${month}${format || "月"}`;
     }
 }

package/coms/zimoli/fromBase64.js

@@ -5,6 +5,8 @@ var decodeMap = function () {
     for (var cx = 0, dx = encoding.length; cx < dx; cx++) {
         map[encoding[cx]] = cx;
     }
+    map["-"] = map["+"];
+    map["_"] = map["/"];
     return map;
 }();
 function fromBase64(input) {

package/coms/zimoli/grid.js

@@ -290,7 +290,7 @@ function grid(breakpoints) {
     }
     extend(grid, grid_prototype);
     if (!breakpoints) {
-        if (grid.clientHeight || grid.isMounted) {
+        if (grid.clientHeight || grid.$mounted) {
             createPointsWithChildren.call(grid);
         } else {
             on("append")(grid, createPointsWithChildren);
@@ -454,7 +454,7 @@ var grid_prototype = {
         run(this.breakpoints);
     },
     reshape() {
-        if (this.isMounted || this.offsetWidth || this.offsetHeight) {
+        if (this.$mounted || this.offsetWidth || this.offsetHeight) {
             this._reshape();
         } else {
             once("append")(this, this._reshape);

package/coms/zimoli/isMounted.js

@@ -1,9 +1,9 @@
 function isMounted(parent) {
-    if ("isMounted" in parent) return parent.isMounted;
+    if ("$mounted" in parent) return parent.$mounted;
     var temp = parent;
     while (temp && temp !== document.documentElement) {
-        if ("isMounted" in temp) {
-            return parent.isMounted = temp.isMounted;
+        if ("$mounted" in temp) {
+            return parent.$mounted = temp.$mounted;
         }
         temp = temp.parentNode;
     }

package/coms/zimoli/list.js

@@ -9,10 +9,10 @@ function ylist(container, generator, $Y) {
     list.autoFix = true;
     var saved_itemIndex = 0;
     addClass(list, 'list-' + $Y.toLowerCase());
-    if (!list.renders) {
-        list.renders = [];
+    if (!list.$renders) {
+        list.$renders = [];
     }
-    list.renders.push(function () {
+    list.$renders.push(function () {
         var a = saved_itemIndex;
         saved_itemIndex = void 0;
         if (a !== void 0) scrollTo(a);
@@ -463,9 +463,9 @@ function ylist(container, generator, $Y) {
      * @param {Element|null} focused 
      * @param {boolean} animate
      */
-    list.setFocus = function (focused, animate) {
+    list.setFocus = function (focused, animate = true) {
         if (isElement(focused) && (focused.hasAttribute("disabled") || focused.hasAttribute("line"))) return;
-        if (isFinite(focused)) {
+        if (focused === (focused | 0)) {
             var index = focused;
             focused = list.getIndexedElement(index);
             if (!focused) {