From f99c2d34db4b05df38371fca1f706924b315b2f0 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 18 Apr 2022 13:18:32 +0800 Subject: [PATCH] opt some --- frame.js | 4 +++- lib/page.js | 3 ++- lib/user.js | 3 ++- plugin/input.js | 2 +- plugin/local/code/inner.js | 7 +++++-- plugin/state.js | 10 +++++++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/frame.js b/frame.js index 7b60b764..4ed524cd 100644 --- a/frame.js +++ b/frame.js @@ -394,7 +394,9 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, function run(cmds) { var msg = can.sup.request(event, line, can.Option()) return can.run(event, cmds, function(msg) { if (can.core.CallFunc([can.sup, chat.ONIMPORT, ice.MSG_PROCESS], {can: can.sup, msg: msg})) { return } - if (msg.Result().length > 0 || msg.Length() > 0) { + if (msg.Option(ice.MSG_DISPLAY) != "") { + can.onappend._output(can.sup, msg, msg.Option(ice.MSG_DISPLAY)) + } else if (msg.Result().length > 0 || msg.Length() > 0) { can.onappend.table(can, msg) can.onappend.board(can, msg) } else { diff --git a/lib/page.js b/lib/page.js index 1d8028b7..1bb854fb 100644 --- a/lib/page.js +++ b/lib/page.js @@ -166,7 +166,8 @@ Volcanos("page", {help: "用户界面", ClassList: { // 语言转换 if (type == html.INPUT) { data.type == html.BUTTON && (data.value = can.user.trans(can, data.value)) if (data.type == html.TEXT||data.type == html.PASSWORD||!data.type) { data.autocomplete = data.autocomplete||"off" - data.placeholder = can.user.trans(can, (data.placeholder||data.name||"").split(ice.PT).pop()) + // data.placeholder = can.user.trans(can, (data.placeholder||data.name||"").split(ice.PT).pop()) + data.placeholder = (data.placeholder||data.name||"").split(ice.PT).pop() data.title = can.user.trans(can, data.title||data.placeholder) } } diff --git a/lib/user.js b/lib/user.js index fd83ae93..3863ded3 100644 --- a/lib/user.js +++ b/lib/user.js @@ -255,7 +255,8 @@ Volcanos("user", {help: "用户操作", agent: { can.onappend.figure(can, item, target) } - return {type: html.TR, list: [{type: html.TD, list: [{text: item._trans||can.user.trans(can, item.name)||""}]}, {type: html.TD, list: [can.page.input(can, item)]} ]} + // return {type: html.TR, list: [{type: html.TD, list: [{text: item._trans||can.user.trans(can, item.name)||""}]}, {type: html.TD, list: [can.page.input(can, item)]} ]} + return {type: html.TR, list: [{type: html.TD, list: [{text: item.name||""}]}, {type: html.TD, list: [can.page.input(can, item)]} ]} })}, {view: chat.ACTION}, ]}]) diff --git a/plugin/input.js b/plugin/input.js index 38d88cb5..64bb2b8a 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -5,7 +5,7 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, meta, } }, run: function(event, can) { can.run(event) }, - list: function(event, can) { can.run(event) }, + list: function(event, can) { can.sup.Conf("mode") != "simple" && can.run(event) }, back: function(event, can) { can.sup.onimport._back(can.sup) }, refresh: function(event, can) { can.run(event) }, diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 955f9f99..9d7fc4cf 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -2,6 +2,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.onengine.plugin(can, "can.code.inner.plugin", shy("插件", {}, [ice.LIST, ice.BACK], function(msg, cmds) { console.log("what") })) + can.Conf(can._args) can.onengine.plugin(can, "can.code.inner.keymap", shy("按键", {}, ["mode", "key", ice.LIST, ice.BACK], function(msg, cmds) { can.core.Item(can.onkeymap._mode, function(mode, value) { @@ -43,22 +44,23 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.ui._path = can.page.insertBefore(can, [{view: "path"}], can.ui.content) can.base.isFunc(cb) && cb(msg) - can.onimport.tabview(can, can.Option(nfs.PATH), can.Option(nfs.FILE), can.Option(nfs.LINE)) can.Conf("mode") == "simple"? can.onimport._simple(can): can.onimport.project(can, paths, function() { can.onimport._toolkit(can, can.ui.toolkit), can.onimport._session(can, msg), can.onimport._keydown(can) can.onmotion.delay(can, function() { can.core.Next(files.slice(1), function(file, next) { can.onimport.tabview(can, can.Option(nfs.PATH), file, can.Option(nfs.LINE), next) - // }, function() { can.onimport.tabview(can, paths[0], files[0]) }) }) }) }) + can.onimport.tabview(can, can.Option(nfs.PATH), can.Option(nfs.FILE), can.Option(nfs.LINE)) can.user.isMobile && !can.user.isLandscape() && can.onmotion.hidden(can, can.ui.project) }, _simple: function(can, target) { + can.tabview[can.onexport.keys(can)] = can._msg can.Conf(html.HEIGHT, ""), can.ui.project._toggle() can.page.ClassList.add(can, can._fields, chat.OUTPUT) can.page.ClassList.add(can, can._fields, "simple") + can.onmotion.hidden(can, can.ui._tabs) }, _project: function(can, target) { target._toggle = function(event) { can.onmotion.toggle(can, target), can.onimport.layout(can) } @@ -258,6 +260,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.page.styleWidth(can, can.ui.content, width-can.ui.project.offsetWidth-can.ui.profile.offsetWidth) can.page.styleWidth(can, can.ui.display, width-can.ui.project.offsetWidth) + if (!height && can.Conf("mode") == "simple") { return } var height = can.ConfHeight()-(can.user.isMobile && can.user.mod.isCmd? (can.user.isLandscape()? 14: 54): 0)-(can.user.isWindows? 20: 0) if (!height || height > window.innerHeight) { height = window.innerHeight - 200 } if (can.user.isMobile && can.user.isLandscape() && height < 200) { height = 400 } diff --git a/plugin/state.js b/plugin/state.js index 71005667..d9111948 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -32,7 +32,15 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, return true }, _field: function(can, msg) { - msg.Table(function(item) { can.onappend._plugin(can, item, {arg: can.base.Obj(item[ice.ARG], [])}, function(sub, meta) { + msg.Table(function(item) { item.type = chat.STORY, can.onappend._plugin(can, item, {type: chat.STORY, arg: can.base.Obj(item[ice.ARG], [])}, function(sub, meta) { + sub.Conf(can.base.Obj(item.conf)) + if (sub.Conf("mode") == "simple") { + var msg = can.request() + msg.Echo(sub.Conf("result")) + sub.Conf(html.HEIGHT, can.Conf(html.HEIGHT)/2) + can.onappend._output(sub, msg, msg.Option(ice.MSG_DISPLAY)||sub.Conf("feature.display")||"/plugin/table.js") + return + } var opt = can.base.Obj(item[ice.OPT], []) sub.Conf(html.HEIGHT, can.Conf(html.HEIGHT)) sub.Conf(html.WIDTH, can.Conf(html.WIDTH)-4*html.PLUGIN_MARGIN)