diff --git a/const.js b/const.js index 153e09be..2e2f3dca 100644 --- a/const.js +++ b/const.js @@ -217,6 +217,7 @@ var code = { WEBPACK: "webpack", BINPACK: "binpack", AUTOGEN: "autogen", COMPILE: "compile", PUBLISH: "publish", UPGRADE: "upgrade", TEMPLATE: "template", COMPLETE: "complete", NAVIGATE: "navigate", CURRENT: "current", PULL: "pull", PUSH: "push", + INSTALL: "install", COMMENT: "comment", KEYWORD: "keyword", DATATYPE: "datatype", PACKAGE: "package", FUNCTION: "function", CONSTANT: "constant", STRING: "string", NUMBER: "number", BOOLEAN: "boolean", OBJECT: "object", ARRAY: "array", UNDEFINED: "undefined", diff --git a/index.css b/index.css index 3b4d8afb..eea2afb3 100644 --- a/index.css +++ b/index.css @@ -66,11 +66,14 @@ body { font-family:var(--body-font-family); } body { background-color:var(--body-bg-color); color:var(--body-fg-color); } body.cmd { background-color:var(--plugin-bg-color); } body.windows { --code-font-family:"Courier New"; } -body.mobile { --qrcode-height:284px; --svg-font-size:13px; } +body.mobile { + --qrcode-height:284px; --svg-font-size:13px; + --footer-height:60px; +} body.width1 { /* 320-640 手机竖屏 */ --river-width:280px; --project-width:120px; --input-width:80px; --river-margin:0; --plugin-margin:0; --button-margin:5px; - --footer-height:60px; --table-button:2; + --table-button:2; } body.width2 { /* 640-960 手机横屏 平板竖屏 笔记本调试 */ --input-width:80px; diff --git a/plugin/input/key.js b/plugin/input/key.js index 4489518f..a24e7ad4 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -18,7 +18,7 @@ Volcanos(chat.ONFIGURE, {key: { }} }), can.onappend._status(can, [mdb.TOTAL, mdb.INDEX]), can.Status(mdb.TOTAL, msg.Length()), can.Status("index", "-1") can.onmotion.toggle(can, can._status, msg.Length() > 5), can.onmotion.toggle(can, can._target, can.Status("total") > 0) - can.core.CallFunc(can.oninputs._show, {event: event, can: can, msg: msg, target: target, name: name}) + can.core.CallFunc([can.oninputs, "_show"], {event: event, can: can, msg: msg, target: target, name: name}) can.page.style(can, can._output, html.MAX_HEIGHT, can.page.height()/2, html.MIN_WIDTH, target.offsetWidth, html.MAX_WIDTH, can.Conf("style.width")||can.page.width()/2) msg.append.length == 1 && can.page.ClassList.add(can, can._target, chat.SIMPLE) can.onlayout.figure({target: target}, can, can._target, false, 200) diff --git a/plugin/table.js b/plugin/table.js index b057e314..a97b2683 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -10,9 +10,11 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { }, card: function(can, msg, target) { can.sup.onexport.outputMargin = function() { return 200 } can.page.Appends(can, target||can.ui.content||can._output, msg.Table(function(value) { value.icon = value.icon||value.image + var img = can.misc.Resource(can, value.icon, value.type == web.MASTER? "": value.name) + if (img.indexOf("/require/") == 0 && value.origin) { img = value.origin + img } return {view: [[html.ITEM, value.type, value.status]], list: [ {view: [wiki.TITLE, html.DIV], list: [ - value.icon && {img: can.misc.Resource(can, value.icon, value.type == web.MASTER? "": value.name)}, + value.icon && {img: img}, {view: wiki.TITLE, list: [{text: value.name}, can.onappend.label(can, value)]}, ]}, {view: [wiki.CONTENT, html.DIV, value.text]},