efront 3.35.5 → 3.35.6

package/coms/basic/cross_.js

@@ -309,6 +309,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         var fire = async function (code) {
             if (!~requests.indexOf(xhr)) return;
+            prepareHeaders();
             xhr.method = method;
             xhr.url = url;
             xhr.encrypt = code;
@@ -365,25 +366,28 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
-    var cookie_ = this.hostCookie(xhr);
-    var _cookies = cookie_.getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    var cookobj = null;
-    for (var k in headers) {
-        if (/^\$/.test(headers[k])) {
-            var k2 = headers[k].slice(1);
-            if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
-            if (k2 in cookobj) {
-                _headers[k] = cookobj[k2];
-            }
+    var cookie_;
+    var prepareHeaders = () => {
+        cookie_ = this.hostCookie(xhr);
+        var _cookies = cookie_.getCookies(originDomain);
+        if (_cookies) {
+            _headers.Cookie = _cookies;
         }
-        else {
-            _headers[k] = headers[k];
+        var cookobj = null;
+        for (var k in headers) {
+            if (/^\$/.test(headers[k])) {
+                var k2 = headers[k].slice(1);
+                if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
+                if (k2 in cookobj) {
+                    _headers[k] = cookobj[k2];
+                }
+            }
+            else {
+                _headers[k] = headers[k];
+            }
         }
-    }
+    };
+    var _headers = {};
     if (/^[mc]/i.test(method)) {
         _headers["User-Agent"] = /^m/i.test(method)
             ? "efront/3.25 (iPhone) Safari/602.1"

package/coms/zimoli/cross.js

@@ -59,7 +59,8 @@ cross.setHost = function (host) {
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
     cross_.setHost(host);
 };
-cross.hostCookie = function () {
+cross.hostCookie = function (xhr) {
+    if (xhr.cookie) return xhr.cookie;
     return cookie;
 };
 cross.getCookies = function (dp) {

package/coms/zimoli/prompt.js

@@ -33,9 +33,10 @@ function prompt() {
     };
     var buttons = [button("确认"), button("取消", 'white')];
     if (isFunction(check)) {
-        var setDisable = function () {
+        var setDisable = function (event) {
+            if (oked || ohed) return;
             var valid = validate(ipt.value, check, tip);
-            attr(body, "error", !valid);
+            if (event) attr(body, "error", !valid);
             attr(buttons[0], 'disabled', !valid);
         };
         on('keyup')(ipt, setDisable);
@@ -49,7 +50,7 @@ function prompt() {
     var c = confirm(msg, body, buttons, function (_) {
         if (oked || ohed) return;
         if (_ === buttons[0]) {
-            if (check && validate(ipt.value, check, tip)) return false;
+            if (check && !validate(ipt.value, check, tip)) return false;
             oked = true;
         } else {
             ohed = true;
@@ -65,11 +66,8 @@ function prompt() {
     on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
     on("keydown.enter")(c, function (event) {
         if (event.defaultPrevented) return;
-        if (check && check(ipt.value) === false) return;
         event.preventDefault();
-        oked = true;
-        remove(c);
-        fire();
+        buttons[0].click();
     });
     c.then = function (ok, oh) {
         oks.push(ok);

package/coms/zimoli/selectList.js

@@ -170,9 +170,10 @@ function main() {
             switch (target) {
                 case this.children[0]:
                     var a = prompt("请输入", a => {
+                        if (!a) return false;
+                        console.log(itemMap, a);
                         if (a in itemMap) {
-                            alert(`选项 ${a} 已存在！`);
-                            return false;
+                            return `选项 ${a} 已存在！`;
                         }
                     });
                     page.with = a;
@@ -192,6 +193,7 @@ function main() {
                     var edit = selectListEdit(options.slice(0));
                     page.with = edit;
                     on("remove")(edit, function () {
+                        itemMap = Object.create(null);
                         page.with = null;
                         children.splice(0, children.length);
                         children.push.apply(children, edit.$scope.options.map(o => ({ key: o.key || o.value, name: o.name || o.innerHTML })))

package/package.json

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