From c045033e552bb67563283f0352d4d0c7239e924f Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 25 Jan 2025 15:15:48 +0800 Subject: [PATCH] add some --- base/web/serve.go | 2 +- core/code/compile.go | 3 ++- core/wiki/portal.css | 15 +++++++-------- core/wiki/portal.js | 2 +- misc/git/spides.go | 3 ++- misc/git/status.go | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/base/web/serve.go b/base/web/serve.go index f181fe18..69fe4709 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -189,7 +189,7 @@ func _serve_handle(key string, cmd *ice.Command, m *ice.Message, w http.Response }) UserHost(m) for k, v := range m.R.Header { - m.Info("what %v %v", k, v) + // m.Info("what %v %v", k, v) kit.If(strings.HasPrefix(k, "Wechatpay"), func() { m.Option(k, v) }) } m.W.Header().Add(strings.ReplaceAll(ice.LOG_TRACEID, ".", "-"), m.Option(ice.LOG_TRACEID)) diff --git a/core/code/compile.go b/core/code/compile.go index ed2e0982..c939aeac 100644 --- a/core/code/compile.go +++ b/core/code/compile.go @@ -107,7 +107,8 @@ func init() { m.Cmdy(INSTALL, web.DOWNLOAD, kit.Format("%s/go%s.%s-%s.%s", m.Option(SERVICE), m.Option(VERSION), runtime.GOOS, runtime.GOARCH, kit.Select("tar.gz", "zip", runtime.GOOS == cli.WINDOWS)), ice.USR_LOCAL) }}, web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { - kit.If(m.IsDebug() && aaa.IsTechOrRoot(m) && m.Option(mdb.TYPE) == web.WORKER && nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), ice.SRC_MAIN_GO)), func() { + // kit.If(m.IsDebug() && aaa.IsTechOrRoot(m) && m.Option(mdb.TYPE) == web.WORKER && nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), ice.SRC_MAIN_GO)), func() { + kit.If(m.IsDebug() && aaa.IsTechOrRoot(m), func() { kit.If(cli.SystemFindGo(m), func() { m.PushButton(kit.Dict(m.CommandKey(), m.Commands("").Help)) }) }) }}, diff --git a/core/wiki/portal.css b/core/wiki/portal.css index 6131ba38..c17b695d 100644 --- a/core/wiki/portal.css +++ b/core/wiki/portal.css @@ -2,8 +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 { - border-bottom:var(--box-border); +fieldset.web.wiki.portal>div.output>div.header { border-bottom:var(--box-border); 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; } @@ -13,12 +12,16 @@ fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div. fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item { display:flex; align-items:center; } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:first-child { padding:var(--input-padding); } body.mobile fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:first-child span { display:none; font-size:18px; max-width:160px; } -fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:first-child { line-height:calc(var(--portal-header-height) - 2 * var(--legend-padding)); font-size:24px; font-weight:bold; font-style:italic; } +fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:first-child { line-height:calc(var(--portal-header-height) - 2 * var(--legend-padding)); font-size:24px; font-weight:bold; + // font-style:italic; +} fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:first-child img { margin-right:var(--button-margin); } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item.select { background-color:var(--output-bg-color); } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item:hover { background-color:var(--output-bg-color); } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item.space { padding:0px; margin:0 var(--portal-main-padding); } fieldset.web.wiki.portal>div.output>div.layout { display:flex; justify-content:center; } +fieldset.web.wiki.portal>div.output>div.layout table.story.content { background-color:var(--output-bg-color); } +fieldset.web.wiki.portal>div.output>div.layout table.story.content th { text-align:left; padding:var(--table-padding); } fieldset.web.wiki.portal>div.output>div.layout>div.nav { border-right:var(--box-border); padding:var(--portal-main-padding); padding-right:var(--button-padding); min-width:var(--project-width); overflow:auto; } fieldset.web.wiki.portal>div.output>div.layout>div.nav div.story[data-name=navmenu] div.item { padding:var(--input-padding); } fieldset.web.wiki.portal>div.output>div.layout>div.nav div.story[data-name=navmenu] div.item.select { border-right:var(--box-notice); } @@ -29,7 +32,6 @@ fieldset.web.wiki.portal>div.output>div.layout>div.aside div.item { padding:var( fieldset.web.wiki.portal>div.output>div.layout>div.aside div.item.select { border-left:var(--box-notice); } fieldset.web.wiki.portal>div.output>div.layout>div.aside div.item.section { padding-left:var(--legend-padding); } fieldset.web.wiki.portal>div.output>div.layout>div.main { - // background-color:var(--output-bg-color); padding:var(--portal-main-padding); height:600px; min-width:390px; max-width:var(--portal-max-width); overflow:auto; overflow-x:hidden; } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column { display:flex; flex-direction:column; justify-content:center; } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column fieldset.inner>div.output>div.layout>div.layout div.content div.tips { top:5px; right:10px; } @@ -45,8 +47,7 @@ fieldset.web.wiki.portal>div.output>div.layout>div.main div.story.column input[t 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 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] { 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 table.content div.story[data-type=spark][data-name=shell] { margin-top:unset; } @@ -58,7 +59,6 @@ body.dark fieldset.web.wiki.portal>div.output>div.layout { background-color:var( body.dark fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset:not(.macos) { border:var(--plugin-border); } body.dark fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset { border-radius:0; } body.dark fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { border-left:var(--box-notice3); } -// body.dark fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { border:var(--box-border); } body.white fieldset.web.wiki.portal>div.output>div.header { color:silver; } body.light fieldset.web.wiki.portal>div.output>div.header { color:white; } body.light fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] { --hover-fg-color:black; } @@ -75,4 +75,3 @@ body.mobile fieldset.web.wiki.portal.home>div.output>div.layout>div.main h2 { ma body.mobile fieldset.web.wiki.portal>div.output>div.layout>div.main p { padding:var(--input-padding); margin:0; } body.width2 fieldset.web.wiki.portal>div.output>div.layout>div.main>div.flex { flex-direction:column; } body.web.wiki.portal fieldset.Action.home>div.toast { display:none; } -// body.web.wiki.portal.cmd { background-color:rgb(22 31 49); } diff --git a/core/wiki/portal.js b/core/wiki/portal.js index 5c34294f..6d36961e 100644 --- a/core/wiki/portal.js +++ b/core/wiki/portal.js @@ -23,7 +23,7 @@ Volcanos(chat.ONIMPORT, { meta.style && can.page.style(can, target, can.base.Obj(meta.style)) }); var nav = can.db.nav[file]; nav? nav.click(): can.onimport.content(can, "content.shy") can.page.Select(can, can.ui.header, "div.item:first-child>span", function(target, index) { - can.page.insertBefore(can, [{img: msg.Option(mdb.ICONS)||can.misc.ResourceFavicon(can, can.user.info.favicon), style: {height: 42}}], target) + can.page.insertBefore(can, [{img: can.misc.ResourceFavicon(can, msg.Option(mdb.ICONS)||can.user.info.favicon), style: {height: 42}}], target) }) }, 300) }, diff --git a/misc/git/spides.go b/misc/git/spides.go index 0b2e3ac8..676ed223 100644 --- a/misc/git/spides.go +++ b/misc/git/spides.go @@ -2,6 +2,7 @@ package git import ( ice "shylinux.com/x/icebergs" + "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/nfs" ) @@ -10,7 +11,7 @@ const SPIDES = "spides" func init() { Index.MergeCommands(ice.Commands{ - SPIDES: {Name: "spides repos auto", Help: "构架图", Hand: func(m *ice.Message, arg ...string) { + SPIDES: {Name: "spides repos auto", Help: "构架图", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { m.Cmdy(REPOS) } else if p := _repos_path(m, arg[0]); len(arg) == 1 { diff --git a/misc/git/status.go b/misc/git/status.go index eb86370a..0f372441 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -1,7 +1,6 @@ package git import ( - "path" "strings" "shylinux.com/x/go-git/v5/config" @@ -60,7 +59,8 @@ func init() { m.ProcessHold() }}, web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { - if !m.IsDebug() || !aaa.IsTechOrRoot(m) || !nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), _GIT)) { + // if !m.IsDebug() || !aaa.IsTechOrRoot(m) || !nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), _GIT)) { + if !m.IsDebug() || !aaa.IsTechOrRoot(m) { m.Push(mdb.TEXT, "") return }