From 3627f5f9009a4b42f9d57a7084b17fec44d2d2be Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 5 Mar 2024 21:24:35 +0800 Subject: [PATCH] add some --- base/web/render.go | 2 +- core/wiki/portal.css | 4 ++-- core/wiki/portal.go | 4 ++-- core/wiki/portal.js | 3 +-- core/wiki/spark.go | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/base/web/render.go b/base/web/render.go index e4502ed6..a8067400 100644 --- a/base/web/render.go +++ b/base/web/render.go @@ -46,7 +46,7 @@ func Render(m *ice.Message, cmd string, args ...ice.Any) bool { arg := kit.Simple(args...) kit.If(len(arg) == 0, func() { args = nil }) if cmd != "" { - if cmd != ice.RENDER_DOWNLOAD || !kit.HasPrefix(arg[0], ice.SRC_TEMPLATE, ice.USR_INTSHELL, ice.USR_VOLCANOS) { + if cmd != ice.RENDER_DOWNLOAD || !kit.HasPrefix(arg[0], nfs.SRC, nfs.USR, ice.SRC_TEMPLATE, ice.USR_INTSHELL, ice.USR_VOLCANOS) { if !(cmd == ice.RENDER_RESULT && len(args) == 0) { defer func() { m.Logs("Render", cmd, args) }() } diff --git a/core/wiki/portal.css b/core/wiki/portal.css index c3eab1f0..9d2351e6 100644 --- a/core/wiki/portal.css +++ b/core/wiki/portal.css @@ -40,8 +40,8 @@ fieldset.web.wiki.portal>div.output>div.layout>div.main fieldset.inner.output di --code-object:silver; --code-datatype:silver; --code-package:silver; } fieldset.web.wiki.portal>div.output>div.layout>div.main div.story[data-type=spark][data-name=shell] { - background-color:var(--code-bg-color); color:var(--code-fg-color); padding:var(--button-padding) var(--input-padding); margin:var(--plugin-margin) 0; box-shadow:var(--box-shadow); - margin:10px 0; + background-color:var(--code-bg-color); color:var(--code-fg-color); box-shadow:var(--box-shadow); + padding:var(--button-padding) var(--input-padding); margin-top:10px; } 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; } diff --git a/core/wiki/portal.go b/core/wiki/portal.go index d8b42f66..0b13b21b 100644 --- a/core/wiki/portal.go +++ b/core/wiki/portal.go @@ -74,7 +74,7 @@ func init() { ctx.RUN: {Hand: func(m *ice.Message, arg ...string) { if p := path.Join(ice.USR_PORTAL, path.Join(arg...)); (m.Option(ice.DEBUG) == ice.TRUE || !nfs.ExistsFile(m, p)) && aaa.Right(m.Spawn(), arg) { ctx.Run(m, arg...) - m.Cmd(nfs.SAVE, p, ice.Maps{nfs.CONTENT: m.FormatMeta(), nfs.DIR_ROOT: ""}) + m.Cmd(nfs.SAVE, p, ice.Maps{nfs.CONTENT: m.FormatsMeta(nil), nfs.DIR_ROOT: ""}) } else { m.Copy(m.Spawn([]byte(m.Cmdx(nfs.CAT, p)))) } @@ -91,7 +91,7 @@ func init() { }) } func _portal_path(m *ice.Message, arg ...string) (res string) { - if !nfs.Exists(m, path.Join("src/document/", path.Join(arg...)), func(p string) { res = p }) { + if !nfs.Exists(m, path.Join(nfs.SRC_DOCUMENT, path.Join(arg...)), func(p string) { res = p }) { res = path.Join(nfs.USR_LEARNING_PORTAL, path.Join(arg...)) } return res diff --git a/core/wiki/portal.js b/core/wiki/portal.js index acde3eb4..12cd0894 100644 --- a/core/wiki/portal.js +++ b/core/wiki/portal.js @@ -14,7 +14,6 @@ Volcanos(chat.ONIMPORT, { can.ui.header.innerHTML = msg.Append(html.HEADER), can.ui.nav.innerHTML = msg.Append(html.NAV) if (msg.Append(html.NAV) == "") { can.onmotion.hidden(can, can.ui.nav), can.onmotion.hidden(can, can.ui.aside) - can.onimport.content(can, "content.shy") } else { can.page.styleWidth(can, can.ui.nav, 230), can.page.styleWidth(can, can.ui.aside, 200) if (can.ConfWidth() < 1000) { can.onmotion.hidden(can, can.ui.aside) } @@ -24,7 +23,7 @@ Volcanos(chat.ONIMPORT, { can.db.nav = {}, can.page.Select(can, can._output, wiki.STORY_ITEM, function(target) { var meta = target.dataset||{} can.core.CallFunc([can.onimport, can.onimport[meta.name]? meta.name: meta.type||target.tagName.toLowerCase()], [can, meta, target]) meta.style && can.page.style(can, target, can.base.Obj(meta.style)) - }); var nav = can.db.nav[file]; nav && nav.click() + }); var nav = can.db.nav[file]; nav? nav.click(): can.onimport.content(can, "content.shy") }) }, _scroll: function(can) { can.ui.main.onscroll = function(event) { var top = can.ui.main.scrollTop, select diff --git a/core/wiki/spark.go b/core/wiki/spark.go index 3be9e016..2669d98d 100644 --- a/core/wiki/spark.go +++ b/core/wiki/spark.go @@ -124,7 +124,7 @@ func _spark_project(m *ice.Message, arg ...string) { m.Cmdy(SPARK, html.BUTTON, "文 档", ROUTE, "started/") m.Cmdy(STYLE, END) m.Cmdy(STYLE, END) - m.Cmdy(STYLE, COLUMN, FLEX, "0 0 480px") + m.Cmdy(STYLE, COLUMN, FLEX, "0 0 500px", "padding", "10px") m.Cmdy(SPARK, INNER, ice.SRC_MAIN_GO, html.WIDTH, "480px") m.Cmdy(SPARK, SHELL, kit.Renders(` git clone {{ .Make.Remote }}