tools/scan-code-jssdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
iqudoo
2026-05-02 23:04:49 +08:00
parent 69b0c4e27c
commit 4afa5ec8cb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/services/provider/scan.js
View File

@@ -405,7 +405,7 @@ export function scanVideo() {
unlockScanBeep(); unlockScanBeep();
Promise.resolve().then(() => { Promise.resolve().then(() => {
__scanning(); __scanning();
return startScanForWeb(getConfig("webScanCanvasStyle"), __result).then(resp => { return startScanForWeb(__result).then(resp => {
if (resp && resp.result) { if (resp && resp.result) {
__result(resp.result); __result(resp.result);
} }

8
src/services/web/index.js
View File

@@ -423,7 +423,7 @@ export function startScanForImage() {
}); });
} }
export function startScanForWeb(canvasStyle, onResult) { export function startScanForWeb(onResult) {
let currentUuid = null; let currentUuid = null;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
@@ -431,18 +431,20 @@ export function startScanForWeb(canvasStyle, onResult) {
scanWeb.uuid = createUUID(); scanWeb.uuid = createUUID();
scanWeb.finish = false; scanWeb.finish = false;
currentUuid = scanWeb.uuid; currentUuid = scanWeb.uuid;
let canvasStyle = getConfig("webScanCanvasStyle");
let canvasClass = getConfig("webScanCanvasClass");
let videoEl = createEl("video", let videoEl = createEl("video",
"__webscan_video__", "__webscan_video__",
"display: none", false); "display: none", false);
let canvasEnabled = getConfig("webScanCanvasEnabled") !== false; let canvasEnabled = getConfig("webScanCanvasEnabled") !== false;
let canvasDisplay = ""; let canvasDisplay = "";
let canvasBaseStyle = canvasStyle || "position: fixed; width: 300px; height: 300px; top: 0; left: 0; z-index: 9999;"; let canvasBaseStyle = canvasStyle || (!!canvasClass ? "" : "position: fixed; width: 300px; height: 300px; top: 0; left: 0; z-index: 9999;");
let canvasEl = createEl("canvas", let canvasEl = createEl("canvas",
"__webscan_canvas__", "__webscan_canvas__",
canvasBaseStyle + " display: none;", true); canvasBaseStyle + " display: none;", true);
canvasDisplay = canvasEl.style.display; canvasDisplay = canvasEl.style.display;
canvasEl.style.cssText = canvasBaseStyle; canvasEl.style.cssText = canvasBaseStyle;
canvasEl.className = getConfig("webScanCanvasClass") || ""; canvasEl.className = canvasClass || "";
canvasDisplay = canvasEl.style.display; canvasDisplay = canvasEl.style.display;
let canvasDisplaySize = getCanvasDisplaySize(canvasEl, 300, 240); let canvasDisplaySize = getCanvasDisplaySize(canvasEl, 300, 240);
canvasEl.style.display = "none"; canvasEl.style.display = "none";