efront 4.17.0 → 4.18.3

package/coms/zimoli/render.js

@@ -608,19 +608,21 @@ var binders = {
         attr = attr.replace(/\-(\w)/g, (_, w) => w.toUpperCase());
         var getter = createGetter(this, search);
         var oldValue;
-        this.$renders.push(function () {
+        var hook = function () {
             var value = getter(this);
             if (deepEqual(value, oldValue)) return;
             oldValue = value;
             if (this[attr] !== value) {
                 this[attr] = this[attr.replace(/\-[a-z]/g, a => a.toUpperCase())] = value;
             }
-        });
+        }
+        this.$renders.push(hook);
+        return hook;
     },
     ""(attr, search) {
         var getter = createGetter(this, search);
         var oldValue;
-        this.$renders.push(function () {
+        var hook = function () {
             var value = getter(this);
             if (deepEqual(value, oldValue)) return;
             oldValue = value;
@@ -633,7 +635,9 @@ var binders = {
                     this.removeAttribute(attr);
                 }
             } else if (this.getAttribute(attr) !== value) this.setAttribute(attr, value);
-        });
+        }
+        this.$renders.push(hook);
+        return hook;
     }
 };
 var reject = function (e) { digest(); throw e };
@@ -715,6 +719,25 @@ function getFromScopes(key, scope, parentScopes) {
         if (key in presets) return presets[key];
     }
 }
