efront 3.9.9 → 3.9.15

package/coms/zimoli/data.js

@@ -72,7 +72,13 @@ const formulaters = {
         return formulate(data, params);
     }
 };
-
+var seekFromSource = function (obj, base) {
+    var source = dataSourceMap;
+    if (base && base in dataSourceMap) source = source[base];
+    obj = seek(source, obj);
+    if (isObject(obj)) for (var k in obj) if (obj[k] === dataSourceMap) delete obj[k];
+    return obj;
+};
 function getErrorMessage(error = this) {
     if (!isObject(error)) return String(error);
     if (error instanceof Error) return String(error);
@@ -533,9 +539,9 @@ var privates = {
         rest.forEach(k => delete params[k]);
         return { method: realmethod, coinmethod, selector: method.slice(spliterIndex + 1), search, baseuri, uri, params };
     },
-    loadIgnoreConfig(method, url, params, api) {
+    loadIgnoreConfig(method, url, params1, api) {
         var headers = api && api.headers;
-        var { method: realmethod, uri, baseuri, coinmethod, search, selector, params } = this.prepare(method, url, params);
+        var { method: realmethod, uri, baseuri, coinmethod, search, selector, params } = this.prepare(method, url, params1);
         var id = realmethod + " " + baseuri;
         var promise = cachedLoadingPromise[id];
         var temp = JSON.stringify(params);
@@ -543,18 +549,19 @@ var privates = {
         if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
-                    headers = seek(dataSourceMap, headers);
+                    headers = seekFromSource(headers, api.base);
                 }
                 cross(realmethod, uri, headers).send(params).done(e => {
                     ok(e.response || e.responseText);
                 }).error(xhr => {
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, error: e, toString: getErrorMessage })
+                        oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }
                 });
+                updateLoadingCount();
             });
             promise.search = search;
             promise.params = temp;
@@ -609,7 +616,6 @@ var loadInstance = function (storage, id) {
 };
 
 function responseCrash(e, data) {
-    if (data.is_loading) this.loading_count--;
     data.is_errored = true;
     data.is_loading = false;
     data.error_message = getErrorMessage(e);
@@ -619,19 +625,24 @@ function responseCrash(e, data) {
     } else {
         data.error = e;
     }
-    error_report(data.error_message, e.status < 500 ? 'warn' : 'error');
+    error_report(e, e.status < 500 ? 'warn' : 'error');
+    updateLoadingCount();
 }
 var getData = function () { return this.data };
+var updateLoadingCount = function () {
+    data.loading_count = cross.requests.length;
+};
 var data = {
     decodeStructure,
     encodeStructure,
+    abortAll: cross.abortAll,
     responseLoaded(response) {
         if (isObject(response)) {
             response.is_loaded = true;
             response.is_loading = false;
             if (response.then === LoadingArray_then) delete response.then;
         }
-        this.loading_count--;
+        updateLoadingCount();
     },
     responseCrash,
     responseLoading(response) {
@@ -640,7 +651,6 @@ var data = {
             response.is_loading = true;
             response.then = LoadingArray_then;
         }
-        this.loading_count++;
     },
     setReporter(report, checker) {
         if (report instanceof Function) {
@@ -840,19 +850,18 @@ var data = {
             if (promise1 !== instance.loading_promise) throw outdate;
             if (instance.loading) {
                 instance.loading.abort();
-                data.loading_count--;
             }
             this.responseLoading(instance);
-            var params = privates.pack(sid, params1);
-            if (!privates.validApi(api, params)) throw aborted;
+            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, params);
+            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 = seek(dataSourceMap, headers);
+                    headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
                     if (instance.loading !== xhr) return oh(aborted);
@@ -862,11 +871,13 @@ var data = {
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     try {
-                        oh(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        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);
                     }
                 });
+                updateLoadingCount();
             }).then(function (response) {
                 return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
             });
@@ -884,7 +895,6 @@ var data = {
         });
         promise1.catch((e) => {
             if (e === outdate) return;
-            if (e === aborted) return data.loading_count--;
             this.responseCrash(e, instance);
         });
 

package/coms/zimoli/on.js

@@ -167,8 +167,13 @@ if (is_addEventListener_enabled) {
         var eventtypes = parseEventTypes(k);
         k = k.replace(eventtypereg, '');
         function addhandler(element, handler, firstmost) {
+            var target = this;
             handler = wrapHandler(handler);
             if (eventtypes.capture) firstmost = true;
+            if (target && element !== target) {
+                handler = handler.bind(element);
+                element = target;
+            }
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
                 element.needchanges++;
@@ -207,11 +212,16 @@ if (is_addEventListener_enabled) {
 
         if (handlersMap[on_event_path]) return handlersMap[on_event_path];
         function addhandler(element, handler, firstmost = false) {
+            var target = this;
             handler = wrapHandler(handler);
             if (eventtypes.capture) {
                 console.warn("当前运行环境不支持事件capture");
                 firstmost = true;
             }
+            if (target && element !== target) {
+                handler = handler.bind(element);
+                element = target;
+            }
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
                 element.needchanges++;

package/coms/zimoli/popup.js

@@ -105,9 +105,16 @@ var popup_path = function (path = "", parameters, target) {
                 element.style.opacity = 1;
             });
         }
+        callbacks.forEach(f => f(element));
     };
+    var callbacks = [];
     popup.prepare(path, fullfill);
-    return element;
+    return element || {
+        then(ok) {
+            if (element) return ok(element);
+            else callbacks.push(ok);
+        }, fullfill
+    };
 };
 
 var popup_view = function (element, target, style) {

package/coms/zimoli/select.js

@@ -42,6 +42,9 @@ function select(target, list, removeOnSelect, direction) {
         direction = removeOnSelect;
         removeOnSelect = arguments[3];
     }
+    if (direction === undefined) {
+        direction = target.getAttribute("direction") || target.direction;
+    }
     if (!target) {
         target = document.createElement("select");
     }
@@ -63,11 +66,13 @@ function select(target, list, removeOnSelect, direction) {
     var onlistchange = function () {
         if (target.multiple) {
         } else {
-            if (!savedOptions) {
-                target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+            if (target.value !== this.value) {
+                if (!savedOptions) {
+                    target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+                }
+                target.value = this.value;
+                dispatch(target, "change");
             }
-            target.value = this.value;
-            dispatch(target, "change");
         }
     };
     var onlistclick = function (event) {

package/coms/zimoli/view.less

@@ -52,12 +52,19 @@ body>& {
     position: relative;
     position: sticky;
     line-height: 20px;
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     color: #333;
     padding: 12px 16px 10px 16px;
 
+    &:before {
+        display: block;
+        content: "";
+        width: 20px;
+        height: 20px;
+        float: right;
+    }
+
     &:not(:last-child) {
         margin: 0 0 -42px;
     }

package/package.json

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