From 63cbd6d4c0dd370f7a514adf50710d09dd6c7bf9 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 7 May 2024 15:21:25 +0800 Subject: [PATCH] add some --- base/nfs/grep.go | 11 ++++++----- core/chat/macos/desktop.js | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/base/nfs/grep.go b/base/nfs/grep.go index 64c0b0a8..b0b0bea3 100644 --- a/base/nfs/grep.go +++ b/base/nfs/grep.go @@ -1,7 +1,6 @@ package nfs import ( - "path" "strings" ice "shylinux.com/x/icebergs" @@ -20,13 +19,15 @@ func init() { Index.MergeCommands(ice.Commands{ GREP: {Name: "grep word file auto", Help: "搜索", Hand: func(m *ice.Message, arg ...string) { kit.If(len(arg) == 0, func() { arg = append(arg, ice.MAIN) }) - m.Options(mdb.VALUE, arg[0], CMD_DIR, kit.Select("", arg, 2)) - kit.For(strings.Split(m.System(GREP, "--exclude=.[a-z]*", "--exclude-dir=.[a-z]*", "-rni", arg[0], path.Join(kit.Select(SRC, arg, 1))).Result(), ice.NL), func(s string) { + kit.If(len(arg) == 1, func() { arg = append(arg, ice.SRC) }) + m.Options(mdb.VALUE, arg[0]) + kit.For(kit.SplitLine(m.System(GREP, "--exclude=.[a-z]*", "--exclude-dir=.[a-z]*", "-rni", arg[0], kit.AddUniq([]string{}, arg[1:]...)).Result()), func(s string) { if ls := strings.SplitN(s, DF, 3); len(ls) > 2 { - m.Push(FILE, strings.TrimPrefix(ls[0], PWD)).Push(LINE, ls[1]).Push(mdb.TEXT, ls[2]) + _ls := SplitPath(m, ls[0]) + m.Push(PATH, _ls[0]).Push(FILE, _ls[1]).Push(LINE, ls[1]).Push(mdb.TEXT, ls[2]) } }) - m.StatusTimeCount(kit.Dict(PATH, m.Option(CMD_DIR))) + m.Sort("path,file,line") }}, }) } diff --git a/core/chat/macos/desktop.js b/core/chat/macos/desktop.js index be5db00f..bfdbdd76 100644 --- a/core/chat/macos/desktop.js +++ b/core/chat/macos/desktop.js @@ -152,7 +152,7 @@ Volcanos(chat.ONEXPORT, { tabs: function(can) { var list = can.page.Select(can, can.ui.menu._output, html.DIV_TABS, function(target) { return { select: can.page.ClassList.has(can, target, html.SELECT), - name: can.page.SelectOne(can, target, html.SPAN_NAME).innerHTML, + name: can.page.SelectOne(can, target, html.SPAN).innerHTML, list: can.page.SelectChild(can, target._desktop, html.FIELDSET, function(target) { return target._meta }) } }); can.misc.sessionStorage(can, [can.ConfIndex(), html.TABS], JSON.stringify(list)) },