efront 3.20.0 → 3.20.3

package/coms/zimoli/menu.less

@@ -178,7 +178,7 @@ body:active & {
 
         &.hover {
             text-shadow: none;
-            color: #fff;
+            // color: #fff;
         }
 
     }
@@ -188,17 +188,17 @@ body:active & {
         line-height: 28px;
 
         &.open {
-            color: #fff;
             background: #1e282c;
-
+            
             & s:after {
                 top: -9.2px;
             }
         }
-
+        
         &.checked,
         &.actived,
         &.selected {
+            color: #fff;
             border-left-color: #3c8dbc;
         }
 

package/coms/zimoli/render.js

@@ -451,37 +451,25 @@ var directives = {
             oldValue = value;
             this.setValue(value);
         } : null;
+        var setter2 = function (key) {
+            var value = getter();
+            if (value === undefined) value = "";
+            if (deepEqual(oldValue, value)) return;
+            oldValue = value;
+            this[key] = value;
+        };
         if (/^input$/i.test(this.tagName) && /^checkbox$/i.test(this.type) || /^checkbox$/i.test(this.tagName)) {
-            this.renders.push(setter || function () {
-                var value = getter();
-                if (value === undefined) value = "";
-                if (deepEqual(oldValue, value)) return;
-                oldValue = value;
-                this.checked = value;
-            });
+            this.renders.push(setter || setter2.bind(this, 'checked'));
             var change = new Function(`${search[0]}with(this.$scope)${search[1]}=${getstr || "this.checked"}`).bind(this);
         } else if (("value" in this || this.getValue instanceof Function) && this.setValue instanceof Function) {
-            this.renders.push(setter || function () {
-                var value = getter();
-                if (value === undefined) value = "";
-                if (deepEqual(oldValue, value)) return;
-                oldValue = value;
-                if ((this.getValue instanceof Function ? this.getValue() : this.value) !== value) this.setValue(value);
-            });
+            this.renders.push(setter);
             var change = new Function(`${search[0]}with(this.$scope)${search[1]}=${getstr || "this.value"}`).bind(this);
         } else if (/^(select|input|textarea)$/i.test(this.tagName) || "value" in this) {
-            this.renders.push(setter || function () {
-                var value = getter();
-                if (isEmpty(value)) value = "";
-                if (deepEqual(oldValue, value)) return;
-                oldValue = value;
-                if (this.value !== value) this.value = value;
-            });
+            this.renders.push(setter || setter2.bind(this, 'value'));
             var change = new Function(`${search[0]}with(this.$scope)${search[1]}=${getstr || "this.value"}`).bind(this);
         } else {
             this.renders.push(setter || function () {
                 var value = getter();
-
                 if (value === undefined) value = "";
                 if (deepEqual(oldValue, value)) return;
                 oldValue = value;
@@ -489,8 +477,18 @@ var directives = {
             });
             var change = new Function("html", `${search[0]}with(this.$scope)${search[1]}=${getstr || "'value' in this?this.value:html(this)"}`).bind(this, html);
         }
-        var onchange = change;
-        eventsHandlers.map(on => on(this, onchange));
+        setter2 = null;
+        var onchange = function () {
+            change.call(this);
+            var value = getter();
+            if (value === oldValue) {
+                return;
+            }
+            oldValue = value;
+            change.call(this, value);
+            userChanged = true;
+        };
+        eventsBinders.forEach(on => on(this, onchange, true));
     },
 
     "class"(search) {
@@ -869,8 +867,16 @@ function render(element, scope, parentScopes, lazy = true) {
 var digest = lazy(refresh, -{});
 render.digest = render.apply = render.refresh = digest;
 render.parseRepeat = parseRepeat;
-var eventsHandlers = "fullscreenchange,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
-eventsHandlers.map(on => on(window, digest));
+var eventsBinders = "fullscreenchange,load,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
+var userChanged = false;
+eventsBinders.splice(0, 2).forEach(on => on(window, digest));
+var changeListener = function () {
+    if (userChanged) {
+        userChanged = false;
+        digest();
+    }
+};
+eventsBinders.forEach(on => on(window, changeListener));
 on("render")(window, digest);
 var register = function (key, creater) {
     key = key.replace(/\-(\w)/, (_, a) => a.toUpperCase()).replace(/^\w/, a => a.toLowerCase());

package/coms/zimoli/resize.js

@@ -124,11 +124,7 @@ var handle = {
         css(dragging.rect, style);
         move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
         dispatch(dragging.rect, 'resize');
-        resizingList.forEach(a => {
-            if (getTargetIn(dragging.rect, a)) {
-                dispatch(a, 'resize');
-            }
-        });
+        resizingList.hit(rect);
     },
     end(e) {
         dragging = null;
@@ -151,14 +147,16 @@ resize.on = function (elem, dragHandle) {
     var computed = getComputedStyle(elem);
     var resizeh = function () {
         var elem = this;
+        var resized = false;
         if (elem.scrollWidth > elem.clientWidth) {
             css(elem, { width: elem.offsetWidth });
-            dispatch(elem, 'resize');
+            resized = true;
         }
         if (elem.scrollHeight > elem.clientHeight) {
             css(elem, { height: elem.offsetHeight });
-            dispatch(elem, 'resize');
+            resized = true;
         }
+        if (resized) dispatch(elem, 'resize'), resizingList.hit(elem);
         if (unbind && parseInt(computed.height) && parseInt(computed.width)) {
             unbind();
             unbind = null;

package/coms/zimoli/resizingList.js

@@ -1,6 +1,24 @@
 onresize(window, function () {
-    for (var cx = 0, dx = resizingList.length; cx < dx; cx++) {
-        dispatch(resizingList[cx], 'resize');
+    for (var r of resizingList) {
+        dispatch(r, 'resize');
     }
 });
-var resizingList = [];
+var mount = function () {
+    resizingList.push(this);
+    dispatch(this, 'resize');
+};
+var unmount = function () {
+    removeFromList(resizingList, this);
+};
+var resizingList = [];
+resizingList.set = function (e) {
+    on('append')(e, mount);
+    on("remove")(e, unmount);
+};
+resizingList.hit = function (e) {
+    for (var a of this) {
+        if (getTargetIn(e, a)) {
+            dispatch(a, 'resize');
+        }
+    }
+};

package/coms/zimoli/select.js

@@ -119,13 +119,25 @@ function select(target, list, removeOnSelect, direction) {
     }
     else if (target.$src) {
         var generator = getGenerator(target);
+        var optionsMap = {};
         var initList2 = function (src) {
+            src.forEach(s => {
+                optionsMap[s.key] = s;
+            });
             list = selectList(generator, src, !!target.multiple, !!target.editable);
             if (!target.multiple) {
                 onclick(list, onlistclick);
             }
+            if (target.value) {
+                target.setValue(target.value);
+            }
             bindEvent();
         };
+        target.setValue = function (v) {
+            var s = optionsMap[v];
+            this.innerHTML = `<option selected value="${v}">${s ? s.name : ''}</option>`;
+            this.value = v;
+        };
         care(target, initList2);
         var initList = function () {
         };

package/coms/zimoli/tree.js

@@ -1,31 +1,4 @@
-function getTreeFromArray(array) {
-    var root = [];
-    root.tab = -Infinity;
-    root.count = 0;
-    root.total = 0;
-    var path = [root];
-    for (var cx = 0, dx = array.length; cx < dx; cx++) {
-        var arg = array[cx];
-        var item = new Item(arg);
-        item.root = root;
-        for (var cy = path.length - 1; cy >= 0; cy--) {
-            var parentElement = path[cy];
-            if (parentElement.tab < arg.tab) {
-                item.parent = parentElement;
-                parentElement.push(item);
-                path.splice(cy + 1, path.length - cy - 1, item);
-                break;
-            }
-            parentElement.parent.count += parentElement.count || parentElement.length || 1;
-            parentElement.parent.total += (parentElement.total || parentElement.length) + 1;
-        }
-    }
-    while (path.length > 1) {
-        var item = path.pop();
-        path[path.length - 1].count += item.count || item.length || 1;
-    }
-    return root;
-}
+var getTreeFromArray = Tree.fromArray;
 function buildCrack(com, set) {
     var count = com.length;
     for (var cx = 0, dx = com.length; cx < dx; cx++) {
@@ -54,55 +27,8 @@ function getCrackTarget(com) {
     return com.target;
 }
 
-function getArrayFromTree(root, skipClosed = true) {
-    var path = [root], pathcx = [0];
-    var result = [];
-    var max_deep = 1;
-    loop: while (pathcx.length) {
-        var pathindex = pathcx.length - 1;
-        var cx = pathcx[pathindex];
-        var item = path[pathindex];
-        if (cx >= item.length) {
-            path.pop();
-            pathcx.pop();
-            continue loop;
-        }
-        var elem = item[cx];
-        elem.parent = item;
-        result.push(elem);
-        pathcx[pathindex] = ++cx;
-        if (!skipClosed || !elem.isClosed()) {
-            if (elem.length) {
-                path.push(elem);
-                pathcx.push(0);
-                if (pathcx.length > max_deep) {
-                    max_deep = pathcx.length;
-                }
-            }
-        }
-    }
-    result.deep = max_deep;
-    return result;
-}
-function appendTo(parent, datas) {
-    var tab = parent && parent.tab + 1 || 1;
-    var length = parent.length;
-    datas.map(function (data) {
-        if (isObject(data)) {
-            data.tab = tab;
-            var item = new Item(data);
-            item.parent = parent;
-            item.root = parent.root;
-            parent.push(item);
-        }
-    });
-
-    var delta = parent.length - length;
-    while (parent) {
-        parent.count += delta;
-        parent = parent.parent;
-    }
-}
+var getArrayFromTree = Tree.toArray;
+var appendTo = Tree.appendTo;
 
 function tree() {
     var element, generator;
@@ -294,14 +220,8 @@ function tree() {
 
 
     banner.setData = function (src) {
-        if (isArray(src)) {
-            if (src[0] && 'tab' in src[0]) {
-                root = getTreeFromArray(src);
-            } else {
-                root = getTreeFromData(src);
-            }
-            refresh();
-        }
+        root = new Tree(src);
+        refresh();
     };
     banner.addData = function (data, parent = root) {
         appendTo(parent, data);

package/package.json

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