+function renderProp(elem, props) {
+    for (var k in props) {
+        try {
+            if (elem[k] !== props[k]) elem[k] = props[k];
+        } catch (e) { }
+    }
+}
+
+function renderBinds(element, binds, init) {
+    var bind = binders._;
+    var hs = [];
+    for (var k in binds) {
+        if (k === 'src') continue;
+        if (directives.hasOwnProperty(k)) continue;
+        var h = bind.call(element, k, binds[k]);
+        hs.push(h);
+    }
+    return hs;
+}
 
 function renderRest(element, struct, replacer = element) {
     var renders = element.$renders;
@@ -724,24 +747,13 @@ function renderRest(element, struct, replacer = element) {
         delete element.renders;
     }
     element.$renders = [];
-    var { binds, attrs, props } = struct;
-    for (var k in binds) {
-        if (k === 'src') continue;
-        if (directives.hasOwnProperty(k)) {
-            directives[k].call(element, binds[k], replacer);
-        }
-        else {
-            binders._.call(element, k, binds[k]);
-        }
+    var { attrs, binds } = struct;
+    for (var k in binds) if (k !== 'src' && k in directives) {
+        directives[k].call(element, binds[k], replacer);
     }
     for (var k in struct.attrs) {
         binders[""].call(element, k, attrs[k]);
     }
-    for (var k in struct.props) {
-        try {
-            if (replacer[k] !== props[k]) replacer[k] = props[k];
-        } catch (e) { }
-    }
     if (binds.src) directives.src.call(element, binds.src);
     if (renders && renders.length) element.$renders.push.apply(element.$renders, renders);
     if (!isElement(replacer)) replacer = element;
@@ -791,7 +803,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         }
         var $struct = element.$struct;
         element.$renders = element.$renders || element.renders ? [].concat(element.$renders || [], element.renders || []) : [];
-        var { copys, binds, once } = $struct;
+        var { copys, binds, once, props } = $struct;
         if (once) element.$renderid = 9;
         if (binds.src) {
             element.$src = parseRepeat(binds.src);
@@ -799,6 +811,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         var { tagName, parentNode, nextSibling } = element;
         // 替换元素
         var constructor = getFromScopes(tagName, scope, parentScopes);
+        renderProp(element, props);
+        renderBinds(element, binds);
         if (isFunction(constructor)) {
             var replacer = constructor.call(scope, element, scope, parentScopes);
             if (element === replacer) {
@@ -837,7 +851,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     if (element.$renders.length) {
         if (element.$renderid !== 9) {
-            onmounted(element, addRenderElement);
+            on("append")(element, addRenderElement);
             onremove(element, removeRenderElement);
             if (isMounted(element) || element.$renderid > 1) addRenderElement.call(element);
             else if (eagermount) rebuild(element);

package/coms/zimoli/select.js

@@ -93,7 +93,7 @@ function select() {
             this.appendChild(o);
         });
         care(target, 'set-options', function (options) {
-            this.innerHTML = options.map(o => `<option value="${o.value}">${o.name}</option>`).join("");
+            this.innerHTML = options.map(o => `<option value="${o.key || o.value}">${o.name || o.innerHTML}</option>`).join("");
         });
         on('focus')(target, preventDefault);
     }

package/coms/zimoli/selectList.js

@@ -76,7 +76,7 @@ function main() {
     var clicker = multiple ? multipleClick : singleClick;
     var itemMap = Object.create(null);
     function createItem(option) {
-        var key = option.key || option.value;
+        var key = isEmpty(option.key) ? option.value : option.key;
         if (key in itemMap) return itemMap[key];
         var item = itemMap[key] = document.createElement('div');
         item.setAttribute("item", '');
@@ -89,7 +89,7 @@ function main() {
                 page.setAttribute('iconed', '');
             }
             hasIcon = true;
-            css(item, { backgroundImage: `url('${icon}')` });
+            css(item, { backgroundImage: icon });
         }
         item.value = key;
         if (item.value === page.value) {
@@ -201,14 +201,16 @@ function main() {
                     break;
                 case this.children[1]:
                     var options = Array.apply(null, children);
-                    var edit = selectListEdit(options.slice(0));
+                    var optholder = isEmpty(options[0].key) && isEmpty(options[0].value) ? options.shift() : null;
+                    var edit = selectListEdit(options);
                     page.with = edit;
-                    on("remove")(edit, function () {
+                    care(edit, function () {
                         itemMap = Object.create(null);
                         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 })))
-                        cast(page.target, 'set-options', edit.$scope.options);
+                        if (optholder) children.push(optholder);
+                        children.push.apply(children, edit.$scope.options.map(o => ({ value: o.key || o.value, name: o.name || o.innerHTML })))
+                        cast(page.target, 'set-options', children);
                         page.clean();
                         remove(adder);
                         page.go(0);

package/coms/zimoli/selectListEdit.html

@@ -5,7 +5,7 @@
             -if="search&&!filtered.hasFullmatch">添加</a>
     </div>
     <div class="item" -repeat="o in (search?filtered:options)">
-        <span -html=o.name></span>
+        <span -html=o.name||o.innerHTML></span>
         <a type="danger" @click="del(o)">删除</a>
     </div>
 </div>

package/coms/zimoli/selectListEdit.js

@@ -42,6 +42,7 @@ function main(options) {
             remove(page);
         },
         save() {
+            cast(page, options);
             remove(page);
         },
         filtered: []

package/coms/zimoli/view.js

@@ -94,6 +94,9 @@ var init = function () {
 };
 var resize2 = function () {
     var [head, body, foot] = getTypedChildren(this, ["head", "body", "foot"]);
+    this.head = head;
+    this.body = body;
+    this.foot = foot;
     var changed = false;
     a: if (head && body) {
         var height = head.offsetHeight + head.offsetTop;

package/coms/zimoli/zimoli.js

@@ -144,6 +144,7 @@ function go(pagepath, args, history_name, oldpagepath) {
     var page_object = page_generators[pgpath];
     if (!isEmpty(args0)) page_object.state.data = args, args = args0;
     var fullfill = function () {
+        zimoliad = zimoliid;
         var _page = create(pgpath, args, oldpagepath);
         var isDestroy = pushstate(pagepath, history_name, oldpagepath);
         if (isNode(history_name)) {
@@ -436,13 +437,10 @@ function create(pagepath, args, from, needroles) {
 
 }
 
-var zimoliid = 0;
+var zimoliid = 0, zimoliad = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
-
-    if (isNode(history_name))
-        var zid = history_name.zimoliid = (history_name.zimoliid | 0) + 1;
-    else var zid = ++zimoliid;
     if (arguments.length === 0) {
+        if (zimoliid !== zimoliad) return;
         history_name = current_history;
         var _history = history[history_name] || [];
         root_path = _history[0] || "/main";
@@ -456,6 +454,9 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         args = data;
         oldpagepath = from;
     }
+    if (isNode(history_name))
+        var zid = history_name.zimoliid = (history_name.zimoliid | 0) + 1;
+    else var zid = ++zimoliid;
 
     if (page_generators[pagepath]) return go(pagepath, args, history_name, oldpagepath);
     return prepare(pagepath, function () {

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -29,7 +29,7 @@
         coder.innerHTML = colored;
     };
     coder.getValue = function () {
-        return coder.innerText;
+        return coder.innerText.replace(/[\u00a0\u2002]/g, ' ');
     };
     var markAnchorOffset = function () {
         var { anchorNode, anchorOffset } = document.getSelection();

package/docs/mark.xht

@@ -62,6 +62,14 @@
         color: #808080;
     }
 
+    blockquote {
+        margin: 10px 0 0 0;
+        border: 1px solid #0003;
+        border-left: 6px solid #0003;
+        padding: 6px 10px;
+        background: #fff6;
+    }
+
     m {
         padding: 0 6px;
         margin: 0 4px;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.17.0",
+    "version": "4.18.3",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {