From 39a5ce360e9cfb76cf77dc80d601b00930f99534 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 18 Oct 2024 14:08:56 +0800 Subject: [PATCH] add some --- base/web/dream.go | 18 ++++++++---------- base/web/space.go | 6 +++--- core/wiki/portal.css | 10 +++------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 74d4b67a..0b31078e 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -29,6 +29,7 @@ func _dream_list(m *ice.Message, simple bool) *ice.Message { return } if space, ok := list[value[mdb.NAME]]; ok { + value[ice.MAIN] = space[ice.MAIN] value[mdb.ICONS] = space[mdb.ICONS] m.Push("", value, kit.Slice(head, 0, -1)) if m.IsCliUA() || simple { @@ -83,6 +84,7 @@ func _dream_list_icon(m *ice.Message) { }) } func _dream_list_more(m *ice.Message, simple bool) *ice.Message { + field := kit.Split(mdb.Config(m, mdb.FIELD) + ",type,status,module,version,text") m.Cmds(SPACE).Table(func(value ice.Maps) { value[nfs.REPOS] = "https://" + value[nfs.MODULE] value[aaa.ACCESS] = kit.Select("", value[aaa.USERROLE], value[aaa.USERROLE] != aaa.VOID) @@ -113,7 +115,7 @@ func _dream_list_more(m *ice.Message, simple bool) *ice.Message { default: return } - m.Push("", value, kit.Split(mdb.Config(m, mdb.FIELD)+",type,status,module,version,text")) + m.Push("", value, field) }) return m } @@ -431,17 +433,13 @@ func init() { m.Cmd(CHAT_GRANT, aaa.CONFIRM, kit.Dict(SPACE, m.Option(mdb.NAME))) }}, OPEN: {Style: "notice", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { - if kit.IsIn(m.Option(mdb.NAME), - "20240724-community", - "20240724-education", - "20240724-enterprise", - "20240903-operation", - ) || kit.HasPrefixList(arg, ctx.RUN) { + if strings.HasSuffix(m.Option(ice.MAIN), ".portal") || kit.HasPrefixList(arg, ctx.RUN) { if !kit.HasPrefixList(arg, ctx.RUN) { defer m.Push(TITLE, m.Option(mdb.NAME)) - defer m.Push("_width", "390") - defer m.Push("_height", "844") defer m.Push("_icon", m.Option(mdb.ICON)) + defer m.Push("_style", "portal") + defer m.Push("_height", "844") + defer m.Push("_width", "390") } ctx.ProcessFloat(m, CHAT_IFRAME, S(m.Option(mdb.NAME)), arg...) } else if m.Option(mdb.TYPE) == ORIGIN { @@ -527,7 +525,7 @@ func init() { DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Cmd(cli.SYSTEM, cli.GO, "work", "use", path.Join(ice.USR_LOCAL_WORK, name)) }) }}, }, StatsAction(), DreamAction(), DreamTablesAction(), mdb.ImportantHashAction( - mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icons,repos,binary,template,restart,access", + mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,main,icons,repos,binary,template,restart,access", html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, STATUS, VIMER, COMPILE, XTERM, DREAM), ONLINE, ice.TRUE, )), Hand: func(m *ice.Message, arg ...string) { diff --git a/base/web/space.go b/base/web/space.go index 3d7e57bb..6fb7403c 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -32,7 +32,7 @@ func _space_dial(m *ice.Message, dev, name string, arg ...string) { msg := m.Cmd(SPIDE, dev) origin := msg.Append(CLIENT_ORIGIN) u := kit.ParseURL(kit.MergeURL2(strings.Replace(origin, HTTP, "ws", 1), PP(SPACE), mdb.TYPE, ice.Info.NodeType, mdb.NAME, name, TOKEN, msg.Append(TOKEN), mdb.ICONS, ice.Info.NodeIcon, - mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH, arg)) + ice.MAIN, ice.Info.NodeMain, mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH, arg)) args := kit.SimpleKV("type,name,host,port", u.Scheme, dev, u.Hostname(), kit.Select(kit.Select(tcp.PORT_443, tcp.PORT_80, u.Scheme == "ws"), u.Port())) gdb.Go(m, func() { once := sync.Once{} @@ -84,7 +84,7 @@ func _space_fork(m *ice.Message) { safe = aaa.IsTechOrRoot(m) } } - args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON)) + args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON, "main")) args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) args = append(args, cli.SYSTEM, m.Option(cli.GOOS)) args = append(args, ParseUA(m)...) @@ -410,7 +410,7 @@ func init() { }}, nfs.PS: {Hand: func(m *ice.Message, arg ...string) { _space_fork(m) }}, }, gdb.EventsAction(SPACE_LOGIN), mdb.HashAction(mdb.LIMIT, 1000, mdb.LEAST, 500, - mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,text,icons,module,version,agent,system,ip,usernick,username,userrole", + mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,text,main,icons,module,version,agent,system,ip,usernick,username,userrole", ctx.ACTION, OPEN, REDIAL, kit.Dict("a", 1000, "b", 100, "c", 1000), ), mdb.ClearOnExitHashAction()), Hand: func(m *ice.Message, arg ...string) { if len(arg) < 2 { diff --git a/core/wiki/portal.css b/core/wiki/portal.css index 63fa0c43..73754d0a 100644 --- a/core/wiki/portal.css +++ b/core/wiki/portal.css @@ -2,7 +2,7 @@ fieldset.web.wiki.portal { --portal-max-width:1200px; --portal-header-height:64p fieldset.web.wiki.portal.home { --portal-max-width:1500px; } fieldset.web.wiki.portal>div.header { display:none; } fieldset.web.wiki.portal>div.output { padding:0; } -fieldset.web.wiki.portal>div.output>div.header { background-color:rgb(22 31 49); height:var(--portal-header-height); --hover-bg-color:var(--plugin-bg-color); } +fieldset.web.wiki.portal>div.output>div.header { background-color:var(--panel-bg-color); height:var(--portal-header-height); --hover-bg-color:var(--plugin-bg-color); } fieldset.web.wiki.portal>div.output>div.header div.list { display:flex; } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] { --hover-fg-color:white; } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] { display:flex; justify-content:center; } @@ -33,15 +33,11 @@ fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column b { fon fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column input[type=button] { box-shadow:var(--th-box-shadow); border:0; background-color:var(--notice-bg-color); color:var(--notice-fg-color); } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column input[type=button]:hover { box-shadow:var(--notice-box-shadow); } fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset.desktop>legend { display:none; } -fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset.inner.output div.content { - padding:var(--input-padding) 0; -} +fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset.inner.output div.content { padding:var(--input-padding) 0; } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { box-shadow:var(--th-box-shadow); border:var(--box-border); border-left:var(--box-notice3); } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell]:hover { box-shadow:var(--notice-box-shadow); } -fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { - padding:var(--button-padding); margin-top:var(--button-margin); -} +fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { padding:var(--button-padding); margin-top:var(--button-margin); } fieldset.web.wiki.portal>div.output>div.layout>div.main table.content div.story[data-type=spark][data-name=shell] { margin-top:unset; } fieldset.web.wiki.portal.home>div.output>div.layout>div.main p { white-space:pre-wrap; text-align:center; } fieldset.web.wiki.portal.home>div.output>div.layout>div.main p:hover { background-color:var(--hover-bg-color); color:var(--hover-fg-color); }