diff --git a/page/index.js b/page/index.js index 2c3c0a7e..11a5adfb 100644 --- a/page/index.js +++ b/page/index.js @@ -18,5 +18,6 @@ Volcanos({name: "chat", iceberg: "/chat/", volcano: "/frame.js", "/plugin/local/wiki/word.js", "/plugin/local/code/vimer.js", "/plugin/local/code/inner.js", + "/plugin/local/wiki/draw/path.js" ], }) diff --git a/panel/Header.js b/panel/Header.js index e3d78f51..1dc04927 100644 --- a/panel/Header.js +++ b/panel/Header.js @@ -10,6 +10,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, "clear": "清除背景", "pack": "打包页面", + "shareuser": "共享用户", "usernick": "修改昵称", "logout": "退出登录", } @@ -178,7 +179,8 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, if (can.user.confirm("auth "+can.user.Search(can, "auth"))) { can.run(event, ["action", "auth", "space", can.user.Search(can, "auth")]) } - debugger + can.user.Search(can, "auth", "") + return } msg.Result()? init(): msg.Option("sso")? can.user.jumps(msg.Option("sso")): can.user.login(can, init) }) @@ -191,7 +193,10 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, can.user.jumps(can.user.MergeURL(can, args, true)) }, username: function(event, can) { - can.onaction.carte(event, can, ["usernick", "logout"]) + can.onaction.carte(event, can, ["shareuser", "usernick", "logout"]) + }, + shareuser: function(event, can) { + can.user.share(can, can.request(event), ["action", "share", "type", "login"]) }, usernick: function(event, can) { can.user.input(event, can, [{_input: "text", name: "usernick", value: can.Conf("username")}], function(ev, button, data, list, args) { diff --git a/panel/River.js b/panel/River.js index 72e902c4..5e83917d 100644 --- a/panel/River.js +++ b/panel/River.js @@ -50,7 +50,7 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, msg, can.run({}, ["search", "Header.onimport.menu", "river", ["添加", "创建群组", "添加应用", "添加工具", "添加用户", "添加设备", "创建空间"], !can.user.isMobile && ["访问", "内部系统", "访问应用", "访问工具", "访问用户", "访问设备", "工作任务"], - ["共享", "共享群组", "共享应用", "共享工具", "共享用户", "共享设备"], + ["共享", "共享群组", "共享应用", "共享工具", "共享设备"], ], function(event, item) { can.core.CallFunc([can.ondetail, item], [event, can, item, can.Conf("river"), can.Conf("storm")]) }) @@ -233,13 +233,6 @@ Volcanos("ondetail", {help: "菜单交互", list: ["共享群组", "添加用户 can.user.select(event, can, "task", "time,zone,id,type,name,text") }, - "共享用户": function(event, can, button, river, storm) { - can.user.input(event, can, [ - {_input: "text", name: "name", value: river}, - ], function(event, button, meta, list) { - can.user.share(can, can.request(event), [river, "action", "share", "type", "login"]) - }) - }, "共享设备": function(event, can, button, river, storm) { can.run(event, ["action", "invite"], function(msg) { var toast = can.user.toast(can, { diff --git a/plugin/state.js b/plugin/state.js index 494da1be..2705640a 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -62,7 +62,14 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, scanQRCode: function(event, can, cmd) { can.user.agent.scanQRCode(function(text) { var cmds = ["action", cmd] - can.core.Item(can.base.parseJSON(text), function(key, value) { cmds.push(key, value) }) + var data = can.base.parseJSON(text) + can.core.Item(data, function(key, value) { cmds.push(key, value) }) + if (data["auth"]) { + if (can.user.confirm("auth "+data["auth"])) { + can.run(event, ["action", "auth", "space", data["auth"]]) + } + return + } can.run(event, cmds, function(msg) { can.user.toast(can, "添加成功"), can.run() }, true) }, can) },