efront 4.0.53 → 4.0.54

package/coms/basic/Table.js

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

package/coms/basic/parseCSV.js

@@ -0,0 +1,54 @@
+function readCSV(data) {
+    var reg = /""?|,|\r\n|\r|\n|\u2028|\u2029/g;
+    var str = [];
+    var instr = false;
+    var lastIndex = 0;
+    var row = [];
+    var table = [];
+    while (true) {
+        var m = reg.exec(data);
+        if (!m) break;
+        var s = data.slice(lastIndex, m.index);
+        lastIndex = reg.lastIndex;
+        if (s) str.push(s);
+        switch (m[0]) {
+            case `""`:
+                str.push('"');
+                break;
+            case `"`:
+                instr = !instr;
+                break;
+            case `,`:
+                if (instr) {
+                    str.push(',');
+                }
+                else {
+                    row.push(str.join(''));
+                    str = [];
+                }
+                break;
+            case "\r\n":
+            case "\r":
+            case "\n":
+            case "\u2028":
+            case "\u2029":
+                if (instr) {
+                    str.push("\r\n");
+                }
+                else {
+                    row.push(str.join(""));
+                    table.push(row);
+                    row = [];
+                    str = [];
+                }
+                break;
+        }
+    }
+    if (str.length || row.length) row.push(str.join(''));
+    if (row.length) table.push(row);
+    row = [];
+    str = [];
+    var fields = table.shift();
+    if (fields) fields = fields.map((a, i) => { return { name: a, key: i } })
+    return Table.from(fields, table);
+}

package/coms/basic_/exec_.js

