fix: can't copy image record

ltaoo · ltaoo · commit 023734688109 · 2025-10-28T23:38:59.000+08:00
diff --git a/config/config.go b/config/config.go
@@ -70,7 +70,7 @@ func LoadConfig() (*Config, error) {
 		}
 	}
 
-	viper.SetDefault("info.version", "0.3.0")
+	viper.SetDefault("info.version", "0.3.1")
 	viper.SetDefault("info.productName", "Devboard")
 	viper.SetDefault("UserConfigDir", data_dir)
 	viper.SetDefault("UserConfigName", "settings.json")
diff --git a/frontend/src/biz/shortcut/shortcut.ts b/frontend/src/biz/shortcut/shortcut.ts
@@ -11,7 +11,7 @@ export function ShortcutModel(props: {}) {
     refresh() {
       bus.emit(Events.StateChange, { ..._state });
     },
-    register(handlers: Record<string, (event: KeyboardEvent) => void>) {
+    register(handlers: Record<string, (event: KeyboardEvent & { step?: 'keydown' | 'keyup' }) => void>) {
       const keys = Object.keys(handlers);
       for (let i = 0; i < keys.length; i += 1) {
         const handle_key = keys[i];
@@ -65,10 +65,22 @@ export function ShortcutModel(props: {}) {
         const handler = _shortcut_map[key1];
         if (handler) {
           // console.log("[BIZ]shortcut - key1 bingo!", key1, step);
+          // @ts-ignore
+          event.step = step;
           handler(event);
           return;
         }
       }
+      // 会触发两次啊，不行
+      // if (step === "keyup" && key1.includes("+")) {
+      //   const handler = _shortcut_map[key1];
+      //   if (handler) {
+      //     // @ts-ignore
+      //     event.step = step;
+      //     handler(event);
+      //     return;
+      //   }
+      // }
       if (step === "keydown" && key2) {
         // methods.invokeHandlers(event, key2);
         const handler = _shortcut_map[key2];
@@ -100,7 +112,7 @@ export function ShortcutModel(props: {}) {
   const ui = {};
 
   let _handlers: Handler<TheTypesOfEvents[Events.Shortcut]>[] = [];
-  let _shortcut_map: Record<string, (event: { code: string; preventDefault: () => void }) => void> = {};
+  let _shortcut_map: Record<string, (event: { code: string; step?: 'keydown' | 'keyup'; preventDefault: () => void }) => void> = {};
   let _pressed_codes: string[] = [];
   let _pressed_code_map: Record<string, boolean> = {};
   let _continuous_timer: NodeJS.Timeout | number | null = null;
@@ -127,7 +139,7 @@ export function ShortcutModel(props: {}) {
     methods,
     ui,
     state: _state,
-    ready() {},
+    ready() { },
     destroy() {
       bus.destroy();
     },
diff --git a/frontend/src/components/dynamic-content/with-click.tsx b/frontend/src/components/dynamic-content/with-click.tsx
@@ -11,15 +11,15 @@ export function ModelInList<T>(props: {}) {
       bus.emit(Events.StateChange, { ..._state });
     },
     set(uid: string, v: () => T) {
-      console.log("set", uid);
+      // console.log("set", uid);
       const existing = _cache.get(uid);
       if (existing) {
         return;
       }
       _cache.set(uid, v());
     },
     get(uid: string) {
-      console.log("get", uid);
+      // console.log("get", uid);
       return _cache.get(uid) ?? null;
     },
   };
diff --git a/frontend/src/domains/list-select/index.ts b/frontend/src/domains/list-select/index.ts
@@ -64,7 +64,7 @@ export function ListSelectModel(props: { $view: ScrollViewCore; num?: number })
     },
     moveToNextOption(opt: Partial<{ step: number; force: boolean }> = {}) {
       const { step = 1, force = false } = opt;
-      console.log("[COMPONENT]with-tags-input - moveToNextOption", _opt_idx, _options);
+      // console.log("[DOMAIN]list-select - moveToNextOption", _opt_idx, _options);
       if (_options.length === 0) {
         return;
       }
diff --git a/frontend/src/pages/helper_center/shortcut.tsx b/frontend/src/pages/helper_center/shortcut.tsx
@@ -73,7 +73,7 @@ export function HelperCenterShortcutView(props: ViewComponentProps) {
           <tbody>
             <tr>
               <td class="p-2 w-[280px]">
-                <ShortcutKey keys={["Ctrl", "Shift", "M"]} separator="+" />
+                <ShortcutKey keys={["Ctrl", "~"]} separator="+" />
               </td>
               <td class="p-2">
                 <div>macOS端</div>
diff --git a/frontend/src/pages/home/index.tsx b/frontend/src/pages/home/index.tsx
@@ -426,7 +426,7 @@ function HomeIndexViewModel(props: ViewComponentProps) {
       ui.$list_select.methods.moveToPrevOption({ step: 3, force: true });
     },
     "KeyJ,ArrowDown"(event) {
-      console.log("[]shortcut - KeyJ", ui.$input_search.isFocus, ui.$input_search.isOpen, event.code);
+      // console.log("[]shortcut - KeyJ", ui.$input_search.isFocus, ui.$input_search.isOpen, event.code);
       // console.log("[]shortcut - moveToNextOption");
       if (ui.$input_search.isFocus) {
         if (event.code === "ArrowDown") {
@@ -513,6 +513,12 @@ function HomeIndexViewModel(props: ViewComponentProps) {
     Escape() {
       ui.$input_search.methods.blur();
     },
+    EscapeEscape(event) {
+      setTimeout(() => {
+        Events.Emit({ name: "m:hide-main-window", data: null });
+        // 100 是为了 keyup 能正确清除掉按下的 Esc
+      }, 100);
+    },
   });
 
   request.paste.list.onStateChange(() => methods.refresh());
diff --git a/internal/biz/shortcut_darwin.go b/internal/biz/shortcut_darwin.go
@@ -3,14 +3,13 @@
 package biz
 
 import (
-	"fmt"
-
 	"golang.design/x/hotkey"
 )
 
 // const ModCommandKey = hotkey.ModCmd
 func NewHotkey() *hotkey.Hotkey {
-	fmt.Println("[]register hotkey in darwin")
-	hk := hotkey.New([]hotkey.Modifier{hotkey.ModCmd, hotkey.ModShift}, hotkey.KeyM)
+	// fmt.Println("[]register hotkey in darwin")
+	// hk := hotkey.New([]hotkey.Modifier{hotkey.ModCmd, hotkey.ModShift}, hotkey.KeyM)
+	hk := hotkey.New([]hotkey.Modifier{hotkey.ModCmd}, hotkey.Key(0x32))
 	return hk
 }
diff --git a/internal/biz/shortcut_windows.go b/internal/biz/shortcut_windows.go
@@ -10,5 +10,6 @@ import (
 func NewHotkey() *hotkey.Hotkey {
 	// fmt.Println("[]register hotkey")
 	// hk := hotkey.New([]hotkey.Modifier{}, hotkey.)
-	return &hotkey.Hotkey{}
+	hk := hotkey.New([]hotkey.Modifier{hotkey.ModCtrl}, hotkey.Key(0xC0))
+	return hk
 }
diff --git a/internal/service/paste.go b/internal/service/paste.go
@@ -187,7 +187,6 @@ func (s *PasteService) Write(body PasteboardWriteBody) *Result {
 	if record.FileListJSON != "" {
 		is_file = true
 	}
-
 	if is_html {
 		s.Biz.ManuallyWriteClipboardTime = time.Now()
 		text := record.Html
@@ -199,13 +198,6 @@ func (s *PasteService) Write(body PasteboardWriteBody) *Result {
 		}
 		return Ok(nil)
 	}
-	if is_text {
-		s.Biz.ManuallyWriteClipboardTime = time.Now()
-		if err := clipboard.WriteText(record.Text); err != nil {
-			return Error(err)
-		}
-		return Ok(nil)
-	}
 	if is_image {
 		s.Biz.ManuallyWriteClipboardTime = time.Now()
 		decoded_data, err := base64.StdEncoding.DecodeString(record.ImageBase64)
@@ -241,6 +233,13 @@ func (s *PasteService) Write(body PasteboardWriteBody) *Result {
 		}
 		return Ok(nil)
 	}
+	if is_text {
+		s.Biz.ManuallyWriteClipboardTime = time.Now()
+		if err := clipboard.WriteText(record.Text); err != nil {
+			return Error(err)
+		}
+		return Ok(nil)
+	}
 	return Error(fmt.Errorf("invalid record data"))
 }
 
diff --git a/main.go b/main.go
@@ -5,7 +5,6 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
-	"log"
 	"net/http"
 	"net/url"
 	"runtime"
@@ -227,9 +226,12 @@ func main() {
 	}
 	menu := app.NewMenu()
 	m_main := menu.Add("Show Devboard")
-	if runtime.GOOS == "darwin" {
-		m_main.SetAccelerator("CmdOrCtrl+Shift+M")
-	}
+	// if runtime.GOOS == "darwin" {
+	// 	m_main.SetAccelerator("CmdOrCtrl+Shift+M")
+	// }
+	// if runtime.GOOS == "windows" {
+	// 	m_main.SetAccelerator("CmdOrCtrl+Backquote")
+	// }
 	m_main.OnClick(func(ctx *application.Context) {
 		win.Show()
 		win.Focus()
@@ -339,6 +341,9 @@ func main() {
 		search := fmt.Sprintf("?title=%v&desc=%v", body.Title, body.Content)
 		biz.ShowErrorWindow(search)
 	})
+	app.Event.On("m:hide-main-window", func(event *application.CustomEvent) {
+		win.Hide()
+	})
 	go func() {
 		machine_id, err := machineid.ID()
 		if err != nil {
@@ -381,6 +386,35 @@ func main() {
 		biz.SetUserConfig(biz_config)
 		// win.Show()
 	}()
+
+	var register_global_shortcut func(win *application.WebviewWindow, hk *hotkey.Hotkey)
+	register_global_shortcut = func(win *application.WebviewWindow, hk *hotkey.Hotkey) {
+		// hk := hotkey.New([]hotkey.Modifier{hotkey.ModCmd, hotkey.ModShift}, hotkey.KeyM)
+		if err := hk.Register(); err != nil {
+			t := fmt.Sprintf("hotkey: failed to register hotkey: %v", err)
+			biz.ShowErrorWindow("?" + url.QueryEscape("title=InitializeFailed&desc="+t))
+			return
+		}
+		// log.Printf("hotkey: %v is registered\n", hk)
+		<-hk.Keydown()
+		// log.Printf("hotkey: %v is down\n", hk)
+		<-hk.Keyup()
+		// log.Printf("hotkey: %v is up\n", hk)
+		if err := hk.Unregister(); err != nil {
+			t := fmt.Sprintf("hotkey: failed to unregister hotkey: %v", err)
+			biz.ShowErrorWindow("?" + url.QueryEscape("title=Shortcut&desc="+t))
+			return
+		}
+		// log.Printf("hotkey: %v is unregistered\n", hk)
+		if win.IsVisible() {
+			win.Hide()
+		} else {
+			win.Show()
+			win.Focus()
+		}
+		register_global_shortcut(win, hk)
+	}
+
 	go func() {
 		register_global_shortcut(win, hk)
 	}()
@@ -392,26 +426,3 @@ func main() {
 		fmt.Println(err.Error())
 	}
 }
-
-func register_global_shortcut(win *application.WebviewWindow, hk *hotkey.Hotkey) {
-	// hk := hotkey.New([]hotkey.Modifier{hotkey.ModCmd, hotkey.ModShift}, hotkey.KeyM)
-	err := hk.Register()
-	if err != nil {
-		log.Fatalf("hotkey: failed to register hotkey: %v", err)
-		return
-	}
-	// log.Printf("hotkey: %v is registered\n", hk)
-	<-hk.Keydown()
-	// log.Printf("hotkey: %v is down\n", hk)
-	<-hk.Keyup()
-	// log.Printf("hotkey: %v is up\n", hk)
-	hk.Unregister()
-	// log.Printf("hotkey: %v is unregistered\n", hk)
-	if win.IsVisible() {
-		win.Hide()
-	} else {
-		win.Show()
-		win.Focus()
-	}
-	register_global_shortcut(win, hk)
-}

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func LoadConfig() (*Config, error) {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- viper.SetDefault("info.version", "0.3.0")`
	`73`	`+ viper.SetDefault("info.version", "0.3.1")`
`74`	`74`	`viper.SetDefault("info.productName", "Devboard")`
`75`	`75`	`viper.SetDefault("UserConfigDir", data_dir)`
`76`	`76`	`viper.SetDefault("UserConfigName", "settings.json")`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export function ListSelectModel(props: { $view: ScrollViewCore; num?: number })`
`64`	`64`	`},`
`65`	`65`	`moveToNextOption(opt: Partial<{ step: number; force: boolean }> = {}) {`
`66`	`66`	`const { step = 1, force = false } = opt;`
`67`		`- console.log("[COMPONENT]with-tags-input - moveToNextOption", _opt_idx, _options);`
	`67`	`+ // console.log("[DOMAIN]list-select - moveToNextOption", _opt_idx, _options);`
`68`	`68`	`if (_options.length === 0) {`
`69`	`69`	`return;`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ import (`
`10`	`10`	`func NewHotkey() *hotkey.Hotkey {`
`11`	`11`	`// fmt.Println("[]register hotkey")`
`12`	`12`	`// hk := hotkey.New([]hotkey.Modifier{}, hotkey.)`
`13`		`- return &hotkey.Hotkey{}`
	`13`	`+ hk := hotkey.New([]hotkey.Modifier{hotkey.ModCtrl}, hotkey.Key(0xC0))`
	`14`	`+ return hk`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,6 @@ func (s PasteService) Write(body PasteboardWriteBody) Result {`
`187`	`187`	`if record.FileListJSON != "" {`
`188`	`188`	`is_file = true`
`189`	`189`	`}`
`190`		`-`
`191`	`190`	`if is_html {`
`192`	`191`	`s.Biz.ManuallyWriteClipboardTime = time.Now()`
`193`	`192`	`text := record.Html`
`@@ -199,13 +198,6 @@ func (s PasteService) Write(body PasteboardWriteBody) Result {`
`199`	`198`	`}`
`200`	`199`	`return Ok(nil)`
`201`	`200`	`}`
`202`		`- if is_text {`
`203`		`- s.Biz.ManuallyWriteClipboardTime = time.Now()`
`204`		`- if err := clipboard.WriteText(record.Text); err != nil {`
`205`		`- return Error(err)`
`206`		`- }`
`207`		`- return Ok(nil)`
`208`		`- }`
`209`	`201`	`if is_image {`
`210`	`202`	`s.Biz.ManuallyWriteClipboardTime = time.Now()`
`211`	`203`	`decoded_data, err := base64.StdEncoding.DecodeString(record.ImageBase64)`
`@@ -241,6 +233,13 @@ func (s PasteService) Write(body PasteboardWriteBody) Result {`
`241`	`233`	`}`
`242`	`234`	`return Ok(nil)`
`243`	`235`	`}`
	`236`	`+ if is_text {`
	`237`	`+ s.Biz.ManuallyWriteClipboardTime = time.Now()`
	`238`	`+ if err := clipboard.WriteText(record.Text); err != nil {`
	`239`	`+ return Error(err)`
	`240`	`+ }`
	`241`	`+ return Ok(nil)`
	`242`	`+ }`
`244`	`243`	`return Error(fmt.Errorf("invalid record data"))`
`245`	`244`	`}`
`246`	`245`