efront 4.32.3 → 4.32.4

package/apps/pay/alipay.jsp

@@ -51,7 +51,7 @@ ACQ.MERCHANT_PERM_RECEIPT_DAY_LIMIT	超过单日累计收款额度	联系支付
         return a;
     }
     var amount = request.id;
-    if (!/^(\d+)(\.\d+)?$/.test(amount)) amount = encode62.packdecode(request.id);
+    if (!/^(\d+)(\.\d+)?$/.test(amount)) amount = crypt$encode62.packdecode(request.id);
     var [amount, subject = '网页扫码支付'] = amount.split(',');
     var trade_no = createId();
     if (!+amount) return forbidden("参数异常");

package/coms/compile/Html.js

@@ -82,7 +82,15 @@ var fixElement = function (o) {
                 ps = ps.slice(cx);
                 if (!ps.length);
                 else if (ps.length === 1) {
-                    push(ps[0]);
+                    if (ps[0].type === SCOPED) {
+                        push(ps[0]);
+                    }
+                    else {
+                        push(new Node({
+                            type: QUOTED,
+                            text: strings.encode(ps[0].text)
+                        }));
+                    }
                 }
                 else {
                     ps.type = QUOTED;
@@ -206,7 +214,6 @@ Html.prototype.createScoped = function (code) {
                 break;
             case QUOTED:
             case PIECE:
-
                 if (c.length) {
                     c.forEach(run);
                     break;
@@ -227,10 +234,12 @@ Html.prototype.createScoped = function (code) {
                             used[k].push(...s.used[k]);
                         }
                     }
+                    for (var k in vars) delete used[k];
                 }
                 break;
             case EXPRESS:
                 if (inScript || noTag) break;
+                if (c.queue.type === QUOTED) break;
                 var t = c.text;
                 t = parseExpress(t);
                 var s = createScoped(t);

package/coms/compile/translate.js

@@ -163,7 +163,6 @@ function translate([imap, supports], code) {
                             var a = scanner2(`[]`);
                             v.map(function (o) {
                                 var name = o.name;
-                                if (!name) return o;
                                 if (!name) return scanner2(`(${JSON.stringify(o)})`)[0];
                                 delete o.name;
                                 name = ctn('i18n' + getm(name, t.nodup, t.warn), t);

package/coms/frame/payment.html

@@ -5,7 +5,7 @@
 <div class="body">
     <item>
         <label>原始价格：</label>
-        <span v-model="(+price).toFixed(2)"></span>元
+        <span -bind="(+price).toFixed(2)"></span>元
     </item>
     <item>
         <label>支付渠道：</label>
@@ -22,7 +22,7 @@
     <item ng-if="+paytype">
         <label>应支付：</label>
         <span style="color: red;">
-            <span v-model=finalpay></span>元
+            <span -bind=finalpay></span>元
         </span>
     </item>
     <item ng-if="+paytype">

package/coms/zimoli/appendChild.js

@@ -20,13 +20,20 @@ function _onappend(node, append = createEvent("append"), mount = createEvent("mo
     dispatch(node, mount);
 }
 
+var unremove = function (o) {
+    if (o.removeTimer) {
+        clearTimeout(o.removeTimer);
+        delete o.removeTimer;
+    }
+}
+
 function appendChild(parent, obj, transition) {
     var children = getArgsChildren(arguments);
     if (parent.appendChild) {
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var o = release(children[cx]);
             if (!o) continue;
-            if (o.removeTimer) clearTimeout(o.removeTimer);
+            unremove(o);
             if (hasEnterStyle(o) && transition !== false) {
                 isFunction(appendChild.transition) && appendChild.transition(o);
             }
@@ -44,7 +51,7 @@ function insertBefore(alreadyMounted, obj, transition) {
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
-        if (o.removeTimer) clearTimeout(o.removeTimer);
+        unremove(o);
         parent.insertBefore(o, alreadyMounted);
         o.with && insertBefore(alreadyMounted, o.with, transition);
         if (isMounted(parent)) _onappend(o);
@@ -64,7 +71,7 @@ function insertAfter(alreadyMounted, obj, transition) {
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
-        if (o.removeTimer) clearTimeout(o.removeTimer);
+        unremove(o);
         parent.insertBefore(o, nextSibling);
         o.with && insertBefore(nextSibling, o.with, transition);
         if (isMounted(parent)) _onappend(o);

package/coms/zimoli/marker.js

@@ -11,8 +11,9 @@ function marker(e) {
     if (!e) e = document.createElement("marker");
     on("changes")(e, function () {
         remove(e.childNodes);
-        if (isEmpty(this.source)) return;
-        var source = mark(this.source, this.search, wrap);
+        var source = this.source;
+        if (isEmpty(source)) source = '';
+        else if (typeof source === 'string') source = mark(source, this.search, wrap);
         if (isArray(source)) appendChild(this, source);
         else this.innerText = source;
     });

package/coms/zimoli/password.js

@@ -9,7 +9,7 @@ function password() {
                 if (numhide !== null) numhide = !numhide; break;
             case 20/*capslock*/: if (capslock !== null) capslock = !capslock; break;
         }
-        if (!numhide && /^Numpad/.test(event.code)) {
+        if (!numhide && /^Numpad/.test(event.code) && which !== 13) {
             numhide = which < 96;
         }
         if (which >= 65 && which <= 90) {

package/coms/zimoli/password.less

@@ -82,7 +82,14 @@
 
     >holder {
         color: #777;
-        position: relative;
+        pointer-events: none;
+        top: 50%;
+        line-height: 1;
+        left: 0;
+        right: 0;
+        text-align: inherit;
+        margin-top: -.5em;
+        position: absolute;
     }
 
     >input[type=password] {

package/coms/zimoli/remove.js

@@ -5,11 +5,13 @@ function remove(node, transition) {
         node = args[cx];
         if (!node) continue;
         if (node.removeTimer) clearTimeout(node.removeTimer);
+        delete node.removeTimer;
         if (hasLeaveStyle(node) && transition !== false && isFunction(remove.transition)) {
             var duration = remove.transition(node, true);
             if (duration) {
                 node.removeTimer = setTimeout(function (node) {
                     return function () {
+                        delete node.removeTimer;
                         remove(node, false);
                     };
                 }(node), +duration || 100);

package/coms/zimoli/render.js

@@ -429,7 +429,7 @@ var ifset = function (shouldMount) {
         var c = elements[cx];
         if (cx === shouldMount) {
             var e = c.$template;
-            if (c.nextSibling !== e) appendChild.after(c, e);
+            if (c.nextSibling !== e || e.removeTimer) appendChild.after(c, e);
             if (renderIds.get(e) < 0) {
                 renderIds.set(e, this.$id);
                 e = c.$template = render(e);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.32.3",
+    "version": "4.32.4",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {