efront 4.4.14 → 4.5.0

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]) {
@@ -178,11 +178,10 @@ function getUrlParamsForApi(api, url) {
     var cap = [];
     var base = 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 += "?";
     var params = {};
     url = url.replace(/[\?#]*$/g, function (match) {
@@ -192,13 +191,14 @@ function getUrlParamsForApi(api, url) {
             params[k] = v;
         });
         return '';
-    }).replace(new RegExp(`^${base}$`, 'ig'), function () {
+    });
+    if (api.base) url = url.slice(api.base.length);
+    url.replace(new RegExp(`^${base}$`, 'ig'), function () {
         var args = arguments;
         cap.forEach(function (a, cx) {
             params[a] = args[cx + 1];
         });
     });
-    params = serialize(params);
     return params;
 }
 
@@ -256,7 +256,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,7 +300,7 @@ 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 !== ':') {
             required.push(p);
@@ -468,7 +468,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)) {
@@ -545,12 +581,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 +589,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) {
@@ -605,7 +611,7 @@ 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);
                     }
@@ -681,6 +687,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 +734,13 @@ var unbindInstance = function (instanceId, callback) {
 };
 var OUTDATE = new Error(i18n`请求被覆盖`);
 var ABORTED = new Error(i18n`请求已取消`);
+var wrapRequest = function (p, req) {
+
+};
 var data = {
+    prepareURL,
     decodeStructure,
+    getUrlParamsForApi,
     encodeStructure,
     abortAll: cross.abortAll,
     responseLoaded(response) {
@@ -812,12 +827,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) {

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);

package/coms/zimoli/maps.js

@@ -185,7 +185,7 @@ function maps(config = {}) {
         canvas.map.refresh();
         canvas._default = canvas.map.defaultImage();
     };
-    if (canvas.isMounted) reshape();
+    if (canvas.$mounted) reshape();
     else once("append")(canvas, reshape);
     bind('resize')(canvas, reshape);
 

package/coms/zimoli/menuList.js

@@ -296,7 +296,7 @@ function main() {
         }
         return generator(index, item);
     }, direction);
-    page.renders.unshift(function () {
+    page.$renders.unshift(function () {
         this.$scope.hasIcon = hasIcon();
     });
     page.open = function (a) {

package/coms/zimoli/model.js

@@ -46,6 +46,36 @@ unmark(checkbox);
 unmark(swap);
 unmark(image);
 unmark(success);
+var renderOption = function (o, index) {
+    if (typeof o === 'string') return o;
+    if (isFunction(o)) {
+        var name = typeof index === 'number' ? o.name : index;
+        return `<a href="javascript:;" @click=field.options[${strings.encode(index)}](data)>${name}</a>`
+    }
+    if (isObject(o)) {
+        if (o.href) {
+            return `<a href=${strings.encode(o.href)}>${o.name}</a>`;
+        }
+        return `<a href='javascript:;' @click=field.options[${strings.encode(index)}](data)>${o.name}</a>`
+    }
+    return o;
+}
+var renderOptions = function (field, data) {
+    var { options } = field;
+    if (typeof options === 'string') return options;
+    if (isFunction(options)) return renderOption(options);
+    if (options instanceof Array) {
+        return options.map(renderOption).join('');
+    }
+    else if (isObject(options)) {
+        return Object.keys(options).map(k => renderOption(options[k], k)).join('');
+    }
+    return '';
+}
+var onoff = function () {
+    var { data, field } = this;
+    data[field.key] = checker.changeValue(data[field.key]);
+};
 var constructors = {
     input,
     swap(e) {
@@ -77,7 +107,7 @@ var constructors = {
     date() {
         var elem = document.createElement("input");
         elem.type = "date";
-        elem.renders = [function () {
+        elem.$renders = [function () {
             var { data, field } = this.$scope;
             if (data && field) elem.value = parseDate(data[field.key]);
         }]
@@ -96,6 +126,11 @@ var constructors = {
         if (options) img.setAttribute("uploadto", options.uploadto);
         return img;
     },
+    checker(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = `<span @click="onoff()"><checker -model=data[field.key]></checker><span -bind='field.holder'></span></span>${renderOptions(field, data)}`;
+        render(elem.children, { onoff, checker, data, a: button, field });
+    },
     checkbox({ field }) {
         var elem = checkbox();
         cast(elem, field);
@@ -132,7 +167,7 @@ var constructors = {
     },
     "repeat"(_, field_type) {
         var elem = input();
-        elem.renders = [function () {
+        elem.$renders = [function () {
             var { field, data } = this.$scope;
             var { status } = this;
             var valid = this.value === data[field_type];
@@ -183,7 +218,8 @@ var readonly_types = {
         if (field.options) {
             if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
             var o = field.optionsMap[v];
-            if (isObject(o)) return o.name;
+            try { e.setAttribute(field.key, v); } catch { }
+            if (isObject(o)) return `<s></s>` + o.name;
             if (isHandled(o)) return o;
         }
         if (isEmpty(v)) v = '';
@@ -293,7 +329,7 @@ function main(elem) {
                     if (!ipt.$scope) {
                         renderModel.call(ipt, field, data);
                         var saved_sataus;
-                        ipt.renders.push(function () {
+                        ipt.$renders.push(function () {
                             var { valid, status } = this;
                             if (elem.valid !== valid) elem.valid = valid;
                             if (saved_sataus === status) return;
@@ -310,7 +346,7 @@ function main(elem) {
                         on("change")(ipt, copyOptionData);
                     }
                     if ("options_from" in field) {
-                        ipt.renders.push(rebuildOptions);
+                        ipt.$renders.push(rebuildOptions);
                     }
                 }
             }

package/coms/zimoli/on.js

@@ -263,7 +263,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
             var [e, h, c] = hs[cx];
             if (h === handler && e === eventtypes && c === context) {
                 hs.splice(cx, 1);
-                if (k === changes_key) element.needchanges--;
+                if (k === changes_key) element.$needchanges--;
             }
         }
         if (!hs.length && hs.h) {
@@ -330,8 +330,8 @@ var append = function (k, hk, listener2, firstmost) {
         if (h === handler && eventtypes === e && c === context) return;
     }
     if (k === changes_key) {
-        if (!element.needchanges) element.needchanges = 0;
-        element.needchanges++;
+        if (!element.$needchanges) element.$needchanges = 0;
+        element.$needchanges++;
     }
     if (firstmost) handlers.unshift(listener2);
     else handlers.push(listener2);
@@ -342,7 +342,7 @@ var on = document.efronton = function (k) {
     if (handlersMap[on_event_path]) return handlersMap[on_event_path];
     var eventtypes = parseEventTypes(k);
     k = k.replace(eventtypereg, '');
-    var handler_path = k + "handlers";
+    var handler_path = "$h_" + k;
     var hk = handler_path + +!!eventtypes.capture;
     if (supportPassive) hk += +!!eventtypes.passive;
     if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {

package/coms/zimoli/remove.js

@@ -40,14 +40,14 @@ function hasLeaveStyle(o) {
 }
 
 function _onremove(node, event) {
-    if (!node || node.isMounted === false) return;
+    if (!node || node.$mounted === false) return;
     var children = node.childNodes;
-    if (node.isMounted) {
+    if (node.$mounted) {
         if (!event) {
             event = createEvent("remove");
         }
         dispatch(node, event);
-        node.isMounted = false;
+        node.$mounted = false;
     }
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
         _onremove(children[cx], event);