efront 3.12.0 → 3.12.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/getGenerator.js

@@ -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;
@@ -85,6 +107,7 @@ function ylist(container, generator, $Y) {
         return map;
     };
     var createItem = function (index) {
+        console.log(index)
         var item = generator(index);
         if (item) {
             item.index = index;
@@ -102,10 +125,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 +204,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 +262,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 +303,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 +333,6 @@ function ylist(container, generator, $Y) {
         } else {
             deltaScroll = patchTop(deltaY, animate);
         }
-
         if (deltaScroll) {
             if (animate && __scrollBy) {
                 list.scrollTop += deltaScroll - deltaY;
@@ -378,13 +397,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;
         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 +418,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 +427,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

@@ -165,6 +165,7 @@ function main(elem, mode) {
                 }
                 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,

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/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 = [];

package/coms/zimoli/selectList.js

@@ -29,8 +29,28 @@ var multipleClick = function () {
     dispatch(node, "change");
 };
 
-function main(children, multiple, addable) {
-    var page = div();
+
+function main() {
+    var children, multiple, addable, generator, page;
+    for (let a of arguments) {
+        if (a instanceof Array) children = a;
+        switch (typeof a) {
+            case "function":
+                generator = a;
+                break;
+            case "boolean":
+                if (multiple === void 0) multiple = a;
+                else addable = a;
+            case "object":
+                if (isNode(a)) {
+                    page = a;
+                    if (!generator) generator = getGenerator(page);
+                }
+                else if (a.length) children = a;
+
+        }
+    }
+    if (!page) page = div();
     page.value = multiple ? [] : "";
     var clicker = multiple ? multipleClick : singleClick;
     var itemMap = Object.create(null);
@@ -67,18 +87,28 @@ function main(children, multiple, addable) {
             item.setAttribute('disabled', '');
         } else {
             onclick(item, clicker);
+            on("mouseenter")(item, mouseenter);
         }
         return item;
 
     }
+    var mouseenter = function () {
+        if (!mouse) return;
+        focus = this.index;
+        setFocus();
+    };
+
+
     var hasIcon = false, iconed = '';
     var page = list(page, function (i) {
         if (i < 0 || i >= children.length) return;
-        return createItem(children[i]);
+        return createItem(generator ? generator(i) : children[i]);
     });
-    on("append")(page, function () {
+    once("append")(page, function () {
+        var index = 0;
+        for (var cx = 0, dx = children.length; cx < dx; cx++)if (children[cx].selected) index = cx;
         page.clean();
-        page.go(0);
+        page.go(index);
         if (adder) {
             remove(adder);
             appendChild(page, adder);
@@ -135,6 +165,60 @@ function main(children, multiple, addable) {
         adder.setAttribute("adder", '');
     }
     page.icon = iconed;
+    var focus = 0, focused, mouse = false;
+    var setFocus = function () {
+        var e = page.getIndexedElement(focus);
+        if (e === focused) return;
+        if (focused) removeClass(focused, 'focus');
+        focused = e;
+        if (e) addClass(e, 'focus');
+        mouse = false;
+    };
+    var setMouse = function () {
+        mouse = true;
+    }
+    onmousemove(page, setMouse);
+    onmousewheel(page, setMouse);
+    var moveFocus = function (delta) {
+        focus += delta;
+        if (focus < 0) focus = 0;
+        if (focus >= children.length) focus = children.length - 1;
+        page.scrollIfNotCover(focus);
+        setFocus();
+    };
+    bind('keydown.up')(page, function () {
+        moveFocus(-1);
+    });
+    bind('keydown.down')(page, function () {
+        moveFocus(1);
+    });
+    bind('keydown.tab')(page, function (event) {
+        if (document.activeElement === page.target) event.preventDefault();
+        moveFocus(event.shiftKey ? -1 : 1);
+    });
+    bind("keydown.home")(page, function (e) {
+        moveFocus(-focus);
+    });
+    bind("keydown.end")(page, function (e) {
+        moveFocus(children.length - 1 - focus);
+    });
+    bind("keydown.pagedown")(page, function (e) {
+        page.scrollBy(page.clientHeight);
+        focus = page.index() | 0;
+        moveFocus(0);
+    })
+    bind("keydown.pageup")(page, function (e) {
+        page.scrollBy(-page.clientHeight);
+        focus = page.index() | 0;
+        moveFocus(0);
+    })
+    var enter = function (e) {
+        e.preventDefault();
+        var e = page.getIndexedElement(focus);
+        if (e) e.click();
+    };
+    bind('keydown.enter')(page, enter);
+    bind('keydown.space')(page, enter);
     on('mousedown')(page, e => e.preventDefault());
     return page;
 }

package/coms/zimoli/selectList.less

@@ -18,7 +18,7 @@
             color: #29e;
         }
 
-        &:hover {
+        &.focus {
             background-color: #2ca2f9;
             color: #fff;
         }

package/coms/zimoli/selectList_test.html

@@ -2,9 +2,13 @@
     <option>选项一</option>
     <option>选项二</option>
     <option>选项三</option>
+    <option selected>简单选项</option>
 </select>
 <select>
-    <option>选项一</option>
-    <option>选项二</option>
-    <option>选项三</option>
+    <option -repeat="(o,i) in options600" -text="'选项'+o">选项</option>
+    <option selected>600个选项</option>
 </select>
+<select -src="(o,i) in options6000">
+    <option -text="'选项'+o">选项</option>
+    <option insert selected>60000个选项</option>
+</select>

package/coms/zimoli/selectList_test.js

@@ -1,8 +1,14 @@
 var page = div();
 page.innerHTML = selectList_test;
-render(page,{
-    select
-})
+render(page, {
+    select,
+    select2() {
+        var sel = document.createElement("select");
+        return sel;
+    },
+    options600: new Array(600).fill(0).map((_, a) => a),
+    options6000: new Array(60000).fill(0).map((_, a) => a)
+});
 function main() {
     return page;
 }

package/coms/zimoli/touchList_test.js

@@ -1,7 +1,7 @@
-var listY = list(function (data, index) {
+var listY = list(function (index) {
     var item = div();
     css(item, `width:100%;height:${Math.random() * 110 + 30}px;border:1px solid;`);
-    text(item, data);
+    text(item, index);
     return item;
 }, "Y");
 onappend(listY, function () {

package/package.json

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