From ec2c27030154a959f15e1d0d6176dd743f068942 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 22 Jan 2024 11:03:51 +0800 Subject: [PATCH] add some --- base/web/dream.go | 3 --- core/chat/script.go | 9 +++++---- core/chat/script.js | 6 ++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 28f53336..7ac630df 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -23,9 +23,6 @@ import ( ) func _dream_list(m *ice.Message) *ice.Message { - if ice.Info.NodeType == WORKER { - return m - } list := m.CmdMap(SPACE, mdb.NAME) mdb.HashSelect(m).Table(func(value ice.Maps) { if space, ok := list[value[mdb.NAME]]; ok { diff --git a/core/chat/script.go b/core/chat/script.go index 523cd63c..e76d7869 100644 --- a/core/chat/script.go +++ b/core/chat/script.go @@ -4,19 +4,20 @@ import ( ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/cli" "shylinux.com/x/icebergs/base/mdb" + "shylinux.com/x/icebergs/base/web" ) const SCRIPT = "script" func init() { Index.MergeCommands(ice.Commands{ - SCRIPT: {Name: "script zone id auto", Help: "脚本化", Icon: "script.png", Actions: ice.MergeActions(ice.Actions{ - mdb.INSERT: {Name: "insert zone space index"}, - }, mdb.ImportantZoneAction(mdb.FIELDS, "time,id,space,index,play,status,style"), mdb.ExportZoneAction()), Hand: func(m *ice.Message, arg ...string) { + SCRIPT: {Name: "script zone id auto", Help: "脚本化", Icon: "script.png", Actions: ice.MergeActions( + mdb.ImportantZoneAction(mdb.FIELDS, "time,id,space,index,play,status,style"), mdb.ExportZoneAction(), + ), Hand: func(m *ice.Message, arg ...string) { if mdb.ZoneSelect(m.Options(mdb.CACHE_LIMIT, "30"), arg...).Display(""); len(arg) == 0 { m.PushAction(cli.RECORD, mdb.REMOVE).Action(mdb.CREATE, cli.STOP) } else { - m.Sort(mdb.ID, ice.INT).PushAction("preview").Action(mdb.INSERT, cli.PLAY) + m.Sort(mdb.ID, ice.INT).PushAction(web.PREVIEW).Action(mdb.INSERT, cli.PLAY) } }}, }) diff --git a/core/chat/script.js b/core/chat/script.js index 6eeec5b3..19d3f268 100644 --- a/core/chat/script.js +++ b/core/chat/script.js @@ -9,15 +9,13 @@ Volcanos(chat.ONIMPORT, { }) Volcanos(chat.ONACTION, { record: function(event, can, msg) { can.misc.sessionStorage(can, SCRIPT_ZONE, msg.Option(mdb.ZONE)), can.user.toastSuccess(can, msg.Option(mdb.ZONE)), can.Update(event) }, - enable: function(event, can, msg) { can.runAction(event, mdb.MODIFY, [mdb.STATUS, mdb.ENABLE]) }, - disable: function(event, can, msg) { can.runAction(event, mdb.MODIFY, [mdb.STATUS, mdb.DISABLE]) }, 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) { - can.Status(cli.STEP, index), can.Status(cli.COST, can.base.Duration((new Date().getTime()-begin))) + can.Status(cli.STEP, index), can.Status(cli.COST, can.base.Duration(new Date().getTime()-begin)) 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) value.status == mdb.DISABLE? next(): can.onaction.preview({}, can, can.request({}, value), next) - }, function(list) { can.Status(cli.STEP, list.length), can.Status(cli.COST, can.base.Duration((new Date().getTime()-begin))), can.user.toastSuccess(can) }) }, + }, function(list) { can.Status(cli.STEP, list.length), can.Status(cli.COST, can.base.Duration(new Date().getTime()-begin)), can.user.toastSuccess(can) }) }, preview: function(event, can, msg, next) { can.onappend.plugin(can, {space: msg.Option(web.SPACE), index: msg.Option(ctx.INDEX), style: msg.Option(ctx.STYLE)}, function(sub) { var done = false function action(skip) { sub.Update(sub.request({}, {_handle: ice.TRUE}), [ctx.ACTION, msg.Option(cli.PLAY)], function(msg) {