efront 4.0.38 → 4.0.40

package/coms/basic/BigNumber.js

@@ -82,7 +82,13 @@ class BigNumber {
         if (system_scale <= 36) {
             value = value.toLowerCase();
         }
+        var sign = false;
         for (var v of value) {
+            if (v === "-") {
+                sign = !sign;
+                continue;
+            }
+            if (v === '+') continue;
             if (v === '.') {
                 dotOccurs = true;
                 continue;
@@ -97,12 +103,13 @@ class BigNumber {
                 num = BigNumber.add(BigNumber.prd(num, scale), vmap[v]);
             }
         }
+        if (sign) num = '-' + num;
         this.value = num;
     }
     static DECIMAL_DIGIT = 120;
     toString(system_scale) {
         system_scale |= 0;
-        if (!system_scale || system_scale === 10) return this.value;
+        if (!system_scale || system_scale === 10) return this.value || "0";
         if (system_scale <= 1 || system_scale > 36) throw new Error("进制错误！");
         var [s, n, m] = prepare(this.value);
         var dist = [];
@@ -121,6 +128,7 @@ class BigNumber {
                 if (++c > BigNumber.DECIMAL_DIGIT || !m) break;
             }
         }
+        if (!dist.length) dist.push("0");
         if (s) dist.unshift('-');
         return dist.join('');
     };

package/coms/basic/Table.js

@@ -75,7 +75,7 @@ class Table extends Array {
             var [p, m] = mark.power(name, searchtext);
             power += p;
             if (p >= searchtext.length) this.coverCount++;
-            if (isString(f.key)) o[f.key] = m;
+            if (!isEmpty(f.key)) o[f.key] = m;
             else o.name = m, o.toString = returnName, o.valueOf = returnName;
         }
         o.power = power;

package/coms/basic/mark.js

@@ -1,32 +1,62 @@
-var couple = function (source, marker) {
+var _pinyin = null;
+Promise.resolve(init("pinyin")).then(py => _pinyin = py);
+var isABC = a => /^[a-zA-Z]$/.test(a);
+var couple = function (source, marker, pinyin) {
+    var isLike = function () {
+        var is = isABC(s), im = isABC(m);
+        if (is && im) return s.toLowerCase() === m.toLowerCase();
+        if (im) {
+            if (pinyin.py(s).indexOf(m.toLowerCase()) < 0) return false;
+            var py = pinyin.pinyin(s).split('|');
+            var i = 1;
+            var t = c2 + ct;
+            for (var p of py) {
+                if (p.length + t <= marker.length && p.indexOf(marker.slice(t, p.length + t).toLowerCase()) === 0) i = p.length;
+            }
+            c2 += i - 1;
+            dt = setDt();
+            return true;
+        }
+        return false;
+    };
+    var setDt = function () {
+        var d1 = len1 - c1;
+        var d2 = len2 - c2;
+        return d1 > d2 ? d2 : d1;
+    };
     var len1 = source.length;
     var len2 = marker.length;
     var match = "", begin1 = len1, begin2 = len2;
+    var end2 = begin2;
     for (var cx = -len1, dx = len2; cx < dx; cx++) {
         var c1 = cx >= 0 ? 0 : -cx;
         var c2 = cx >= 0 ? cx : 0;
-        var d1 = len1 - c1;
-        var d2 = len2 - c2;
+        var cc = c2;
         var start = 0, end = 0;
-        for (var ct = 0, dt = d1 > d2 ? d2 : d1; ct < dt; ct++) {
-            if (source[c1 + ct] === marker[c2 + ct]) {
+        for (var ct = 0, dt = setDt(); ct < dt; ct++) {
+            var s = source[c1 + ct];
+            var m = marker[c2 + ct];
+            if (s === m || pinyin && isLike()) {
                 end = ct + 1;
                 if (end === dt && end - start > match.length) {
                     match = source.slice(c1 + start, c1 + end);
                     begin1 = c1 + start;
-                    begin2 = c2 + start;
+                    begin2 = cc + start;
+                    end2 = c2 + end;
                 }
             } else {
                 if (end - start > match.length) {
                     match = source.slice(c1 + start, c1 + end);
                     begin1 = c1 + start;
-                    begin2 = c2 + start;
+                    begin2 = cc + start;
+                    end2 = c2 + end;
                 }
+                cc = c2;
                 start = ct + 1;
             }
         }
     }
-    return [match, begin1, begin2];
+    return [match, begin1, begin2, end2];
 };
 var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
 var MARK_AFT1, MARK_AFT2, _AFT1, _AFT2 = _AFT1 = "</b>";
@@ -52,31 +82,31 @@ var power = function (source, search) {
     if (!search || !source) {
         return [0, source];
     }
-    var matchers = couple(source, search);
+    var matchers = couple(source, search, _pinyin);
     var match_text = matchers[0];
-    var match_start2 = matchers[1];
+    var match_start = matchers[1];
     if (search.length === 1) {
         var p = 0;
-        var res = source.replace(new RegExp(search.replace(/[\\\*\?\+\(\)\[]/g, "\\$&"), "g"), (m, i) => {
+        var res = source.replace(new RegExp(search.replace(/[\\\*\?\+\(\)\[]/g, "\\$&"), "ig"), (m, i) => {
             if (!p) p = .1 / (1 + i);
-            return MARK_PRE1 + search + MARK_AFT1;
+            return MARK_PRE1 + m + MARK_AFT1;
         });
         return [p, res];
     }
-    if (match_text.length > 1) {
-        var match_text_pre = source.slice(0, match_start2);
-        var match_text_aft = source.slice(match_start2 + match_text.length);
+    if (matchers[3] - matchers[2] > 1) {
+        var match_text_pre = source.slice(0, match_start);
+        var match_text_aft = source.slice(match_start + match_text.length);
         var pp = 0, ap = 0;
         var p = match_text.length;
         p = match_text.length;
-        if (match_start2) p += .1 / match_start2 - .2;
+        if (match_start) p += .1 / match_start - .2;
         if (match_text_pre.length > 1) {
             [pp, match_text_pre] = power(match_text_pre, search);
         }
         if (match_text_aft.length > 1) {
             [ap, match_text_aft] = power(match_text_aft, search);
         }
-        if (match_text.length !== search.length) {
+        if (matchers[3] - matchers[2] !== search.length) {
             p += (pp + ap) / source.length / search.length * .01 - .2;
         }
         return [p, match_text_pre.concat(MARK_PRE1, match_text, MARK_AFT1, match_text_aft)];

package/coms/basic/mark_test.js

@@ -4,4 +4,10 @@ var test = function (t1, t2) {
 }
 test("11234", '1234');
 test("1234", '1234');
-
+await init('pinyin')
+test('我们', 'women');
+test('我们', 'wm');
+test('盛', 'cheng');
+test('盛', 'sheng');
+test('着火', 'zhaohuo');
+test('着陆', 'zhuolu');