diff --git a/lib/page.js b/lib/page.js index 38bbc97d..7a0ad89e 100644 --- a/lib/page.js +++ b/lib/page.js @@ -144,13 +144,15 @@ Volcanos("page", {help: "用户界面", ClassList: { item.list = item.td.map(function(text) { return {text: [text, "td"]} }) } - if (type == "input") { - data.type == "button" && (data.value = can.user.trans(can, data.value)) + if (type == "input") { data.type == "button" && (data.value = can.user.trans(can, data.value)) if (data.type == "text" || data.type == "password" || !data.type) { data.autocomplete = data.autocomplete||"off" data.placeholder = can.user.trans(can, (data.placeholder||data.name||"").split(".").pop()) data.title = can.user.trans(can, data.title||data.placeholder) } } + if (type == "textarea") { + data.placeholder = can.user.trans(can, (data.placeholder||data.name||"").split(".").pop()) + } // 创建节点 !data.name && item.name && (data.name = item.name) diff --git a/panel/action.js b/panel/action.js index 51867907..9364571f 100644 --- a/panel/action.js +++ b/panel/action.js @@ -41,8 +41,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) } can._menu && can.page.Remove(can, can._menu) can._menu = can.search({}, ["Header.onimport.menu", can._ACTION, - ["布局", "默认布局", "流动布局", "网格布局", "标签布局", "自由布局"], - ["help", "tutor", "manual", "program", "refer"], + // ["布局", "默认布局", "流动布局", "网格布局", "标签布局", "自由布局"], + ["help", "tutor", "manual", "service", "devops", "refer"], ], function(event, button, list) { if (list[0] == "help") { can.user.open("/chat/cmd/src/help/"+button+".shy") diff --git a/panel/header.js b/panel/header.js index 32fbaeae..7082b34a 100644 --- a/panel/header.js +++ b/panel/header.js @@ -158,10 +158,11 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, meta, "river": "菜单", "search": "搜索", - "help": "文档", + "help": "帮助", "tutor": "入门简介", "manual": "使用手册", - "program": "编程手册", + "service": "服务手册", + "devops": "编程手册", "refer": "参考手册", "setting": "设置", diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 81ed8ff3..34f1d459 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -47,6 +47,9 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, item.onclick = function(event) { target.scrollIntoView() } }) }, + title: function(can, data, target) { + can.user.isCmd && can.user.title(data.text) + }, spark: function(can, data, target) { if (data["name"] == "inner") { target.title = "点击复制", target.onclick = function(event) { diff --git a/plugin/story/trend.js b/plugin/story/trend.js index 6928201b..f8812233 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -44,7 +44,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.Status({"from": begin, "commit": count, "total": add+del, "max": max}) }, }) -Volcanos("onaction", {help: "组件菜单", list: ["编辑", ["view", "趋势图", "柱状图", "数据源"], ["height", "100", "200", "400", "600"], ["speed", "10", "20", "50", "100"]], +Volcanos("onaction", {help: "组件菜单", list: ["编辑", ["view", "趋势图", "柱状图", "数据源"], ["height", "100", "200", "400", "600", "800"], ["speed", "10", "20", "50", "100"]], "编辑": function(event, can) { can.onmotion.toggle(can, can.draw._action) can.onmotion.toggle(can, can.draw._status)