efront 3.5.12 → 3.7.1

package/coms/zimoli/popup.js

@@ -4,8 +4,10 @@
 onkeydown(document, function (e) {
     if (e.which === 27 && rootElements.length) {
         var r = rootElements.pop();
-        r.blur();
-        remove(r);
+        if (r) {
+            r.blur();
+            remove(r);
+        }
     }
 });
 var animationStyle = "opacity:0;transform:scale(1.2);transition:.1s opacity ease-out,.2s transform ease-out;";
@@ -162,24 +164,27 @@ var popup_with_mask = function (element, mask = createMask(element)) {
     return element;
 };
 var isypop = function (target) {
+    if (!target) return false;
     var { offsetParent, nextSibling, previousSibling } = target;
     if (
-        nextSibling
+        nextSibling && nextSibling.tagName === target.tagName
         && (
             nextSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - nextSibling.offsetLeft >= nextSibling.offsetWidth / 2
         )
-        || previousSibling
+        || previousSibling && previousSibling.tagName === target.tagName
         && (
             previousSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - previousSibling.offsetLeft >= previousSibling.offsetWidth / 2
         )
     ) return true;
-    if (offsetParent && target.offsetTop / target.offsetHeight < .2 && offsetParent.offsetWidth / target.offsetWidth > 1.5) return true;
+    var padding = parseFloat(getComputedStyle(offsetParent).paddingTop) + parseFloat(getComputedStyle(offsetParent).paddingBottom);
+    if (offsetParent && target.offsetTop / target.offsetHeight < .2 && (offsetParent.clientWidth - padding) / target.offsetWidth > 1.5) return true;
 
 };
 var isxpop = arriswise(isypop, arguments);
 var popup_as_extra = function (element, target, style) {
+    element.target = target;
     if (style) {
         if (/^[vy]/i.test(style)) {
             popup_as_yextra(element, target, style);
@@ -195,9 +200,9 @@ var popup_as_extra = function (element, target, style) {
         popup_as_yextra(element, target, style);
     } else if (isxpop(target)) {
         popup_as_xextra(element, target, style);
-    } else if (isypop(target.parentNode)) {
+    } else if (isypop(target.offsetParent)) {
         popup_as_yextra(element, target, style);
-    } else if (isxpop(target.parentNode)) {
+    } else if (isxpop(target.offsetParent)) {
         popup_as_xextra(element, target, style);
     } else {
         if (/inline|cell/i.test(getComputedStyle(target).display)) {
@@ -266,10 +271,10 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         }
 
         css(element, `min-width:auto;`);
-        var aimedWidth = element.offsetWidth;
+        var aimedWidth = getScreenPosition(element).width;
         //如果宽度不足其附着元素的宽度
-        if (aimedWidth < target.offsetWidth) {
-            aimedWidth = target.offsetWidth;
+        if (aimedWidth < position.width) {
+            aimedWidth = position.width;
         }
 
         //如果宽度超出可视区，调整宽度

package/coms/zimoli/prompt.js

@@ -0,0 +1,40 @@
+function prompt(msg = "请输入", check) {
+    var ipt = input();
+    var oked, ohed;
+    var oks = [], ohs = [];
+    var fire = function () {
+        if (!oked && !ohed) return;
+        if (oked) oks.forEach(o => o(ipt.value));
+        if (ohed) ohs.forEach(o => o(ipt.value));
+        oks.splice(0, oks.length);
+        ohs.splice(0, ohs.length);
+    };
+    var c = confirm(msg, ipt, ["确认", "取消"], function (_) {
+        if (oked || ohed) return;
+        if (_ === "确认") {
+            if (check && check(ipt.value) === false) return false;
+            oked = true;
+        } else {
+            ohed = true;
+        }
+        fire();
+    });
+    on('append')(ipt, function () {
+        setTimeout(function () {
+            ipt.focus();
+        });
+    })
+    on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
+    on("keydown.enter")(c, function () {
+        if (check && check(ipt.value) === false) return;
+        oked = true;
+        remove(c);
+        fire();
+    });
+    c.then = function (ok, oh) {
+        oks.push(ok);
+        ohs.push(oh);
+        fire();
+    };
+    return c;
+}

package/coms/zimoli/rootElements.js

@@ -25,6 +25,7 @@ rootElements.pop = function (elem) {
     if (cx < 0) {
         cx = rootElements.length - 1;
     }
+    if (isFunction(rootElements[cx].onback) && rootElements[cx].onback() === false) return;
     return rootElements.splice(cx, 1)[0];
 };
 rootElements.mount = function (elem) {

package/coms/zimoli/search.js

@@ -0,0 +1,15 @@
+function search(seartext, options) {
+    if (options instanceof Array) {
+        var hasFullmatch = false;
+        var a = options.map(o => {
+            if (o.name === seartext) hasFullmatch = true;
+            var [power, m] = mark.power(o.name, seartext);
+            return { power, name: m, value: o.value };
+        }).filter(a => a.power > 0);
+        a.sort(function (a, b) {
+            return b.power - a.power;
+        });
+        a.hasFullmatch = hasFullmatch;
+        return a;
+    }
+}

package/coms/zimoli/select.js

@@ -2,21 +2,22 @@ var saved_list;
 var _remove = function () {
     var removing_list = saved_list;
     if (removing_list) {
-        var target = this;
-        setTimeout(function () {
+        setTimeout(function run() {
             if (removing_list !== saved_list) return remove(removing_list);
             var { activeElement } = document;
-            if (!getTargetIn(removing_list, activeElement)) {
+            a: if (!getTargetIn(removing_list, activeElement)) {
+                var extras = [].concat(removing_list.with);
+                for (var e of extras) {
+                    if (getTargetIn(e, activeElement)) break a;
+                }
                 remove(removing_list);
                 if (removing_list === saved_list) saved_list = null;
-            } else {
-                once('blur')(activeElement, function () {
-                    setTimeout(function () {
-                        if (document.activeElement === target) return;
-                        _remove();
-                    });
-                });
+                return;
             }
+            once('blur')(activeElement, function () {
+                if (!isMounted(this)) return removing_list.target.focus();
+                run();
+            });
         });
     }
 };
@@ -48,10 +49,23 @@ function select(target, list, removeOnSelect, direction) {
     onblur(target, removeByBlur);
     if (/select/i.test(target.tagName)) {
         onmousedown(target, preventDefault);
+        care(target, 'add-option', function (a) {
+            var o = document.createElement('option');
+            o.value = a.value || a;
+            o.innerHTML = a.name || a;
+            this.appendChild(o);
+        });
+        care(target, 'set-options', function (options) {
+            this.innerHTML = options.map(o => `<option value="${o.value}">${o.name}</option>`).join("");
+        });
+        on('focus')(target, preventDefault);
     }
     var onlistchange = function () {
         if (target.multiple) {
         } else {
+            if (!savedOptions) {
+                target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+            }
             target.value = this.value;
             dispatch(target, "change");
         }
@@ -114,9 +128,9 @@ 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);
+            list = selectList(allOptions, target.multiple, target.editable);
             if (!target.multiple) {
-                onclick(list, _remove);
+                onclick(list, onlistclick);
             }
             bindEvent();
         };

package/coms/zimoli/selectList.js

@@ -6,6 +6,7 @@ var singleClick = function () {
     node.activeNode = this;
     if (node.value === this.value) return;
     node.value = this.value;
+    node.name = this.name;
     dispatch(node, "change");
 };
 var multipleClick = function () {
@@ -21,21 +22,27 @@ var multipleClick = function () {
     }
     dispatch(node, "change");
 };
-function main(children, multiple) {
+
+function main(children, multiple, addable) {
     var list = div();
     list.value = multiple ? [] : "";
     var firstValue = false;
     var clicker = multiple ? multipleClick : singleClick;
-    var hasIcon = false, iconed = '';
-    appendChild(list, [].map.call(children, function (option) {
-        var item = div();
-        item.innerHTML = option.innerHTML;
-        var icon = option.getAttribute("icon");
+    var itemMap = Object.create(null);
+    function createItem(option) {
+        var key = option.key || option.value;
+        if (key in itemMap) return itemMap[key];
+        var item = itemMap[option.value] = document.createElement('div');
+
+        item.setAttribute("item", '');
+        item.innerHTML = option.innerHTML || option.name;
+        item.name = option.name || option.innerHTML;
+        var icon = option.getAttribute ? option.getAttribute("icon") : option.icon;
         if (icon) {
             hasIcon = true;
             css(item, { backgroundImage: `url('${icon}')` });
         }
-        item.value = option.value;
+        item.value = key;
         if (option.selected) {
             iconed = icon;
             if (multiple) {
@@ -54,10 +61,63 @@ function main(children, multiple) {
             onclick(item, clicker);
         }
         return item;
-    }));
+
+    }
+    var hasIcon = false, iconed = '';
+    appendChild(list, [].map.call(children, createItem));
+    if (addable) {
+        var adder = document.createElement("div");;
+        adder.innerHTML = "<a>添加</a><a>管理</a>";
+        button(adder.firstChild);
+        button(adder.children[1]);
+        on("click")(adder, async function (event) {
+            event.preventDefault();
+            var target = getTargetIn(this, event.target, false);
+            switch (target) {
+                case this.children[0]:
+                    var a = prompt("请输入", a => {
+                        if (a in itemMap) {
+                            alert(`选项 ${a} 已存在！`);
+                            return false;
+                        }
+                    });
+                    list.with = a;
+                    on('remove')(a, function () {
+                        list.with = null;
+                    });
+                    a = await a;
+                    if (a in itemMap) return false;
+                    cast(list.target, "add-option", a);
+                    children.push({ name: a, key: a });
+                    list.insertBefore(createItem({
+                        name: a,
+                        value: a,
+                    }), adder);
+                    break;
+                case this.children[1]:
+                    var options = [].slice.call(list.children, 0, list.children.length - 1);
+                    var edit = selectListEdit(options.slice(0));
+
+                    list.with = edit;
+                    on("remove")(edit, function () {
+                        list.with = null;
+                        remove([].slice.call(list.children, 0, list.children.length - 1));
+                        children.splice(0, children.length);
+                        children.push.apply(children, edit.$scope.options.map(o => ({ key: o.key || o.value, name: o.name || o.innerHTML })))
+                        appendChild.before(adder, edit.$scope.options.map(createItem));
+                        cast(list.target, 'set-options', edit.$scope.options);
+                    });
+                    popup(edit, [.5, .5]);
+                    break;
+            }
+        })
+        adder.setAttribute("adder", '');
+        list.appendChild(adder)
+    }
     if (hasIcon) {
         list.setAttribute('iconed', '');
     }
     list.icon = iconed;
+    on('mousedown')(list, e => e.preventDefault());
     return list;
 }

package/coms/zimoli/selectList.less

@@ -2,9 +2,11 @@
     max-width: 100%;
     background-color: #fff;
     line-height: 30px;
-    box-shadow: 0 0 20px -6px rgba(0, 0, 0, .3);
+    box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
+    box-sizing: border-box;
+    border: 1px solid #0003;
 
-    >div {
+    >[item] {
         cursor: default;
         padding: 0 16px;
 
@@ -49,4 +51,15 @@
         background-position-y: 50%;
         background-position-x: 8px;
     }
+}
+
+>[adder] {
+    padding: 0 16px;
+    text-align: right;
+
+    a {
+        cursor: pointer;
+        vertical-align: top;
+        margin-left: 10px;
+    }
 }

package/coms/zimoli/selectListEdit.html

@@ -0,0 +1,15 @@
+<div head>管理选项</div>
+<div body>
+    <div>
+        <input placeholder="搜索或添加" v-model="search" @keydown.enter="add()" /><a @click="add()"
+            -if="search&&!filtered.hasFullmatch">添加</a>
+    </div>
+    <div class="item" -repeat="o in (search?filtered:options)">
+        <span -html=o.name></span>
+        <a type="danger" @click="del(o)">删除</a>
+    </div>
+</div>
+<div foot>
+    <btn @click="save()">确定</btn>
+    <btn type="white" @click="remove()">取消</btn>
+</div>

package/coms/zimoli/selectListEdit.js

@@ -0,0 +1,68 @@
+function main(options) {
+    var page = view();
+    page.innerHTML = template;
+    on("submit")(page, e => e.preventDefault());
+    render(page, {
+        options, a: button, input, _search: '',
+        add() {
+            var a = this._search;
+            a = a.trim();
+            if (!a) return;
+            if (this.filtered.hasFullmatch) return;
+            options.push({ name: a, value: a });
+            this.research();
+        },
+        del(o) {
+            for (var cx = 0, dx = options.length; cx < dx; cx++) {
+                if (options[cx].value === o.value) {
+                    var i = cx;
+                    break;
+                }
+            }
+            if (i >= 0) options.splice(i, 1);
+            console.log(i)
+            this.research();
+        },
+        get search() {
+            return this._search;
+        },
+        research() {
+            var v = this._search;
+            if (v) {
+                this.filtered = search(v, options);
+            }
+        },
+        set search(v) {
+            this._search = v;
+            if (v) {
+                this.research();
+            }
+        },
+        btn: button,
+        remove() {
+            remove(page);
+        },
+        save() {
+            remove(page);
+        },
+        filtered: []
+    });
+    drag.on(page.firstChild, page);
+    on("append")(page, function () {
+        setTimeout(function () {
+            page.querySelector("input").focus();
+        });
+    });
+    on("mousedown")(page, e => {
+        if (e.target !== page.querySelector("input")) {
+            e.preventDefault();
+        }
+    });
+    page.onback = function () {
+        if (page.$scope.search) {
+            page.$scope.search = '';
+            return false;
+        }
+    };
+    return page;
+}

package/coms/zimoli/selectListEdit.less

@@ -0,0 +1,21 @@
+& {
+    position: absolute;
+    user-select: none;
+}
+
+[body]>div {
+    padding: 6px 10px;
+    background: #fff;
+
+    >* {
+        line-height: 28px;
+        vertical-align: top;
+        margin-right: 20px;
+    }
+
+    &.item {
+        &:nth-of-type(n+2) {
+            border-top: 1px solid #0003;
+        }
+    }
+}

package/coms/zimoli/table.html

@@ -8,7 +8,8 @@
     <tr>
         <td -repeat="f in fields">
             <span -if="f.key" -text="d[f.key]"></span>
-            <a on-click="o.do(d)" -if="f.options" _type="o.type" -repeat="o in f.options">
+            <a on-click="o.do(d)" -if="f.options" _type="o.type instanceof Function?o.type(d):o.type"
+                -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>

package/coms/zimoli/table.js

@@ -91,7 +91,7 @@ var adaptTarget = function (event) {
             }
             if (target) target = getFirstSingleColCell(this, target.colend);
             if (target) {
-                if (position.right >= getSelection(this).right - 7) {
+                if (position.right >= getScreenPosition(this).right - 7) {
                     target = this;
                     return;
                 }

package/coms/zimoli/zimoli.js

@@ -249,11 +249,31 @@ function prepare(pgpath, ok) {
         return _with_elements;
     };
     state.path = function (url) {
-        if (isString(url) && /^[^\\\/]/.test(url)) {
+        if (isString(url) && /^\.+[\\\/]/.test(url)) {
+            url = url.replace(/^\.[\\\/]/, '');
             url = pgpath.replace(/[^\/]*$/, url);
+            var ps = url.split(/[\\\/]/);
+            var ds = [];
+            for (var p of ps) {
+                if (p === "..") {
+                    ds.pop();
+                }
+                else if (p !== ".") {
+                    ds.push(p);
+                }
+            }
+            url = ds.join('/');
         }
         return url;
-    }
+    };
+    state.popup = function (a) {
+        a = state.path(a);
+        return popup.apply(this, [a].concat([].slice.call(arguments, 1)));
+    };
+    state.init = function (a) {
+        a = state.path(a);
+        return init.apply(this, [a].concat([].slice.call(arguments, 1)));
+    };
     state.go = function (url, args, _history_name) {
         // if (arguments.length === 1 && isFinite(url)) return window_history.go(url | 0);
         var to = function (_url, args, _history_name) {

package/package.json

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