efront 3.4.5 → 3.5.1

package/coms/zimoli/getGenerator.js

@@ -1,7 +1,12 @@
 
 var _slider = createElement(div);
-var getGenerator = function (container, parsedSrc) {
+var empty = function (index, item) {
+    if (!item) return;
+    return document.createElement('empty');
+};
+var getGenerator = function (container) {
     if (!container) return;
+    if (!container.childNodes.length) return container.$generator || empty;
     var template = document.createElement("div");
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {
@@ -20,26 +25,27 @@ var getGenerator = function (container, parsedSrc) {
     appendChild(template, templates);
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
-    return function (index, com) {
+    var scopes = container.$parentScopes.concat(container.$scope);
+    return container.$generator = function (index, com) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
         if (!com) return;
-        var template1 = template.cloneNode();
-        template1.innerHTML = template.innerHTML;
+        var template1 = template.cloneNode(true);
         if (!template1.childNodes.length) return template1;
         var item = template1.childNodes[0];
         item.with = [].concat.apply([], template1.childNodes).slice(1);
+        var parsedSrc = container.$src;
         if (parsedSrc) {
             var { keyName, itemName, indexName } = parsedSrc;
-            var newScope = extend(Object.create(container.$scope), {
+            var newScope = {
                 [keyName || '$key']: index,
                 [itemName || '$item']: com,
                 [indexName || '$index']: index
-            });
-            var newItem = render(item, newScope);
-            newItem.with = render(item.with, newScope);
+            };
+            var newItem = render(item, newScope, scopes);
+            if (item.with.length) newItem.with = render(item.with, newScope, scopes);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -59,8 +65,8 @@ var getGenerator = function (container, parsedSrc) {
                     return this.$item;
                 }
             }
-            var newItem = render(item, newScope, [container.$scope]);
-            newItem.with = render(newItem.with = item.with, newScope, [container.$scope]);
+            var newItem = render(item, newScope, scopes);
+            newItem.with = render(newItem.with = item.with, newScope, scopes);
         }
         return newItem;
     };

package/coms/zimoli/image.less

@@ -14,6 +14,10 @@
 
     >.button {
         border: none;
+        width: 100%;
+        cursor: pointer;
+        padding: 0;
+        margin: 0;
 
         >.track {
 

package/coms/zimoli/list.js

@@ -433,18 +433,8 @@ function list() {
         bindSrc = container;
         container = div();
     } else if (container && !generator) {
-        var src = container.getAttribute("src") || container.getAttribute("ng-src") || container.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                container.setAttribute("ng-src", src);
-                container.removeAttribute("src");
-                var generator = getGenerator(container);
-            } else {
-                container.setAttribute("ng-src", parsedSrc.srcName);
-                container.removeAttribute("src");
-                var generator = getGenerator(container, parsedSrc);
-            }
+        if ("$src" in container) {
+            generator = getGenerator(container);
             care(container, function () {
                 var index = container.index();
                 container.clean();

package/coms/zimoli/menu.js

@@ -110,18 +110,6 @@ function main(elem, mode) {
             }
         }
         mode = mode ? mode.toLowerCase() : "horizonal";
-        var src = elem.getAttribute("src") || elem.getAttribute("ng-src") || elem.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem);
-            } else {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem, parsedSrc);
-            }
-            elem.setAttribute("ng-src", parsedSrc ? parsedSrc.srcName : src);
-        }
 
         switch (mode) {
             case "i":
@@ -130,6 +118,7 @@ function main(elem, mode) {
             case "t":
             case "tree":
                 if (elem) {
+                    var generator = getGenerator(elem);
                     tree(elem, function (index, item) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
@@ -165,9 +154,10 @@ function main(elem, mode) {
                 var emit = function (item) {
                     active(elem, item, item.value);
                 };
-                if (src) {
+                if ("$src" in elem) {
+                    getGenerator(elem);
                     care(elem, function (src) {
-                        menuList(elem, getTreeFromData(src), emit, generator, direction);
+                        menuList(elem, getTreeFromData(src), emit, direction);
                     });
                 } else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/menuList.js

@@ -8,7 +8,7 @@ var release = function () {
 var clear = function () {
     clearTimeout(releaseTimer);
 };
-function main(page, items, active, generator, direction = 'y') {
+function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
@@ -21,7 +21,7 @@ function main(page, items, active, generator, direction = 'y') {
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
         clone.innerHTML = template.innerHTML;
-        var menu = main(clone, item.children, active, generator);
+        var menu = main(clone, item.children, active);
         mounted_menus.push(menu);
 
         page.active = menu;
@@ -46,7 +46,7 @@ function main(page, items, active, generator, direction = 'y') {
         template.innerHTML = page.innerHTML;
         page.tempalte = template;
     }
-    if (!generator || !page.children.length || page.menutype === 1) {
+    if (!page.children.length || page.menutype === 1) {
         page.innerHTML = menuList;
         page.menutype = 1;
         var hasIcon = function () {
@@ -82,6 +82,7 @@ function main(page, items, active, generator, direction = 'y') {
             this.$scope.hasIcon = hasIcon();
         });
     } else {
+        var generator = getGenerator(page);
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;

package/coms/zimoli/on.js

@@ -144,6 +144,22 @@ function checkKeyNeed(eventtypes, e) {
     }
     return true;
 }
+function wrapHandler(h) {
+    if (h instanceof Function) {
+        return function () {
+            var res = h.apply(this, arguments);
+            if (res && isFunction(res.then)) {
+                this.setAttribute('pending', '');
+                var removePending = () => {
+                    this.removeAttribute('pending');
+                };
+                res.then(removePending, removePending);
+            }
+            return res;
+        }
+    }
+    return h;
+}
 if (is_addEventListener_enabled) {
     var on = function (k) {
         var on_event_path = "on" + k;
@@ -151,6 +167,7 @@ if (is_addEventListener_enabled) {
         var eventtypes = parseEventTypes(k);
         k = k.replace(eventtypereg, '');
         function addhandler(element, handler, firstmost) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) firstmost = true;
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
@@ -190,6 +207,7 @@ if (is_addEventListener_enabled) {
 
         if (handlersMap[on_event_path]) return handlersMap[on_event_path];
         function addhandler(element, handler, firstmost = false) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) {
                 console.warn("当前运行环境不支持事件capture");
                 firstmost = true;

package/coms/zimoli/radio.html

@@ -1,4 +1,4 @@
 <a ng-repeat="o in options" ng-click="select(o)" ng-class="{activate:o===options.active}">
-    <r>◯<s>●</s></r>
+    <r><s></s></r>
     <span ng-bind=o.name||o></span>
 </a>

package/coms/zimoli/radio.less

@@ -6,18 +6,36 @@
         font-family: sans-serif;
         display: inline-block;
         position: relative;
-        margin-right: 4px;
-        line-height: 1;
+        margin-right: .3em;
         text-align: center;
+        vertical-align: middle;
+        width: 1em;
+        height: 1em;
+        border: .1em solid;
+        border-radius: 50%;
 
         >s {
             display: none;
             position: absolute;
             text-decoration: none;
-            left: 0;
-            right: 0;
-            top: -3%;
-            bottom: 0;
+            overflow: hidden;
+            border-radius: 50%;
+            width: .4em;
+            height: .4em;
+            top: 50%;
+            left: 50%;
+            margin: -.2em;
+
+            text-indent: -.5em;
+
+            &:after {
+                position: absolute;
+                left: 0;
+                top: 0;
+                display: block;
+                content: "";
+                border: .3em solid;
+            }
         }
     }
 
@@ -25,7 +43,7 @@
     &.activate {
         >r {
             >s {
-                display: inline;
+                display: block;
             }
         }
     }

package/coms/zimoli/render.js

@@ -55,7 +55,7 @@ var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s]|\?\s*\.(?=[^\d])
 var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
-    var ret = /\;|(\d\.|[^\{\.\+\:\?\-\=\*\/\?\\,~!<>%\^&\}\s])\s*([\r\n\u2028\u2029])\s*(\.\d|[^\.\+\-\=\*\/\?\\,~!<>%\^&\[\}\(\?\:\s])/.test(searchContext) ? "" : "return ";
+    var ret = /\;/.test(searchContext) ? "" : "return ";
     if (/\?\s*\.(?=[^\d])/.test(searchContext)) {
         searchContext = searchContext.replace(variableReg, function (context) {
             var dist;
@@ -144,7 +144,10 @@ var createRepeat = function (search, id = 0) {
             throw new Error("数据量过大，取消绘制！");
         }
         var $parentScopes = element.$parentScopes || [];
-        if (element.$scope) $parentScopes = $parentScopes.concat(element.$scope);
+        var $struct = element.$struct;
+        if (element.$scope) {
+            $struct = Object.assign({}, $struct, { context: $struct.context + `with(this.$parentScopes[${$parentScopes.length}])` }), $parentScopes = $parentScopes.concat(element.$scope);
+        }
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
             var k = isArrayResult ? cx : key;
@@ -161,6 +164,7 @@ var createRepeat = function (search, id = 0) {
             };
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
+            clone.$struct = $struct;
             clone = render(clone, $scope, clone.$parentScopes);
             clonedElements1[k] = clone;
             return clone;
@@ -302,19 +306,17 @@ var parseIfWithRepeat = function (ifExpression, repeatExpression) {
 
 var createStructure = function ({ name: ifkey, key, value: ifexp } = {}, { name: forkey, value: repeat } = {}, context) {
     var element = this;
-    if (!ifkey) return structures.repeat.call(element, [context, repeat]);
-    if (!repeat) return structures[key].call(element, [context, ifexp]);
+    if (!ifkey) return element.removeAttribute(forkey), structures.repeat.call(element, [context, repeat]);
+    if (!repeat) return element.removeAttribute(ifkey), structures[key].call(element, [context, ifexp]);
     if (!ifexp) {
         element.removeAttribute(ifkey);
         return structures[key].call(element, [context, ifexp]);
     }
     var { before, after } = parseIfWithRepeat(ifexp, repeat);
-    if (!after.length) {
-        element.removeAttribute(ifkey);
-    } else {
-        element.setAttribute(ifkey, after.join("&&"));
+    element.removeAttribute(ifkey);
+    if (after.length) {
+        element.setAttribute("a-if", after.join("&&"));
     }
-
     if (before.length > 0) {
         // 懒渲染
         createIf.call(element, [context, before.join("&&")], null);
@@ -367,6 +369,27 @@ var createBinder = function (binder) {
 
     }
 }
+
+var src2 = function (search) {
+    var getter = createGetter(search).bind(this);
+    var savedValue;
+    this.renders.push(function () {
+        var origin = getter();
+        var temp = origin;
+        if (origin instanceof Array) {
+            temp = extend([], origin);
+        } else if (isObject(origin)) {
+            temp = extend({}, origin);
+        } else if (isEmpty(origin)) {
+            temp = "";
+        }
+        var changes = getChanges(temp, savedValue);
+        if (!changes || isEmpty(origin) && isEmpty(this.src)) return;
+        savedValue = temp;
+        this.src = origin;
+        cast(this, origin);
+    });
+}
 var directives = {
     bind: createBinder(text),
     html: createBinder(html),
@@ -379,47 +402,9 @@ var directives = {
         elem.style.display = value ? '' : 'none';
     }),
     style: createBinder(css),
-    src(search) {
-        var getter = createGetter(search).bind(this);
-        var savedValue, pending;
-        var refresh = function () {
-            that.src = savedValue;
-            removeClass(that, "pending");
-            pending = 0;
-        };
-        var img = document.createElement("img");
-        var that = this;
-        this.renders.push(function () {
-            var origin = getter();
-            var temp = origin;
-            if (origin instanceof Array) {
-                temp = extend([], origin);
-            } else if (isObject(origin)) {
-                temp = extend({}, origin);
-            } else if (isEmpty(origin)) {
-                temp = "";
-            }
-            var changes = getChanges(temp, savedValue);
-            if (!changes) return;
-            savedValue = temp;
-            if (/^img$/i.test(this.tagName)) {
-                if (!isString(origin)) {
-                    return;
-                }
-                if (origin) {
-                    img.src = origin;
-                    if (img.complete) {
-                        this.src = origin;
-                    } else if (!pending) {
-                        addClass(this, "pending");
-                        pending = setTimeout(refresh);
-                    }
-                }
-            } else {
-                this.src = origin;
-                cast(this, origin);
-            }
-        });
+    src([s, src]) {
+        var parsedSrc = this.$src;
+        return src2.call(this, [s, parsedSrc ? parsedSrc.srcName : src]);
     },
     model(search) {
         var getter = createGetter(search).bind(this);
@@ -510,6 +495,7 @@ var directives = {
         });
     },
 };
+directives.text = directives.bind;
 // property binder
 var binders = {
     _(attr, search) {
@@ -551,6 +537,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     },
     once(key, search) {
@@ -559,6 +546,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     }
 };
@@ -607,10 +595,14 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     if (parentNode) {
         if (parentNode.renderid > 1 || parentNode.isMounted) element.renderid = 2;
     }
-    var ons = [];
 
     if (isFirstRender) {
-        var attrs = [].concat.apply([], element.attributes);
+        element.renders = element.renders ? [].concat(element.renders) : [];
+        var { ons, copys, attrs, props, binds, context: withContext } = element.$struct;
+        delete element.$struct;
+        if (binds.src) {
+            element.$src = parseRepeat(binds.src);
+        }
         var { tagName, parentNode, nextSibling } = element;
         // 替换元素
         var constructor = getFromScopes(tagName, scope, parentScopes);
@@ -623,13 +615,12 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             constructor = getFromScopes(tagName, scope, parentScopes);
         }
         if (isFunction(constructor)) {
-            var attrsMap = {};
             var replacer = constructor.call(scope, element, scope, parentScopes);
             if (isNode(replacer) && element !== replacer) {
                 if (nextSibling) appendChild.before(nextSibling, replacer);
                 else if (parentNode) appendChild(parentNode, replacer);
                 if (element.parentNode === parentNode) remove(element);
-                attrs.map(function (attr) {
+                copys.forEach(function (attr) {
                     var { name, value } = attr;
                     switch (name.toLowerCase()) {
                         case "class":
@@ -643,62 +634,39 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                             replacer[name] = value;
                             break;
                         default:
-                            if (!/[\-@\:\._]/.test(name)) {
-                                replacer.setAttribute(name, value);
-                            } else {
-                                attrsMap[name] = attr;
-                            }
+                            replacer.setAttribute(name, value);
                     }
                 });
                 replacer.renderid = element.renderid;
+                replacer.renders = element.renders;
+                if (binds.src) replacer.$src = element.$src;
                 element = replacer;
                 element.$scope = scope;
                 element.$parentScopes = parentScopes;
             }
-            [].concat.apply([], element.attributes).forEach(attr => {
-                if (attrsMap[attr.name]) {
-                    delete attrsMap[attr.name];
-                }
-                attrsMap[attr.name] = attr;
-            });
-            attrs = Object.keys(attrsMap).map(key => attrsMap[key]);
         }
     }
     if (element.children.length) renderElement(element.children, scope, parentScopes);
     if (!isFirstRender) return element;
-    // 解析属性
-    element.renders = element.renders ? [].concat(element.renders) : [];
-    var withContext = parentScopes ? parentScopes.map((_, cx) => `with(this.$parentScopes[${cx}])`).join("") : '';
-    var emiter_reg = /^(?:(v|ng|on|once)\-|v\-on\:|@|once|on)/i;
-    attrs.map(function (attr) {
-        var { name, value } = attr;
-        if (/^(?:class|style|src|\:)$/i.test(name)) return;
-        var key = name.replace(/^(ng|v|.*?)\-|^[\:\_\.]/i, "").toLowerCase();
-        if (directives.hasOwnProperty(key) && isFunction(directives[key])) {
-            directives[key].call(element, [withContext, value]);
-            element.removeAttribute(name);
-        } else if (emiter_reg.test(name)) {
-            var match = emiter_reg.exec(name);
-            var ngon = (match[1] || match[0]).toLowerCase() === 'once' ? 'once' : 'on';
-            element.removeAttribute(name);
-            ons.push([emiters[ngon], name.replace(emiter_reg, ''), value]);
-        } else if (/^([\_\:\.]|v\-bind\:)/.test(name)) {
-            binders._.call(element, name.replace(/^([\_\:\.]|v\-bind\:)/, ""), [withContext, value]);
-            element.removeAttribute(name);
-        } else if (/[_@\:\.]$/.test(name)) {
-            binders[""].call(element, name.replace(/[_@\:\.]$/, ""), [withContext, value]);
-            element.removeAttribute(name);
-        } else {
-            name = name.replace(/\-(\w)/g, (_, w) => w.toUpperCase());
-            try {
-                element[name] = value === '' ? true : value;
-            } catch (e) {
-            }
+    for (var k in binds) {
+        if (directives.hasOwnProperty(k)) {
+            directives[k].call(element, [withContext, binds[k]])
         }
-    });
-    rebuild(element);
+        else {
+            binders._.call(element, k, [withContext, binds[k]]);
+        }
+    }
+    for (var k in attrs) {
+        binders[""].call(element, k, [withContext, attrs[k]]);
+    }
+    for (var k in props) {
+        try {
+            element[k] = props[k];
+        } catch (e) { }
+    }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
     if (element.renders.length) {
+        rebuild(element);
         onappend(element, addRenderElement);
         onremove(element, removeRenderElement);
         if (element.isMounted || element.renderid > 1) addRenderElement.call(element);
@@ -720,11 +688,19 @@ function renderStructure(element, scope, parentScopes = []) {
     }
     var attrs = [].concat.apply([], element.attributes);
     var withContext = parentScopes ? parentScopes.map((_, cx) => `with(this.$parentScopes[${cx}])`).join("") : '';
-    attrs = attrs.filter(a => structures.hasOwnProperty(a.name.replace(/^(ng|V|.*?)\-/i, '').toLowerCase()));
     var types = {};
-    if (attrs.length > 2) throw new Error(`请不要在同一元素上使用三次及以上的结构属性:${attrs.map(a => a.name)}`);
-    attrs.map(function (attr) {
-        var { name } = attr;
+    var emiter_reg = /^(?:(v|ng|on|once)\-|v\-on\:|@|once|on)/i;
+    var ons = [];
+    var copys = [];
+    var binds = {};
+    var attr1 = {};
+    var props = {};
+    for (var attr of attrs) {
+        var { name, value } = attr;
+        if (/^(?:class|style|src|\:|placeholder)$/i.test(name)) {
+            copys.push(attr);
+            continue;
+        }
         var key = name.replace(/^(ng|v|.*?)\-/i, "").toLowerCase();
         if (structures.hasOwnProperty(key) && isFunction(structures[key])) {
             if (element.renderid <= -2) {
@@ -747,9 +723,29 @@ function renderStructure(element, scope, parentScopes = []) {
             }
             if (!element.renderid) element.renderid = -1;
             else element.renderid = -2;
+            // element.removeAttribute(name);
+        }
+        if (element.$struct) continue;
+        var key = name.replace(/^(ng|v|.*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();
+        if (directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
+            binds[key] = value;
             element.removeAttribute(name);
         }
-    });
+        else if (emiter_reg.test(name)) {
+            var match = emiter_reg.exec(name);
+            var ngon = (match[1] || match[0]).toLowerCase() === 'once' ? 'once' : 'on';
+            element.removeAttribute(name);
+            ons.push([emiters[ngon], name.replace(emiter_reg, ''), value]);
+        }
+        else if (/[_@\:\.]$/.test(name)) {
+            attr1[name.replace(/[_@\:\.]$/, "")] = value;
+            element.removeAttribute(name);
+        }
+        else {
+            props[name.replace(/\-(\w)/g, (_, w) => w.toUpperCase())] = value === "" ? true : value;
+        }
+    }
+    if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext };
     if (element.renderid <= -1) createStructure.call(element, types.if, types.repeat, withContext);
 }
 function render(element, scope, parentScopes) {

package/coms/zimoli/table.html

@@ -0,0 +1,16 @@
+<thead>
+    <tr>
+        <td -repeat="f in fields"><i -if="f.icon" -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
+        </td>
+    </tr>
+</thead>
+<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" -repeat="o in f.options">
+                <span -text=o.name></span>
+            </a>
+        </td>
+    </tr>
+</tbody>

package/coms/zimoli/table.js

@@ -142,6 +142,7 @@ function table(elem) {
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
         if (table.resizing) return false;
+        if (!getTargetIn(thead, element)) return false;
         if (!tdElementReg.test(element.tagName)) return false;
         var savedRowDeltas = [];
         [].map.call(thead.children, function (tr) {
@@ -153,10 +154,24 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    care(table, function ([fields, data]) {
+        this.innerHTML = template;
+        render(this, {
+            fields,
+            tbody: list,
+            data,
+            a: button,
+        }, this.$parentScopes.concat(this.$scope));
+    })
     autodragchildren(
         table,
         cellMatchManager,
         function (src, dst, rel, append, parentNode) {
+            if (table.src) {
+                var [fields] = table.src;
+                var [f] = fields.splice(src, 1);
+                fields.splice(dst, 0, f);
+            }
             var children = parentNode.children;
             var srcElement = children[src];
             var dstElement = children[rel];