瀏覽代碼

fix: image paste

Tienson Qin 4 年之前
父節點
當前提交
8823b624d9
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      resources/js/preload.js
  2. 2 1
      src/main/frontend/handler/editor.cljs

+ 1 - 1
resources/js/preload.js

@@ -115,7 +115,7 @@ contextBridge.exposeInMainWorld('apis', {
 
     await fs.promises.mkdir(assetsRoot, { recursive: true })
 
-    from = decodeURIComponent(from || getFilePathFromClipboard())
+    from = from && decodeURIComponent(from || getFilePathFromClipboard())
 
     if (from) {
       // console.debug('copy file: ', from, dest)

+ 2 - 1
src/main/frontend/handler/editor.cljs

@@ -1505,7 +1505,8 @@
               filename (str path "/" filename)]
                                         ;(js/console.debug "Write asset #" dir filename file)
           (if (util/electron?)
-            (let [from (.-path file)]
+            (let [from (.-path file)
+                  from (if (string/blank? from) nil from)]
               (p/then (js/window.apis.copyFileToAssets dir filename from)
                       #(p/resolved [filename (if (string? %) (js/File. #js[] %) file) (.join util/node-path dir filename)])))
             (p/then (fs/write-file! repo dir filename (.stream file) nil)