diff --git a/base/web/option.go b/base/web/option.go index 3e22f2ed..cd47f37f 100644 --- a/base/web/option.go +++ b/base/web/option.go @@ -111,7 +111,9 @@ func Toast(m *ice.Message, text string, arg ...ice.Any) *ice.Message { // [title } } kit.If(len(arg) == 0, func() { arg = append(arg, m.PrefixKey()) }) - kit.If(len(arg) > 0 && arg[0] == "", func() { arg[0] = kit.Keys(m.Option(ice.MSG_USERPOD), ctx.ShortCmd(m.PrefixKey())) }) + kit.If(len(arg) > 0 && arg[0] == "", func() { + arg[0] = kit.Keys(m.Option(ice.MSG_USERPOD0), m.Option(ice.MSG_USERPOD), ctx.ShortCmd(m.PrefixKey())) + }) PushNoticeToast(m, text, arg) return m } diff --git a/base/web/route.go b/base/web/route.go index f666a1df..4a3ad9d0 100644 --- a/base/web/route.go +++ b/base/web/route.go @@ -85,6 +85,7 @@ func init() { }}, cli.BUILD: {Name: "build space", Help: "构建", Hand: func(m *ice.Message, arg ...string) { _route_toast(m, m.Option(SPACE), cli.RUNTIME, UPGRADE) + m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD0), m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey())) func() { defer ToastProcess(m)(); m.Sleep3s() }() m.SetAppend().Cmdy("", "travel") }}, diff --git a/core/chat/script.js b/core/chat/script.js index efece055..49f33d16 100644 --- a/core/chat/script.js +++ b/core/chat/script.js @@ -12,12 +12,12 @@ Volcanos(chat.ONACTION, { stop: function(event, can, msg) { can.misc.sessionStorage(can, SCRIPT_ZONE, ""), can.Update(event) }, play: function(event, can) { var begin = new Date().getTime(); can.core.Next(can._msg.Table(), function(value, next, index, list, data) { var ls = can.core.Split(value.style||""); data = data||{}, data.list = data.list||[]; var fork - if (ls && ls.length > 0 && ls[0] == "fork") { data.done = parseInt(ls[1])+1, fork = {skip: parseInt(ls[1])} } - if (!fork && data.skip > 0) { return next({skip: data.skip-1}) } + if (data.skip > 0) { return next({skip: data.skip-1}) } if (data.done === 0) { return } if (data.done > 0) { data.done -= 1 } data.list.push(value) - can.Status(cli.STEP, index), can.Status(cli.COST, can.base.Duration(new Date().getTime()-begin)) + if (ls && ls.length > 0 && ls[0] == "fork") { data.done = parseInt(ls[1]), fork = {skip: parseInt(ls[1])} } can.user.toastProcess(can, `${can.core.Keys(value.space, value.index)} ${value.play} ${index}/${can._msg.Length()}`, "", index*100/list.length) var tr = can.page.Select(can, can._output, html.TR)[1]; can.onmotion.select(can, tr.parentNode, html.TR, index) + can.Status(cli.STEP, index), can.Status(cli.COST, can.base.Duration(new Date().getTime()-begin)) value.status == mdb.DISABLE? next(data): can.onaction.preview({}, can, can.request({}, value), next, data) if (fork) { next(fork) } }, function(list) { can.Status(cli.STEP, list.length), can.Status(cli.COST, can.base.Duration(new Date().getTime()-begin)), can.user.toastSuccess(can) }) },