efront 3.12.2 → 3.12.3

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/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/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/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/package.json

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