efront 4.0.41 → 4.0.45

package/apps/pivot/log/count.js

@@ -1,6 +1,6 @@
 var fields = refilm`
-路径/path html
-访问量/count
+访问量/count money/10
+路径/path html/20
 `;
 function main() {
     var page = div();

package/coms/basic/Table.js

@@ -56,6 +56,7 @@ class Table extends Array {
         var searchtext = this.searchText;
         var fields = this.searchFields ? this.searchFields : this.fields;
         var power = 0;
+        var s = o;
         if (isNode(o)) {
             o = extend({
                 name: o.name,
@@ -68,6 +69,7 @@ class Table extends Array {
             }, o);
         }
         else o = isObject(o) ? Object.create(o) : new o.constructor(o);
+        o.$origin = s;
         for (var f of fields) {
             var name = seek(o, f.key);
             if (isEmpty(name) || !isString(name)) continue;
@@ -90,14 +92,14 @@ class Table extends Array {
         this.update();
     }
     async update() {
+        var origin = this.searched ? this.splice(0, this.length).map(o => o.$origin) : [];
         this.searched = 0;
-        this.splice(0, this.length);
         var source = this.sorted ? this.sorted : this.source;
         if (!source) return;
         var searchid = ++this.searchid;
         this.complete = false;
         this.coverCount = 0;
-        if (this.searchText) for (var o of source) {
+        if (this.searchText) for (var o of origin.length ? origin.concat(source) : source) {
             this.addItem(o);
             if (++this.searched % 600 === 0) {
                 if (isFunction(this.callback)) this.callback();

package/coms/basic/analyse_test.js

@@ -1,5 +1,6 @@
 var require = window.require;
 var fs, path;
+var document = window.document;
 function test(url) {
     var data = fs.readFileSync(url);
     data = String(data);
@@ -39,7 +40,7 @@ function analyse_test(text) {
     fs = require("fs");
     path = require("path");
     if (text) return analyse(text);
-    testxml("/book/金山打字");
+    if (document) testxml("/book/金山打字");
     // testcode("/work/efront/coms/basic");
 
     testblog("炒面.txt");

package/coms/basic/arrayEqual.js

@@ -0,0 +1,8 @@
+function sliceEqual(a, b) {
+    if (a === b) return true;
+    if (a.length !== b.length) return false;
+    for (var cx = 0, dx = a.length; cx < dx; cx++) {
+        if (!isSame(a[cx], b[cx])) return false;
+    }
+    return true;
+}

package/coms/{zimoli → basic}/deepEqual.js

@@ -53,23 +53,6 @@ var objectEqual = function (o1, o2, deep) {
     }
     return true;
 };
-function shallowEqual(o1, o2) {
-    // 浅层比对，对内层对象不进行递归比对
-    if (o1 === o2) return true;
-    if (isObject(o1) && isObject(o2)) {
-        var keys1 = Object.keys(o1), keys2 = Object.keys(o2);
-        if (keys1.length !== keys2.length) return false;
-        keys1.sort(), keys2.sort();
-        for (var cx = 0, dx = keys1.length; cx < dx; cx++) {
-            var key1 = keys1[cx];
-            var key2 = keys2[cx];
-            if (key1 !== key2) return false;
-            if (!singleEqual(o1[key1], o2[key2])) return false;
-        }
-        return true;
-    }
-    return singleEqual(o1, o2);
-}
 function deepEqual(o1, o2) {
     if (o1 === o2) return true;
     if (isObject(o1) && isObject(o2)) {

package/coms/basic/isSame.js

@@ -1,3 +1,4 @@
+var isNaN = Number.isNaN;
 function isSame(o1, o2) {
-    return o1 === o2 || isNumber(o1) && isNumber(o2) && isNaN(o1) && isNaN(o2);
+    return o1 === o2 || isNaN(o1) && isNaN(o2);
 }

package/coms/basic/refilm_decode.js

@@ -275,13 +275,13 @@ function parse(piece) {
             }
         };
         var is = function (a) {
-            var reg = /^[\*\+\-\!\-\$&\?\~]|[\*\+\-\!\-\$&\?\~]$/;
+            var reg = /^[\*\+\-\!\-&\?\~]|^\$(?!\d)|[\*\+\-\!\-\$&\?\~]$/;
             if (!reg.test(a)) return a;
             required = test(/^\*|\*$/, a);
             if (test(/^[\+]|[\+]$/, a)) inlist = true;
             if (test(/^[\!]|[\!]$/, a)) inlist = false;
             hidden = test(/^\-|\-$/, a);
-            readonly = test(/^[\$&]|[\$&]$/, a);
+            readonly = test(/^&|\$(?!\d)|[\$&]$/, a);
             delete_onempty = test(/^\?|\?$/, a);
             delete_onsubmit = test(/^\~|\~$/, a);
             return a.replace(reg, '');
@@ -331,6 +331,7 @@ function parse(piece) {
             type = d + 'bit/' + t;
         }
         var sizematch = /^(\-?\d+|\-?\d*\.\d+)?([YZEPTGMK]i?b?|bytes?|bits?|words?|dword|real[48]|long|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
+        if (!sizematch[1] && /^\$\d/.test(sizematch[2])) sizematch = null;
         if (sizematch) {
             var [size_text, size = 1, unit, eq] = sizematch;
             if (unit && /^i?b?$/i.test(unit.slice(1))) {

package/coms/basic/refilm_decode_test.js

@@ -0,0 +1,2 @@
+var fields = refilm_decode(["启动时间/time $1"]);
+console.log(fields);

package/coms/basic/shallowEqual.js

@@ -0,0 +1,18 @@
+var singleEqual = isSame;
+function shallowEqual(o1, o2) {
+    // 浅层比对，对内层对象不进行递归比对
+    if (o1 === o2) return true;
+    if (isObject(o1) && isObject(o2)) {
+        var keys1 = Object.keys(o1), keys2 = Object.keys(o2);
+        if (keys1.length !== keys2.length) return false;
+        keys1.sort(), keys2.sort();
+        for (var cx = 0, dx = keys1.length; cx < dx; cx++) {
+            var key1 = keys1[cx];
+            var key2 = keys2[cx];
+            if (key1 !== key2) return false;
+            if (!singleEqual(o1[key1], o2[key2])) return false;
+        }
+        return true;
+    }
+    return singleEqual(o1, o2);
+}

package/coms/basic/str2array.js

@@ -0,0 +1,5 @@
+var spliter = /\s*[,;\|]\s*/
+module.exports = function (names) {
+    if (typeof names === 'string') names = names.split(spliter);
+    return names;
+}

package/coms/compile/Program.js

@@ -153,6 +153,7 @@ class Program {
     extends_reg = /^(extends)$/;
     spaces = spaceDefined;
     nocase = false
+    keepspace = false;
     lastIndex = 0
     compile(s) {
         return s.replace(/\\[\s\S]|[\[\]\(\)\{\}\+\.\-\*\?\$\^\|\\\/ ]/g, function (m) {
@@ -192,7 +193,7 @@ class Program {
             var last = queue.last;
             Object.defineProperty(scope, 'queue', { value: queue, enumerable: false, configurable: true });
             scope.prev = last;
-            if (scope.type !== COMMENT && scope.type !== SPACE) {
+            if (!(scope.type & (COMMENT | SPACE))) {
                 var keeplast = program.setType(scope) === false;
                 if (keeplast) {
                     if (queue.last !== last) last = queue.last;
@@ -237,12 +238,7 @@ class Program {
                 }
             }
             var last = queue.last;
-            if (type === SPACE) {
-                if (last && last.isend === false) {
-                    last.isend = true;
-                    queue.inExpress = false;
-                }
-            }
+            if (type === SPACE);
             else if (type !== STAMP);
             else if (m === ";") {
                 if (last && last.isend === false) last.isend = true;
@@ -526,8 +522,16 @@ class Program {
                     m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, "\r\n");
                     row += m.replace(/[^\r\n]+/g, '').length >> 1;
                     colstart = match.index + m.replace(/[^\r\n]+$/, '').length - 1;
+                    var last = queue.last;
+                    if (last && last.isend === false) {
+                        last.isend = true;
+                        queue.inExpress = false;
+                    }
                     save(SPACE);
                 }
+                else {
+                    if (this.keepspace) save(SPACE);
+                }
                 lasttype = SPACE;
                 continue;
             }

package/coms/compile/common.js

@@ -13,7 +13,7 @@ const [
     /*1024 */PROPERTY,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
-var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mn])?$/i;
+var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mniul]|ll)?$/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var skipAssignment = function (o, cx) {
     var next = arguments.length === 1 ? function () {
@@ -132,6 +132,7 @@ var skipAssignment = function (o, cx) {
                 next();
             }
             else if (o.text === 'else') {
+                if (ifdeep <= 0) break loop;
                 ifdeep--;
                 needpunc = false;
                 next();
@@ -140,7 +141,6 @@ var skipAssignment = function (o, cx) {
                 if (o.text === 'if') ifdeep++;
                 next();
                 next();
-                break;
             }
             else if (o.text === 'do') {
                 next();
@@ -151,14 +151,12 @@ var skipAssignment = function (o, cx) {
                 next();
                 if (o.type === STRAP && o.text === 'await') next();
                 next();
-                break;
             }
             else if (o.text === "class") {
                 next();
                 while (o && !o.isClass) next();
                 while (o && o.isClass) next();
                 needpunc = true;
-                break;
             }
             else if (o.text === "function") {
                 next();
@@ -167,7 +165,6 @@ var skipAssignment = function (o, cx) {
                 if (o) next();
                 if (o) next();
                 needpunc = true;
-                break;
             }
             else if (o.text === 'debugger') {
                 next();
@@ -1005,6 +1002,7 @@ var createString = function (parsed) {
     var keepspace = parsed.keepspace !== false;
     var helpcode = parsed.helpcode;
     var lasttype = SPACE;
+    var uncomment = parsed.comment === false;
     var result = [], cacheresult, finalresult = result;
     var helpcolor = parsed.keepcolor === false;
     var run = (o, i, a) => {
@@ -1022,8 +1020,9 @@ var createString = function (parsed) {
         switch (o.type) {
             case COMMENT:
                 // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
+                if (uncomment) break;
                 var tmp = o.text, opentmp = false;
-                if (!keepspace || helpcode) {
+                if (helpcode) {
                     if (/^\/[\/\*]\s*\<\!--/.test(tmp)) {
                         opentmp = true;
                         if (/^\/\*/.test(tmp)) opentmp = 2;
@@ -1102,7 +1101,7 @@ var createString = function (parsed) {
             default:
                 if (o instanceof Object) {
                     if (o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^[\.\[]/.test(o.text) || /\.$/.test(o.prev.text)));
-                    else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE) & o.type) {
+                    else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
                         result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {

package/coms/compile/formatcode.js

@@ -14,7 +14,7 @@ function format(code, step) {
         var lowspace = rest.pop();
         var cp = code.prev;
         var cpp = cp && cp.prev;
-        if(cpp && cpp.type === STRAP && cpp.text==="switch"){
+        if (cpp && cpp.type === STRAP && cpp.text === "switch") {
             lowspace += step;
         }
         var space = lowspace + step;
@@ -37,10 +37,15 @@ function format(code, step) {
                         code.push({ type: SPACE, text: lowspace });
                     }
                 }
+                if (breakline && e.type === STAMP) {
+                    if (e.text === ':' && !e.inExpress) {
+                        if (code[code.length - 1].type === SPACE) code.pop();
+                    }
+                }
                 code.push(e);
                 if (e.type === SCOPED) rest.push(space, e);
             }
-            if (breakline && (e.type === STAMP && /^[,;]$/.test(e.text) || !code.isClass && !code.isObject)) hasCommaBefore = !code.isObject && e.text === ',', code.push({ type: SPACE, text: hasCommaBefore ? deepspace: space });
+            if (breakline && (e.type === STAMP && /^[,;]$/.test(e.text) || !code.isClass && !code.isObject)) hasCommaBefore = !code.isObject && e.text === ',', code.push({ type: SPACE, text: hasCommaBefore ? deepspace : space });
         }
         if (breakline) {
             var hasspaceend = code[code.length - 1].type === SPACE;

package/coms/compile/scanner2_test.js

@@ -111,6 +111,16 @@ function testUnicode() {
     var m = scanner(`\\u{0042}\\u0042=1`);
     console.log(m.toString())
 }
+function testComment() {
+    var m = scanner(`SDL_MAX_SINT8   ((Sint8)0x7F)           /* 127 */`);
+    console.log(m[m.length - 1].type === common.COMMENT);
+    m.comment = false;
+    console.log(common.createString(m));
+}
+function testQuote() {
+    var m = scanner(`(sizeof(("table")) / sizeof(("table")[0]))`);
+    console.log(m.toString());
+}
 Program.debug = true;
 // testSpeed();
 // testVariables();
@@ -124,6 +134,8 @@ Program.debug = true;
 // testJsxOnlyHtml();
 // testSpaceLess();
 // testArrow();
-testUnicode();
+// testUnicode();
+// testComment();
+testQuote();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

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);
@@ -120,4 +120,6 @@ 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\nreturn [0, 9];\r\nreturn [1, 9];\r\nreturn [2, 0];\r\na; return [1, 0]')
+test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\nreturn [0, 9];\r\nreturn [1, 9];\r\nreturn [1, 0]');

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.45",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {