efront 3.12.2 → 3.12.6

package/coms/basic/{_cross.js → cross_.js}

@@ -46,7 +46,7 @@ function toResponse() {
     if (this.responseType === 'json') return JSON.stringify(this.response);
     return this.response;
 }
-function _cross(jsonp, digest = noop, method, url, headers) {
+function cross_(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
     if (!originDomain) throw new Error("路径格式错误！");
     var _cookies = getCookies(originDomain);
@@ -149,7 +149,7 @@ function _cross(jsonp, digest = noop, method, url, headers) {
                         }
                         location = getRequestProtocol(url) + "//" + location;
                     }
-                    var crs = _cross("get", location, _headers);
+                    var crs = cross_("get", location, _headers);
                     crs.isRedirected = (xhr.isRedirected || 0) + 1;
                     crs.done(onload, false);
                     crs.error(onerror, false);
@@ -304,10 +304,10 @@ function reform(r, info, fire, cancel, e) {
 function addReform(r) {
     if (isFunction(r)) reforms.push(r);
 }
-var bind = _cross.bind;
-_cross.bind = function () {
-    var _cross = bind.apply(this, arguments);
-    extend(_cross, {
+var bind = cross_.bind;
+cross_.bind = function () {
+    var cross_ = bind.apply(this, arguments);
+    extend(cross_, {
         requests,
         abortAll() {
             var rs = requests.splice(0, requests.length);
@@ -320,10 +320,10 @@ _cross.bind = function () {
         addDirect,
         getCrossUrl
     });
-    return _cross;
+    return cross_;
 }
-_cross.setHost = setHost;
-_cross.setLocation = function (host) {
+cross_.setHost = setHost;
+cross_.setLocation = function (host) {
     location_href = host;
     if (!base) base = /^https?\:/i.test(location_href) ? '/' : "http://efront.cc/";
 };

package/coms/kugou/parseSongsList.js

@@ -4,7 +4,6 @@ a => {
         if (!m) throw new Error("无法加载数据！");
         if (m) a = m[1];
         a = JSON.parse(a);
-        console.log(a)
     }
     return a.map(b => {
         var data = {};

package/coms/reptile/cross.js

@@ -1,4 +1,4 @@
-return _cross.bind(function (callback, onerror) {
+return cross_.bind(function (callback, onerror) {
     var response, responseObject, responseType = "", error;
     var xhr = {
         status: 0,

package/coms/zimoli/active.js

@@ -1,11 +1,11 @@
 // 激活 自定义的 active 事件
-function active(target, value, item, targetElement) {
+function active(target, value, item = value, srcElem) {
     var activeEvent = createEvent("active");
     activeEvent.item = item;
     activeEvent.value = value;
-    if (targetElement) {
-        if (Object.defineProperty) Object.defineProperty(activeEvent, 'currentTarget', { value: targetElement });
-        else activeEvent.currentTarget = targetElement;
+    if (srcElem) {
+        if (Object.defineProperty) Object.defineProperty(activeEvent, 'currentTarget', { value: srcElem });
+        else activeEvent.currentTarget = srcElem;
     }
     activeEvent = dispatch(target, activeEvent);
     return activeEvent && !activeEvent.defaultPrevented;

package/coms/zimoli/button.js

@@ -16,7 +16,25 @@ var active = function () {
     __addClass(this, "hover active");
 };
 var checkclick = function () {
-    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) onclick.preventClick = true;
+    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) {
+        onclick.preventClick = true;
+        return;
+    }
+    if (this.hasAttribute("confirm") || this.confirm) {
+        if (!this.confirm_sign) {
+            addClass(this, 'confirm');
+            var that = this;
+            that.confirm_sign = true;
+            setTimeout(function () {
+                removeClass(that, "confirm");
+                delete that.confirm_sign;
+            }, 2000);
+            onclick.preventClick = true;
+            return;
+        }
+        delete this.confirm_sign;
+        removeClass(this, "confirm");
+    }
 };
 var resetactive = function () {
     removeClass(this, "active");

package/coms/zimoli/button.less

@@ -259,4 +259,11 @@ a&,
     }
 
     text-shadow: none;
+}
+
+&.confirm {
+    &:before {
+        content: "确认";
+    }
+    background: #333;
 }

package/coms/zimoli/chooseFile.js

@@ -27,6 +27,8 @@ function chooseFile(accept, multiple, extra) {
             }
         });
     });
-    input.click();
+    setTimeout(function(){
+        input.click();
+    });
     return result;
 }

package/coms/zimoli/cross.js

@@ -5,7 +5,7 @@ var saveCookie = lazy(function () {
 var { efrontURI, cross_host = efrontURI } = this;
 var location_href = parseURL(location.href);
 location_href = `${location_href.protocol}//${location_href.host}/`;
-_cross.setLocation(location_href);
+cross_.setLocation(location_href);
 
 var cookieItemsInSessionStorageKey = "--zimoli-coms-cross";
 var cookiesData = sessionStorage.getItem(cookieItemsInSessionStorageKey);
@@ -21,7 +21,7 @@ var digest = function () {
     dispatch('render', window);
 };
 
-var cross = _cross.bind(function (callback, onerror) {
+var cross = cross_.bind(function (callback, onerror) {
     var xhr = new XMLHttpRequest;
     var abort = xhr.abort;
     xhr.abort = function () {
@@ -55,6 +55,6 @@ cross.setHost = function (host) {
     if (!host) return console.error("cross_host格式不正确", host);
     var host = parsed.host + (parsed.pathname || '/');
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
-    _cross.setHost(host);
+    cross_.setHost(host);
 };
 if (cross_host) cross.setHost(cross_host);

package/coms/zimoli/css.js

@@ -19,9 +19,15 @@ var transfromSimpleValue = function (value) {
 };
 var transformValue = function (value, k) {
     if (ratioPropReg.test(k) || !value) return value;
-    if (/^[\w\s\.]+$/.test(value)) return isFinite(value) ? transfromSimpleValue(value) : String(value).split(/\s/).map(transfromSimpleValue).join(' ');
+    if (/^[\w\s\.]+$/.test(value)) return isFinite(value) ? transfromSimpleValue(value) : String(value).split(/\s+/).map(transfromSimpleValue).join(' ');
     return value;
 };
+var partifyValue = function (v) {
+    return String(v).toLowerCase().split(/['"`]|\s+/).join(" ");
+};
+var isSameValue = function (v1, v2) {
+    return partifyValue(v1) === partifyValue(v2);
+};
 /**
  * 将中划线转成驼峰式
  * @param {string} key 
@@ -86,7 +92,8 @@ var cssTargetNode = function (targetNode, oStyle, oValue) {
                 var key = transformNodeKey(k);
                 if (key in styleobject) {
                     try {
-                        styleobject[key] = transformValue(oStyle[k], key);
+                        var value = transformValue(oStyle[k], key);
+                        if (!isSameValue(value, styleobject[value])) styleobject[key] = transformValue(oStyle[k], key);
                     } catch (e) {
                         console.warn(key, oStyle[k], "无效");
                     }
@@ -95,7 +102,8 @@ var cssTargetNode = function (targetNode, oStyle, oValue) {
         } else {
             for (var k in oStyle) {
                 var key = transformNodeKey(k);
-                if (key in styleobject) styleobject[key] = transformValue(oStyle[k], key);
+                var value = transformValue(oStyle[k], key);
+                if (key in styleobject && !isSameValue(value, styleobject[key])) styleobject[key] = value;
             }
         }
     }
@@ -153,9 +161,9 @@ function cssTargetStyleSheet(stylesheet, innerCss) {
     var styleSheet = stylesheet.styleSheet;
     if (styleSheet) {
         //IE
-        styleSheet.cssText = innerCss;
+        if (styleSheet.cssText !== innerCss) styleSheet.cssText = innerCss;
     } else {
-        stylesheet.innerHTML = innerCss;
+        if (stylesheet.innerHTML !== innerCss) stylesheet.innerHTML = innerCss;
     }
 }
 

package/coms/zimoli/data.js

@@ -165,6 +165,7 @@ function getUrlParamsForApi(api, url) {
     var params = {};
     url = url.replace(/[\?#]*$/g, function (match) {
         match.split(/[&#\?]+/).forEach(function (s) {
+            if (!s) return;
             var [k, v] = s.split("=");
             params[k] = v;
         });
@@ -176,7 +177,7 @@ function getUrlParamsForApi(api, url) {
         });
     });
     params = serialize(params);
-    return api.id + "?" + params;
+    return params;
 }
 
 function __seekprop(data, prop) {
@@ -204,7 +205,7 @@ function seekResponse(data, seeker, apiMap = {}) {
         }
         if (data && prop) {
             var reg1 = /[\:\>\\]/, next;
-            var getNextValue = /[\>\\]/.test(prop);
+            var getNextValue = !/\:/.test(prop);
             if (reg1.test(prop)) {
                 var [prop, next, pick] = prop.split(reg1);
                 next = apiMap[next];
@@ -231,8 +232,8 @@ function seekResponse(data, seeker, apiMap = {}) {
                 data = JSON.parse(data);
             }
             if (next) {
-                data = getUrlParamsForApi(next, data);
-                if (pick || getNextValue) {
+                data = (pick || next.id) + "?" + getUrlParamsForApi(next, data);
+                if (getNextValue) {
                     data = getParamsFromUrl(data);
                     if (pick) data = data[pick];
                 }
@@ -894,7 +895,7 @@ var data = {
             return data;
         });
         promise1.catch((e) => {
-            if (e === outdate) return;
+            if (e === outdate || e === aborted) return;
             this.responseCrash(e, instance);
         });
 

package/coms/zimoli/encode62.js

@@ -29,7 +29,9 @@ var encode62 = {
     timeencode(string) {
         var { time_delta } = this;
         var time_free = time_delta / 6 | 0;
-        var time_stamp = +new Date() - time_free;
+        var time = +new Date;
+        time = time - time % (time_delta >> 2);
+        var time_stamp = time - time_free;
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
@@ -39,9 +41,10 @@ var encode62 = {
     timeupdate(string) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
-        var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
+        var time = +new Date;
+        var time_start = parseInt((time - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        if (time_stamp + (time_delta >> 1) > +new Date()) {
+        if (time_stamp + (time_delta >> 1) > time) {
             return string;
         } else {
             return this.timeencode(this.timedecode(string));

package/coms/zimoli/getGenerator.js

@@ -2,7 +2,7 @@
 var _slider = createElement(div);
 var getGenerator = function (container, tagName = 'item') {
     if (!container) return;
-    if (!container.childNodes.length && container.$generator) return container.$generator;
+    if (container.$generator) return container.$generator;
     var template = document.createElement(tagName);
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {

package/coms/zimoli/list.js

@@ -404,12 +404,6 @@ function ylist(container, generator, $Y) {
         var scrolled = (list.scrollTop - firstElement.offsetTop + parseFloat(getComputedStyle(list).paddingTop) + .5 | 0) / firstElement.offsetHeight;
         return index + scrolled;
     };
-    on("remove")(list, function () {
-        saved_itemIndex = list.index();
-    });
-    on("append")(list, function () {
-        if (isFinite(saved_itemIndex)) list.go(saved_itemIndex);
-    })
     list.topIndex = function () {
         var element = getFirstElement(1);
         return element ? element.index : 0;
@@ -419,6 +413,12 @@ function ylist(container, generator, $Y) {
     list.patchTop = patchTop;
     list.scrollIfNotCover = scrollIfNotCover;
     vbox(list, $Y);
+    on("remove")(list, function () {
+        saved_itemIndex = list.index();
+    });
+    on("append")(list, function () {
+        if (isFinite(saved_itemIndex)) list.go(saved_itemIndex);
+    })
     return list;
 }
 var allArgumentsNames = arguments[arguments.length - 1];

package/coms/zimoli/menu.js

@@ -154,14 +154,24 @@ function main(elem, mode) {
             case "y":
             case "vertical":
                 var emit = function (item, target) {
-                    active(elem, item, item.value, target);
+                    active(elem, item.value, item, target);
                 };
                 if ("$src" in elem) {
                     getGenerator(elem, 'menu-item');
-                    care(elem, function (src) {
-                        menuList(elem, getTreeFromData(src), emit, direction);
+                    on("append")(elem, function () {
                         elem.registerAsRoot();
                     });
+                    var src0 = [];
+                    menuList(elem, src0, emit, direction);
+                    care(elem, function (src) {
+                        src0.splice(0, src0.length);
+                        var s = getTreeFromData(src);
+                        var i = 0;
+                        while (i < s.length) {
+                            src0.push.apply(src0, s.slice(i, i += 1000));
+                        }
+                        elem.go(0);
+                    });
                 }
                 else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/menuList.js

@@ -275,7 +275,6 @@ function main(page, items, active, direction = 'y') {
             var className = `{'has-children':${itemName}.children&&${itemName}.children.length,'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red'}`;
             var notHidden = `!${itemName}.hidden`;
             var generator = getGenerator(page, 'menu-item');
-
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;

package/coms/zimoli/model.js

@@ -100,7 +100,7 @@ var constructors = {
                     break;
                 }
             }
-            var pad = selectList(field.options, field.multi, true);
+            var pad = selectList(field.options, !!field.multi, true);
             var e = document.createElement('select');
             e.innerHTML = `<option selected value="${opt ? opt.key : ''}">${opt ? opt.name : '请选择'}</option>`;
             e.value = opt ? opt.key : '';

package/coms/zimoli/picture.js

@@ -17,8 +17,15 @@ var getstation = function (n, s) {
     return n;
 };
 var _createImage = function (url, callback) {
-    var imgpic = document.createElement('img');
-    imgpic.src = url;
+    var imgpic;
+    if (url instanceof Image) {
+        imgpic = new Image;
+        imgpic.src = url.src;
+    }
+    else {
+        imgpic = document.createElement('img');
+        imgpic.src = url;
+    }
     var onload = function () {
         imgpic.onload = null;
         callback(imgpic);
@@ -393,7 +400,6 @@ function picture(url, to = 0, key) {
     var gen = function (index, ratio) {
         if (index >= urls.length || index < 0) return null;
         if (images[index] && images[index].url !== urls[index]) {
-            console.log(images[index].url, urls[index]);
             delete images[index];
         }
         if (!images[index]) {

package/coms/zimoli/popup.js

@@ -152,10 +152,6 @@ var createMask = function (element) {
     return mask;
 };
 var popup_with_mask = function (element, mask = createMask(element)) {
-    if (!mask.clean) {
-        mask.clean = new Cleanup(element.with);
-    }
-    onremove(element, mask.clean);
     css(element, `z-index:${zIndex()};`);
     if (mask.parentNode) {
         global(element, false);
@@ -167,6 +163,10 @@ var popup_with_mask = function (element, mask = createMask(element)) {
     } else {
         if (element.with !== element) element.with = [element.with, mask];
     }
+    if (!mask.clean) {
+        mask.clean = new Cleanup(element.with);
+    }
+    onremove(element, mask.clean);
     if (!element.parentNode) global(element, false);
     return element;
 };

package/coms/zimoli/render.js

@@ -381,7 +381,7 @@ var src2 = function (search) {
             temp = "";
         }
         var changes = getChanges(temp, savedValue);
-        if (!changes || isEmpty(origin) && isEmpty(this.src)) return;
+        if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
         savedValue = temp;
         this.src = origin;
         cast(this, origin);

package/coms/zimoli/select.js

@@ -42,12 +42,12 @@ 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");
     }
+    if (direction === undefined) {
+        direction = target.getAttribute("direction") || target.direction;
+    }
     target.tabIndex = 0;
     onblur(target, removeByBlur);
     if (/select/i.test(target.tagName)) {
@@ -116,7 +116,7 @@ function select(target, list, removeOnSelect, direction) {
     else if (target.$src) {
         var generator = getGenerator(target);
         var initList2 = function (src) {
-            list = selectList(generator, src, target.multiple, target.editable);
+            list = selectList(generator, src, !!target.multiple, !!target.editable);
             if (!target.multiple) {
                 onclick(list, onlistclick);
             }
@@ -158,7 +158,7 @@ function select(target, list, removeOnSelect, direction) {
             var allOptions = [].concat.apply([], target.querySelectorAll("option"));
             if (deepEqual.shallow(allOptions, savedOptions)) return;
             savedOptions = allOptions;
-            list = selectList(allOptions, target.multiple, target.editable);
+            list = selectList(allOptions, !!target.multiple, !!target.editable);
             if (!target.multiple) {
                 onclick(list, onlistclick);
             }

package/coms/zimoli/selectList.js

@@ -39,14 +39,17 @@ function main() {
                 generator = a;
                 break;
             case "boolean":
-                if (multiple === void 0) multiple = a;
-                else addable = a;
+            case "undefined":
+                if (multiple === void 0) multiple = !!a;
+                else addable = !!a;
+                break;
             case "object":
                 if (isNode(a)) {
                     page = a;
                     if (!generator) generator = getGenerator(page);
                 }
                 else if (a.length) children = a;
+                break;
 
         }
     }

package/coms/zimoli/slider.js

@@ -122,17 +122,23 @@ function slider(autoplay, circle = true) {
     };
     var park = function () {
         direction = 0;
-        if (delta_negative_index > 0) {
-            if (negative_index - floor(negative_index) > 0.3 / (1 + abs(_speed())))
+        var singleTarget = getSingleTarget();
+        if (singleTarget) {
+            negative_index = round(negative_index);
+        }
+        else if (delta_negative_index > 0) {
+            if (negative_index - floor(negative_index) > 0.2 / (1 + 6 * abs(_speed())))
                 negative_index = ceil(negative_index);
             else
                 negative_index = floor(negative_index);
-        } else if (delta_negative_index < 0) {
-            if (ceil(negative_index) - negative_index > 0.3 / (1 + abs(_speed())))
+        }
+        else if (delta_negative_index < 0) {
+            if (ceil(negative_index) - negative_index > 0.2 / (1 + 6 * abs(_speed())))
                 negative_index = floor(negative_index);
             else
                 negative_index = ceil(negative_index);
-        } else {
+        }
+        else {
             negative_index = round(negative_index);
         }
         animate();
@@ -173,9 +179,10 @@ function slider(autoplay, circle = true) {
         }
         return enabled;
     };
+    var getSingleTarget = () => (!_imageMain || !_imageHelp) && (_imageMain || _imageHelp);
     var moveDeltaX = function (deltax, event) {
         var width = outter.clientWidth;
-        var singleTarget = (!_imageMain || !_imageHelp) && (_imageMain || _imageHelp);
+        var singleTarget = getSingleTarget();
         if (singleTarget) {
             var current_Left = singleTarget.offsetLeft;
             var avail_deltaWidth = round(width >> 2);

package/coms/zimoli/vbox.js

@@ -201,7 +201,7 @@ function ybox(generator) {
         }
         this.YScrollBoxId = +scrollId + 1;
     }
-    if (_box.isMounted) initScrollId.call(_box);
+    if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
     _box.cancelFrame = function () {
         cancelAnimationFrame(smooth_timer);

package/package.json

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