Skip to content

Commit 0a3adc2

Browse files
committed
修复:electron-clipboard-ex 平台兼容性问题
1 parent 6ed3cad commit 0a3adc2

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

electron/mapi/manager/clipboard/clipboardFiles.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ import fs from 'fs';
44
import path from 'path';
55
import ofs from 'original-fs';
66
import {isLinux, isMac, isWin} from "../../../lib/env";
7-
import electronClipboardEx from 'electron-clipboard-ex';
7+
8+
let electronClipboardEx = null
9+
if (isMac || isWin) {
10+
(async () => {
11+
try {
12+
electronClipboardEx = await import('electron-clipboard-ex');
13+
electronClipboardEx = electronClipboardEx.default;
14+
console.log('electronClipboardEx', electronClipboardEx);
15+
} catch (e) {
16+
}
17+
})()
18+
}
819

920
export const getClipboardFiles = (): FileItem[] => {
1021
let fileInfo: any;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"crypto": "^1.0.1",
7777
"date-and-time": "^3.4.1",
7878
"dayjs": "^1.11.12",
79-
"electron-clipboard-ex": "^1.3.3",
8079
"electron-context-menu": "^4.0.4",
8180
"extract-file-icon": "^0.3.2",
8281
"ffmpeg-static": "^5.2.0",
@@ -110,6 +109,7 @@
110109
"yauzl": "^3.1.3"
111110
},
112111
"optionalDependencies": {
113-
"node-mac-permissions": "^2.4.0"
112+
"node-mac-permissions": "^2.4.0",
113+
"electron-clipboard-ex": "^1.3.3"
114114
}
115115
}

0 commit comments

Comments
 (0)