efront 4.0.41 → 4.0.48

package/coms/compile/unstruct.js

@@ -7,9 +7,7 @@ var RETURN = { type: STRAP, text: "@ret" };// return;
 var THROW = { type: STRAP, text: "@throw" };// return;
 var YIELD = { type: STRAP, text: "@yield" };// return;
 var NEXT = { type: STRAP, text: "@next" };// return;
-var _break = function (body, cx, result, iscontinue) {
-    var re = result[result.length - 1];
-    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
+var mount_break = function (body, cx, b1s, iscontinue) {
     var label;
     do {
         var o = body[++cx];
@@ -24,11 +22,11 @@ var _break = function (body, cx, result, iscontinue) {
             if (b.type === LABEL && b.text === label + ":") {
                 if (!s) s = b;
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2('return []');
-                _b.ret_ = -1;
-                if (iscontinue) _b[1].continue = s, s.continue = true;
-                b.breaks.push(_b[1]);
-                pushstep(result, _b);
+                if (iscontinue) s.continue = true;
+                b1s.forEach(b1 => {
+                    if (iscontinue) b1.continue = s
+                    b.breaks.push(b1);
+                });
                 break;
             }
             else {
@@ -41,16 +39,24 @@ var _break = function (body, cx, result, iscontinue) {
             var b = labels[cx];
             if (b.type !== LABEL && (!iscontinue || b.text !== 'switch')) {
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2("return []");
-                _b.ret_ = -1;
-                if (iscontinue) _b[1].continue = b, b.continue = true;
-                b.breaks.push(_b[1]);
-                pushstep(result, _b);
+                if (iscontinue) b.continue = true;
+                b1s.forEach(b1 => {
+                    if (iscontinue) b1.continue = b;
+                    b.breaks.push(b1);
+                })
                 break;
             }
         }
     }
     return bx;
+}
+var _break = function (body, cx, result, iscontinue) {
+    var re = result[result.length - 1];
+    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
+    var _b = scanner2('return []');
+    _b.ret_ = -1;
+    mount_break(body, cx, [_b[1]], iscontinue);
+    pushstep(result, _b);
 };
 var _try = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -140,11 +146,13 @@ var _switch = function (body, cx, unblock, result, getname) {
     var tmp = [];
     while (o[cy] !== m) cy++;
     var default_ = null, case_ = null;
+    var cbindex = 0, cblength = 0;
     while (cy < o.length) {
         var block = getblock(o, ++cy);
         cy += block.length;
         while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
         cy++;
+        while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
         var getnextname = function (deep) {
             return getname(deep + 1);
         };
@@ -152,18 +160,43 @@ var _switch = function (body, cx, unblock, result, getname) {
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
         if (qe.name) case_ = scanner2(`if(${qn}===${qe.name})return[]`), pushstep(result, case_);
-        else default_ = case_ = scanner2(`return[]`), default_.ret_ = -1;
+        else default_ = case_ = scanner2(`return[]`), default_.ret_ = -2;
         var by = cy;
         m = o[cy];
         while (m && (m.type !== STRAP || !/^(default|case)$/i.test(m.text))) m = o[++cy];
-        tmp.push(result.length - 1, case_[case_.length - 1], o.slice(by, cy));
+        var cbody = o.slice(by, cy);
+        var cb0 = cbody[0];
+        if (cb0 && cb0.type === STRAP && (cb0.text === "break" || cb0.text === 'continue')) {
+            if (!cblength) {
+                var brks = [case_[case_.length - 1]];
+                while (tmp.length > cbindex) {
+                    tmp.pop();
+                    brks.push(tmp.pop());
+                    tmp.pop();
+                };
+                mount_break(cbody, 0, brks, cb0.text === 'continue');
+                cblength = 0;
+                cbindex = tmp.length;
+                continue;
+            }
+            cbindex = tmp.length + 3;
+            cblength = 0;
+        }
+        while (cbody.length) {
+            var cbe = cbody[cbody.length - 1];
+            if (cbe.type === SPACE) cbody.pop();
+            else if (cbe.type === STAMP && cbe.text === ';') cbody.pop();
+            else break;
+        }
+        cblength += cbody.length;
+        tmp.push(result.length - 1, case_[case_.length - 1], cbody);
     }
     if (!default_) {
-        default_ = scanner2(`return[]`), default_.ret_ = -1;
-        tmp.push(result.length - 1, default_[default_.length - 1], []);
+        default_ = scanner2(`return[]`), default_.ret_ = -2;
+        if (tmp.length) tmp.push(result.length - 1, default_[default_.length - 1], []);
     }
     var default_r = default_[default_.length - 1];
-    pushstep(result, default_);
+    if (tmp.length) pushstep(result, default_);
     default_r.index = result.length - 1;
     while (tmp.length) {
         cy = tmp.shift();
@@ -441,7 +474,7 @@ var remove_end_comma = function (o) {
 };
 var ispropcall = function (o) {
     var n = o.next;
-    if (!n || n.type !== SCOPED && n.entry !== '(') return false;
+    if (!n || n.type !== SCOPED || n.entry !== '(') return false;
     if (o.type === EXPRESS && snapExpressHead(o) !== o) return true;
     if (o.type === SCOPED && o.entry === '[' && snapExpressHead(o) !== o) return true;
     return false;
@@ -457,6 +490,7 @@ var _invoke = function (t, getname) {
     queue.name = t.name;
     var qname = t.name;
     var bx = 0;
+    var lastlink = false;
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
         a: if (o.type === STRAP) {
@@ -482,6 +516,7 @@ var _invoke = function (t, getname) {
         }
         if (o.type === SCOPED && (o.entry === '[' || o.entry === "(")) {
             var _nameindex = nameindex;
+            nameindex += lastlink;
             remove_end_comma(o);
             var iseval = o.iseval = isEval(o);
             var constStart = 0;
@@ -532,16 +567,19 @@ var _invoke = function (t, getname) {
             for (var c of cache) pushstep(result, c);
             cache = [];
             var n = o.next;
-            if (n && !needbreak(n) && !ispropcall(o)) {
-                var h = snapExpressHead(o);
-                var hx = t.lastIndexOf(h, cx);
-                var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
-                fs.unshift(...scanner2(`${getname(nameindex)}=`));
-                relink(fs);
-                fs.name = getname(nameindex);
-                pushstep(result, fs);
-                nameindex++;
-                cx = hx - 1;
+            if (n && !needbreak(n)) {
+                lastlink = n.type === SCOPED;
+                if (!ispropcall(o)) {
+                    var h = snapExpressHead(o);
+                    var hx = t.lastIndexOf(h, cx);
+                    var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
+                    fs.unshift(...scanner2(`${getname(nameindex)}=`));
+                    relink(fs);
+                    fs.name = getname(nameindex);
+                    pushstep(result, fs);
+                    cx = hx - 1;
+                }
+                if (!lastlink) nameindex++;
             }
         }
     }

package/coms/compile/unstruct_test.js

@@ -40,7 +40,7 @@ test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_,
 test("await a", "_ = a; return [_, 1]", true);
 test("yield a", "return [a, 3]", true);
 test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; (_)", true);
-test("a=1?2:3",`if (false) return [1, 0]; a = 2; return [2, 0];\r\n a = 3; return [1, 0]`)
+test("a=1?2:3", `if (false) return [1, 0]; a = 2; return [2, 0];\r\n a = 3; return [1, 0]`)
 test("await a()", "_ = a(); return [_, 1]", true);
 test("yield a()", "_ = a(); return [_, 3]", true);
 test("a = await a()", "_ = a(); return [_, 1];\r\n _ = @; a = _", true);
@@ -77,9 +77,9 @@ test("do{await b}while(a)", "_ = b; return [_, 1];\r\n _ = @; if (a) return [-1,
 test("switch(a){case 1:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
 test("switch(a){case 1: default:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
 test("switch(a.a){case 1:}", "_ = a.a; if (_ === 1) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:break;}", "if (a === 1) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:break;}", "if (a === 1) return [1, 0]", true);
+test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]", true);
+test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
@@ -120,4 +120,12 @@ test("menus[0].name+='aaa'", "_ = menus[0]; _0 = _.name + 'aaa'; _.name = _0", t
 test("menus[a+b].name+='aaa'", "_ = a + b; _ = menus[_]; _0 = _.name + 'aaa'; _.name = _0", true);
 test("menus[a+b]()", "_ = a + b; menus[_]()", true);
 test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1, 0];\r\n a; return [1, 0];\r\n b; return [1, 0]', true);
-test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
+test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
+test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
+test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [1, 0]');
+test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
+test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
+test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
+test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
+test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
+test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');

package/coms/pivot/pedit.js

@@ -1,13 +1,22 @@
-function main(title, type, params, idkey = params.fields[0].key) {
+function send(type, key, value, origin) {
+    return data.from(origin ? "edit" : "add", {
+        type,
+        key: encode62.timeencode(key),
+        value: encode62.timeencode(JSON.stringify(value)),
+    }).loading_promise;
+}
+function pedit(title, type, params, idkey = params.fields[0].key) {
     return frame$edit(title, {
         submit(a, fields) {
             a = submit(fields, a);
-            return data.from(params.data ? "edit" : "add", {
-                type,
-                key: encode62.timeencode(a[idkey]),
-                value: encode62.timeencode(JSON.stringify(a)),
-            }).loading_promise;
+            return send(type, a[idkey], a, params.data);
         },
 
     }, params);
+}
+pedit.create = function (type, key, value) {
+    return send(type, key, value, false);
+}
+pedit.update = function (type, key, value) {
+    return send(type, key, value, true);
 }

package/coms/reptile/detectWithExtension.js

@@ -0,0 +1,36 @@
+var path = require("path");
+var fs = require("fs").promises;
+var str2array = require("../basic/str2array");
+async function detectWithExtension(filenames, extensions = [""], folders = [""]) {
+    if (typeof filenames === 'string') filenames = str2array(filenames);
+    if (typeof extensions === 'string') extensions = str2array(extensions);
+    if (typeof folders === 'string') folders = str2array(folders);
+    if (extensions === null) {
+        extensions = [""];
+    }
+    if (folders === null) folders = [""];
+    extensions = [].concat(extensions);
+    filenames = filenames.map(f => efront$$split(f).join('/')).map(filename => {
+        var tempname = filename.replace(/[#\?][\s\S]*$/, '');
+        var params = filename.slice(tempname.length);
+        return [tempname, params];
+    });
+
+    var findedFolder = null;
+    for (var folder of folders) for (var [tempname, params] of filenames) for (var ext of extensions) {
+        var f = tempname + ext;
+        if (folder) f = path.join(folder, f);
+        f = path.normalize(f);
+        try {
+            var stats = await fs.stat(f);
+            if (stats.isFile()) {
+                f = await fs.realpath(f);
+                return f + params;
+            }
+            if (!findedFolder) findedFolder = f + params;
+        } catch { }
+    }
+    if (!findedFolder) throw new Error(`路径<gray>${filenames}</gray>不存在`);
+    return findedFolder;
+}
+module.exports = detectWithExtension;

package/coms/zimoli/data.js

@@ -936,7 +936,7 @@ var data = {
         var promise1 = instance.loading_promise;
         if (promise1) {
             var params = promise1.params;
-            if (deepEqual.shallow(params1, params)) {
+            if (shallowEqual(params1, params)) {
                 return instance;
             }
         }

package/coms/zimoli/getChanges.js

@@ -1,11 +1,11 @@
 function getChanges(current_props, previous_props) {
-    if (!isObject(current_props) && !isObject(previous_props)) return !deepEqual.shallow(current_props, previous_props);
+    if (!isObject(current_props) && !isObject(previous_props)) return !shallowEqual(current_props, previous_props);
     var changes = null;
     if (!isObject(current_props)) current_props = Object.create(null), changes = {};
     if (!isObject(previous_props)) previous_props = Object.create(null), changes = {};
     keys(previous_props, current_props).forEach(function (key) {
         if (key.charAt(0) === "$") return;
-        if (!deepEqual.shallow(current_props[key], previous_props[key])) {
+        if (!shallowEqual(current_props[key], previous_props[key])) {
             if (!changes) changes = {};
             changes[key] = { previous: previous_props[key], current: current_props[key] };
         }

package/coms/zimoli/render.js

@@ -216,7 +216,7 @@ var createRepeat = function (search, id = 0) {
         var result = getter(this);
         var origin = result;
         result = extend(result instanceof Array ? [] : {}, result);
-        if (savedOrigin === origin && deepEqual.shallow(savedValue, result)) return;
+        if (savedOrigin === origin && shallowEqual(savedValue, result)) return;
         var changes = getChanges(result, savedValue);
         if (!changes) return;
         savedValue = result;
@@ -442,7 +442,7 @@ var createBinder = function (binder) {
         var oldValue;
         this.renders.push(function () {
             var value = getter(this);
-            if (deepEqual.shallow(value, oldValue)) return;
+            if (shallowEqual(value, oldValue)) return;
             var oldv = oldValue;
             oldValue = value;
             if (isNode(value) || isArray(value)) {

package/coms/zimoli/select.js

@@ -182,7 +182,7 @@ function select(target, list, removeOnSelect, direction) {
                 }
                 return o.selected;
             });
-            if (deepEqual.shallow(lastSelected, selected)) return;
+            if (shallowEqual(lastSelected, selected)) return;
             lastSelected = selected;
             if (hasIcon) {
                 var icon = selected.length === 1 && selected[0].getAttribute('icon');
@@ -198,7 +198,7 @@ function select(target, list, removeOnSelect, direction) {
         };
         var initList = function () {
             var allOptions = [].concat.apply([], target.querySelectorAll("option"));
-            if (deepEqual.shallow(allOptions, savedOptions)) return;
+            if (shallowEqual(allOptions, savedOptions)) return;
             savedOptions = allOptions;
             list = selectList(allOptions, !!target.multiple, !!target.editable);
             setListValue();

package/coms/zimoli/table.html

@@ -2,8 +2,8 @@
     <tr inline-block #adapter thead @mounted="resizeT(this)">
         <td draggable="false" fixed row-index>${i18n`序号`}</td>
         <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
-                -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"></span><template
-                -else>&nbsp;</template>
+                -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"
+                type@="typeof f.type==='string'?f.type:''"></span><template -else>&nbsp;</template>
         </td>
         <td style="min-width: 0;" draggable="false">&nbsp;</td>
     </tr>

package/coms/zimoli/table.js

@@ -527,7 +527,7 @@ function table(elem) {
         render(this, $scope, this.$parentScopes.concat(this.$scope));
         $scope.data = Table.from(fields, await data);
         $scope.data.callback = function () {
-            if ($scope.tbody0) $scope.tbody0.go($scope.tbody0.index());
+            render.digest();
         };
     })
     autodragchildren(

package/coms/zimoli/table.less

@@ -142,6 +142,7 @@ thead {
             position: relative;
             color: #fff;
             background-color: #395268;
+            clear: both;
         }
     }
 }
@@ -188,6 +189,7 @@ thead {
             z-index: 1;
             background: #999;
             color: #fff;
+            clear: both;
         }
     }
 
@@ -212,4 +214,10 @@ thead {
     margin-right: 10px;
     vertical-align: middle;
     display: inline-block;
+}
+
+[type=money],
+[type=number],
+[type=price] {
+    float: right;
 }

package/package.json

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