@@ -11,7 +11,7 @@ var exec_ = function (args, ok, oh, int) {
             fina();
         }
         else if (catches.length) {
-            catch_ = catches.pop();
+            catch_ = catches[catches.length - 1];
             [index, p, throwed] = catch_;
             index += p & 0xffff;
             if (p >>> 16) {
@@ -19,6 +19,7 @@ var exec_ = function (args, ok, oh, int) {
             }
             else {
                 e = err;
+                catches.pop();
                 fina();
             }
         }

package/coms/compile/autoenum.js

@@ -1,4 +1,4 @@
-var { skipAssignment, snapSentenceHead, snapExpressFoot, EXPRESS, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
+var { skipAssignment, snapSentenceHead, snapExpressFoot, EXPRESS, SPACE, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
 var strings = require("../basic/strings");
 
 var createRefId = function (o) {
@@ -206,6 +206,7 @@ function enumref(scoped) {
                         continue;
                     }
                     if (!eq) break;
+                    if (o.short) continue;
                     o.type = eq.type;
                     o.isdigit = true;
                     o.text = eq.text;

package/coms/compile/autoenum_test.js

@@ -26,4 +26,5 @@ t("for(;a=1;){ console.log(a)} console.log(a)", "for (; a = 1;) { console.log(1)
 t("for(;;a=1){ console.log(a)} console.log(a)", "for (;; a = 1) { console.log(a) } console.log(a)");
 t("for(var a = 1;;){ console.log(a)} console.log(a)", "for (var a = 1;;) { console.log(1) } console.log(1)");
 t("for(let a = 1;;){ console.log(a)} console.log(a)", "for (let a = 1;;) { console.log(a) } console.log(a)");
+t("var a=-1; console.log(-a)", "var a = -1; console.log(- -1)");
 // t(fs.readFileSync(path.join(__dirname,"../zimoli/spacechar_test.js")).toString())

package/coms/compile/common.js

@@ -1107,7 +1107,8 @@ var createString = function (parsed) {
                     else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
                         if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
                         else if (lasttype === STAMP) {
-                            result.push(" ");
+                            var prev = o.prev;
+                            if (!prev.unary || /[\+\-]$/.test(prev.text) && prev.text === o.text) result.push(" ");
                         }
                         else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
                             var prev_prev = o.prev.prev;
@@ -1116,6 +1117,7 @@ var createString = function (parsed) {
                                 || prev_prev.type & (EXPRESS | VALUE)
                             ) result.push(";");
                         }
+
                         else if (o.text === '*') {
                             if (keepspace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
                         }
@@ -1127,6 +1129,9 @@ var createString = function (parsed) {
                         if (/^0[0-7]+$/.test(o.text)) {
                             o.text = '0o' + o.text.slice(1);
                         }
+                        if (+o.text < 0 && /\-$/.test(result[result.length - 1])) {
+                            result.push(" ");
+                        }
                     }
                     result.push(o.text);
                 }

package/coms/compile/scanner2_test.js

@@ -121,6 +121,10 @@ function testQuote() {
     var m = scanner(`(sizeof(("table")) / sizeof(("table")[0]))`);
     console.log(m.toString());
 }
+function testMinus() {
+    var m = scanner(`a- - -!!!b`);
+    console.log(m.toString());
+}
 Program.debug = true;
 // testSpeed();
 // testVariables();
@@ -136,6 +140,7 @@ Program.debug = true;
 // testArrow();
 // testUnicode();
 // testComment();
-testQuote();
+// testQuote();
+testMinus();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/zimoli/button.less

@@ -88,7 +88,6 @@
 
 &>.track {
     border-radius: inherit;
-    transition: box-shadow .1s, background-color .2s;
     width: 100%;
     height: 100%;
     position: absolute;

package/coms/zimoli/contextmenu.less

@@ -1,4 +1,5 @@
 & {
     cursor: default;
     outline: none;
+    max-height: 50%;
 }

package/coms/zimoli/model.js

@@ -257,7 +257,7 @@ function main(elem) {
                     elem.innerHTML = '<span ng-bind=get()></span>';
                     render(elem, {
                         get() {
-                            if (!field.key) return;
+                            if (isEmpty(field.key)) return;
                             var value = seek(data, field.key);
                             if (field.options) {
                                 if (!field.optionsMap) {

package/coms/zimoli/table.html

@@ -13,9 +13,9 @@
         <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
-            <model -if="f.key&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
+            <model -if="!isEmpty(f.key)&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
-            <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"
+            <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>

package/coms/zimoli/table.js

@@ -371,28 +371,23 @@ var getTdsOfSameRow = function (td) {
     return tds;
 };
 function setContextMenu(thead) {
-    var fields = this.fields.slice();
-    var scope = this;
-    var menuItems = fields.map(f => {
-        return {
-            name: f.name || " ",
-            checked: !f.hidden,
-            width: f.width,
-            do() {
-                this.checked = !this.checked;
-                f.hidden = !this.checked;
-                scope.fields = fields.filter(f => !f.hidden);
-                var width = thead.scrollWidth / scope.fields.length;
-                if (!width || width < 200) width = 200;
-                forEachRow(thead, function (tr) {
-                    for (var td of tr.children) {
-                        if (td.offsetWidth > width) css(td, { width });
-                    }
-                });
-                setLazyFixedColumn.call(thead.parentNode, true)
+    var fields = this.originFields.slice();
+    var _do = function () {
+        this.checked = !this.checked;
+        var f = fields[this.index];
+        f.hidden = !this.checked;
+        scope.fields = fields.filter(f => !f.hidden);
+        var width = thead.scrollWidth / scope.fields.length;
+        if (!width || width < 200) width = 200;
+        forEachRow(thead, function (tr) {
+            for (var td of tr.children) {
+                if (td.offsetWidth > width) css(td, { width });
             }
-        }
-    });
+        });
+        setLazyFixedColumn.call(thead.parentNode, true)
+    };
+    var menuItems = fields.map((f, i) => ({ name: f.name || "&nbsp", index: i, width: f.width, key: f.key, checked: !f.hidden, do: _do }));
+    var scope = this;
     contextmenu(thead, menuItems);
 }
 function table(elem) {
@@ -468,11 +463,19 @@ function table(elem) {
         };
         vbox(table, 'x');
     };
-    care(table, async function ([fields, data]) {
+    care(table, async function (src) {
+        if (src instanceof Table) {
+            data = src;
+            fields = data.fields;
+        }
+        else if (src instanceof Array) {
+            var [fields, data] = src;
+        }
+        else throw new Error("table组件源数据错误！");
         if (_vbox) _vbox(), _vbox = null;
         watch(table, {
             find(text) {
-                if ($scope.data.constructor === Table){
+                if ($scope.data.constructor === Table) {
                     $scope.data.searchText = text;
                     $scope.data.update();
                 }
@@ -485,7 +488,8 @@ function table(elem) {
         markedRows = false;
         this.style.display = 'block';
         var $scope = {
-            fields,
+            originFields: fields,
+            fields: fields.filter(f => !f.hidden),
             isEmpty,
             hasFoot: true,
             setContextMenu,

package/package.json

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