x/volcanos
1
0
Fork 1
mirror of https://shylinux.com/x/volcanos synced 2025-04-26 01:04:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt arg

Browse Source
This commit is contained in:
shaoying 2019-12-25 22:03:00 +08:00
parent ed7e31e2a1
commit 93ca4afb46
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/misc.js
View File

@ -40,9 +40,9 @@ Volcanos("misc", {help: "工具模块",
msg.option && msg.option.forEach(function(item) { msg.option && msg.option.forEach(function(item) {
msg[item] && (option[item] = msg[item]) msg[item] && (option[item] = msg[item])
}) })
for (var k in dataset) { // for (var k in dataset) {
option[k] = dataset[k].toLowerCase().split(",") // option[k] = dataset[k].toLowerCase().split(",")
} // }
var what = ++arguments.callee.meta.order var what = ++arguments.callee.meta.order
@ -56,17 +56,10 @@ Volcanos("misc", {help: "工具模块",
// kit.Log(msg.detail.concat([msg])) // kit.Log(msg.detail.concat([msg]))
// kit.History("run", -1, option) // kit.History("run", -1, option)
if (can.user.Search(can, "feature") == "ice") { this.POST(can, msg, can.Conf("context")+dataset.names.toLowerCase(), option, function(msg) {
this.POST(can, msg, can.Conf("context")+msg.Option("names"), option, function(msg) {
// kit.Log("run", what, "result", msg.result? msg.result[0]: "", msg) // kit.Log("run", what, "result", msg.result? msg.result[0]: "", msg)
typeof cb == "function" && cb(msg) typeof cb == "function" && cb(msg)
}), delete(event.msg) }), delete(event.msg)
} else {
this.POST(can, msg, can.Conf("context"), option, function(msg) {
// kit.Log("run", what, "result", msg.result? msg.result[0]: "", msg)
typeof cb == "function" && cb(msg)
}), delete(event.msg)
}
}), }),
}) })

2
lib/page.js
View File

@ -174,7 +174,7 @@ Volcanos("page", {help: "网页模块",
}) })
}), }),
AppendField: shy("添加插件", function(can, target, type, item) { AppendField: shy("添加插件", function(can, target, type, item) {
var dataset = {}; item && item.name && (dataset.names = item.name); item && item.group && (dataset.group = item.group); var dataset = {}; item && item.name && (dataset.names = item.name);
var field = can.page.Append(can, target, [{view: [type, "fieldset"], list: [ var field = can.page.Append(can, target, [{view: [type, "fieldset"], list: [
item.pos? undefined: {text: [(item.nick||item.name||"")+"("+(item.help||"")+")", "legend"]}, item.pos? undefined: {text: [(item.nick||item.name||"")+"("+(item.help||"")+")", "legend"]},
{view: ["option", "form"], dataset: dataset, list: [{type: "input", style: {display: "none"}}]}, {view: ["option", "form"], dataset: dataset, list: [{type: "input", style: {display: "none"}}]},

18
pane/Login.js
View File

@ -7,7 +7,6 @@ Volcanos("onimport", {help: "导入数据", list: [],
if (!ui.username.value) {ui.username.focus(); return} if (!ui.username.value) {ui.username.focus(); return}
if (!ui.password.value) {ui.password.focus(); return} if (!ui.password.value) {ui.password.focus(); return}
if (can.user.Search(can, "feature") == "ice") {
can.run(event, ["login", ui.username.value, ui.password.value], function(msg) { can.run(event, ["login", ui.username.value, ui.password.value], function(msg) {
if (msg.result && msg.result.length > 0) { if (msg.result && msg.result.length > 0) {
can.Hide(), can.Export(event, "", "login") can.Hide(), can.Export(event, "", "login")
@ -15,15 +14,6 @@ if (can.user.Search(can, "feature") == "ice") {
can.user.toast("用户或密码错误") can.user.toast("用户或密码错误")
} }
}) })
} else {
can.run(event, [ui.username.value, ui.password.value], function(msg) {
if (msg.result && msg.result.length > 0) {
can.Hide(), can.Export(event, "", "login")
} else {
can.user.toast("用户或密码错误")
}
})
}
event.stopPropagation() event.stopPropagation()
event.preventDefault() event.preventDefault()
return true return true
@ -32,17 +22,9 @@ if (can.user.Search(can, "feature") == "ice") {
}, },
login: function(event, can, value, cmd, output) { login: function(event, can, value, cmd, output) {
if (!can.user.Cookie("sessid")) {can.Show(event, 400, 400); return} if (!can.user.Cookie("sessid")) {can.Show(event, 400, 400); return}
if (can.user.Search(can, "feature") == "ice") {
can.run(event||{}, ["check"], function(msg) {var user = msg.Result() can.run(event||{}, ["check"], function(msg) {var user = msg.Result()
user? can.Export(event, user, "username"): can.Show(event, -1, -1) user? can.Export(event, user, "username"): can.Show(event, -1, -1)
}) })
} else {
can.run(event||{}, [], function(msg) {
msg.nickname && msg.nickname.length > 0?
can.Export(event, msg.nickname[0], "username"): can.Show(event, -1, -1)
})
}
}, },
}) })
Volcanos("onaction", {help: "组件交互", list: []}) Volcanos("onaction", {help: "组件交互", list: []})