From 9463b2a845fcee81bcfa0d5a5a2f0ef0ca786d4d Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sat, 3 Dec 2022 22:39:50 +0800 Subject: [PATCH] opt wiki --- core/wiki/field.go | 2 -- core/wiki/parse.go | 2 -- core/wiki/spark.go | 3 --- 3 files changed, 7 deletions(-) diff --git a/core/wiki/field.go b/core/wiki/field.go index f791c00b..b839af3b 100644 --- a/core/wiki/field.go +++ b/core/wiki/field.go @@ -38,11 +38,9 @@ func _field_show(m *ice.Message, name, text string, arg ...string) { if len(meta) == 0 || !aaa.Right(m.Spawn(), cmds[0]) { return } - name = strings.ReplaceAll(name, ice.SP, "_") meta[mdb.NAME], meta[mdb.INDEX] = name, text msg := m.Spawn() - for i := 0; i < len(arg)-1; i += 2 { if strings.HasPrefix(arg[i], ARGS) { kit.Value(meta, arg[i], m.Optionv(arg[i], kit.Split(strings.TrimSuffix(strings.TrimPrefix(arg[i+1], "["), "]")))) diff --git a/core/wiki/parse.go b/core/wiki/parse.go index 56c4f067..6523735b 100644 --- a/core/wiki/parse.go +++ b/core/wiki/parse.go @@ -25,7 +25,6 @@ func init() { if len(arg) < 2 { return } - if arg[1] = strings.TrimSpace(arg[1]); arg[0] == ice.AUTO { if strings.HasPrefix(arg[1], "{") || strings.HasPrefix(arg[1], "[") { arg[0] = nfs.JSON @@ -39,7 +38,6 @@ func init() { arg[0] = mdb.LIST } } - switch m.OptionFields(mdb.DETAIL); arg[0] { case "base64": if buf, err := base64.StdEncoding.DecodeString(arg[1]); err == nil { diff --git a/core/wiki/spark.go b/core/wiki/spark.go index 4d3c3d35..54ea18d5 100644 --- a/core/wiki/spark.go +++ b/core/wiki/spark.go @@ -13,15 +13,12 @@ func _spark_show(m *ice.Message, name, text string, arg ...string) *ice.Message if _option(m, m.CommandKey(), name, text, arg...); name == "" { return _wiki_template(m, name, text, arg...) } - m.Echo(`
`, name, m.Option("style")) defer m.Echo("
") - switch name { case "inner", FIELD: return m.Echo(text) } - prompt := kit.Select(name+"> ", m.Config(kit.Keys(ssh.PROMPT, name))) for _, l := range kit.SplitLine(text) { m.Echo(Format("div", Format("label", prompt), Format("span", l)))