efront 3.26.6 → 3.26.8

package/coms/basic/cross_.js

@@ -127,7 +127,9 @@ var mergedata = function (cachedata, pkv) {
     }
     return res;
 };
-
+function createResponse(response, status = 0) {
+    return { status, response: response, toString: toResponse }
+}
 /**
  * @param { () => XMLHttpRequest } jsonp
  * @this { () => XMLHttpRequest }
@@ -162,12 +164,15 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         if (!~requests.indexOf(_xhr)) return;
         removeFromList(requests, _xhr);
         errored = e || "未知错误！";
+        if (typeof errored === 'string') {
+            errored = createResponse(e, xhr.status);
+        }
         flush();
         digest();
     };
     var onerror = async function (e) {
         if (e.type === 'error') {
-            e = { response: "无法访问服务器", toString: toResponse };
+            e = createResponse("无法访问服务器！");
         }
         for (var r of reforms) {
             var r = await reform.call(xhr, r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
@@ -245,13 +250,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     xhr.responseText = xhr.response;
                 }
                 catch (e) {
-                    return onerror({ status: xhr.status, response: "数据无法解析！", toString: toResponse })
+                    return onerror("数据无法解析！")
                 }
             };
             switch (xhr.status) {
                 case 0:
                     if (!xhr.response) {
-                        onerror({ status: 0, response: "无法访问服务器", toString: toResponse });
+                        onerror("无法访问服务器");
                         break;
                     }
                 case 200:
@@ -312,9 +317,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             forceForm = true;
             xhr.data(data);
         };
-        var fire = async function () {
-            if (!~requests.indexOf(xhr)) return;
-            var code = await xhr.encrypt;
+        var fire = async function (code) {
             if (!~requests.indexOf(xhr)) return;
             xhr.encrypt = code;
             var isform = /^f/i.test(method);
@@ -366,7 +369,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             else send.call(xhr);
             digest();
         };
-        Promise.resolve().then(fire);
+        Promise.resolve(xhr.encrypt).then(fire, onerror1);
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
@@ -448,7 +451,7 @@ function addReform(r) {
 function getCode() {
     return new Promise((ok, oh) => {
         this('get', base + "!").then((xhr) => { return ok(encode62.timedecode(xhr.response || xhr.responseText)) }, () => {
-            return oh('未连接到可加密的服务器！');
+            return oh('无法连接可加密的服务器！');
         });
     });
 }

package/coms/zimoli/model.js

@@ -279,7 +279,6 @@ function main(elem) {
                 }
             } else {
                 var create = field_type === "function" ? field_editor : findEditerForElement(field_type, elem) || constructors[field_type];
-                console.log(create === constructors.select)
                 var ipt = create ? create(elem, field_ref) : field.key ? input(function () {
                     var input = document.createElement('input');
                     input.setAttribute('type', field.type);

package/coms/zimoli/render.js

@@ -189,6 +189,7 @@ var createRepeat = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(srcName).bind(this);
     var element = this, clonedElements = [], savedValue, savedOrigin;
+    if (this.$struct.if) id = -7;
     var renders = [function () {
         var result = getter();
         var origin = result;
@@ -266,6 +267,8 @@ var createIf = function (search, id = 0) {
     var savedValue;
     elements.parent = this.parentNode;
     elements.comment = search;
+    if (this.$struct.repeat) id = -3;
+
     elements.renders = [function () {
         var shouldMount = -1;
         for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
@@ -363,23 +366,21 @@ var parseIfWithRepeat = function (ifExpression, repeatExpression) {
 var renderStructure = function (element) {
     var $struct = element.$struct;
     if ($struct.if) var { name: ifkey, key, value: ifexp } = $struct.if;
-    if ($struct.repeat) var { name: forkey, value: repeat } = $struct.repeat;
-    if (!ifkey) return element.removeAttribute(forkey), structures.repeat.call(element, repeat);
-    if (!repeat) return element.removeAttribute(ifkey), structures[key].call(element, ifexp);
-    if (!ifexp) {
-        element.removeAttribute(ifkey);
-        return structures[key].call(element, ifexp);
-    }
+    if ($struct.repeat) var { value: repeat } = $struct.repeat;
+    if (!ifkey) return createRepeat.call(element, repeat);
+    if (!ifexp || !repeat) return structures[key].call(element, ifexp);
     var { before, after } = parseIfWithRepeat(ifexp, repeat);
-    element.removeAttribute(ifkey);
     if (after.length) {
-        element.setAttribute("a-if", after.join("&&"));
+        $struct.if = { key, name: ifkey, value: after.join("&&") };
+    }
+    else {
+        delete $struct.if;
     }
     if (before.length > 0) {
-        // 懒渲染
         return createIf.call(element, before.join("&&"), null);
     } else {
-        element.removeAttribute(forkey);
+        delete $struct.repeat;
+        if (!repeat) debugger;
         return createRepeat.call(element, repeat, null);
     }
 };
@@ -684,7 +685,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
 
         if (isEmpty(s.once)) s.once = once;
         element.$eval = $eval;
-        if (!element.$struct) console.log(element, element.$struct, element.renderid, s)
     }
     if (element.renderid <= -1) element = renderStructure(element);
     if (!element) return;
@@ -881,6 +881,7 @@ function createStructure(element) {
             }
             if (!element.renderid) element.renderid = -1;
             else element.renderid = -2;
+            element.removeAttribute(name);
             continue;
         }
         // ng-html,ng-src,ng-text,ng-model,ng-style,ng-class,...
@@ -943,9 +944,9 @@ function render(element, scope, parentScopes, lazy = true) {
 var digest = lazy(refresh, -{});
 render.digest = render.apply = render.refresh = digest;
 render.parseRepeat = parseRepeat;
-var eventsBinders = "fullscreenchange,resize,load,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
+"fullscreenchange,resize,load,hashchange".split(",").forEach(e => on(e)(window, digest));
+var eventsBinders = "change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
 var userChanged = false;
-eventsBinders.splice(0, 3).forEach(on => on(window, digest));
 var changeListener = function () {
     if (userChanged) {
         userChanged = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.26.6",
+    "version": "3.26.8",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {