diff --git a/pane/Action.js b/pane/Action.js index 716db146..357bc829 100644 --- a/pane/Action.js +++ b/pane/Action.js @@ -84,7 +84,8 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg, msg.Clear("option"), can.run(msg._event, [river, storm], function(sup) { can._output.innerHTML = "" can.core.Next(sup.Table(), function(value, next) { - value.inputs = can.base.Obj(value.inputs||"[]", []) + value.feature = can.base.Obj(value.feature||value.meta||"{}", []) + value.inputs = can.base.Obj(value.inputs||value.list||"[]", []) value.height = can._target.offsetHeight value.width = can._target.offsetWidth diff --git a/pane/River.js b/pane/River.js index 7d7baae9..7c4e39f9 100644 --- a/pane/River.js +++ b/pane/River.js @@ -42,7 +42,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, }), can.page.ClassList.add(can, event.target, "select") }, oncontextmenu: function(event) { // 右键点击 - can.user.carte(can, {}, ["添加工具", "重命名", "保存", "删除应用"], function(ev, item, meta) { + can.user.carte(can, {}, ["添加工具", "重命名", "保存参数", "删除应用"], function(ev, item, meta) { switch (item) { case "重命名": can.user.input(event, can, ["name"], function(event, button, meta, list) { @@ -53,17 +53,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, return true }) break - case "保存": - var list = can.page.Select(can, document.body, "fieldset.Action>div.output>fieldset.plugin>form.option", function(item) { - return JSON.stringify(can.page.Select(can, item, 'input[type="text"],select', function(item) { - return item.value||"" - })) - }) - - can.run(event, [can.Conf(RIVER), storm.hash, STORM, "action", "save"].concat(list), function(msg) { - can.user.toast(can, "保存成功", STORM) - }) - break default: can.ondetail[item](event, can, item, storm) } @@ -108,6 +97,20 @@ Volcanos("ondetail", {help: "菜单交互", list: ["添加应用", "添加设备 }) }) }, + "保存参数": function(event, can, button, storm) { + var list = can.page.Select(can, document.body, "fieldset.Action>div.output>fieldset.plugin>form.option", function(item) { + return JSON.stringify(can.page.Select(can, item, 'args', function(item) { + return item.value||"" + })) + can.run(event, [can.Conf(RIVER), "tool", "action", "modify", storm.hash, STORM].concat(list), function(msg) { + can.user.toast(can, "保存成功", STORM) + }) + }) + + can.run(event, [can.Conf(RIVER), storm.hash, STORM, "action", "save"].concat(list), function(msg) { + can.user.toast(can, "保存成功", STORM) + }) + }, "删除应用": function(event, can, button, storm) { var msg = can.request(event); msg.Option("hash", storm.hash) can.run(event, [can.Conf(RIVER), "tool", "action", "remove"], function(msg) {