From 06bffb92182ba654053305e406a5b9002ffc79e0 Mon Sep 17 00:00:00 2001
From: harveyshao <harveyshao@tencent.com>
Date: Wed, 25 Jan 2023 00:35:49 +0800
Subject: [PATCH] opt vimer.js

---
 base/cli/qrcode.go | 4 ++--
 base/log/log.go    | 2 +-
 core/code/xterm.go | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base/cli/qrcode.go b/base/cli/qrcode.go
index 66c249ac..118dcbfa 100644
--- a/base/cli/qrcode.go
+++ b/base/cli/qrcode.go
@@ -126,8 +126,8 @@ func init() {
 				}
 			}},
 		}, Hand: func(m *ice.Message, arg ...string) {
-			m.Option(FG, kit.Select(kit.Select(BLACK, BLUE, m.Option(ice.TOPIC) == BLACK), arg, 1))
-			m.Option(BG, kit.Select(kit.Select(WHITE, BLACK, m.Option(ice.TOPIC) == BLACK), arg, 2))
+			m.Option(FG, kit.Select(kit.Select(BLACK, WHITE, m.Option(ice.TOPIC) == BLACK || m.Option(ice.TOPIC) == "dark"), arg, 1))
+			m.Option(BG, kit.Select(kit.Select(WHITE, BLACK, m.Option(ice.TOPIC) == BLACK || m.Option(ice.TOPIC) == "dark"), arg, 2))
 			if m.IsCliUA() {
 				_qrcode_cli(m, kit.Select(kit.Select(ice.Info.Make.Domain, ice.Info.Domain), arg, 0))
 			} else {
diff --git a/base/log/log.go b/base/log/log.go
index 7660fc2b..cf818f6f 100644
--- a/base/log/log.go
+++ b/base/log/log.go
@@ -94,7 +94,7 @@ var Index = &ice.Context{Name: LOG, Help: "日志模块", Configs: ice.Configs{
 	FILE: {Name: FILE, Help: "日志文件", Value: kit.Dict(
 		BENCH, kit.Dict(nfs.PATH, path.Join(ice.VAR_LOG, "bench.log"), mdb.LIST, []string{}),
 		WATCH, kit.Dict(nfs.PATH, path.Join(ice.VAR_LOG, "watch.log"), mdb.LIST, []string{
-			mdb.CREATE, mdb.REMOVE, mdb.INSERT, mdb.DELETE, mdb.MODIFY, mdb.SELECT, mdb.EXPORT, mdb.IMPORT,
+			mdb.CREATE, mdb.REMOVE, mdb.INSERT, mdb.DELETE, mdb.MODIFY, mdb.EXPORT, mdb.IMPORT,
 		}),
 		ERROR, kit.Dict(nfs.PATH, path.Join(ice.VAR_LOG, "error.log"), mdb.LIST, []string{ice.LOG_WARN, ice.LOG_ERROR}),
 		TRACE, kit.Dict(nfs.PATH, path.Join(ice.VAR_LOG, "trace.log"), mdb.LIST, []string{ice.LOG_DEBUG}),
diff --git a/core/code/xterm.go b/core/code/xterm.go
index b558e84b..8a0e907a 100644
--- a/core/code/xterm.go
+++ b/core/code/xterm.go
@@ -40,6 +40,8 @@ func _xterm_get(m *ice.Message, h string) _xterm {
 	return mdb.HashSelectTarget(m, h, func() ice.Any {
 		ls := kit.Split(kit.Select(nfs.SH, t))
 		cmd := exec.Command(cli.SystemFind(m, ls[0]), ls[1:]...)
+		cmd.Env = append(cmd.Env, os.Environ()...)
+		cmd.Env = append(cmd.Env, "TERM=xterm")
 		tty, err := pty.Start(cmd)
 		m.Assert(err)
 		m.Go(func() {
@@ -98,7 +100,7 @@ func init() {
 				ctx.ProcessHold(m)
 			}},
 			"proxy": {Help: "代理", Hand: func(m *ice.Message, arg ...string) {
-				_xterm_get(m, kit.Select("", arg, 0)).Write(kit.Format(`git config --global url."%s".insteadOf "https://shylinux.com"`, m.Option(ice.MSG_USERHOST))+ice.NL)
+				_xterm_get(m, kit.Select("", arg, 0)).Write(kit.Format(`git config --global url."%s".insteadOf "https://shylinux.com"`, m.Option(ice.MSG_USERHOST)) + ice.NL)
 				ctx.ProcessHold(m)
 			}},
 			INSTALL: {Help: "安装", Hand: func(m *ice.Message, arg ...string) {
@@ -110,7 +112,6 @@ func init() {
 			if mdb.HashSelect(m, arg...); len(arg) == 0 {
 				m.PushAction(web.WEBSITE, mdb.REMOVE).Action(mdb.CREATE, mdb.PRUNES)
 			} else {
-				ctx.Toolkit(m, FAVOR, "web.chat.iframe")
 				m.Action(INSTALL, "debug", "proxy", "波浪线", "反引号")
 				ctx.DisplayLocal(m, "")
 			}