efront 3.7.6 → 3.8.2

package/coms/zimoli/render.js

@@ -565,7 +565,8 @@ function getFromScopes(key, scope, parentScopes) {
     if (key in scope) {
         return scope[key];
     }
-    if (parentScopes) for (var o of parentScopes) {
+    if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
+        var o = parentScopes[cx];
         if (key in o) {
             return o[key];
         }

package/coms/zimoli/select.js

@@ -16,7 +16,7 @@ var _remove = function () {
             }
             once('blur')(activeElement, function () {
                 if (!isMounted(this)) return removing_list.target.focus();
-                run();
+                _remove();
             });
         });
     }
@@ -137,8 +137,8 @@ function select(target, list, removeOnSelect, direction) {
     }
     var mousedown = function () {
         initList();
-        if (saved_list !== list) {
-            _remove();
+        if (saved_list !== list || !isMounted(list)) {
+            if (saved_list && saved_list !== list) _remove();
             if (document.activeElement !== target) target.focus();
             popup(list, target, direction);
             saved_list = list;

package/coms/zimoli/selectList.js

@@ -24,8 +24,8 @@ var multipleClick = function () {
 };
 
 function main(children, multiple, addable) {
-    var list = div();
-    list.value = multiple ? [] : "";
+    var page = div();
+    page.value = multiple ? [] : "";
     var firstValue = false;
     var clicker = multiple ? multipleClick : singleClick;
     var itemMap = Object.create(null);
@@ -33,7 +33,6 @@ function main(children, multiple, addable) {
         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;
@@ -47,12 +46,12 @@ function main(children, multiple, addable) {
             iconed = icon;
             if (multiple) {
                 item.setAttribute("selected", "");
-                list.value.push(option.value);
+                page.value.push(option.value);
             } else if (!firstValue) {
                 item.setAttribute("selected", "");
-                list.activeNode = item;
+                page.activeNode = item;
                 firstValue = true;
-                list.value = option.value
+                page.value = option.value
             }
         }
         if (option.disabled) {
@@ -64,10 +63,22 @@ function main(children, multiple, addable) {
 
     }
     var hasIcon = false, iconed = '';
-    appendChild(list, [].map.call(children, createItem));
+    var page = list(page, function (i) {
+        if (i < 0 || i >= children.length) return;
+        return createItem(children[i]);
+    });
+    on("append")(page, function () {
+        page.clean();
+        page.go(0);
+        if (adder) {
+            remove(adder);
+            appendChild(page, adder);
+        }
+    })
     if (addable) {
         var adder = document.createElement("div");;
         adder.innerHTML = "<a>添加</a><a>管理</a>";
+        adder.setAttribute('insert', '');
         button(adder.firstChild);
         button(adder.children[1]);
         on("click")(adder, async function (event) {
@@ -81,43 +92,43 @@ function main(children, multiple, addable) {
                             return false;
                         }
                     });
-                    list.with = a;
+                    page.with = a;
                     on('remove')(a, function () {
-                        list.with = null;
+                        page.with = null;
                     });
                     a = await a;
                     if (a in itemMap) return false;
-                    cast(list.target, "add-option", a);
+                    cast(page.target, "add-option", a);
                     children.push({ name: a, key: a });
-                    list.insertBefore(createItem({
+                    page.insertBefore(createItem({
                         name: a,
                         value: a,
                     }), adder);
                     break;
                 case this.children[1]:
-                    var options = [].slice.call(list.children, 0, list.children.length - 1);
+                    var options = [].slice.call(children, 0, children.length);
                     var edit = selectListEdit(options.slice(0));
-
-                    list.with = edit;
+                    page.with = edit;
                     on("remove")(edit, function () {
-                        list.with = null;
-                        remove([].slice.call(list.children, 0, list.children.length - 1));
+                        page.with = null;
                         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);
+                        cast(page.target, 'set-options', edit.$scope.options);
+                        page.clean();
+                        remove(adder);
+                        page.go(0);
+                        appendChild(page, adder);
                     });
                     popup(edit, [.5, .5]);
                     break;
             }
-        })
+        });
         adder.setAttribute("adder", '');
-        list.appendChild(adder)
     }
     if (hasIcon) {
-        list.setAttribute('iconed', '');
+        page.setAttribute('iconed', '');
     }
-    list.icon = iconed;
-    on('mousedown')(list, e => e.preventDefault());
-    return list;
+    page.icon = iconed;
+    on('mousedown')(page, e => e.preventDefault());
+    return page;
 }

package/coms/zimoli/selectList.less

@@ -5,6 +5,10 @@
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
     box-sizing: border-box;
     border: 1px solid #0003;
+    overflow: hidden;
+    width: auto;
+    height: auto;
+    max-height: 360px;
 
     >[item] {
         cursor: default;

package/coms/zimoli/selectListEdit.js

@@ -20,7 +20,6 @@ function main(options) {
                 }
             }
             if (i >= 0) options.splice(i, 1);
-            console.log(i)
             this.research();
         },
         get search() {

package/coms/zimoli/swap.less

@@ -30,7 +30,7 @@
     -o-appearance: none;
     appearance: none;
     &:before {
-        background-color: #26f;
+        background-color: #28c;
         transition: all .1s ease-out;
         left: 50%;
         top: 50%;

package/coms/zimoli/table.html

@@ -8,8 +8,8 @@
 <tbody -src="d in data">
     <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 instanceof Function?o.type(d):o.type"
+            <model -if="f.key" :field=f :data=d readonly ></model>
+            <a on-click="o.do(d)" -if="!f.key&&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>

package/coms/zimoli/table.js

@@ -215,6 +215,7 @@ function table(elem) {
             fields,
             tbody: list,
             data,
+            model,
             setWidth(target, f) {
                 css(target, { width: f.width });
             },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.7.6",
+    "version": "3.8.2",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepare": "node tools/build-efront.js",
+        "prepare": "node tools/build-efront.js --uplevel",
         "start": "efront ./efront/ --libs=typescript,esprima,escodegen,esmangle,pngjs,less-node"
     },
     "repository": {