efront 3.17.2 → 3.18.2

package/coms/zimoli/grid.js

@@ -202,6 +202,21 @@ var resizeView = function (event) {
     }
     grid.reshape();
 };
+var clearResizer = function (grid) {
+    var target = grid.editting.target;
+    if (target) target.style.zIndex = null;
+    var { clientX, clientY } = grid.editting;
+    if (clientX) {
+        clientX[1].forEach(e => removeClass(e, 'border-right'));
+        clientX[2].forEach(e => removeClass(e, 'border-left'));
+    }
+    if (clientY) {
+        clientY[1].forEach(e => removeClass(e, "border-bottom"));
+        clientY[2].forEach(e => removeClass(e, "border-top"));
+    }
+    grid.editting = null;
+};
+
 var resizer = function (event) {
     var grid = this;
     if (!grid.direction) return;
@@ -227,24 +242,7 @@ var resizer = function (event) {
         //右边
         generateResizeParameters.call(grid, "x", "left", "right", "width", area.right, event, 1, resize);
     }
-    grid.editting = resize;
-    var cancelup = onmouseup(window, function () {
-        var target = grid.editting.target;
-        if (target) target.style.zIndex = null;
-        var { clientX, clientY } = resize;
-        resize = null;
-        if (clientX) {
-            clientX[1].forEach(e => removeClass(e, 'border-right'));
-            clientX[2].forEach(e => removeClass(e, 'border-left'));
-        }
-        if (clientY) {
-            clientY[1].forEach(e => removeClass(e, "border-bottom"));
-            clientY[2].forEach(e => removeClass(e, "border-top"));
-        }
-        grid.editting = null;
-
-        cancelup();
-    });
+    return grid.editting = resize;
 };
 var gridListener = function () {
     var grid = this;
@@ -261,7 +259,14 @@ var gridListener = function () {
     /**
      * 指针按下
      */
-    var offmousedown = onmousedown(grid, resizer);
+    var offmousedown = onmousedown(grid, function (event) {
+        if (!resizer.call(this, event)) return;
+        var that = this;
+        var cancelup = onmouseup(window, function () {
+            clearResizer(that);
+            cancelup();
+        });
+    });
 
     var offremove = onremove(grid, function () {
         offremove();
@@ -359,6 +364,51 @@ var bindToOrderedSpliters = function (split_points, target, value, side) {
     return split_points;
 };
 var grid_prototype = {
+    resizeCell(cell, side, delta) {
+        side = side.toLowerCase();
+        var { left, top, right, bottom } = getScreenPosition(cell);
+        var clientX, clientY, targetX, targetY;
+        var direction;
+        switch (side.toLowerCase()[0]) {
+            case "l":
+            case "w":
+                direction = 'w';
+                clientX = left;
+                targetX = left + delta;
+                targetY = clientY = top + bottom >> 1;
+                break;
+            case "t":
+            case "n":
+                direction = 'n';
+                clientY = top;
+                targetY = top + delta;
+                targetX = clientX = left + right >> 1;
+                break;
+            case "r":
+            case "e":
+                direction = 'e';
+                clientX = right;
+                targetX = right + delta;
+                targetY = clientY = left + right >> 1;
+
+                break;
+            case "b":
+            case "s":
+                direction = 's';
+                clientX = bottom;
+                targetY = bottom + delta;
+                targetX = clientX = left + right >> 1;
+                break;
+            default:
+                throw new Error("参数不支持", side);
+        }
+        this.direction = direction;
+        var e = resizer.call(this, { clientX, clientY, target: cell });
+        if (!e) return;
+        resizeView.call(this, { clientX: targetX, clientY: targetY, target: cell });
+        clearResizer(this);
+        this.direction = '';
+    },
     setGrid(breakpoints, bounds) {
         var grid = this;
         if (!bounds) {

package/coms/zimoli/list.js

@@ -379,12 +379,12 @@ function ylist(container, generator, $Y) {
         if (deltay >= delta) {
             return false;
         }
-        if (deltay < 1) y = target_y;
-        else if (deltay > count || deltay > 3) {
-            y = last_y + Math.max(2 * (target_y > last_y ? .8 : -.8));
-        }
+        if (deltay < 2) y = target_y;
         else {
-            y = (target_y + last_y) / 2;
+            var speed = Math.abs(spd.read()[0]);
+            if (speed < 1) speed = 1;
+            if (deltay < 3) speed = .5;
+            y = last_y + (target_y > last_y ? speed : -speed);
         }
         list.Top(y);
         if (target_y === y) {

package/coms/zimoli/menu.js

@@ -48,19 +48,20 @@ var getArrayNodes = function (elem) {
         var nodeName = node.children.length > 1 ? node.children[0].innerHTML : node.innerHTML;
         deep++;
         if (nodeName) {
-            nodes.push({
+            nodes.push(new Item({
                 name: nodeName,
                 tab: deep,
                 href: node.getAttribute("path") || node.getAttribute("href"),
                 class: node.className,
                 closed: true
-            });
+            }));
         }
         var index = nodes.length - 1;
         if (node.children.length > 1) {
             [].forEach.call(node.children[1].children, run);
         }
-        nodes[index].children = nodes.splice(index + 1, nodes.length - index);
+        nodes[index].push.apply(nodes[index], nodes.splice(index + 1, nodes.length - index));
+        nodes[index].children = nodes[index];
         deep--;
     };
     [].forEach.call(elem.children, run);
@@ -93,7 +94,7 @@ var getTreeNodes = function (elem) {
 var emitEvent = function (item, event) {
     event.preventDefault(true);
     if (item.disabled) return;
-    active(this, item, item, createItemTarget.call(this, item));
+    active(this, item, item, this.$src ? createItemTarget.call(this, item) : this);
 }
 function bindGlobalkey(elem, keymap, emit) {
     if (elem.keymap) {
@@ -194,8 +195,8 @@ function main(elem, mode) {
             case "y":
             case "vertical":
                 if (!direction) mode = "vertical", direction = 'y';
-                var emit = function (item) {
-                    active(elem, item.value, item, createItemTarget.call(elem, item.value));
+                var emit = function (item, target) {
+                    active(elem, item.value, item, elem.$src ? createItemTarget.call(elem, item.value) : target);
                 };
                 if ("$src" in elem) {
                     getGenerator(elem, 'menu-item');

package/coms/zimoli/menuItem.js

@@ -17,7 +17,7 @@ function main(elem, scope, hasIcon) {
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }], false);
+    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }], 0);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     if (scope.hotkey) bindAccesskey(item, scope.hotkey);
     return item;

package/coms/zimoli/menuList.js

@@ -286,6 +286,7 @@ function main(page, items, active, direction = 'y') {
         };
         var $scope = {
             "menu-item"(e, s) {
+                if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
                 var a = button(
                     menuItem(e, s.value, this.hasIcon)
                 );
@@ -293,7 +294,7 @@ function main(page, items, active, direction = 'y') {
                     page.firstMenu = a;
                     page.total = items.length;
                 }
-                a.menu = s.menu;
+                a.menu = s;
                 return a;
             },
             menus: items,

package/coms/zimoli/model.js

@@ -212,9 +212,9 @@ function main(elem) {
                     if (create) {
                         var e = create(elem, data, field_ref);
                         if (isNode(e)) {
-                            appendChild(elem, e);
+                            if (e !== elem) appendChild(elem, e);
                         }
-                        else {
+                        else if (!isEmpty(e)) {
                             elem.innerHTML = e;
                         }
                         return;
@@ -222,6 +222,7 @@ function main(elem) {
                     elem.innerHTML = '<span ng-bind=get()></span>';
                     render(elem, {
                         get() {
+                            if (!field.key) return;
                             var value = seek(data, field.key);
                             if (field.options) {
                                 if (!field.optionsMap) {
@@ -243,7 +244,7 @@ function main(elem) {
                 }
             } else {
                 var create = field_type === "function" ? field_editor : constructors[field_type];
-                var ipt = create ? create(elem, field_ref) : input();
+                var ipt = create ? create(elem, field_ref) : field.key ? input() : null;
 
                 if (ipt) {
                     if (ipt !== elem) appendChild(elem, ipt);

package/coms/zimoli/render.js

@@ -1,17 +1,26 @@
 var hasOwnProperty = {}.hasOwnProperty;
 var renderElements = Object.create(null);
 var presets = Object.create(null);
+var createTemplateNodes = function (text) {
+    var node = document.createElement(this.parentNode.tagName || "div");
+    node.innerHTML = text;
+    remove(this.with);
+    this.with = [].slice.call(node.childNodes, 0);
+    appendChild.after(this, this.with);
+    renderElement(this.with, this.$scope, this.$parentScopes, this.renderid === 9);
+};
 presets.template = function (t) {
     var comment = document.createComment('template');
     comment.$scope = t.$scope;
     comment.$parentScopes = t.$parentScopes;
-    once("append")(comment, function () {
-        var node = document.createElement(comment.parentNode.tagName || "div");
-        node.innerHTML = t.innerHTML;
-        comment.with = [].slice.call(node.childNodes, 0);
-        appendChild.after(comment, comment.with);
-        renderElement(comment.with, comment.$scope, comment.$parentScopes);
-    });
+    if (!t.innerHTML) {
+        care(comment, createTemplateNodes)
+    }
+    else {
+        once("append")(comment, function () {
+            createTemplateNodes.call(comment, t.innerHTML);
+        });
+    }
     return comment;
 };
 window.renderElements = renderElements;
@@ -20,8 +29,11 @@ var renderidClosed = 0;
 var addRenderElement = function () {
     var element = this;
     if (!isNode(element)) return;
-    if (element.renderid < 10 && element.renderid > 0) element.renderid = ++renderidOffset;
-    renderElements[element.renderid] = element;
+    if (element.renderid !== 9) {
+        // 只渲染一次
+        if (element.renderid < 10 && element.renderid > 0) element.renderid = ++renderidOffset;
+        renderElements[element.renderid] = element;
+    }
     rebuild(element);
 };
 var removeRenderElement = function () {
@@ -78,12 +90,19 @@ var createGetter = function (search, isprop = true) {
 var initialComment = function (renders, type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
     comment.renders = renders;
-    comment.renderid = ++renderidOffset;
-    onappend(comment, addRenderElement);
-    onremove(comment, removeRenderElement);
     appendChild.after(this, comment);
     if (!/if/i.test(type)) remove(this);
-    rebuild(comment);
+    if (!this.$struct.once) {
+        comment.renderid = ++renderidOffset;
+        onmounted(comment, addRenderElement);
+        onremove(comment, removeRenderElement);
+        if (isMounted(comment) || eagermount) rebuild(comment);
+    }
+    else {
+        comment.renderid = 9;
+        rebuild(comment);
+        remove(comment);
+    }
     return comment;
 };
 var parseRepeat = function (expression) {
@@ -442,7 +461,7 @@ var directives = {
         } else if (/^(select|input|textarea)$/i.test(this.tagName) || "value" in this) {
             this.renders.push(setter || function () {
                 var value = getter();
-                if (value === undefined) value = "";
+                if (isEmpty(value)) value = "";
                 if (deepEqual(oldValue, value)) return;
                 oldValue = value;
                 if (this.value !== value) this.value = value;
@@ -599,17 +618,17 @@ function getFromScopes(key, scope, parentScopes) {
     }
 }
 
-function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, eager) {
+function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, once) {
     if (!isNode(element) && element.length) {
         return [].concat.apply([], element).map(function (element) {
-            return renderElement(element, scope, parentScopes);
+            return renderElement(element, scope, parentScopes, once);
         });
     }
     if (!isElement(element)) {
         return element;
     }
     if (!isNumber(element.renderid)) {
-        renderStructure(element, scope, parentScopes);
+        renderStructure(element, scope, parentScopes, once);
     }
     var elementid = element.getAttribute("renderid") || element.getAttribute("elementid") || element.getAttribute("id");
     if (elementid) {
@@ -631,7 +650,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             if (parentNode.renderid > 1 || isMounted(parentNode)) element.renderid = 2;
         }
         element.renders = element.renders ? [].concat(element.renders) : [];
-        var { ons, copys, attrs, props, binds, context: withContext, ids } = element.$struct;
+        var { ons, copys, attrs, props, binds, context: withContext, ids, once } = element.$struct;
+        if (once) element.renderid = 9;
         delete element.$struct;
         if (binds.src) {
             element.$src = parseRepeat(binds.src);
@@ -671,7 +691,9 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                     }
                 });
                 replacer.renderid = element.renderid;
-                replacer.renders = element.renders;
+                var renders = element.renders;
+                if (replacer.renders) renders = renders.concat(replacer.renders);
+                replacer.renders = renders;
                 if (binds.src) replacer.$src = element.$src;
                 element = replacer;
                 element.$scope = scope;
@@ -679,8 +701,10 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             }
         }
     }
-    if (element.children && element.children.length) renderElement(element.children, scope, parentScopes);
+    if (element.children && element.children.length) renderElement(element.children, scope, parentScopes, once);
     if (!isFirstRender) return element;
+    var renders = element.renders;
+    element.renders = [];
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) {
             directives[k].call(element, [withContext, binds[k]])
@@ -698,11 +722,17 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         } catch (e) { }
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
+    if (renders.length) element.renders.push.apply(element.renders, renders);
     if (element.renders.length) {
-        onmounted(element, addRenderElement);
-        onremove(element, removeRenderElement);
-        if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
-        else if (eagermount) rebuild(element);
+        if (element.renderid !== 9) {
+            onmounted(element, addRenderElement);
+            onremove(element, removeRenderElement);
+            if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
+            else if (eagermount) rebuild(element);
+        }
+        else {
+            rebuild(element);
+        }
     }
     if (elementid) scope[elementid] = element;
     for (var id of ids) {
@@ -710,7 +740,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     return element;
 }
-function renderStructure(element, scope, parentScopes = []) {
+function renderStructure(element, scope, parentScopes = [], once) {
     // 处理结构流
     if (parentScopes !== null && !isArray(parentScopes)) {
         throw new Error('父级作用域链应以数组的类型传入');
@@ -791,25 +821,33 @@ function renderStructure(element, scope, parentScopes = []) {
             if (!/\-/.test(name) || value === '') {
                 copys.push(attr);
             }
-            props[name.replace(/\-(\w)/g, (_, w) => w.toUpperCase())] = value === "" ? true : value;
+            var k = name.replace(/\-(\w)/g, (_, w) => w.toUpperCase());
+            if (!(k in element)) {
+                props[k] = value === "" ? true : value;
+            }
+            else {
+                props[k] = element[k];
+            }
         }
     }
-    if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext, ids };
+    if (props["zimoli"] || props["fresh"] || props["once"]) once = true;
+    else if (props["refresh"] || props["digest"] || props["mount"]) once = false;
+    if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext, ids, once };
     if (element.renderid <= -1) createStructure.call(element, types.if, types.repeat, withContext);
 }
 var eagermount = false, renderlock = false;
 function render(element, scope, parentScopes, lazy = true) {
     var if_top_length = if_top.length;
     var haslock = false;
+    if (isFinite(scope) && arguments.length === 2) lazy = scope, scope = undefined;
+    else if (isFinite(parentScopes) && arguments.length === 3) lazy = parentScopes, parentScopes = undefined;
+    var renderonce = lazy === 0;
     if (!renderlock) {
         haslock = true;
         renderlock = true;
-        if (isBoolean(scope) && arguments.length === 2) lazy = +scope, scope = undefined;
-        else if (isBoolean(parentScopes) && arguments.length === 3) lazy = +parentScopes, parentScopes = undefined;
-        else lazy = +lazy;
-        eagermount = !lazy;
+        eagermount = !+lazy;
     }
-    var e = renderElement(element, scope, parentScopes);
+    var e = renderElement(element, scope, parentScopes, renderonce);
     if (haslock) {
         renderlock = false;
         eagermount = false;

package/coms/zimoli/tree.js

@@ -224,7 +224,7 @@ function tree() {
         _div.refresh();
         onclick(_div, function (event) {
             var isClosed = com.isClosed();
-            if (!active(banner, com.value, com, element.$src ? createItemTarget.call(element, com.value) : _div)) {
+            if (!active(banner, com.value, com, banner.$src ? createItemTarget.call(banner, com.value) : _div)) {
                 return;
             }
             if (isClosed === com.isClosed() && com.length) {

package/coms/zimoli/vbox.js

@@ -84,7 +84,7 @@ function ybox(generator) {
     var stop = _box.stopY;
     var stop2 = lazy(function () {
         scrollY.smooth(stop);
-    }, 60);
+    }, 40);
     var decrease = function () {
         var res = _decrease(increaser_t) + _decrease(increaser_b);
         if (!res) {
@@ -128,7 +128,7 @@ function ybox(generator) {
     } else {
         var wheelTime = 0;
         onmousewheel(_box, function (event) {
-            if (event.timeStamp - wheelTime > 60 && Math.abs(event.deltaY) < 12) {
+            if (event.timeStamp - wheelTime > 40 && Math.abs(event.deltaY) < 12) {
                 wheelTime = event.timeStamp;
                 return;
             }

package/coms/zimoli/zimoli.js

@@ -127,7 +127,13 @@ function go(pagepath, args, history_name, oldpagepath) {
     } else {
         var { roles, options, id } = getZimoliParams(pagepath);
     }
-    if (!pagepath) return true;
+    if (!pagepath) {
+        if (isNode(history_name)) {
+            remove(history_name.activateNode);
+            history_name.activate = pagepath;
+        }
+        return true;
+    }
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
     prepare(pagepath, function (res) {
         if (!res.roles || res.roles === true) res.roles = !!roles;
@@ -594,7 +600,11 @@ function addGlobal(element, name = null, isDestroy) {
         }
         global[name] = element;
     } else if (isNode(name)) {
-        if (isDestroy) appendChild.insert(name, element);
+        if (name.nodeType !== 1) {
+            appendChild.after(name, element);
+            name.with = [element];
+        }
+        else if (isDestroy) appendChild.insert(name, element);
         else appendChild(name, element);
     } else if (isFunction(name)) {
         name(element);

package/package.json

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