efront 3.35.3 → 3.35.5

package/coms/basic/#loader.js

@@ -23,6 +23,7 @@ var {
     console,
     efrontURI,
     parseFloat,
+    encodeURI,
     preventFrame,
     PREVENT_FRAMEWORK_MODE = preventFrame,
     devicePixelRatio = 1,
@@ -46,6 +47,7 @@ var efront_time = +new Date;
 var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
     var xhr = new (XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP");
+    url = encodeURI(url);
     xhr.open("POST", url);
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {

package/coms/basic/JSAM.md

@@ -0,0 +1,7 @@
+图状数据序列化工具，与JSON语法一致
+```javascript
+    JSAM.stringify(obj);
+    JSAM.parse(str);
+```
+该工具已单独发布至[](https://www.npmjs.com/package/jsam)，
+更多用法参考可参考该链接。

package/coms/basic/Speed.js

@@ -41,20 +41,25 @@ function inertia(gun) {
         var id = smooth_timer;
         var res = gun.apply(that, args);
         if (id !== smooth_timer) return;
+
         if (false === res) {
             spd.reset();
             train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
-        if (decrease && args.filter(a => Math.abs(a) > 1).length === 0) {
+        if (args.stop || rate && args.rate < rate) {
+            if (!decrease) {
+                train.state = 停止;
+                return;
+            }
             train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
         smooth_timer = requestAnimationFrame(smooth);
     };
-    var spd, smooth_timer, that, decrease;
+    var spd, smooth_timer, that, decrease, rate;
     var train = function () {
         _cancel();
         var args = [].slice.call(arguments, 0, arguments.length);
@@ -63,9 +68,10 @@ function inertia(gun) {
         gun.apply(this, args);
         that = this;
     };
-    train.smooth = function (d) {
+    train.smooth = function (d, r) {
         _cancel();
         decrease = d;
+        rate = r;
         if (train.state === 移动) {
             train.state = 减速;
             smooth_timer = requestAnimationFrame(smooth);
@@ -162,16 +168,20 @@ class Speed extends Array {
         for (var v of values) sum += v * v;
         v = Math.sqrt(sum);
         var a = this.accelerate * Math.atan(v + 1);
+        values.rate = v;
         if (v > a + 1e-14) {
             v = Math.sqrt(v * (v - a)) / v;
         }
         else {
-            v = 1e-9;
+            if (v < 1e-6) {
+                values.stop = true;
+            }
+            v = 0.6180339887498949;
         }
         var r = ratio * v;
         for (var cx = 0, dx = values.length; cx < dx; cx++) {
             values[cx] *= r;
-            if (Math.abs(this[cx]) > .1) this[cx] *= v;
+            if (Math.abs(this[cx]) > 1e-16) this[cx] *= v;
         }
         return values;
     }

package/coms/basic/Speed_test.js

@@ -0,0 +1,58 @@
+var test = function (queue, wait = 40) {
+    var spd = new Speed;
+    var now = 0;
+    var writted = [];
+    for (var cx = 0, dx = queue.length; cx < dx; cx++) {
+        var s = queue[cx];
+        if (s instanceof Array && !Array.isArray(queue[cx + 1])) {
+            spd.write(s, now = queue[++cx]);
+            writted.push(s, now);
+        }
+        else {
+            spd.write([].concat(s), now = cx * 16 + 20 + Math.random() * 16);
+            writted.push([].concat(s), now);
+        }
+    }
+    for (var cx = now + wait, dx = now + 20000; cx < dx; cx += 16 + Math.random() * 16) {
+        var a = spd.read(cx);
+        if (a.stop) break;
+    }
+    if (!a.stop) {
+        console.log("测试数据：", writted, "\r\n当前状态：", a);
+        throw `已等待 ${+((cx - now) / 1000).toFixed(3)} 秒，未停止运行`;
+    }
+    console.log(cx - now, a.stop);
+};
+Speed.debug = true;
+test([
+    [2.1878654669544666],
+    27.956586758709825,
+    [2.1878654669544666],
+    37.21775999809554,
+    [3.1878654669544666],
+    67.83162606867668
+])
+test([1.1878654669544668, 1.1878654669544668, 1.1878654669544668]);
+test([2.1878654669544668, 2.1878654669544668, 3.1878654669544668]);
+test([
+    0.3251661026176258,
+    0.44988734829376603,
+    0.43652435853899707,
+    0.43652435853899707,
+    0.47438616350792273,
+    0.4253885330796093,
+    0.5300652921323553,
+    0.5256109608866051,
+]);
+test([
+    [0, false], 2880.300000011921,
+    [0, false], 2894.300000011921,
+    [0, false], 2969,
+    [0, false], 2971.199999988079,
+    [0, false], 3019.600000023842,
+    [0, false], 3026.800000011921,
+    [0, false], 3044.5,
+    [0, false], 3114.900000035763,
+    [0, false], 3250.199999988079,
+    [0, false], 3314.699999988079
+], 900);

package/coms/basic/parseYML.md

@@ -0,0 +1 @@
+`YAML`格式解析工具，目前尚不完善，解析个别数据可能出错。

package/coms/basic/queue.md

@@ -0,0 +1,10 @@
+依次传入数组中的数据，执行可能生成Promise的函数，类似如下代码：
+```javascript
+    for await(func());
+    或:
+    for (){await func();}
+```
+用法如下：
+```javascript
+queue.call(数组,func,最大并发数);
+```

package/coms/basic/serialize.md

@@ -0,0 +1,4 @@
+键值对序列化工具
+```javascript
+    serialize({ k1: v1, k2: v2 }, 分隔符, 等号);
+```

package/coms/basic/sortname.md

@@ -0,0 +1,4 @@
+文件名排序工具
+```javascript
+sortname(文件名数组)
+```

package/coms/basic/wait.md

@@ -0,0 +1,7 @@
+等待一个函数的返回值为真。用法如下：
+```javascript
+wait(function(){
+    return ...;
+}, 超时时长, 每次检查的时间间隔)
+```
+其中两个时间参数可不传入，超时时长默认为80毫秒，时间间隔按超时时长动态生成，约为其1/16。

package/coms/compile/Html.js

@@ -90,6 +90,7 @@ Html.prototype.createScoped = function (code) {
     dom.childNodes = childNodes;
     dom.children = children;
     var scriptNodes = [], styleNodes = [], tempNodes = [];
+    var inScript = false;
     for (var cx = 0, dx = code.length, c = code[0]; cx < dx; c = code[++cx])switch (c.type) {
         case LABEL:
             if (!/^(script|style|template)$/i.test(c.text)) {
@@ -100,6 +101,7 @@ Html.prototype.createScoped = function (code) {
             if (!c.isclose) {
                 var node = new Node;
                 node.tagName = c.text.toUpperCase();
+                if (node.tagName === 'SCRIPT' || node.tagName === 'STYLE') inScript = true;
                 nodePath.push(node);
                 node.childNodes = [];
                 node.children = [];
@@ -132,8 +134,8 @@ Html.prototype.createScoped = function (code) {
                 }
                 if (childNodes1.length) node.innerStart = childNodes1[0].outerStart;
                 else node.innerStart = innerEnd;
-                if (node.tagName === "SCRIPT") scriptNodes.push(node), tempNodes.push(node), node.isScript = true;
-                else if (node.tagName === "STYLE") styleNodes.push(node), tempNodes.push(node), node.isStyle = true;
+                if (node.tagName === "SCRIPT") scriptNodes.push(node), tempNodes.push(node), node.isScript = true, inScript = false;
+                else if (node.tagName === "STYLE") styleNodes.push(node), tempNodes.push(node), node.isStyle = true, inScript = false;
                 nodePath.pop();
                 node = nodePath[nodePath.length - 1];
                 childNodes = node.childNodes;
@@ -169,6 +171,7 @@ Html.prototype.createScoped = function (code) {
             }
             break;
         case EXPRESS:
+            if (inScript) continue;
             var t = c.text;
             t = parseExpress(t);
             var envs = createScoped(t).envs;
@@ -243,7 +246,7 @@ Html.prototype.createString = function (code) {
     for (var c of code) {
         switch (c.type) {
             case PIECE:
-                if (p && p.type === PIECE) dist.push(" ");
+                if (p && p.type & (PIECE | EXPRESS)) dist.push(" ");
                 dist.push(c.text);
                 break;
             case SPACE:

package/coms/compile/Program.js

@@ -549,6 +549,9 @@ class Program {
                 var scope = [];
                 scope.entry = m;
                 scope.type = SCOPED;
+                scope.start = match.index;
+                scope.col = match.index - colstart;
+                scope.row = row;
                 var last = queue.last;
                 if (m === "{") {
                     if (!last) {
@@ -579,7 +582,6 @@ class Program {
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
-                scope.start = match.index;
                 push_parents(scope);
                 continue;
             }
@@ -596,13 +598,13 @@ class Program {
                 pop_parents();
                 continue;
             }
-
+            if (this.scope_leave[m]) console.warn("标记不匹配", queue.entry, m, "queue:", `${queue.row}:${queue.col}`, "position:", `${row}:${index - colstart}\r\n`, text.slice(queue.start, index));
             if (this.stamp_reg.test(m)) {
                 save(STAMP);
             }
 
         }
-        if (queue !== origin) throw console.log(createString(origin), createString([queue])), new Error("代码异常结束");
+        if (queue !== origin) throw console.log(createString(origin), `\r\n------ deep: ${parents.length} - enrty: ${queue.entry} - length: ${queue.length} - last: ${createString([queue.last])} -----\r\n`, createString([queue])), "代码异常结束";
         return queue;
     }
     commit() {
@@ -619,11 +621,13 @@ class Program {
         quoteslike.forEach(q => {
             var a = q[0];
             if (a instanceof RegExp) a = stringsFromRegExp(a);
-            if (typeof a === "string" && a.length === 1) tokens[a] = true;
             if (a instanceof Array) {
-                a.forEach(a => quote_map[a] = q);
+                a.forEach(a => {
+                    quote_map[a] = q;
+                    tokens[a.charAt(0)] = true;
+                });
             }
-            else quote_map[a] = q;
+            else quote_map[a] = q, tokens[a.charAt(0)] = true;
             var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
                 if (q instanceof Array) {
                     q = q[q.length - 2];

package/coms/compile/namelist.js

@@ -76,7 +76,7 @@ source += source.toUpperCase() + "_$";
 var number = source + '0123456789';
 // source += "ªµºΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψω";
 source += function () {
-    var reg = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02af\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/;
+    var reg = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02AF\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0621-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/;
     var dist = [];
     reg.source.replace(/\\[xu]([0-9a-f]+)(?:\-\\[xu]([0-9a-f]+))?/ig, function (_, a, b) {
         a = parseInt(a, 16);

package/coms/compile/richcss.js

@@ -41,7 +41,7 @@ Richcss.prototype.setType = function (o) {
 };
 Richcss.prototype.createScoped = function (code) {
     var run = function (o) {
-        var props = Object.create(null);
+        var props = [];
         var values = null;
         loop: while (o) {
             switch (o.type) {
@@ -51,7 +51,10 @@ Richcss.prototype.createScoped = function (code) {
                         p.push(o.text);
                         o = o.next;
                     }
-                    props[p.join(" ")] = values = [];
+                    var pj = p.join(' ');
+                    props.push({ p: pj, v: values = [] });
+                    if (!props[pj]) props[pj] = [];
+                    props[pj].push(values);
                     if (!o) break loop;
                     if (o.type === STAMP) break;
                     continue;
@@ -65,15 +68,14 @@ Richcss.prototype.createScoped = function (code) {
                 case SCOPED:
                     var s = run(o.first);
                     var vars = null, used = null;
-                    for (var k in s) {
-                        var v = s[k];
+                    for (var { p: k, v } of s) {
                         if (/^\-\-/.test(k)) {
                             if (!vars) vars = {};
                             vars[k] = v.join(" ");
                         }
                         else {
                             if (!used) used = [];
-                            used[k] = v;
+                            used.push({ p: k, v });
                         }
                     }
                     values.used = used;
@@ -113,11 +115,13 @@ var fixBase = function (b, a) {
 function evalscoped(scoped, scopeNames, base = '') {
     var root = scoped[":root"], scope = scoped[":scope"];
     var vars = Object.create(null);
-    if (root) extend(vars, root.vars);
-    if (scope) extend(vars, scope.vars);
+    if (root) root.forEach(r => extend(vars, r.vars));
+    if (scope) scope.forEach(s => extend(vars, s.vars));
     scopeNames.forEach(s => {
         var ss = scoped[s];
-        if (ss) extend(vars, ss.vars), ss.rooted = true;
+        if (ss) ss.forEach(s => {
+            extend(vars, s.vars), s.rooted = true;
+        })
     });
     var vlist = [vars];
     var mlist = [];
@@ -154,8 +158,7 @@ function evalscoped(scoped, scopeNames, base = '') {
                 return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
             });
         };
-        for (var k in props) {
-            var p = props[k];
+        for (var { p: k, v: p } of props) {
             if (p.used) {
                 var match = /^(@[^\s,]+)\s*\(\s*(@[^\s,]+\s*(?:,\s*@[^\s,]+\s*)*)?\)/.exec(k);
                 if (!match) continue;
@@ -164,7 +167,8 @@ function evalscoped(scoped, scopeNames, base = '') {
                 args = args.split(",").map(a => a.trim());
                 p.args = args;
                 p.reg = new RegExp(args.join("|"), 'g');
-                methods[name] = function () {
+                if (!methods[name]) methods[name] = [];
+                methods[name].push(function () {
                     var body = evalthis(this);
                     var valueMap = {};
                     this.args.forEach((a, i) => {
@@ -178,12 +182,12 @@ function evalscoped(scoped, scopeNames, base = '') {
                     var body = body.map(replace);
                     body.rest = rest;
                     return body;
-                }.bind(p);
-                delete props[k];
+                }.bind(p));
+                p.isMethod = true;
             }
         }
-        for (var k in props) {
-            var p = props[k];
+        for (var { p: k, v: p } of props) {
+            if (p.isMethod) continue;
             if (p.used) {
                 if (base && !p.rooted) p.base = fixBase(base, k);
                 else p.base = k;
@@ -201,10 +205,12 @@ function evalscoped(scoped, scopeNames, base = '') {
                 var [, name, params] = match;
                 params = params.split(",").map(a => a.trim());
                 var method = getFromScopeList(name, mlist);
-                if (!isFunction(method)) throw `函数未定义：${name}`;
-                var res = method.apply(null, params);
-                if (res.rest.length) rest = rest.concat(res.rest);
-                if (res.length) result = result.concat(res);
+                if (!isArray(method)) throw `函数未定义：${name}`;
+                method.forEach(m => {
+                    var res = m.apply(null, params);
+                    if (res.rest.length) rest = rest.concat(res.rest);
+                    if (res.length) result = result.concat(res);
+                });
             }
         }
         mlist.pop();

package/coms/compile/scanner2_test.js

@@ -96,15 +96,21 @@ function testJsxOnlyHtml() {
     <component1 ng-bind="expression"><child1></child1></component1>`);
     console.log(m.toString());
 }
+function testSpaceLess() {
+    var m = scanner(`if(n<0)return'_f("'+t+'")('+e+")"`);
+    console.log(m.toString());
+}
+Program.debug = true;
 // testSpeed();
 // testVariables();
 // testRegexp();
 // testStatic();
 // testAssign();
 // testFormat();
-testJsx();
-testJsx2();
+// testJsx();
+// testJsx2();
 // testJsx3();
-testJsxOnlyHtml();
+// testJsxOnlyHtml();
+testSpaceLess();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/docs/markdown.js

@@ -70,8 +70,8 @@ function richtext(line) {
     line = line.trim();
     line = line.replace(/\[([\s\S]*?)\](?:\(([\s\S]*?)\))?|<(\w+)>[\s\S]*?<\/\3>/g, function (_, content, href) {
         if (/^\</.test(_)) return _;
-        if (href) href = ` href=${strings.recode(href)}`;
-        return `<a${href}>${content}</a>`;
+        if (href) var href1 = ` href=${strings.recode(href)}`;
+        return `<a${href1}>${content || href}</a>`;
     });
     var a;
     if (/^#/.test(line)) a = h(line);

package/coms/reptile/colored_console.js

@@ -34,7 +34,7 @@ var colorReg = /<(\/?)([a-z][\w]*)\>/ig;
 var renderColor = function (obj) {
     var colorpath = [];
     return String(obj).replace(colorReg, function (_, e, c) {
-        if (!getColor(c)) return _;
+        if (!c || c.length < 3 || !getColor(c)) return _;
         if (e) {
             colorpath.pop();
             c = colorpath[colorpath.length - 1];

package/coms/zimoli/arriswise.md

@@ -0,0 +1,12 @@
+替换已知函数中的方向属性(left,top,width,height,x,y等)，生成转置函数。
+如：
+```javascript
+var 水平方向操作 = function(elem,event){
+    var top = event.clientY - elem.offsetTop;
+};
+var 垂直方向操作 = function(elem,event){
+    var left = event.clientX - elem.offsetLeft;
+};
+等同于:
+var 垂直方向操作 = arriswise(水平方向操作,arguments);
+```

package/coms/zimoli/autodragchildren.js

@@ -70,6 +70,7 @@ var scrollX = function (targetBox, moveChildren) {
         scrollDelta = dragPosition.right + 20 - areaPosition.right;
     }
     if (scrollDelta) {
+        if (targetBox === document.documentElement) return;
         vscroll.X.call(targetBox, scrollDelta / 16, false);
         moveChildren();
     }

package/coms/zimoli/autodragchildren.md

@@ -0,0 +1,12 @@
+子项拖拽工具，两种用法可配合使用
+```javascript
+// 启用元素内的拖拽排序
+autodragchildren(元素, 子项过滤器, function(fromIndex,toIndex){
+    // 此回调函数可用于处理数据，也可以什么都不做
+    // 如果返回false 元素位置将不被调换
+});
+// 对已捕获的事件启用拖拽
+autodragchildren.hook(event, target/*用于向用户展示拖拽效果的元素*/,function (接收拖拽的元素/*此元素应具有 allowdrop 属性*/)  {
+});
+```
+更具体的用法可参考代码 [](https://github.com/yunxu1019/qfy/blob/master/page/home/edit.js)

package/coms/zimoli/checkbox.js

@@ -20,7 +20,7 @@ function main(elem = document.createElement("checkbox-group")) {
             options,
             select(a) {
                 a.checked = !a.checked;
-                elem.value = this.options.filter(a => !!a.checked);
+                elem.checked = elem.value = this.options.filter(a => !!a.checked);
                 buildValue(elem.value, this.options);
                 dispatch(elem, 'change');
             }

package/coms/zimoli/cross.md

@@ -0,0 +1,25 @@
+网络请求工具
+```javascript
+    var xhr = await cross(请求方法,请求路径,头信息).send(数据);
+    console.log(xhr.response) // 已对不存在response属性的浏览器做兼容，可放心使用
+```
+默认会通过当前服务器转发请求，请求结果会附加跨域头信息，可以通过`cross.addDirect`指定免转发的服务器
+如：
+```javascript
+    cross.addDirect('efront.cc');
+    或:
+    cross.addDirect(/efront\.cc$/);
+```
+对于无服务器项目或不使用efront做为服务器的项目，也可以通过`cross.setHost`指定用以转发的服务器，如：
+```javascript
+    cross.setHost('efront.cc');
+```
+可以用efront的编译开关区分生成环境和测试环境，如:
+```javascript
+    cross.setHost('efront.cc');
+    // <!--
+    // 这里的代码会在live命令中生效
+    // 会在build命令中移除
+    cross.setHost('localhost');
+    // -->
+```

package/coms/zimoli/grid.js

@@ -308,6 +308,7 @@ function grid(breakpoints) {
 }
 class Point extends Array {
     constructor(value, range) {
+        super();
         var solid = false;
         if (isObject(value)) {
             this.value = value.value;

package/coms/zimoli/inertia.md

@@ -0,0 +1,13 @@
+非线性减速插值工具，可用于用户的滚动或拖动操作平滑停止
+```javascript
+    var f = inertia(function(a){
+        // 一个参数或多个参数，都应为有限的数值，未对其他情况进行测试或排错
+        console.log(a);
+    });
+    f(2);
+    await new Promise(ok=>setTimeout(ok,20));
+    f(2);
+    f.smooth(function(){
+        // 结束时的回调，可不传入
+    }, 最小可用速度/*高维空间中参数向量的模，可不传入*/);
+```

package/coms/zimoli/lattice.md

@@ -0,0 +1,5 @@
+网格排列工具，每行元素最好有一样的高度，超出宽度后自动换行，其行为类似windows操作系统的文件管理窗口
+```html
+    <!-- 用法与list组件一致，增加一个 item-width 属性，可不设置 -->
+    <lattice efront-src="item in items" item-width=280 ></lattice>
+```

package/coms/zimoli/list.js

@@ -390,7 +390,7 @@ function ylist(container, generator, $Y) {
         }
         if (absy <= 1) y = target_y;
         else {
-            var speed = Math.abs(spd.read()[0]);
+            var speed = spd.read().rate;
             if (speed < 1) speed = 1;
             if (absy < 3) speed = .5;
             y = last_y + (target_y > last_y ? speed : -speed);

package/coms/zimoli/list.md

@@ -0,0 +1,10 @@
+列表工具，比ng-repeat或v-for的优势在于，它内置了大数据量的高效展示算法。
+```html
+    <!-- 语法与 ng-repeat 或 v-for 类似，前缀随意 -->
+    <list efront-src="item in items" >
+        <div>
+            <span -bind="item.name"></span>
+            <span -bind="item.silasiladi"></span>
+        </div>
+    </list>
+```

package/coms/zimoli/maps.md

@@ -0,0 +1 @@
+一个地图展示的小工具，目前只有展示瓦片地图（OSM、百度、高德、谷歌等）的功能，无任何其他附加功能。如果您在开发地图类应用，建议使用`openlayers`等已基本成熟的地图框架，不要使用这个可能在未来大修大补的模块。

package/coms/zimoli/menuItem.html

@@ -1,14 +1,17 @@
-<template -if='useIcon?||hasIcon?||icon?'>
-    <i -class="icon?" -style="{color:color?}"></i>
-    <template -if="name?">
+<template -if='hasIcon?'>
+    <i -class="icon?" -style="{color:menu.color}"></i>
+    <template -if="menu.name">
         &nbsp;&nbsp;
     </template>
 </template>
-<span -html="name?" -style="{color:color?}"></span>
-<template -if="typeof hotkey==='string'">
+<span -html="menu.name" -style="{color:menu.color}"></span>
+<template -if="typeof menu.hotkey==='string'">
     &nbsp;&nbsp; <span class="hotkey" -html="hotkey"></span>
 </template>
-<template -elseif="hotkey?.length">
-    &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>
+<template -elseif="menu.hotkey?.length">
+    &nbsp;&nbsp; <span ng-repeat="k of menu.hotkey" class="hotkey" ng-html="k"></span>
+</template>
+<template -if="menu.isChecked?menu.isChecked():''">
+    &nbsp;&nbsp;✓
 </template>
 <s></s>

package/coms/zimoli/menuItem.js

@@ -7,16 +7,21 @@ function main(elem, scope, hasIcon) {
     else if (item.$scope) {
         var scope = item.$scope;
     }
-    if (scope.menu || scope.$item) scope = scope.menu || scope.$item;
-    if (hasIcon === undefined) hasIcon = !!scope.icon;
-    if (scope.disabled || scope.enabled === false) {
+    var menu = scope;
+    if (menu.menu || menu.$item) menu = menu.menu || menu.$item;
+    if (menu.disabled || menu.enabled === false) {
         item.setAttribute('disabled', '');
     }
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon }]);
-    if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
+    scope = {
+        menu,
+        checker,
+    };
+    if (hasIcon) scope.hasIcon = true;
+    render(item.children, scope);
+    if (menu.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;
 }
 main.template = menuItem;

package/coms/zimoli/option.less

@@ -4,7 +4,7 @@
     top: 0;
     left: 0;
     bottom: 0;
-    padding: 0 !important;
+    padding: 0;
     color: #333;
     right: 0;
     display: block;