efront 3.21.2 → 3.21.3

package/coms/basic/BigNumber.js

@@ -0,0 +1,184 @@
+var trim = function (a) {
+    return String(a).replace(/[\s\,]/g, '').replace(/^\+/, '').replace(/[mni]$/i, '');
+};
+var prepare = function (a) {
+    a = trim(a);
+    var neg = /^\-/.test(a);
+    if (neg) a = a.slice(1);
+    var [s1, s2 = ''] = a.split('.');
+    s2 = s2.replace(/0+$/, '');
+    return [neg, s1, s2];
+};
+var repeat = String.prototype.repeat || function (n) {
+    return new Array(n + 1).join(this);
+};
+var repeat0 = function (n) {
+    return repeat.call('0', n);
+};
+var split = function (s, n) {
+    var r = [];
+    var end = s.length;
+    while (end > n) {
+        r.push(s.slice(end - n, end));
+        end -= n;
+    }
+    r.push(s.slice(0, end));
+    return r;
+};
+var fixme = function (neg, res, nl) {
+    if (nl > 0) res = res.slice(0, res.length - nl) + "." + res.slice(res.length - nl).replace(/0+$/, '');
+    res = res.replace(/^0+(?!\.)/, '');
+    if (/^\./.test(res)) res = '0' + res;
+    if (neg) res = '-' + res;
+    return res.replace(/\.$/, '');
+};
+var fixde = function (numstr, fractionDigits, compare) {
+    var [neg, s1, s2] = prepare(numstr);
+    var frag = +s2.charAt(fractionDigits) > compare;
+    if (!frag && compare === 0) {
+        frag = s2.length > fractionDigits;
+    }
+    if (s2.length < fractionDigits) {
+        s2 += repeat0(fractionDigits - s2.length);
+    }
+    else {
+        s2 = s2.slice(0, fractionDigits);
+    }
+    var res = s1 + s2;
+    if (frag) {
+        res = BigNumber.add(res, 1);
+    }
+    if (fractionDigits > 0) res = res.slice(0, res.length - fractionDigits) + '.' + res.slice(res.length - fractionDigits);
+    if (/^\./.test(res)) res = "0" + res;
+    if (neg) res = '-' + res;
+    return res;
+};
+class BigNumber {
+    constructor(value) {
+        if (!this || this.constructor !== BigNumber) {
+            return new BigNumber(value);
+        }
+        this.value = value;
+    }
+    toString() {
+        return this.value;
+    };
+    add(bignumber) {
+        return new BigNumber(BigNumber.add(this.value, bignumber));
+    };
+    static round(numstr) {
+        return fixde(numstr, 0, 4);
+    }
+    static ceil(numstr) {
+        return fixde(numstr, 0, 0);
+    }
+    static floor(numstr) {
+        return fixde(numstr, 0, 9);
+    }
+    static fix(numstr, fractionDigits) {
+        fractionDigits = +fractionDigits || 0;
+        if (fractionDigits < 0 || fractionDigits > 100) {
+            throw new Error("小数位数只能是0和100之间的数字");
+        }
+        return fixde(numstr, fractionDigits, 4);
+    }
+    static add(numstr1, numstr2) {
+        var [neg1, s11, s12] = prepare(numstr1)
+        var [neg2, s21, s22] = prepare(numstr2)
+        var nl = 0;
+        if (s12.length < s22.length) {
+            nl = s22.length;
+            s12 += repeat0(nl - s12.length);
+        }
+        else if (s22.length < s12.length) {
+            nl = s12.length;
+            s22 += repeat0(nl - s22.length);
+        }
+        else {
+            nl = s12.length;
+        }
+        if (s11.length < s21.length) {
+            s11 = repeat0(s21.length - s11.length) + s11;
+        }
+        else if (s11.length > s21.length) {
+            s21 = repeat0(s11.length - s21.length) + s21;
+        }
+        numstr1 = s11 + s12;
+        numstr2 = s21 + s22;
+        var flag = 1;
+        if (neg1 ^ neg2) {
+            if (numstr1 > numstr2) {
+                neg = neg1;
+            }
+            else if (numstr1 < numstr2) {
+                neg = neg2;
+                [numstr1, numstr2] = [numstr2, numstr1];
+            }
+            flag = 0;
+        }
+        else {
+            var neg = neg1 && neg2;
+        }
+        var res = [];
+        var end = (numstr1.length / 15 | 0) * 15;
+        var rest = 0;
+        while (end >= 0) {
+            var s1 = numstr1.slice(end, end + 15);
+            var s2 = numstr2.slice(end, end + 15);
+            var s = +s1 + (flag ? +s2 : -s2) + rest;
+            if (s < 0) {
+                s = +("1" + repeat0(s1.length)) + s;
+                rest = -1;
+            }
+            else {
+                rest = 0;
+            }
+            s = s.toFixed(0);
+            if (s.length > s1.length) {
+                rest = 1;
+                res.push(s.slice(1))
+            }
+            else {
+                if (s.length < s1.length) s = repeat0(s1.length - s.length) + s;
+                res.push(s);
+            }
+            end -= 15;
+        }
+        if (rest) res.push(rest);
+        res = res.reverse().join('');
+        return fixme(neg, res, nl);
+    }
+    static prd(numstr1, numstr2) {
+        var [neg1, s11, s12] = prepare(numstr1);
+        var [neg2, s21, s22] = prepare(numstr2);
+        var d = s12.length + s22.length;
+        numstr1 = s11 + s12;
+        numstr2 = s21 + s22;
+        if (numstr1.length < numstr2.length) [numstr1, numstr2] = [numstr2, numstr1];
+        var ns1 = split(numstr1, 7);
+        var ns2 = split(numstr2, 7);
+        var res = [];
+        var i = 0;
+        for (var cx = 0, dx = ns1.length; cx < dx; cx++) {
+            var s1 = ns1[cx];
+            for (var cy = 0, dy = ns2.length; cy < dy; cy++) {
+                var s2 = ns2[cy];
+                var i = cx + cy;
+                var rest = +res[i] || 0;
+                var s = s1 * s2 + rest;
+                s = String(s);
+                if (s.length > 7) {
+                    rest = +s.slice(0, s.length - 7);
+                    res[i] = s.slice(s.length - 7);
+                    res[i + 1] = (+res[i + 1] || 0) + rest;
+                }
+                else {
+                    if (s.length < 7) s = repeat0(7 - s.length) + s;
+                    res[i] = s;
+                }
+            }
+        }
+        res = res.reverse().join('');
+        return fixme(neg1 ^ neg2, res, d);
+    }
+}

package/coms/basic/BigNumber_test.js

@@ -0,0 +1,51 @@
+var testAdd = function (a, b, s) {
+    assert(BigNumber.add(a, b), s, `${a} + ${b}`);
+};
+var testPrd = function (a, b, s) {
+    assert(BigNumber.prd(a, b), s, `${a} * ${b}`);
+};
+testAdd(0x1fffffffffffff, 1, '9007199254740992');
+testAdd(0x1fffffffffffff, 2, '9007199254740993');
+testAdd(0x1fffffffffffff, 3, '9007199254740994');
+testAdd(0x1fffffffffffff, 3, '9007199254740994');
+testAdd("900719925474099.2", 0.1, '900719925474099.3');
+testAdd("900719925474099.2", 0.1, '900719925474099.3');
+testAdd("900719925474099.3", -0.2, '900719925474099.1');
+testAdd("900719925474099.39007199254740992", "-900719925474099.39007199254740992", '0');
+testAdd("900719925474099.39007199254740992", 0.2, '900719925474099.59007199254740992');
+testAdd("900719925474099.39007199254740992", "-900719925474099.39007", '0.00000199254740992');
+testAdd("90071992547409939007.199254740992", 0.2, '90071992547409939007.399254740992');
+testAdd("-90071992547409939007.199254740992", 0.2, '-90071992547409939006.999254740992');
+var getrandomint = function () {
+    var n = BigInt(Math.random() * new Date | 0) * BigInt(Math.random() * new Date | 0) * BigInt(Math.random() * new Date | 0);
+    return n;
+}
+testPrd(1, 2, '2');
+testPrd(1, 0.2, '0.2');
+testPrd("9007199254740992.1", 0.1, '900719925474099.21');
+testPrd("9007199254740992.1", 0.01, '90071992547409.921');
+for (var cx = 0, dx = 1000; cx < dx; cx++) {
+    var n1 = getrandomint();
+    var n2 = getrandomint();
+    var s = String(n1 + n2);
+    testAdd(n1, n2, s);
+    testPrd(n1, n2, String(n1 * n2));
+}
+assert(BigNumber.fix(2, 2), '2.00');
+assert(BigNumber.fix(2.234, 6), '2.234000');
+assert(BigNumber.fix(2.235, 6), '2.235000');
+assert(BigNumber.fix(2.235, 2), '2.24');
+assert(BigNumber.fix(2.234, 2), '2.23');
+assert(BigNumber.fix(2.2351, 2), '2.24');
+assert(BigNumber.fix(2.2349, 2), '2.23');
+assert(BigNumber.round(2.2349), '2');
+assert(BigNumber.round(2.4999), '2');
+assert(BigNumber.round(2.5000), '3');
+assert(BigNumber.round(2.5100), '3');
+assert(BigNumber.ceil(2.5100), '3');
+assert(BigNumber.ceil(2.000), '2');
+assert(BigNumber.floor(2.000), '2');
+assert(BigNumber.floor(2.999), '2');
+assert(BigNumber.ceil(2.001), '3');
+assert(BigNumber.ceil(2.999), '3');
+assert(BigNumber.fix("9007199254740992.234", 6), '9007199254740992.234000');

