efront 3.11.4 → 3.12.3

package/apps/pivot/link/list.html

@@ -1,5 +1,5 @@
 <div class="clusters">
-    <a -repeat="(c,i) in clusters" ng-class="{current:i===index}" @click="active(i,c)">
+    <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">
         <span -text="c"></span>
     </a>
 </div>

package/apps/pivot/link/list.js

@@ -7,13 +7,13 @@ function main() {
             await this.clusters;
             this.active();
         },
-        index: data.getInstance("index").index || 0,
+        index: data.getInstance("index"),
         clusters: [],
         filterTime(d) {
             return ((new Date - d) / 1000 | 0) + "秒";
         },
         clients: [],
-        active(index = this.index) {
+        active(index = this.index.index | 0) {
             data.setInstance('index', { index });
             var clusters = this.clusters;
             if (index >= clusters.length) index = clusters.length - 1;

package/coms/basic/sortname.js

@@ -48,11 +48,13 @@ var parse一二三 = function (a) {
 };
 var map甲乙丙 = createMap("甲乙丙丁戊己庚辛壬癸");
 var map子丑寅 = createMap("子丑寅卯辰巳午未申酉戌亥");
+var map上中下 = createMap("前上中下后");
 
 var reg123 = /^(\d+|\d+[\.\d]+\d+)[\s\S]*$/;
 var reg一二三 = /^([一二三四五六七八九十百千万亿壹贰叁肆伍陆柒捌玖拾佰仟萬零〇]+)[\s\S]*$/;
 var reg甲乙丙 = /^([甲乙丙丁戊己庚辛壬癸])[\s\S]*$/;
 var reg子丑寅 = /^([子丑寅卯辰巳午未申酉戌亥])[\s\S]*$/;
+var reg上中下 = /^([前上中下后])[\s\S]*$/;
 var reg天干地支 = /^([甲乙丙丁戊己庚辛壬癸][子丑寅卯辰巳午未申酉戌亥])[\s\S]*$/;
 
 var getDelta = function (a, b, reg, parse) {
@@ -85,14 +87,14 @@ var compare = function (a, b) {
     for (var cx1 = a.length - 1, cx2 = b.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
         while (/\s\u00a0/.test(a[cx1])) cx1--;
         while (/\s\u00a0/.test(b[cx2])) cx2--;
-        if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map一二三 || a in power || /^\d$/.test(a[cx1])) break;
+        if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map上中下 || a[cx1] in map一二三 || a in power || /^\d$/.test(a[cx1])) break;
     }
     a = a.slice(0, cx1 + 1);
     b = b.slice(0, cx2 + 1);
     for (var cx1 = 0, cx2 = 0, dx1 = b.length, dx2 = b.length; cx1 < dx1 && cx2 < dx2; cx1++, cx2++) {
         while (/[\s\u00a0]/.test(a[cx1])) cx1++;
         while (/[\s\u00a0]/.test(b[cx2])) cx2++;
-        if (a[cx1] !== b[cx2] || a[cx1] in map甲乙丙 || a[cx1] in map一二三 || a in power || /^\d/.test(a[cx1])) break;
+        if (a[cx1] !== b[cx2] || a[cx1] in map甲乙丙 || a[cx1] in map上中下 || a[cx1] in map一二三 || a in power || /^\d/.test(a[cx1])) break;
     }
     if (cx1) a = a.slice(cx1);
     if (cx2) b = b.slice(cx2);
@@ -108,6 +110,8 @@ var compare = function (a, b) {
     if (delta) return delta;
     delta = getDelta(a, b, reg子丑寅, d => map子丑寅[d]);
     if (delta) return delta;
+    delta = getDelta(a, b, reg上中下, d => map上中下[d]);
+    if (delta) return delta;
     return 0;
 }
 function sortname(list = this) {

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/data.js

@@ -927,6 +927,7 @@ var data = {
     setSource(sourceid, value) {
         var rememberWithStorage;
         if (isObject(sourceid)) {
+
             this.rebuildInstance(dataSourceMap, sourceid);
             rememberWithStorage = value;
         } else {
@@ -975,7 +976,7 @@ var data = {
         if (key === true || key === false || isEmpty(key)) {
             rememberWithStorage = key;
             key = null;
-            var value = instance;
+            var value = instance.valueOf();
         } else {
             var value = instance[key];
         }

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')) {
@@ -24,11 +24,11 @@ var getGenerator = function (container, tagName = 'item') {
     var scopes = container.$parentScopes || [];
     if (container.$scope) scopes = scopes.concat(container.$scope);
     return container.$generator = function (index, com, element) {
-        if (!com) {
+        if (com === undefined) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
-        if (!com) return;
+        if (com === undefined) return;
         if (!element) {
             var template1 = template.cloneNode(true);
             if (!template1.childNodes.length) {

package/coms/zimoli/list.js

@@ -60,6 +60,28 @@ function ylist(container, generator, $Y) {
         }
         return null;
     };
+    var hasCover = function (child) {
+        var scrollTop = list.scrollTop;
+        if (child.offsetTop + child.offsetHeight < scrollTop || child.offsetTop >= scrollTop + list.clientHeight) return false;
+        if (child.offsetTop <= scrollTop && child.offsetTop + child.offsetHeight >= scrollTop + list.clientHeight) return true;
+        if (child.offsetTop < scrollTop) return false;
+        if (child.offsetTop + child.offsetHeight > scrollTop + list.clientHeight) return false;
+        return true;
+    };
+    var scrollIfNotCover = function (index) {
+        var c = getIndexedElement(index);
+        if (!c) return scrollTo(index);
+        if (hasCover(c)) return;
+        var scrollTop = list.scrollTop;
+        var deltat = scrollTop - c.offsetTop;
+        var deltab = c.offsetTop + c.offsetHeight - scrollTop - list.clientHeight;
+        if (deltat > 0) {
+            return scrollBy(-deltab > deltat ? -deltat : -deltab);
+        }
+        if (deltab > 0) {
+            return scrollBy(deltab < deltat ? deltat : deltab);
+        }
+    };
     var getLastVisibleElement = function (deltaY = 0) {
         var { scrollTop } = list;
         scrollTop += deltaY;
@@ -102,10 +124,10 @@ function ylist(container, generator, $Y) {
         }
         var cache_height = list.offsetHeight;
         var index = itemIndex | 0;
+        if (itemIndex < 0) index--;
         var ratio = itemIndex - index || 0;
-        if (index < 0) index = 0;
         var childrenMap = getChildrenMap();
-        var offsetBottom = 0, ratioTop = 0, offset = +index || 0, last_item = getFirstElement() || null, last_index = last_item && last_item.index || offset;
+        var offsetBottom = 0, ratioTop = 0, offset = index, last_item = getFirstElement() || null, last_index = last_item && last_item.index || offset;
         var count = 0, delta = 1, bottom_item, offsett = offset, offsetb = offset, top_item;
         var indexed_item;
         while (offsetBottom - ratioTop <= list.clientHeight + cache_height || indexed_item && top_item && indexed_item.offsetTop - top_item.offsetTop < cache_height) {
@@ -181,7 +203,9 @@ function ylist(container, generator, $Y) {
     var currentY = function () {
         var firstElement = getFirstElement(1);
         if (!firstElement) return;
-        return firstElement.index * firstElement.offsetHeight + list.scrollTop;
+        var index = firstElement.index;
+        if (index < 0) index = index - index | 0;
+        return index * firstElement.offsetHeight + list.scrollTop;
     };
     var getBottomElement = function (last_element) {
         if (!last_element) return null;
@@ -237,8 +261,6 @@ function ylist(container, generator, $Y) {
             let item = childrenMap[k];
             if (item.offsetTop + getOffsetHeight(item) + cache_height < scrollTop) {
                 collection.push(item);
-            } else {
-                break;
             }
         }
         if (collection.length) {
@@ -280,9 +302,6 @@ function ylist(container, generator, $Y) {
             if (!(scrollTop < targetHeight)) {
                 paddingCount--;
             }
-            if (!(offset >= 0)) {
-                break;
-            }
             var item = childrenMap[offset];
             if (!item) {
                 item = createItem(offset);
@@ -313,7 +332,6 @@ function ylist(container, generator, $Y) {
         } else {
             deltaScroll = patchTop(deltaY, animate);
         }
-
         if (deltaScroll) {
             if (animate && __scrollBy) {
                 list.scrollTop += deltaScroll - deltaY;
@@ -378,13 +396,20 @@ function ylist(container, generator, $Y) {
     };
     if (!/^i(Phone|Pod|Watch|Pad)|^Mac/i.test(navigator.platform)) var __scrollBy = list.scrollBy;
     list.scrollBy = scrollBy;
-    list.index = function () {
+    list.index = function (update) {
+        if (update === false) return saved_itemIndex;
         var firstElement = getFirstVisibleElement();
         if (!firstElement) return saved_itemIndex;
         var index = firstElement.index;
-        var scrolled = (list.scrollTop - firstElement.offsetTop + parseFloat(getComputedStyle(list).paddingTop)) / firstElement.offsetHeight;
+        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;
@@ -392,6 +417,7 @@ function ylist(container, generator, $Y) {
     list.getIndexedElement = getIndexedElement;
     list.patchBottom = patchBottom;
     list.patchTop = patchTop;
+    list.scrollIfNotCover = scrollIfNotCover;
     vbox(list, $Y);
     return list;
 }
@@ -400,7 +426,7 @@ var xlist = arriswise(ylist, allArgumentsNames.concat([].slice.call(arguments, 0
 
 var getGeneratorFromArray = function (source) {
     return function (index) {
-        if (index >= source.length) return null;
+        if (index >= source.length || index < 0) return null;
         return block(source[index]);
     };
 };

package/coms/zimoli/list_test.js

@@ -1,5 +1,5 @@
 var listX = list(function (index) {
-    if(index>100)return;
+    if (index > 100 || index < 0) return;
     var item = div();
     css(item, `height:100%;width:${Math.random() * 110 + 30}px;border:1px solid;`);
     text(item, index);
@@ -10,7 +10,7 @@ onappend(listX, function () {
 });
 css(listX, "width:360px;height:160px;");
 var listY = list(function (index) {
-    if(index>100)return;
+    if (index > 100 || index < 0) return;
     var item = div();
     css(item, `width:100%;height:${Math.random() * 110 + 30}px;border:1px solid;`);
     text(item, index);

package/coms/zimoli/menu.js

@@ -154,17 +154,28 @@ 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);
+                    remove(elem.children);
                     elem = menuList(elem, nodes, emit, direction);
                     elem.registerAsRoot();
                 }

package/coms/zimoli/menuList.js

@@ -113,7 +113,7 @@ function keytab(event) {
     if (root_menu !== document.activeElement) return;
     var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
     event.preventDefault();
-    menu.moveFocus(1);
+    menu.moveFocus(event.shiftKey ? -1 : 1);
 }
 function keyesc() {
     if (root_menu === document.activeElement && !mounted_menus.length) {
@@ -142,17 +142,16 @@ function keyspace() {
     }
 }
 function register() {
-    // on('keydown.alt')(window, e => e.preventDefault());
-    on('keydown.tab')(window, keytab);
-    on('keydown.alt.')(window, keyalt);
-    on('keydown.esc')(window, keyesc);
-    on('keydown.left')(window, keyleft);
-    on('keydown.right')(window, keyright);
-    on('keydown.up')(window, keyup);
-    on('keydown.down')(window, keydown);
-    on('keydown.enter')(window, keyspace);
-    on('keydown.space')(window, keyspace);
     root_menu = this;
+    bind('keydown.tab')(root_menu, keytab);
+    bind('keydown.alt.')(root_menu, keyalt);
+    bind('keydown.esc')(root_menu, keyesc);
+    bind('keydown.left')(root_menu, keyleft);
+    bind('keydown.right')(root_menu, keyright);
+    bind('keydown.up')(root_menu, keyup);
+    bind('keydown.down')(root_menu, keydown);
+    bind('keydown.enter')(root_menu, keyspace);
+    bind('keydown.space')(root_menu, keyspace);
 }
 function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
@@ -208,8 +207,8 @@ function main(page, items, active, direction = 'y') {
     var open = function () {
         cancel();
         var elem = this;
-        page.setFocus(elem);
         if (page.ispop) popTimer = setTimeout(function () {
+            page.setFocus(elem);
             popMenu(elem.menu, elem);
         }, 60);
     };
@@ -261,6 +260,7 @@ function main(page, items, active, direction = 'y') {
                 if (!page.firstMenu) {
                     page.firstMenu = a;
                 }
+                a.menu = s.menu;
                 return a;
             },
             menus: items,
@@ -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

@@ -91,15 +91,17 @@ var constructors = {
         }
         else if (t === 'a') {
             var { field, data } = _;
-            var pad = selectList(field.options, field.multi, true);
-            var e = document.createElement('select');
             var opt = null;
-            for (var o of field.options) {
+            for (var cx = 0, options = field.options, dx = options.length; cx < dx; cx++) {
+                var o = options[cx];
                 if (o.key === data[field.key]) {
                     opt = o;
+                    o.selected = true;
                     break;
                 }
             }
+            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 : '';
             elem = select(e, pad);

package/coms/zimoli/on.js

@@ -20,8 +20,8 @@ var keyCodeMap = {
     space: 32,
     pageup: 33,
     pagedown: 34,
-    home: 35,
-    end: 36,
+    end: 35,
+    home: 36,
     left: 37,
     up: 38,
     right: 39,

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

@@ -94,6 +94,15 @@ function select(target, list, removeOnSelect, direction) {
         if (removeOnSelect === null) {
             onmousedown(list, preventDefault);
         }
+        on("keydown.up")(target, preventDefault);
+        on("keydown.down")(target, preventDefault);
+        on("keydown.enter")(target, preventDefault);
+        on("keydown.space")(target, preventDefault);
+        var pop = function () {
+            if (saved_list !== list) mousedown.call(this);
+        };
+        on("keydown.down")(target, pop);
+        on("keydown.enter")(target, pop);
         onremove(list, onlistremove);
     };
     if (isNode(list)) {
@@ -103,7 +112,23 @@ function select(target, list, removeOnSelect, direction) {
         };
         var setIcon = function () {
         };
-    } else {
+    }
+    else if (target.$src) {
+        var generator = getGenerator(target);
+        var initList2 = function (src) {
+            list = selectList(generator, src, target.multiple, target.editable);
+            if (!target.multiple) {
+                onclick(list, onlistclick);
+            }
+            bindEvent();
+        };
+        care(target, initList2);
+        var initList = function () {
+        };
+        var setIcon = function () {
+        };
+    }
+    else {
         var savedOptions;
         removeOnSelect = null;
         var lastSelected = [];