package/coms/basic/cross_.js

@@ -58,6 +58,18 @@ function toResponse() {
     if (this.responseType === 'json') return JSON.stringify(this.response);
     return this.response;
 }
+/**
+ * @this {XMLHttpRequest}
+ */
+var XMLHttpRequest_abort = function () {
+    removeFromList(requests, this);
+    delete this.abort;
+    if (isFunction(this.abort)) this.abort(this);
+};
+/**
+ * @param { () => XMLHttpRequest } jsonp
+ * @this { () => XMLHttpRequest }
+ */
 function cross_(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
     if (!originDomain) throw new Error("路径格式错误！");
@@ -326,11 +338,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         onerrors.push(oh);
         flush();
     };
-    var abort = xhr.abort;
-    xhr.abort = function () {
-        removeFromList(requests, this);
-        if (isFunction(abort)) abort.call(this);
-    };
+    xhr.abort = XMLHttpRequest_abort;
     xhr.delCookies = function () {
         delCookies(originDomain);
         xhr.nocookie = true;
@@ -394,8 +402,7 @@ cross_.bind = function () {
     extend(cross_, {
         requests,
         abortAll() {
-            var rs = requests.splice(0, requests.length);
-            for (var r of rs) r.abort();
+            for (var r of requests) r.abort();
         },
         setHost,
         addReform,

package/coms/basic/submit_.js

@@ -21,6 +21,25 @@ function submit(fields, data) {
         }
         else {
             params[f.key] = data[f.key];
+            var tmp = /\:(\d+)?(?:\.(\d+))?$/.exec(f.type);
+            if (tmp) var [, , fixed] = tmp;
+            else if (/^(money|price)$/i.test(f.type)) fixed = 2;
+            fixed = +fixed;
+            if (fixed) {
+                var v = params[f.key];
+                if (v) {
+                    var d = v.replace(/^[^\.]*\.?/, '').length;
+                    if (d === v.length - 1) v = "0" + v;
+                    if (d > 0 && d < fixed) {
+                        v = v + new Array(fixed + 1 - d).join("0");
+                    }
+                    else if (d === 0) {
+                        v = v.replace(/\.$/, '') + '.' + new Array(fixed + 1).join("0");
+                    }
+                    params[f.key] = v;
+                }
+            }
+
         }
     }
     if (checks.length + select.length + inputs.length) {

package/coms/basic/valid.js

@@ -6,6 +6,27 @@ function valid(field, data) {
         }
         return;
     }
+    var tmp;
+    if (tmp = /\:(\d+)(?:\.(\d+))?$/.exec(field.type)) {
+        var [, a, b] = tmp;
+        var value = data[field.key];
+        a = +a;
+        b = +b;
+        if (a) {
+            if (!b) {
+                if (value.length > a) return `不能超过${a}个字符`;
+            }
+            else {
+                if (value.replace(/\.[\s\S]*$/, '').length > a) return `整数部分不能超过${a}位`;
+            }
+        }
+        if (b) {
+            var digits = value.replace(/^[^\.]+\./, '');
+            if (digits.length > b) {
+                return `小数部分不能超过${b}位`;
+            }
+        }
+    }
     if (field.valid instanceof Function) {
         var e = field.valid(data[field.key]);
         if (e) return e;

package/coms/frame/payment.html

@@ -0,0 +1,34 @@
+<div class="head">
+    扫码支付
+    <close @click="closeView()"></close>
+</div>
+<div class="body">
+    <item>
+        <label>原始价格：</label>
+        <span v-model="(+price).toFixed(2)"></span>元
+    </item>
+    <item>
+        <label>支付渠道：</label>
+        <select ng-model="paytype">
+            <option disabled value="0">请选择</option>
+            <option v-repeat="(o,i) in paytypes" icon_=o.icon value_="i+1" -html="o.name"></option>
+            <!-- <option icon="/page/weixin.ico" value="2">微信</option> -->
+        </select>
+    </item>
+    <item>
+        <label>渠道费：</label>
+        <span b-bind="waycost"></span>元
+    </item>
+    <item ng-if="+paytype">
+        <label>应支付：</label>
+        <span style="color: red;">
+            <span v-model=finalpay></span>元
+        </span>
+    </item>
+    <item ng-if="+paytype">
+        <iframe _src="paysite" allowtransparency="true" scrolling="no">
+        </iframe>
+    </item>
+    <item>
+    </item>
+</div>

package/coms/frame/payment.js

@@ -0,0 +1,50 @@
+var paytype = data.getInstance("paytype");
+function main(paytypes, price) {
+    var page = view();
+    page.innerHTML = payment;
+    renderWithDefaults(page, {
+        get paytype() {
+            return paytype.value;
+        },
+        set paytype(value) {
+            data.patchInstance("paytype", { value }, true);
+        },
+
+        get waycost() {
+            var pay = this.paytypes[this.paytype - 1];
+            if (!pay) return 0;
+            var cost = pay.cost;
+            if (isFunction(cost)) cost = cost.call(pay, price);
+            return BigNumber.fix(cost, 2);
+        },
+        get paysite() {
+            var pay = this.paytypes[this.paytype - 1];
+            if (!pay) return 'about:blank';
+            var url = pay.url;
+            if (isFunction(url)) url = url.call(pay, this.finalpay);
+            else if (url) url += this.finalpay;
+            return url;
+        },
+        get finalpay() {
+            return BigNumber.fix(BigNumber.add(this.price, this.waycost), 2);
+        },
+        paytypes,
+        price,
+        closeView() {
+            remove(page);
+        },
+    });
+    drag.on(page.firstChild, page);
+    resize.on(page);
+    data.bindInstance("paytype", function (type) {
+        console.log(type)
+    });
+    var frame = page.querySelector("iframe");
+    on("mounted")(frame, function () {
+        frame.contentWindow.onmessage = function (e) {
+            var id = e.data;
+            cast(page, 'payment', id);
+        };
+    });
+    return page;
+}

package/coms/frame/payment.less

@@ -0,0 +1,35 @@
+& {
+    border: 1px solid #000;
+    position: absolute;
+}
+
+label {
+    display: inline-block;
+    padding: 0 16px 0 0;
+}
+
+>.head {
+    -webkit-app-region: no-drag;
+}
+
+.body {
+    item {
+        display: block;
+        padding: 0 16px;
+    }
+
+    iframe {
+        width: 256px;
+        height: 256px;
+        overflow: hidden;
+        border: none;
+        display: block;
+        margin: 20px auto;
+    }
+
+    money {
+        display: block;
+        text-align: center;
+        color: red;
+    }
+}

package/coms/zimoli/data.js

@@ -606,7 +606,7 @@ var privates = {
             }
             return data;
         });
-        p.loading = loading;
+        p.loading = promise.loading;
         return p;
     },
 

package/coms/zimoli/zimoli.js

@@ -168,7 +168,7 @@ function go(pagepath, args, history_name, oldpagepath) {
             fullfill_is_dispatched = 0;
         }
         addGlobal(_page, history_name, isDestroy);
-        page_object.prepares.forEach(function (url) {
+        page_object.prepares.splice(0, page_object.prepares.length).forEach(function (url) {
             if (isNumber(url)) {
                 url = _history[url < 1 ? _history.length + url - 1 : url];
             }

package/package.json

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